diff --git a/WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php b/WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php
index 4666d0e4..5d628e81 100644
--- a/WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php
+++ b/WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php
@@ -54,7 +54,7 @@ function websitepanel_addons_AddonActivation($params)
// Retrieve the WebsitePanel Addons module settings
$modSettings = websitepanel_addons_GetSettings();
- if (empty($modSettings['username']) || empty($modSettings['password'])) || empty($modSettings['serverhost'])) || empty($modSettings['serverport'])))
+ if (empty($modSettings['username']) || empty($modSettings['password']) || empty($modSettings['serverhost']) || empty($modSettings['serverport']))
{
// The module is disabled or has not yet been configured - stop
return;
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index b555f5ff..fcdab118 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -3,7 +3,7 @@
2.1.0
$(BUILD_NUMBER)
$(BUILD_NUMBER)
- 2012-12-27
+ 2012-1-11
..
$(RootFolder)\WebsitePanel
@@ -20,10 +20,10 @@
$(TrunkFolder)\Tools\Diff.exe
"$(RootFolder)\tools\sqlcmd\sqlcmd.exe" -S (local)\SQLEXPRESS -E
- "$(RootFolder)\tools\webdeploy\msdeploy.exe"
+ "$(RootFolder)\tools\webdeploy\msdeploy.exe"
"C:\Program Files\7-Zip\7z.exe"
- WebsitePanel_build
+ WebsitePanel_build
server=(local)\SQLEXPRESS;database=$(DataBaseName);Integrated Security=true;
$(TrunkFolder)\Sources\WebsitePanel.WebPortal
@@ -59,6 +59,11 @@
+
+
+ http://www.websitepanel.net/files/$(Version)/WebsitePanelInstaller-$(Version)-webpi.msi
+
+
@@ -185,7 +190,7 @@
-
+
@@ -194,7 +199,7 @@
-
+
@@ -379,7 +384,7 @@
-
+
@@ -389,7 +394,7 @@
-
+
@@ -634,9 +639,15 @@
-
+
+
+
+
+
+
-
+
+
@@ -663,13 +674,14 @@
]]>
+
-
+
$(Version)
@@ -687,33 +699,33 @@
$(InstallerFileChecksum)
- TODO: Evaluate MSI file URL
+ $(InstallerRemoteUri)
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+