From 3a1e8a6dccc6316f54b9dc1b503e7a329bc5251c Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Sun, 21 Dec 2014 03:08:37 +0400 Subject: [PATCH 1/7] in organizationdomainnames removed check ishost. part 2 --- .../WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx | 2 +- .../WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx index 59c42aec..71b7c337 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx @@ -30,7 +30,7 @@ + NavigateUrl='<%# GetDomainRecordsEditUrl(Eval("DomainID").ToString()) %>' Enabled="true"> <%# Eval("DomainName") %> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx index 8c6e86e9..f9e2ab8a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx @@ -30,7 +30,7 @@ + NavigateUrl='<%# GetDomainRecordsEditUrl(Eval("DomainID").ToString()) %>' Enabled="true"> <%# Eval("DomainName") %> From 161b03e8de737e1c8a00dc146a896676e0c04b7d Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 22 Dec 2014 08:16:06 -0500 Subject: [PATCH 2/7] Added tag build-2.1.0.502 for changeset 7dd6e27c826e From 9579debd59613441a5ef7a2ca394400eb533c066 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 22 Dec 2014 12:11:26 -0500 Subject: [PATCH 3/7] Added tag build-2.1.0.503 for changeset ab71151d7cff From dec22ef57b866121601974945bdf397aa21d8c6d Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Mon, 22 Dec 2014 22:58:35 +0400 Subject: [PATCH 4/7] fix check domain used by HostedOrganization --- WebsitePanel/Database/update_db.sql | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 603f79f0..8b609c0f 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -7070,3 +7070,28 @@ BEGIN UPDATE [dbo].[Providers] SET [EditorControl] = 'Windows2012' WHERE [ProviderName] = 'Windows2012' END GO + +-- fix check domain used by HostedOrganization + +ALTER PROCEDURE [dbo].[CheckDomainUsedByHostedOrganization] + @DomainName nvarchar(100), + @Result int OUTPUT +AS + SET @Result = 0 + IF EXISTS(SELECT 1 FROM ExchangeAccounts WHERE UserPrincipalName LIKE '%@'+ @DomainName AND AccountType!=2) + BEGIN + SET @Result = 1 + END + ELSE + IF EXISTS(SELECT 1 FROM ExchangeAccountEmailAddresses WHERE EmailAddress LIKE '%@'+ @DomainName) + BEGIN + SET @Result = 1 + END + ELSE + IF EXISTS(SELECT 1 FROM LyncUsers WHERE SipAddress LIKE '%@'+ @DomainName) + BEGIN + SET @Result = 1 + END + + RETURN @Result +GO From 6e716c311dda78c59494c499d24431ce14a7d26c Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 22 Dec 2014 14:24:08 -0500 Subject: [PATCH 5/7] Added tag build-2.1.0.504 for changeset 1872e8662105 From 69e86444192a8d6b8c4eec05794b4d8cdf4ac80e Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 23 Dec 2014 07:02:17 -0800 Subject: [PATCH 6/7] ST Fixes --- .../SchedulerTasks/DomainExpirationTask.cs | 5 +++-- .../DesktopModules/WebsitePanel/Domains.ascx | 2 +- .../DesktopModules/WebsitePanel/Domains.ascx.cs | 17 +++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs index 521d17be..4e8b079d 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/DomainExpirationTask.cs @@ -183,9 +183,10 @@ namespace WebsitePanel.EnterpriseServer items["user"] = user; items["Domains"] = domains.Select(x => new { DomainName = x.DomainName, - ExpirationDate = x.ExpirationDate, + ExpirationDate = x.ExpirationDate < DateTime.Now ? "Expired" : x.ExpirationDate.ToString(), + ExpirationDateOrdering = x.ExpirationDate, Customer = string.Format("{0} {1}", domainUsers[x.PackageId].FirstName, domainUsers[x.PackageId].LastName) }) - .OrderBy(x => x.ExpirationDate).ThenBy(x => x.Customer).ThenBy(x => x.DomainName); + .OrderBy(x => x.ExpirationDateOrdering).ThenBy(x => x.Customer).ThenBy(x => x.DomainName); items["IncludeNonExistenDomains"] = includeNonExistenDomains; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx index 8dc31afd..c1ac1fcd 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx @@ -42,7 +42,7 @@ <%# GetDomainExpirationDate(Eval("ExpirationDate"), Eval("LastUpdateDate"))%> -
+
">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx.cs index 06fb93e2..db114e6d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Domains.ascx.cs @@ -45,8 +45,12 @@ namespace WebsitePanel.Portal { public partial class Domains : WebsitePanelModuleBase { + public Dictionary dnsRecords; + protected void Page_Load(object sender, EventArgs e) { + dnsRecords = new Dictionary(); + gvDomains.PageSize = UsersHelper.GetDisplayItemsPerPage(); // visibility @@ -154,11 +158,18 @@ namespace WebsitePanel.Portal public string GetDomainDnsRecords(int domainId) { + if(dnsRecords.ContainsKey(domainId)) + { + return dnsRecords[domainId]; + } + var records = ES.Services.Servers.GetDomainDnsRecords(domainId); if (!records.Any()) { - return "No Dns Records"; + dnsRecords.Add(domainId, string.Empty); + + return string.Empty; } var header = GetLocalizedString("DomainLookup.TooltipHeader"); @@ -169,7 +180,9 @@ namespace WebsitePanel.Portal tooltipLines.Add(" "); tooltipLines.AddRange( records.Select(x=>string.Format("{0}: {1}", x.RecordType, x.Value))); - return string.Join("\r\n", tooltipLines); + dnsRecords.Add(domainId, string.Join("\r\n", tooltipLines)); + + return dnsRecords[domainId]; } protected void odsDomainsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e) From 4cd7d2bd40447d9b1f7b213478f64ea0c869bd81 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 23 Dec 2014 16:11:19 -0500 Subject: [PATCH 7/7] Added tag build-2.1.0.505 for changeset ee6aac1f7438