merge commit

This commit is contained in:
robvde 2013-01-19 09:53:18 +04:00
commit 65594c80cc
7 changed files with 124 additions and 109 deletions

View file

@ -310,25 +310,25 @@ namespace WebsitePanel.EnterpriseServer
// error while creating mail account
throw new Exception("Could not create mail account", ex);
}
}
// Instant Alias / Temporary URL
if (tempDomain && (domainId > 0))
// Instant Alias / Temporary URL
if (tempDomain && (domainId > 0))
{
int instantAliasId = ServerController.CreateDomainInstantAlias("", domainId);
if (instantAliasId < 0)
{
int instantAliasId = ServerController.CreateDomainInstantAlias("", domainId);
if (instantAliasId < 0)
{
// rollback wizard
Rollback();
// rollback wizard
Rollback();
return instantAliasId;
}
return instantAliasId;
}
}
// Domain DNS Zone
if (createZoneRecord && (domainId > 0))
{
ServerController.EnableDomainDns(domainId);
}
// Domain DNS Zone
if (createZoneRecord && (domainId > 0))
{
ServerController.EnableDomainDns(domainId);
}
}