zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: webhosting switch shared/dedicated, if domain is claimes as webpointer

Browse source 
error raised.
This commit is contained in:
robvde 2012-10-01 22:29:44 +04:00
parent 507a433c3f
commit 89051f2d0f
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
View file

@ -631,12 +631,18 @@ namespace WebsitePanel.EnterpriseServer
try try
{ {
// remove all web site pointers // remove all web site pointers
DomainInfo domain = ServerController.GetDomain(siteItem.Name);
DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
if (ZoneInfo == null)
throw new Exception("failed to retrieve parent zone");
List<DomainInfo> pointers = GetWebSitePointers(siteItemId); List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
foreach (DomainInfo pointer in pointers) foreach (DomainInfo pointer in pointers)
DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false);
// remove web site main pointer // remove web site main pointer
DomainInfo domain = ServerController.GetDomain(siteItem.Name);
if (domain != null) if (domain != null)
DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false);
@ -653,8 +659,7 @@ namespace WebsitePanel.EnterpriseServer
// associate IP with web site // associate IP with web site
ServerController.AddItemIPAddress(siteItemId, ipAddressId); ServerController.AddItemIPAddress(siteItemId, ipAddressId);
DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
AddWebSitePointer(siteItemId, AddWebSitePointer(siteItemId,
(domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "": domain.DomainName.Replace("." + domain.ZoneName,"") (domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "": domain.DomainName.Replace("." + domain.ZoneName,"")
@ -725,13 +730,19 @@ namespace WebsitePanel.EnterpriseServer
try try
{ {
DomainInfo domain = ServerController.GetDomain(siteItem.Name);
DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
if (ZoneInfo == null)
throw new Exception("failed to retrieve parent zone");
// remove all web site pointers // remove all web site pointers
List<DomainInfo> pointers = GetWebSitePointers(siteItemId); List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
foreach (DomainInfo pointer in pointers) foreach (DomainInfo pointer in pointers)
DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false);
// remove web site main pointer // remove web site main pointer
DomainInfo domain = ServerController.GetDomain(siteItem.Name);
if (domain != null) if (domain != null)
DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false);
@ -763,8 +774,6 @@ namespace WebsitePanel.EnterpriseServer
siteItem.SiteIPAddressId = 0; siteItem.SiteIPAddressId = 0;
PackageController.UpdatePackageItem(siteItem); PackageController.UpdatePackageItem(siteItem);
DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
AddWebSitePointer(siteItemId, AddWebSitePointer(siteItemId,
(domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "" : domain.DomainName.Replace("." + domain.ZoneName, "") (domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "" : domain.DomainName.Replace("." + domain.ZoneName, "")
, ZoneInfo.DomainId, true, true, true); , ZoneInfo.DomainId, true, true, true);