From a54c5e1eb80612e48a36f10ce9919c4e61a59794 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 14 Jan 2013 17:11:20 -0500 Subject: [PATCH 1/9] Fix issue with Web Scheduler crashing Enterprise Server --- .../Code/SchedulerTasks/CheckWebSiteTask.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/SchedulerTasks/CheckWebSiteTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/SchedulerTasks/CheckWebSiteTask.cs index fcd83826..c16812d9 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/SchedulerTasks/CheckWebSiteTask.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/SchedulerTasks/CheckWebSiteTask.cs @@ -31,6 +31,7 @@ using System.IO; using System.Net; using System.Collections.Generic; using System.Text; +using System.Threading; namespace WebsitePanel.EnterpriseServer { @@ -166,6 +167,7 @@ namespace WebsitePanel.EnterpriseServer WebSiteResponse result = new WebSiteResponse(); HttpWebResponse resp = null; StringBuilder sb = new StringBuilder(); + Stream respStream = null; try { WebRequest req = WebRequest.Create(url); @@ -177,7 +179,7 @@ namespace WebsitePanel.EnterpriseServer } resp = (HttpWebResponse)req.GetResponse(); - Stream respStream = resp.GetResponseStream(); + respStream = resp.GetResponseStream(); string charSet = !String.IsNullOrEmpty(resp.CharacterSet) ? resp.CharacterSet : "utf-8"; Encoding encode = System.Text.Encoding.GetEncoding(charSet); @@ -196,6 +198,9 @@ namespace WebsitePanel.EnterpriseServer result.Status = (int)resp.StatusCode; result.Text = sb.ToString(); } + catch (ThreadAbortException) + { + } catch (WebException ex) { result.Status = (int)((HttpWebResponse)ex.Response).StatusCode; @@ -210,10 +215,16 @@ namespace WebsitePanel.EnterpriseServer } finally { + if (respStream != null) + { + respStream.Close(); + } + if (resp != null) { resp.Close(); } + } return result; From f1b05c9ea05bee3a0e259640e24a09cb47b9b197 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 14 Jan 2013 17:20:41 -0500 Subject: [PATCH 2/9] Add SP manual-update-sp.zip to have ability to upload a current build that does not affect release --- WebsitePanel/build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml index 0c447a53..b2197158 100644 --- a/WebsitePanel/build.xml +++ b/WebsitePanel/build.xml @@ -705,6 +705,9 @@ + + + From 6e419d691a920299fb672182dd9401da9273f26a Mon Sep 17 00:00:00 2001 From: robvde Date: Tue, 15 Jan 2013 20:20:59 +0400 Subject: [PATCH 3/9] release build fixed --- .../WebsitePanel.Providers.HostedSolution.Exchange2013.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj index 39c7064a..37f64961 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj +++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj @@ -26,7 +26,7 @@ pdbonly true - bin\Release\ + ..\WebsitePanel.Server\bin\ TRACE prompt 4 From 1b48f48c1e831ef16e17b1b726dce3431d45d985 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 15 Jan 2013 11:45:47 -0500 Subject: [PATCH 4/9] Added tag build-2.1.0.13 for changeset 1a98ae3efad6 From 5b3c358a023ef043382db71df22c0e920707c0c3 Mon Sep 17 00:00:00 2001 From: Christopher York Date: Tue, 15 Jan 2013 11:39:18 -0600 Subject: [PATCH 5/9] Fixed: SOAP compression causes exceptions on certain PHP installations Updated: Readme.txt updated --- .../modules/servers/websitepanel/websitepanel.class.php | 1 - WebsitePanel.WHMCSModule/readme.txt | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php index 7c99db93..8e8d8f7e 100644 --- a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php +++ b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php @@ -415,7 +415,6 @@ class WebsitePanel $soapParams = array('login' => $this->_esUsername, 'password' => $this->_esPassword, 'cache_wsdl' => WSDL_CACHE_NONE, // WSDL caching is an annoying nightmare - we will disable it - 'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP ); try { diff --git a/WebsitePanel.WHMCSModule/readme.txt b/WebsitePanel.WHMCSModule/readme.txt index 9da3efc4..dade497c 100644 --- a/WebsitePanel.WHMCSModule/readme.txt +++ b/WebsitePanel.WHMCSModule/readme.txt @@ -13,10 +13,7 @@ To enable addon automation... What does not work? - Quantities, only a single addon => addon can be allocated - 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 -his / her package at this time. +- 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. - 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. -- 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. \ No newline at end of file + +DO NOT CONTACT WHMCS FOR SUPPORT WITH THIS MODULE - THIS IS NOT DEVELOPED BY WHMCS AND HAS NO AFFILIATION WITH WHMCS OR WHMCS.COM. \ No newline at end of file From c3d784d327a27b59cf8f3ae49d4ec1fe10431794 Mon Sep 17 00:00:00 2001 From: Christopher York Date: Tue, 15 Jan 2013 11:44:31 -0600 Subject: [PATCH 6/9] Fixed: Stupid comma missed :) --- .../modules/servers/websitepanel/websitepanel.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php index 8e8d8f7e..c9689251 100644 --- a/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php +++ b/WebsitePanel.WHMCSModule/modules/servers/websitepanel/websitepanel.class.php @@ -414,7 +414,7 @@ class WebsitePanel $esUrl = (($this->_esUseSsl ? "https" : "http") . "://{$this->_esServerUrl}:{$this->_esServerPort}/{$serviceFile}?WSDL"); $soapParams = array('login' => $this->_esUsername, '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 ); try { From b31270f2bcad48fffdc5b9af6745c0a285a2510d Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 15 Jan 2013 13:24:53 -0500 Subject: [PATCH 7/9] Added tag build-2.1.0.14 for changeset 10524a4f4545 From df033d2cd89e47d1e7fde1c8aa13f87615a161fe Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 15 Jan 2013 13:32:47 -0500 Subject: [PATCH 8/9] Added tag build-2.1.0.16 for changeset 77997b12f8c9 From 3a22ea2ef09d044baebfc5885dd190d406bee41a Mon Sep 17 00:00:00 2001 From: Christopher York Date: Tue, 15 Jan 2013 16:44:34 -0600 Subject: [PATCH 9/9] Fixed: (WHMCS Module) - Domain is not created even if the "Create Zone Record" checkbox is checked. --- .../Code/Wizards/UserCreationWizard.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs index 4f4fbdee..c30c70aa 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Wizards/UserCreationWizard.cs @@ -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