andre 5 лет назад
Родитель
Сommit
0435577c20
1 измененных файлов с 9 добавлено и 43 удалено
  1. 9 43
      zimbraSingle.inc

+ 9 - 43
zimbraSingle.inc

@@ -33,46 +33,26 @@ function zimbraSingleGetAccess()
             ->where('id', '=', $productID)
             ->get();
             $serverID = $serverIDObj[0]->server;
-
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error: could not get accessdata 1",
-                $serverID
-            );
-    
-        } elseif($serverGroupID) {
+    } elseif($serverGroupID) {
         $serverIDObj = Capsule::table('tblservergroupsrel')
             ->select('serverid')
             ->where('groupid', '=', $serverGroupID)
             ->get();
         $serverID = $serverIDObj[0]->serverid;
-
-        logModuleCall(
-            'zimbrasingle',
-            __FUNCTION__,
-            $params,
-            "Error: could not get accessdata 2",
-            $serverID
-        );
-
     } elseif($packageid) {
         $serverIDObj = Capsule::table('tblhosting')
             ->select('server')
             ->where('packageid', '=', $packageid)
             ->get();
             $serverID = $serverIDObj[0]->server;
-
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error: could not get accessdata 3",
-                $serverID
-            );
-    
-        } else {
+    } else {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error: could not get accessdata 3",
+            ""
+        );
         return false;
     }
     $server = Capsule::table('tblservers')
@@ -101,7 +81,6 @@ function zimbraSingleDoesEMailExist($emailNameOnly, $domainName)
 {
     $account_name = $emailNameOnly . "@" . $domainName;
     $accessData = zimbraSingleGetAccess();
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -137,7 +116,6 @@ function zimbraSingleCreateAccount($userData)
         $userData['password'] = $passDecrypt['password'];
     }
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -216,7 +194,6 @@ function zimbraSingleUnsuspendAccount($userData)
 {
     $accessData = zimbraSingleGetAccess();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -250,15 +227,6 @@ function zimbraSingleDeleteAccount($userData)
 {
     $accessData = zimbraSingleGetAccess();
     $accountName = $userData['username'] . '@' . $userData['maildomain'];
-
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "debug: accountName",
-        $account_name
-        );
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -340,7 +308,6 @@ function zimbraSingleChangePassword($userData) {
 function zimbraSingleChangePackage($userData) {
     $accessData = zimbraSingleGetAccess();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -372,7 +339,6 @@ function zimbraSingleClientArea($userData)
 {
     $accessData = zimbraSingleGetAccess();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {