Преглед изворни кода

test setup config options domains

andre пре 5 година
родитељ
комит
001ea95e80
2 измењених фајлова са 20 додато и 19 уклоњено
  1. 18 17
      zimbraSingle.inc
  2. 2 2
      zimbraSingle.php

+ 18 - 17
zimbraSingle.inc

@@ -353,14 +353,12 @@ function zimbraSingleClientArea($userData)
     }
     }
 }
 }
 
 
-function zimbraSingleConfigOptions($test) {
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "All COS Array",
-        $test
-    );
+function zimbraSingleConfigOptions() {
+    ob_flush();
+    ob_start();
+    var_dump(get_defined_vars());
+    file_put_contents("debug_var_dump.txt", ob_get_flush());
+
     $accessData = zimbraSingleGetAccess();
     $accessData = zimbraSingleGetAccess();
 
 
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
@@ -382,14 +380,14 @@ function zimbraSingleConfigOptions($test) {
             'zimbrasingle',
             'zimbrasingle',
             __FUNCTION__,
             __FUNCTION__,
             $params,
             $params,
-            "Error : class of service for $account_name could not be set",
+            "Error : could not fetch classes of service",
             ""
             ""
         );
         );
         return false;
         return false;
     }
     }
     $cosNames = recursiveFindAll($response, 'NAME');
     $cosNames = recursiveFindAll($response, 'NAME');
     $configOptions = array();
     $configOptions = array();
-    $configOptions['cos'] = array (
+    $configOptions['cos'] = array(
         "FriendlyName" => "Class of Service",
         "FriendlyName" => "Class of Service",
         "Type" => "radio",
         "Type" => "radio",
         "Options" => implode(',', $cosNames),
         "Options" => implode(',', $cosNames),
@@ -397,6 +395,16 @@ function zimbraSingleConfigOptions($test) {
     );
     );
     $apiDomainManager = new Zm_Domain($api);
     $apiDomainManager = new Zm_Domain($api);
     $response = $apiDomainManager->getAllDomains();
     $response = $apiDomainManager->getAllDomains();
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : could fetch available maildomains",
+            ""
+        );
+        return false;
+    }
     $domainNames = recursiveFindAll($response, 'NAME');
     $domainNames = recursiveFindAll($response, 'NAME');
     foreach($domainNames as $domainName) {
     foreach($domainNames as $domainName) {
         $configOptions[$domainName] = array(
         $configOptions[$domainName] = array(
@@ -405,13 +413,6 @@ function zimbraSingleConfigOptions($test) {
             "Description" => "use this domain in customer selection?",
             "Description" => "use this domain in customer selection?",
         );
         );
     }
     }
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "All COS Array",
-        $test
-    );
     return $configOptions;
     return $configOptions;
 }
 }
 
 

+ 2 - 2
zimbraSingle.php

@@ -108,9 +108,9 @@ function zimbraSingle_ChangePackage($params)
     return 'Error changing package';
     return 'Error changing package';
 }
 }
 
 
-function zimbraSingle_ConfigOptions($params)
+function zimbraSingle_ConfigOptions()
 {
 {
-    $response = zimbraSingleConfigOptions($params);
+    $response = zimbraSingleConfigOptions();
     if($response) {
     if($response) {
         return $response;
         return $response;
     }
     }