From d9f39919787d4712a2abfc2e1216860cfa0ab5e0 Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 4 Aug 2013 06:48:29 +0400 Subject: [PATCH 1/8] Fixed wsp-10163 WSP 2.1 :: Exchange 2013 :: Connections not properly closed --- .../Exchange2013.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs index fbb8a7ee..57c2b0f1 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs @@ -2014,6 +2014,7 @@ namespace WebsitePanel.Providers.HostedSolution finally { CloseRunspace(runSpace); + CloseRunspaceEx(runSpaceEx); } } @@ -2342,6 +2343,7 @@ namespace WebsitePanel.Providers.HostedSolution { CloseRunspace(runSpace); + CloseRunspaceEx(runSpaceEx); } ExchangeLog.LogEnd("GetMailboxGeneralSettingsInternal"); return info; @@ -2580,6 +2582,7 @@ namespace WebsitePanel.Providers.HostedSolution { CloseRunspace(runSpace); + CloseRunspaceEx(runSpaceEx); } ExchangeLog.LogEnd("GetMailboxAdvancedSettingsInternal"); return info; @@ -2647,6 +2650,7 @@ namespace WebsitePanel.Providers.HostedSolution { CloseRunspace(runSpace); + CloseRunspaceEx(runSpaceEx); } ExchangeLog.LogEnd("SetMailboxAdvancedSettingsInternal"); } @@ -3092,6 +3096,7 @@ namespace WebsitePanel.Providers.HostedSolution finally { CloseRunspace(runSpace); + CloseRunspaceEx(runSpaceEx); } ExchangeLog.LogEnd("GetMailboxStatisticsInternal"); return info; @@ -5987,7 +5992,7 @@ namespace WebsitePanel.Providers.HostedSolution { try { - if (runspace != null && runspace.RunspaceStateInfo.State == RunspaceState.Opened) + if (runspace != null) { runspace.Dispose(); runspace = null; From 48f157de846074f2c0d14f3044dbb646b137a6ee Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 4 Aug 2013 07:11:18 +0400 Subject: [PATCH 2/8] wsp-10160 Exchange - Hosted Organization management - Accepted domain InternalRelay -> AddressBookEnabled False Authorative -> AddressBookEnabled True --- .../Exchange2013.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs index 57c2b0f1..94c4ebe7 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs @@ -6430,6 +6430,7 @@ namespace WebsitePanel.Providers.HostedSolution Command cmd = new Command("Set-AcceptedDomain"); cmd.Parameters.Add("Identity", id); cmd.Parameters.Add("DomainType", domainType.ToString()); + cmd.Parameters.Add("AddressBookEnabled", !(domainType == ExchangeAcceptedDomainType.InternalRelay)); cmd.Parameters.Add("Confirm", false); ExecuteShellCommand(runSpace, cmd); ExchangeLog.LogEnd("SetAcceptedDomainType"); From 4e66474e4978f9dfcc8f6bea6d5f9bcacb274c4a Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sat, 3 Aug 2013 23:20:05 -0400 Subject: [PATCH 3/8] Added tag build-2.1.0.139 for changeset 2fd1b60a2610 From 876a1cd23b267f1b527ff95c3310861c0b30491b Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 4 Aug 2013 07:26:35 +0400 Subject: [PATCH 4/8] wsp-10130 Domain name missing from drownload list on Create Mail Account Page --- .../WebsitePanel/DomainsSelectDomainControl.ascx.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs index 7c52e8f0..a4276f84 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsSelectDomainControl.ascx.cs @@ -99,7 +99,7 @@ namespace WebsitePanel.Portal { get { - return ddlDomains.SelectedItem.Text; + return ddlDomains.SelectedItem.Text.ToLower(); } } @@ -192,7 +192,7 @@ namespace WebsitePanel.Portal else if (HideDomainsSubDomains && !(domain.IsDomainPointer)) continue; - ddlDomains.Items.Add(new ListItem(domain.DomainName, domain.DomainId.ToString())); + ddlDomains.Items.Add(new ListItem(domain.DomainName.ToLower(), domain.DomainId.ToString())); } if (Request.Cookies["CreatedDomainId"] != null) From c31a15c8e3562fc65f47c7b0cb67d450743b6674 Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 4 Aug 2013 07:31:10 +0400 Subject: [PATCH 5/8] wsp-10160 Exchange - Hosted Organization management - Accepted domain Fix for Exchange 2007-2010 --- .../WebsitePanel.Providers.HostedSolution/Exchange2007.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs index d8741eb8..a21d05b7 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/Exchange2007.cs @@ -6050,6 +6050,7 @@ namespace WebsitePanel.Providers.HostedSolution Command cmd = new Command("Set-AcceptedDomain"); cmd.Parameters.Add("Identity", id); cmd.Parameters.Add("DomainType", domainType.ToString()); + cmd.Parameters.Add("AddressBookEnabled", !(domainType == ExchangeAcceptedDomainType.InternalRelay)); cmd.Parameters.Add("Confirm", false); ExecuteShellCommand(runSpace, cmd); ExchangeLog.LogEnd("SetAcceptedDomainType"); From 24c886f7f74de42226d31ce49eebab53b53daf64 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sat, 3 Aug 2013 23:40:01 -0400 Subject: [PATCH 6/8] Added tag build-2.1.0.140 for changeset b1f91a76d3fd From 8100db2e4fde9143e264f921a3b8533f2b9898c2 Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 4 Aug 2013 08:22:01 +0400 Subject: [PATCH 7/8] wsp-10188 Issue with SSL after IP Switching --- .../WebServers/WebServerController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs index 24f91021..07802a23 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs @@ -4186,7 +4186,8 @@ Please ensure the space has been allocated {0} IP address as a dedicated one and IPAddressInfo ip = ServerController.GetIPAddress(item.SiteIPAddressId); if (ip != null) - item.SiteIPAddress = !String.IsNullOrEmpty(ip.InternalIP) ? ip.InternalIP : ip.ExternalIP; + //item.SiteIPAddress = !String.IsNullOrEmpty(ip.InternalIP) ? ip.InternalIP : ip.ExternalIP; + item.SiteIPAddress = ip.ExternalIP; certificate = server.installCertificate(certificate, item); if (certificate.SerialNumber == null) From b6d03a3ecb2ff2ddf100c6349ac9ea09df7b9197 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sun, 4 Aug 2013 00:33:18 -0400 Subject: [PATCH 8/8] Added tag build-2.1.0.141 for changeset 6cd71a620a8a