configoptions

Author: krystianbas

modules/servers/AMP/AMP.php

@@ -264,13 +264,12 @@ function AMP_TestConnection(array $params)
 
 function AMP_CreateAccount(array $params)
 {
-
     try {
-        AMP_commercialCheck($params);
+        //AMP_commercialCheck($params);
         $client = new Client($params);
         $provisioningTemplateId = $params['configoption1'];
         $postCreate = !empty($params['configoption2']) ? $params['configoption2'] : 10;
-        $templates = $client->call('ADSModule/GetDeploymentTemplates');
+        //$templates = $client->call('ADSModule/GetDeploymentTemplates');
 
         $options = [];
         foreach ($templates['result'] as $t) {
@@ -293,6 +292,20 @@ function AMP_CreateAccount(array $params)
         foreach ($array as $key => $value) {
             $extraProvisionSettings[$value[0]] = $value[1];
         }
+
+        $requiredTags = explode(',', trim($params['configoption3']));
+
+        foreach ($params['configoptions'] as $key => $value) {
+            if($key[0] == '+')
+            {
+                $extraProvisionSettings[$key] = $value;
+            }
+            if($key[0] == '@')
+            {
+                $requiredTags[] = $value;
+            }
+        }
+
         $data = [
             'TemplateID' => $provisioningTemplateId,
             'NewUsername' => $username,
@@ -301,11 +314,10 @@ function AMP_CreateAccount(array $params)
             'FriendlyName' => '',
             'Secret' => 'secretwhmcs'. $params['serviceid'],
             'PostCreate' => $postCreate,
-            'RequiredTags' => explode(',', trim($params['configoption3'])),
+            'RequiredTags' => $requiredTags,
             'ExtraProvisionSettings' => $extraProvisionSettings
         ];
 
-
         Capsule::table('ampServices')->updateOrInsert(['serviceId' => $params['serviceid']], ['secret' => 'secretwhmcs'. $params['serviceid']]);
         $response = $client->call('ADSModule/DeployTemplate', $data);