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

+ 0 - 9
zimbraSingle.inc

@@ -247,15 +247,6 @@ function zimbraSingleDeleteAccount($userData)
         );
         );
         return false;
         return false;
     }
     }
-
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "debug: account status",
-        $response
-        );
-
     if ($response != 'locked') {
     if ($response != 'locked') {
         return "Account $accountName active, suspend account first";
         return "Account $accountName active, suspend account first";
     }
     }

+ 2 - 2
zimbraSingle.php

@@ -93,10 +93,10 @@ function zimbraSingle_UnsuspendAccount($params)
 function zimbraSingle_TerminateAccount($params)
 function zimbraSingle_TerminateAccount($params)
 {
 {
     $response = zimbraSingleDeleteAccount($params['customfields']);
     $response = zimbraSingleDeleteAccount($params['customfields']);
-    if($response) {
+    if($response == 'success') {
         return 'success';
         return 'success';
     }
     }
-    return 'Error deleting account';
+    return $response;
 }
 }
 
 
 function zimbraSingle_ChangePackage($params)
 function zimbraSingle_ChangePackage($params)