Merge

WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php

@@ -54,6 +54,11 @@ 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'])))
+        {
+            // The module is disabled or has not yet been configured - stop
+            return;
+        }
         
         // Get the associated WebsitePanel username from WHMCS
         $results = select_query('tblhosting', 'username', array('id' => $params['serviceid']));

WebsitePanel.WHMCSModule/includes/hooks/websitepanel_sync.php

@@ -53,6 +53,11 @@ function websitepanel_sync_ClientEdit($params)
         
         // Retrieve the WebsitePanel Addons module settings
         $modSettings = websitepanel_sync_GetSettings();
+        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;
+        }
         
         // Create the WebsitePanel object instance
         $wsp = new WebsitePanel($modSettings['username'], $modSettings['password'], $modSettings['serverhost'], $modSettings['serverport'], (($modSettings['serversecured']) == 'on' ? TRUE : FALSE));

WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs

@@ -2037,6 +2037,19 @@ namespace WebsitePanel.Providers.Web
                 return System.Diagnostics.FileVersionInfo.GetVersionInfo(apeModulePath).FileVersion;
             }
 
+            apeModulePath = Path.Combine(installDir, "ManualInstall\\bin\\Helicon.Ape.dll");
+            if (File.Exists(apeModulePath))
+            {
+                return System.Diagnostics.FileVersionInfo.GetVersionInfo(apeModulePath).FileVersion;
+            }
+
+            apeModulePath = Path.Combine(installDir, "Helicon.Ape.dll");
+            if (File.Exists(apeModulePath))
+            {
+                return System.Diagnostics.FileVersionInfo.GetVersionInfo(apeModulePath).FileVersion;
+            }
+
+
             return HELICON_APE_NOT_REGISTERED;
         }
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/DomainsAddDomain.ascx.resx

@@ -163,10 +163,10 @@
     <value>Provisioning Options</value>
   </data>
   <data name="PointMailDomain.Text" xml:space="preserve">
-    <value>Point to existing Mail Domain</value>
+    <value>Assign to existing Mail Domain</value>
   </data>
   <data name="PointWebSite.Text" xml:space="preserve">
-    <value>Point to existing Web Site</value>
+    <value>Assign to existing Web Site</value>
   </data>
   <data name="SubDomainFormatValidator.ErrorMessage" xml:space="preserve">
     <value>Please, enter correct sub-domain name, for example "subdomain" or "sub.subdomain".</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/DomainsAddDomainSelectType.ascx.resx

@@ -121,13 +121,13 @@
     <value>Cancel</value>
   </data>
   <data name="DomainDescription.Text" xml:space="preserve">
-    <value>Create a Top-Level Domain (TLD).</value>
+    <value>Create a Top-Level Domain (TLD).  You can create a new web site for domain or assign it to an existing web site.</value>
   </data>
   <data name="DomainLink.Text" xml:space="preserve">
     <value>Domain</value>
   </data>
   <data name="DomainPointerDescription.Text" xml:space="preserve">
-    <value>Create a Top-Level Domain (TLD) or sub-domain that could point to the existing web site only.</value>
+    <value>Create a Top-Level Domain (TLD) or sub-domain that can point to the existing web site only.</value>
   </data>
   <data name="DomainPointerLink.Text" xml:space="preserve">
     <value>Domain Alias</value>
@@ -136,13 +136,13 @@
     <value>Please choose what type of domain you would like to add:</value>
   </data>
   <data name="ProviderSubDomainDescription.Text" xml:space="preserve">
-    <value>Create a sub-domain under domains allowed by your hosting provider. You could create a new web site for sub-domain or point it to existing one.</value>
+    <value>Create a sub-domain under domains allowed by your hosting provider. You can create a new web site for sub-domain or assign it to an existing web site.</value>
   </data>
   <data name="ProviderSubDomainLink.Text" xml:space="preserve">
     <value>Provider Sub-domain</value>
   </data>
   <data name="SubDomainDescription.Text" xml:space="preserve">
-    <value>Create a sub-domain for already added top-level domain. You could create a new web site for sub-domain.</value>
+    <value>Create a sub-domain for already added top-level domain. You can create a new web site for sub-domain or assign it to an existing web site.</value>
   </data>
   <data name="SubDomainLink.Text" xml:space="preserve">
     <value>Sub-domain</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx

@@ -47,7 +47,7 @@
         </asp:Panel>
 
         <asp:Panel id="PointWebSitePanel" runat="server" style="padding-bottom: 15px;">
-            <asp:CheckBox ID="PointWebSite" runat="server" meta:resourcekey="PointWebSite" Text="Point to Web Site" CssClass="Checkbox Bold"
+            <asp:CheckBox ID="PointWebSite" runat="server" meta:resourcekey="PointWebSite" Text="Assign to Web Site" CssClass="Checkbox Bold"
                 AutoPostBack="true" /><br />
             <div style="padding-left: 20px;">
                 <asp:DropDownList ID="WebSitesList" Runat="server" CssClass="NormalTextBox" DataTextField="Name" DataValueField="ID"></asp:DropDownList>
@@ -55,7 +55,7 @@
         </asp:Panel>
         
         <asp:Panel id="PointMailDomainPanel" runat="server" style="padding-bottom: 15px;">
-            <asp:CheckBox ID="PointMailDomain" runat="server" meta:resourcekey="PointMailDomain" Text="Point to Mail Domain" CssClass="Checkbox Bold"
+            <asp:CheckBox ID="PointMailDomain" runat="server" meta:resourcekey="PointMailDomain" Text="Assign to Mail Domain" CssClass="Checkbox Bold"
                 AutoPostBack="true" /><br />
             <div style="padding-left: 20px;">
                 <asp:DropDownList ID="MailDomainsList" Runat="server" CssClass="NormalTextBox" DataTextField="Name" DataValueField="ID"></asp:DropDownList>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.cs

@@ -99,14 +99,14 @@ namespace WebsitePanel.Portal
 			// load package context
 			PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
-			if ((type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted)) && !IsPostBack)
+			if ((type == DomainType.DomainPointer || (type == DomainType.Domain)) && !IsPostBack)
 			{
                 // bind web sites
                 WebSitesList.DataSource = ES.Services.WebServers.GetWebSites(PanelSecurity.PackageId, false);
                 WebSitesList.DataBind();
 			}
 
-            if ((type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted)) && !IsPostBack)
+            if ((type == DomainType.DomainPointer || (type == DomainType.Domain)) && !IsPostBack)
             {
                 // bind mail domains
                 MailDomainsList.DataSource = ES.Services.MailServers.GetMailDomains(PanelSecurity.PackageId, false);
@@ -130,12 +130,12 @@ namespace WebsitePanel.Portal
             }
 
             // point Web site
-            PointWebSitePanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
+            PointWebSitePanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain))
                 && cntx.Groups.ContainsKey(ResourceGroups.Web) && WebSitesList.Items.Count > 0;
             WebSitesList.Enabled = PointWebSite.Checked;
 
 			// point mail domain
-            PointMailDomainPanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
+            PointMailDomainPanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain))
 				&& cntx.Groups.ContainsKey(ResourceGroups.Mail) && MailDomainsList.Items.Count > 0;
 			MailDomainsList.Enabled = PointMailDomain.Checked;
 
@@ -205,14 +205,14 @@ namespace WebsitePanel.Portal
 			// load package context
 			PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
-			if (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
+			if (type == DomainType.DomainPointer || (type == DomainType.Domain))
 			{
 
                 if (PointWebSite.Checked && WebSitesList.Items.Count > 0)
                     pointWebSiteId = Utils.ParseInt(WebSitesList.SelectedValue, 0);
 			}
 
-            if (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
+            if (type == DomainType.DomainPointer || (type == DomainType.Domain))
             {
                 if (PointMailDomain.Checked && MailDomainsList.Items.Count > 0)
                     pointMailDomainId = Utils.ParseInt(MailDomainsList.SelectedValue, 0);

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.designer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2011, Outercurve Foundation.
+// Copyright (c) 2012, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,