plesk · GiovanniMet · Oct 22, 2019 · Oct 22, 2019 · Nov 1, 2019 · Feb 23, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.autogit
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,12 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [221019] - 2019-10-22
+Added:
+- webspace_del for api 1.6.3.2 to fix a bug when deleting a subscription with ipv6 support.
+EXTWHMCS-33:
+- in module option, now we have the hosting type, this option fix the bug so you can select in whmcs the hosting type.
+- fixed various webspace_add.tpl to support hosting type 'none' and 'vrt_hst'.
diff --git a/lang/english.php b/lang/english.php
@@ -8,6 +8,8 @@
     "CONFIG_WHICH_IP_ADDRESSES" => "Which IP addresses to use?",
     "CONFIG_POWER_USER_MODE" => "Use Power User view",
     "CONFIG_POWER_USER_MODE_DESCRIPTION" => "(Parallels Plesk 12+ only)",
+    "CONFIG_HOSTING_TYPE" => "Hosting type for Service Plan",
+    "CONFIG_HOSTING_TYPE_DESCRIPTION" => "Switch to the appropriate hosting type as you selected in plesk; EXAMPLE: 'none' for a mail only service",
     "FIELD_CHANGE_PASSWORD_MAIN_PACKAGE_DESCR" => "Please pay attention that username/password shown above are used for system/FTP user only and can be used to log in to the Panel.",
     "FIELD_CHANGE_PASSWORD_ADDITIONAL_PACKAGE_DESCR" => "Please pay attention that username/password shown above are used for system/FTP user only and can't be used to log in to the Panel. You should use username/password pair from package '@PACKAGE@' instead of them.",
     "ERROR_COMMON_MESSAGE" => "Error code: @CODE@. Error message: @MESSAGE@",

diff --git a/lib/Plesk/Manager/V1000.php b/lib/Plesk/Manager/V1000.php
@@ -298,7 +298,7 @@ protected function _addWebspace($params)
             'username' => $params['username'],
             'password' => $params['password'],
             'status' => Plesk_Object_Webspace::STATUS_ACTIVE,
-            'htype' => Plesk_Object_Webspace::TYPE_VRT_HST,
+            'htype' => $params['configoption5'],
             'planName' => $params['configoption1'],
             'ipv4Address' => $params['ipv4Address'],
             'ipv6Address' => $params['ipv6Address'],

diff --git a/lib/Plesk/Manager/V1630.php b/lib/Plesk/Manager/V1630.php
@@ -213,20 +213,7 @@ protected function _addAccount($params)
 
     protected function _addWebspace($params)
     {
-        $this->_checkRestrictions($params);
-
-        $requestParams = [
-            'domain' => $params['domain'],
-            'ownerId' => $params['ownerId'],
-            'username' => $params['username'],
-            'password' => $params['password'],
-            'status' => Plesk_Object_Webspace::STATUS_ACTIVE,
-            'htype' => Plesk_Object_Webspace::TYPE_VRT_HST,
-            'planName' => $params['configoption1'],
-            'ipv4Address' => $params['ipv4Address'],
-            'ipv6Address' => $params['ipv6Address'],
-        ];
-        Plesk_Registry::getInstance()->api->webspace_add($requestParams);
+        parent::_addWebspace($params);
     }
 
     protected function _setResellerStatus($params)

diff --git a/lib/Plesk/Manager/V1632.php b/lib/Plesk/Manager/V1632.php
@@ -13,6 +13,11 @@ protected function _addWebspace($params)
         parent::_addWebspace($params);
     }
 
+    protected function _deleteWebspace($params)
+    {
+        parent::_deleteWebspace($params);
+    }
+
     protected function _getSharedIpv4($params)
     {
         return $this->_getIp($params);

diff --git a/lib/Plesk/Object/Webspace.php b/lib/Plesk/Object/Webspace.php
@@ -4,6 +4,4 @@
 class Plesk_Object_Webspace
 {
     const STATUS_ACTIVE = 0;
-
-    const TYPE_VRT_HST = 'vrt_hst';
 }
diff --git a/plesk.php b/plesk.php
@@ -77,6 +77,14 @@ function plesk_ConfigOptions(array $params)
             "Type" => "yesno",
             "Description" => $translator->translate("CONFIG_POWER_USER_MODE_DESCRIPTION"),
         ),
+        "hostingType" => array(
+            "FriendlyName" => $translator->translate("CONFIG_HOSTING_TYPE"),
+            "Type" => "dropdown",
+            "Options" => "vrt_hst,none,std_fwd,frm_fwd",
+            "Default" => "vrt_hst",
+            "Description" => $translator->translate("CONFIG_HOSTING_TYPE_DESCRIPTION"),
+            'SimpleMode' => true,
+        ),
 
     );
 

diff --git a/templates/api/1.0.0.0/webspace_add.tpl b/templates/api/1.0.0.0/webspace_add.tpl
@@ -8,6 +8,12 @@
             <htype><?php echo $htype; ?></htype>
             <status><?php echo $status; ?></status>
         </gen_setup>
+        <?php if ($htype === 'none'): ?>
+        <hosting>
+            <none></none>
+        </hosting>
+        <?php endif; ?>
+        <?php if ($htype === 'vrt_hst'): ?>
         <hosting>
             <vrt_hst>
                 <ftp_login><?php echo $username; ?></ftp_login>
@@ -18,6 +24,7 @@
         <prefs>
             <www>true</www>
         </prefs>
+        <?php endif; ?>
         <template-name><?php echo $planName; ?></template-name>
     </add>
 </domain>
diff --git a/templates/api/1.6.3.0/webspace_add.tpl b/templates/api/1.6.3.0/webspace_add.tpl
@@ -8,6 +8,12 @@
             <htype><?php echo $htype; ?></htype>
             <status><?php echo $status; ?></status>
         </gen_setup>
+        <?php if ($htype === 'none'): ?>
+        <hosting>
+            <none></none>
+        </hosting>
+        <?php endif; ?>
+        <?php if ($htype === 'vrt_hst'): ?>
         <hosting>
             <vrt_hst>
                 <property>
@@ -24,6 +30,7 @@
         <prefs>
             <www>true</www>
         </prefs>
+        <?php endif; ?>
         <plan-name><?php echo $planName; ?></plan-name>
     </add>
-</webspace>
+</webspace>
diff --git a/templates/api/1.6.3.2/customer_del.tpl b/templates/api/1.6.3.2/customer_del.tpl
@@ -0,0 +1,8 @@
+<!-- Copyright 1999-2016. Parallels IP Holdings GmbH. -->
+<customer>
+    <del>
+        <filter>
+            <id><?php echo $id; ?></id>
+        </filter>
+    </del>
+</customer>
diff --git a/templates/api/1.6.3.2/customer_get_by_external_id.tpl b/templates/api/1.6.3.2/customer_get_by_external_id.tpl
@@ -0,0 +1,11 @@
+<!-- Copyright 1999-2016. Parallels IP Holdings GmbH. -->
+<customer>
+    <get>
+        <filter>
+            <external-id><?php echo $externalId; ?></external-id>
+        </filter>
+        <dataset>
+            <gen_info/>
+        </dataset>
+    </get>
+</customer>
diff --git a/templates/api/1.6.3.2/webspace_add.tpl b/templates/api/1.6.3.2/webspace_add.tpl
@@ -6,7 +6,14 @@
             <owner-id><?php echo $ownerId; ?></owner-id>
             <htype><?php echo $htype; ?></htype>
             <status><?php echo $status; ?></status>
+            <ip_address><?php echo $ipv4Address; ?></ip_address>
         </gen_setup>
+        <?php if ($htype === 'none'): ?>
+        <hosting>
+            <none></none>
+        </hosting>
+        <?php endif; ?>
+        <?php if ($htype === 'vrt_hst'): ?>
         <hosting>
             <vrt_hst>
                 <property>
@@ -28,6 +35,7 @@
         <prefs>
             <www>true</www>
         </prefs>
+        <?php endif; ?>
         <plan-name><?php echo $planName; ?></plan-name>
     </add>
-</webspace>
+</webspace>
diff --git a/templates/api/1.6.3.2/webspace_del.tpl b/templates/api/1.6.3.2/webspace_del.tpl
@@ -0,0 +1,8 @@
+<!-- Copyright 1999-2016. Parallels IP Holdings GmbH. -->
+<webspace>
+    <del>
+        <filter>
+            <name><?php echo $domain; ?></name>
+        </filter>
+    </del>
+</webspace>
diff --git a/templates/api/1.6.3.2/webspaces_get_by_owner_id.tpl b/templates/api/1.6.3.2/webspaces_get_by_owner_id.tpl
@@ -0,0 +1,11 @@
+<!-- Copyright 1999-2016. Parallels IP Holdings GmbH. -->
+<webspace>
+    <get>
+        <filter>
+            <owner-id><?php echo $ownerId; ?></owner-id>
+        </filter>
+        <dataset>
+            <hosting/>
+        </dataset>
+    </get>
+</webspace>