bugfixing

zimbraSingle.inc

@@ -266,25 +266,20 @@ function zimbraSingleDeleteAccount($userData)
     return 'success';
 }
 
-function zimbraSingleChangePassword($userData) {
+function zimbraSingleChangePassword($userData, $encrypted) {
     $accessData = zimbraSingleGetAccess();
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $userData,
-        "blubb",
-        ""
-    );
-    $passDecrypt = localAPI('DecryptPassword', array('password2' => $userData['password']));
-    if ($passDecrypt['result'] == 'success') {
-        $userData['password'] = $passDecrypt['password'];
+    if($encrypted == 'yes') {
+        $passDecrypt = localAPI('DecryptPassword', array('password2' => $userData['password']));
+            if ($passDecrypt['result'] == 'success') {
+            $userData['password'] = $passDecrypt['password'];
+        }
     }
     logModuleCall(
         'zimbrasingle',
         __FUNCTION__,
         $userData,
         "bla",
-        $passDecrypt
+        ""
     );
     if ($checkPW = zimbraSingleCheckPassword($userData['password'])) {
         return $checkPW;

zimbraSingle.php

@@ -51,13 +51,12 @@ function zimbraSingle_ClientArea($params)
 function zimbraSingle_ChangePassword($params)
 {
     if (defined('CLIENTAREA')) {
-        $passEncrypt = localAPI('EncryptPassword', array('password2' => $userData['password']));
-        if ($passEncrypt['result'] == 'success') {
-            $params['customfields']['password'] = $passEncrypt['password'];
-            $params['customfields']['pwrepeat'] = $passEncrypt['password'];
-        }
+        $params['customfields']['password'] = $userData['password'];
+        $params['customfields']['pwrepeat'] = $userData['password'];
+        $response = zimbraSingleChangePassword($params['customfields'], 'no');
+    } else {
+        $response = zimbraSingleChangePassword($params['customfields'], 'yes');
     }
-    $response = zimbraSingleChangePassword($params['customfields']);
     if($response == 'success') {
         return 'success';
     }