andre 3 лет назад
Родитель
Сommit
2e237e1f7d
2 измененных файлов с 12 добавлено и 21 удалено
  1. 11 20
      api/cwp7/Admin.php
  2. 1 1
      cwp7.php

+ 11 - 20
api/cwp7/Admin.php

@@ -227,25 +227,10 @@ class cwp7_Admin {
         );
         return $this->doRequest('changepass', 'upd', $data);
     }
-    /**
-	 * listDomains
-     * 
-     * @param string $user user
-	 * 
-	 * @return array domain details
-	 */
-    public function listDomains($user)
-	{
-        $data = array(
-            'user' => $user,
-            'type' => 'subdomain',
-        );
-        return $this->doRequest('admindomains', 'list', $data);
-    }
     /**
 	 * addDomain
      * 
-     * @param array $user user, $name domainname
+     * @param array $user user, $name domainname, $type domain or subdomain
 	 * 
 	 * @return array details
 	 */
@@ -257,9 +242,12 @@ class cwp7_Admin {
         if(!isset($params['name'])) {
             return array('error_msg' => 'Error: missing parameter name');
         }
+        if(!isset($params['type'])) {
+            return array('error_msg' => 'Error: missing parameter type');
+        }
         $data = array(
             'user'      => $params['user'],
-            'type'      => 'subdomain',
+            'type'      => $params['type'],
             'name'      => $params['name'],
             'path'      => 'public_html/' . $params['name'],
             'autossl'   => 0,
@@ -267,9 +255,9 @@ class cwp7_Admin {
         return $this->doRequest('admindomains', 'add', $data);
     }
     /**
-	 * modifyDomain
+	 * deleteDomain
      * 
-     * @param array $user user $name domainname
+     * @param array $user user, $name domainname, $type domain or subdomain
 	 * 
 	 * @return array details
 	 */
@@ -281,9 +269,12 @@ class cwp7_Admin {
         if(!isset($params['name'])) {
             return array('error_msg' => 'Error: missing parameter name');
         }
+        if(!isset($params['type'])) {
+            return array('error_msg' => 'Error: missing parameter type');
+        }
         $data = array(
             'user'      => $params['user'],
-            'type'      => 'subdomain',
+            'type'      => $params['type'],
             'name'      => $params['name'],
         );
         return $this->doRequest('admindomains', 'del', $data);

+ 1 - 1
cwp7.php

@@ -160,7 +160,7 @@ function cwp7_UnsuspendAccount($params) {
 function cwp7_ClientArea($params){
 	$clientInfo = array('moduleclientarea' => '1');
 	$cwp7 = new cwp7_Admin($params['serverhostname'], $params['serveraccesshash']);
-	$response = $cwp7->listDomains($params['username']);
+	$response = $cwp7->getAccount($params['username']);
 	if($response['status'] != 'OK') {
 		logModuleCall(
 			'cwp7',