From 04c4d5a1894672abd8a31de3e120730ab9d91515 Mon Sep 17 00:00:00 2001 From: robvde Date: Fri, 28 Sep 2012 13:12:12 +0400 Subject: [PATCH] Fixed Web Shared/Dedicated switch when no global dns records are defined --- .../Code/WebServers/WebServerController.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs index 80f4b454..26f3c3c9 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs @@ -639,6 +639,13 @@ namespace WebsitePanel.EnterpriseServer if (domain != null) DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); + // clear binding left overs + WebServer web = new WebServer(); + ServiceProviderProxy.Init(web, siteItem.ServiceId); + WebSite site = web.GetSite(siteItem.SiteId); + List newBindings = new List(); + web.UpdateSiteBindings(siteItem.SiteId, newBindings.ToArray(), true); + // update site item siteItem.SiteIPAddressId = addressId; PackageController.UpdatePackageItem(siteItem); @@ -661,23 +668,18 @@ namespace WebsitePanel.EnterpriseServer , ZoneInfo.DomainId, true, true, true); } - - WebServer web = new WebServer(); - ServiceProviderProxy.Init(web, siteItem.ServiceId); - WebSite site = web.GetSite(siteItem.SiteId); - // load web site IP address IPAddressInfo ip = ServerController.GetIPAddress(siteItem.SiteIPAddressId); string ipAddr = "*"; if (ip != null) ipAddr = !String.IsNullOrEmpty(ip.InternalIP) ? ip.InternalIP : ip.ExternalIP; - List newBindings = new List(); + newBindings = new List(); ServerBinding srvBinding = new ServerBinding(ipAddr, "80", ""); newBindings.Add(srvBinding); - foreach (ServerBinding b in site.Bindings) + foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId)) { if (!((b.Host == srvBinding.Host) & (b.IP == srvBinding.IP) &