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

Merge tip

Browse source
This commit is contained in:
VoosW 2013-01-17 12:14:05 +01:00
commit 6847fc51de
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs
View file

@ -165,7 +165,7 @@ namespace WebsitePanel.EnterpriseServer
// create domain
int domainId = 0;
if ((createWebSite || createMailAccount) && !String.IsNullOrEmpty(domainName))
if ((createWebSite || createMailAccount || createZoneRecord) && !String.IsNullOrEmpty(domainName))
{
try
{
@ -193,7 +193,7 @@ namespace WebsitePanel.EnterpriseServer
}
}
if (createWebSite && !String.IsNullOrEmpty(domainName))
if (createWebSite && (domainId > 0))
{
// create web site
try
@ -252,7 +252,7 @@ namespace WebsitePanel.EnterpriseServer
}
}
if (createMailAccount && !String.IsNullOrEmpty(domainName))
if (createMailAccount && (domainId > 0))
{
// create default mailbox
try

2
WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj
View file

@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

3
WebsitePanel/build.xml
View file

@ -705,6 +705,9 @@
<TemplateFile Template="$(TrunkFolder)\WebsitePanelFeedTemplate.xml" OutputFilename="$(DeployFolder)\WebsitePanelFeed.xml" Tokens="@(Tokens)" />
</Target>
<Target Name="upload-sp-update">
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/Manual-Update-sp-$(Version).zip" LocalFile="$(DeployFolder)\Manual-Update.zip" />
</Target>
<Target Name="uploadtoftp">
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-Portal-$(Version).zip" LocalFile="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" />