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

Domain management optimized and simplified:

Browse source 
Creation of websites and pointers decoupled from Domains in order to choose
freely the hostname of a website or pointer.

Quota enforcement around domain pointers disabled, though registration is
still in place
This commit is contained in:
robvde 2012-09-04 17:34:39 +04:00
parent ba71e9b29c
commit 92133e2c20
31 changed files with 9005 additions and 10978 deletions
Download patch file Download diff file Expand all files Collapse all files

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs
View file

@ -1686,7 +1686,7 @@ namespace WebsitePanel.EnterpriseServer
}
public static int AddDomainWithProvisioning(int packageId, string domainName, DomainType domainType,
bool createWebSite, int pointWebSiteId, int pointMailDomainId, bool createDnsZone, bool createInstantAlias, bool allowSubDomains)
bool createWebSite, int pointWebSiteId, int pointMailDomainId, bool createDnsZone, bool createInstantAlias, bool allowSubDomains, string hostName)
{
// check account
int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
@ -1729,8 +1729,7 @@ namespace WebsitePanel.EnterpriseServer
int webSiteId = 0;
if (webEnabled && createWebSite)
{
webSiteId = WebServerController.AddWebSite(
packageId, domainId, 0, createInstantAlias);
webSiteId = WebServerController.AddWebSite(packageId, hostName, domainId, 0, createInstantAlias);
if (webSiteId < 0)
{
@ -1742,7 +1741,7 @@ namespace WebsitePanel.EnterpriseServer
// add web site pointer
if (webEnabled && pointWebSiteId > 0)
{
WebServerController.AddWebSitePointer(pointWebSiteId, domainId);
WebServerController.AddWebSitePointer(pointWebSiteId, hostName, domainId);
}
// add mail domain pointer
@ -1801,8 +1800,10 @@ namespace WebsitePanel.EnterpriseServer
else if (isDomainPointer)
{
// domain pointer
/*
if (PackageController.GetPackageQuota(packageId, Quotas.OS_DOMAINPOINTERS).QuotaExhausted)
return BusinessErrorCodes.ERROR_DOMAIN_QUOTA_LIMIT;
*/
}
else
{
@ -2132,7 +2133,7 @@ namespace WebsitePanel.EnterpriseServer
int res = 0;
if (domain.WebSiteId > 0)
res = WebServerController.AddWebSitePointer(domain.WebSiteId, domainId, false);
res = WebServerController.AddWebSitePointer(domain.WebSiteId, hostName, domainId, false);
return res;
}
@ -2173,7 +2174,7 @@ namespace WebsitePanel.EnterpriseServer
// add web site pointer if required
if (domain.WebSiteId > 0 && instantAlias.WebSiteId == 0)
{
int webRes = WebServerController.AddWebSitePointer(domain.WebSiteId, instantAliasId);
int webRes = WebServerController.AddWebSitePointer(domain.WebSiteId, hostName, domainId);
if (webRes < 0)
return webRes;
}