andre 5 лет назад
Родитель
Сommit
7486de8e76
2 измененных файлов с 11 добавлено и 12 удалено
  1. 10 9
      zimbraSingle.inc
  2. 1 3
      zimbraSingle.php

+ 10 - 9
zimbraSingle.inc

@@ -23,6 +23,15 @@ function zimbraSingle_MetaData()
 function zimbraSingleGetAccess()
 {
     $accessData = array('zimbraServer' => '', 'adminUser' => '', 'adminPass' => '');
+    $whmcs = App::self();
+    $servergroup = $whmcs->get_req_var('servergroup');
+    logModuleCall(
+        'zimbrasingle',
+        __FUNCTION__,
+        $params,
+        "debug: vars",
+        $servergroup
+    );
     $servers = Capsule::table('tblservers')
         ->select('ipaddress', 'username', 'password')
         ->where('name', '=', 'Zimbra Single Mailbox')
@@ -353,15 +362,7 @@ function zimbraSingleClientArea($userData)
     }
 }
 
-function zimbraSingleConfigOptions($vars) {
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "debug: vars",
-        $vars
-    );
-
+function zimbraSingleConfigOptions() {
     $accessData = zimbraSingleGetAccess();
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();

+ 1 - 3
zimbraSingle.php

@@ -110,9 +110,7 @@ function zimbraSingle_ChangePackage($params)
 
 function zimbraSingle_ConfigOptions()
 {
-    $whmcs = App::self();
-    $servergroup = $whmcs->get_req_var('servergroup');
-    $response = zimbraSingleConfigOptions($servergroup);
+    $response = zimbraSingleConfigOptions();
     if($response) {
         return $response;
     }