Merge branch 'singelsignon' of andre/whmcsZimbraSingle into master

zimbraSingle.php

@@ -379,19 +379,7 @@ function zimbraSingle_CreateAccount($params) {
     $attrs['gn'] = $params['customfields']['givenname'];
     $attrs['sn'] = $params['customfields']['sn'];
     $attrs['displayName'] = $attrs['gn'] . ' ' . $attrs['sn'];
-    $passDecrypt = localAPI('DecryptPassword', array('password2' => $params['customfields']['password']));
-    if ($passDecrypt['result'] == 'success') {
-        $params['password'] = $passDecrypt['password'];
-    } else {
-        logModuleCall(
-            'zimbrasingle',
-            __FUNCTION__,
-            $params,
-            'Error: could not decrypt password',
-            $passDecrypt['message']
-            );
-            return 'Error: could not decrypt password';
-    }
+    $params['password'] = $params['customfields']['password'];
     $cosID = $apiAccountManager->getCosId($params['configoption1']);
     if(is_a($cosID, 'Exception')) {
         logModuleCall(
@@ -670,17 +658,16 @@ function zimbraSingle_ConfigOptions($params) {
         ->get();
     $accessData['zimbraServer'] = $server[0]->ipaddress;
     $accessData['adminUser'] = $server[0]->username;
-    $adminPassCrypt = $server[0]->password;
-    $adminPassDecrypt = localAPI('DecryptPassword', array('password2' => $adminPassCrypt));
-    if ($adminPassDecrypt['result'] == 'success') {
-        $accessData['adminPass'] = $adminPassDecrypt['password'];
+    $passDecrypt = localAPI('DecryptPassword', array('password2' => $server[0]->password));
+    if ($passDecrypt['result'] == 'success') {
+        $accessData['adminPass'] = $passDecrypt['password'];
     } else {
         logModuleCall(
             'zimbrasingle',
             __FUNCTION__,
-            $adminPassCrypt,
-            'Error: cloud not decrypt admin password' ,
-            $adminPassDecrypt['message']
+            $server,
+            'Error: could not decrypt password',
+            $passDecrypt['message']
         );
         return false;
     }
@@ -690,7 +677,7 @@ function zimbraSingle_ConfigOptions($params) {
         logModuleCall(
             'zimbrasingle',
             __FUNCTION__,
-            $params,
+            $server,
             'Error: cannot login to ' . $accessData['zimbraServer'],
             $login->getMessage()
         );