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

3
WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php
View file

@ -414,8 +414,7 @@ class WebsitePanel
$esUrl = (($this->_esUseSsl ? "https" : "http") . "://{$this->_esServerUrl}:{$this->_esServerPort}/{$serviceFile}?WSDL"); $esUrl = (($this->_esUseSsl ? "https" : "http") . "://{$this->_esServerUrl}:{$this->_esServerPort}/{$serviceFile}?WSDL");
$soapParams = array('login' => $this->_esUsername, $soapParams = array('login' => $this->_esUsername,
'password' => $this->_esPassword, 'password' => $this->_esPassword,
'cache_wsdl' => WSDL_CACHE_NONE, // WSDL caching is an annoying nightmare - we will disable it 'cache_wsdl' => WSDL_CACHE_NONE // WSDL caching is an annoying nightmare - we will disable it
'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP
); );
try try
{ {

9
WebsitePanel.WHMCSModule/readme.txt
View file

@ -13,10 +13,7 @@ To enable addon automation...
What does not work? What does not work?
- Quantities, only a single addon => addon can be allocated - Quantities, only a single addon => addon can be allocated
- Terminating / Suspending Addons, I've ran out of time on what I can do currently - Terminating / Suspending Addons, I've ran out of time on what I can do currently
- When an IP address is allocated WebsitePanel does not return back what IP was allocated, so WHMCS is not updated which what IP has been allocated to - When an IP address is allocated WebsitePanel does not return back what IP was allocated, so WHMCS is not updated which what IP has been allocated to his / her package at this time.
his / her package at this time.
- A single user => single package is the only way the WebsitePanel server module works. I have no plans on making this work any other way. - A single user => single package is the only way the WebsitePanel server module works. I have no plans on making this work any other way.
- Users who use empty pointers when creating websites (domain.com instead of www.domain.com), websites are not created automatically even if the "Create Website"
option is selected. I have provided a patch to the websitepanel developers, should be fixed in a later release. DO NOT CONTACT WHMCS FOR SUPPORT WITH THIS MODULE - THIS IS NOT DEVELOPED BY WHMCS AND HAS NO AFFILIATION WITH WHMCS OR WHMCS.COM.
- The "Enable DNS Zone" option does not currently work - I have provided a patch to the websitepanel developers, should be fixed in a later release.
- Instant aliases / Temp domain are not properly created for websites, I have provided a patch to the websitepanel developers, should be fixed in a later release.

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

@ -165,7 +165,7 @@ namespace WebsitePanel.EnterpriseServer
// create domain // create domain
int domainId = 0; int domainId = 0;
if ((createWebSite || createMailAccount) && !String.IsNullOrEmpty(domainName)) if ((createWebSite || createMailAccount || createZoneRecord) && !String.IsNullOrEmpty(domainName))
{ {
try try
{ {
@ -193,7 +193,7 @@ namespace WebsitePanel.EnterpriseServer
} }
} }
if (createWebSite && !String.IsNullOrEmpty(domainName)) if (createWebSite && (domainId > 0))
{ {
// create web site // create web site
try try
@ -252,7 +252,7 @@ namespace WebsitePanel.EnterpriseServer
} }
} }
if (createMailAccount && !String.IsNullOrEmpty(domainName)) if (createMailAccount && (domainId > 0))
{ {
// create default mailbox // create default mailbox
try 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' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

3
WebsitePanel/build.xml
View file

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