From e7043a5755c44c8df7f49fe970c8ddf96ad1c9e6 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Sun, 30 Sep 2012 13:56:10 -0400 Subject: [PATCH 1/4] Added tag build-2.0.0.76 for changeset 1113d36160c9 From 8d248737a77911ec3996404658da9bd1646c86c3 Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 1 Oct 2012 20:40:11 +0400 Subject: [PATCH 2/4] Fixed: failed to create instant alias. --- WebsitePanel/Database/update_db.sql | 1 + .../Sources/WebsitePanel.EnterpriseServer.sln | 1 + .../Code/Servers/ServerController.cs | 23 ++++++++++--------- .../Code/WebServers/WebServerController.cs | 5 ++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 697cd4e3..21051683 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -694,6 +694,7 @@ FROM Domains AS D INNER JOIN Packages AS P ON D.PackageID = P.PackageID WHERE CHARINDEX('.' + DomainName, @DomainName) > 0 AND (CHARINDEX('.' + DomainName, @DomainName) + LEN('.' + DomainName)) = LEN(@DomainName) + 1 +AND IsDomainPointer = 0 -- this is a domain of other user IF @UserID <> @DomainUserID AND @HostingAllowed = 0 diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln index 01621fa2..36ca6285 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.sln @@ -5,6 +5,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\LICENSE.txt = ..\..\LICENSE.txt ..\..\Readme.htm = ..\..\Readme.htm ..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm + ..\Database\update_db.sql = ..\Database\update_db.sql VersionInfo.vb = VersionInfo.vb EndProjectSection EndProject diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs index bc4864be..e01e1ccd 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs @@ -1800,11 +1800,9 @@ namespace WebsitePanel.EnterpriseServer else if (isDomainPointer) { // domain pointer - /* if (PackageController.GetPackageQuota(packageId, Quotas.OS_DOMAINPOINTERS).QuotaExhausted) return BusinessErrorCodes.ERROR_DOMAIN_QUOTA_LIMIT; - */ - } + } else { // top-level domain @@ -2173,22 +2171,25 @@ namespace WebsitePanel.EnterpriseServer } // add web site pointer if required + /* if (domain.WebSiteId > 0 && instantAlias.WebSiteId == 0) { int webRes = WebServerController.AddWebSitePointer(domain.WebSiteId, hostName, domainId); if (webRes < 0) return webRes; } - /* - // add mail domain pointer - if (domain.MailDomainId > 0 && instantAlias.MailDomainId == 0) - { - int mailRes = MailServerController.AddMailDomainPointer(domain.MailDomainId, instantAliasId); - if (mailRes < 0) - return mailRes; - } */ + // add mail domain pointer + /* + if (domain.MailDomainId > 0 && instantAlias.MailDomainId == 0) + { + int mailRes = MailServerController.AddMailDomainPointer(domain.MailDomainId, instantAliasId); + if (mailRes < 0) + return mailRes; + } + */ + return 0; } catch (Exception ex) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs index 26f3c3c9..433fe879 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs @@ -275,6 +275,7 @@ namespace WebsitePanel.EnterpriseServer { // DEDICATED IP bindings.Add(new ServerBinding(ipAddr, "80", "")); + bindings.Add(new ServerBinding(ipAddr, "443", "")); } UserInfo user = PackageController.GetPackageOwner(packageId); @@ -679,6 +680,10 @@ namespace WebsitePanel.EnterpriseServer ServerBinding srvBinding = new ServerBinding(ipAddr, "80", ""); newBindings.Add(srvBinding); + srvBinding = new ServerBinding(ipAddr, "443", ""); + newBindings.Add(srvBinding); + + foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId)) { if (!((b.Host == srvBinding.Host) & From 89051f2d0fd6c864154b203d950b4a08778a28bc Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 1 Oct 2012 22:29:44 +0400 Subject: [PATCH 3/4] Fixed: webhosting switch shared/dedicated, if domain is claimes as webpointer error raised. --- .../Code/WebServers/WebServerController.cs | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs index 433fe879..109f7aca 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs @@ -631,12 +631,18 @@ namespace WebsitePanel.EnterpriseServer try { // 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 pointers = GetWebSitePointers(siteItemId); foreach (DomainInfo pointer in pointers) DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false); // remove web site main pointer - DomainInfo domain = ServerController.GetDomain(siteItem.Name); + if (domain != null) DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); @@ -653,8 +659,7 @@ namespace WebsitePanel.EnterpriseServer // associate IP with web site ServerController.AddItemIPAddress(siteItemId, ipAddressId); - - DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName); + AddWebSitePointer(siteItemId, (domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "": domain.DomainName.Replace("." + domain.ZoneName,"") @@ -725,13 +730,19 @@ namespace WebsitePanel.EnterpriseServer 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 List pointers = GetWebSitePointers(siteItemId); foreach (DomainInfo pointer in pointers) DeleteWebSitePointer(siteItemId, pointer.DomainId, true, true, false); // remove web site main pointer - DomainInfo domain = ServerController.GetDomain(siteItem.Name); if (domain != null) DeleteWebSitePointer(siteItemId, domain.DomainId, true, true, false); @@ -763,8 +774,6 @@ namespace WebsitePanel.EnterpriseServer siteItem.SiteIPAddressId = 0; PackageController.UpdatePackageItem(siteItem); - DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName); - AddWebSitePointer(siteItemId, (domain.DomainName.Replace("." + domain.ZoneName, "") == domain.ZoneName) ? "" : domain.DomainName.Replace("." + domain.ZoneName, "") , ZoneInfo.DomainId, true, true, true); From 2d9034348c645cb47e0b4792628f6d6a27b2afad Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 1 Oct 2012 14:49:22 -0400 Subject: [PATCH 4/4] Added tag build-2.0.0.77 for changeset 9dc28d45a1fc