cleanup

zimbraSingle.php

@@ -350,7 +350,7 @@ function zimbraSingle_CreateAccount($params)
         );
         return $login->getMessage();
     }
-    $params['username'] = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
+    $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
     $apiAccountManager = new Zm_Account($api);
     $accountExists = $apiAccountManager->accountExists($accountName);
     if(is_a($accountExists, "Exception")) {
@@ -358,13 +358,13 @@ function zimbraSingle_CreateAccount($params)
             'zimbrasingle',
             __FUNCTION__,
             $accessData,
-            "Error: could not verify " . $params['username'],
+            "Error: could not verify $accountName",
             $accountExists
         );
-        return "Error: could not verify " . $params['username'];
+        return "Error: could not verify $accountName";
     }
     if($accountExists === true) {
-        return "Error: account ". $params['username'] . " already exists";
+        return "Error: account $accountName already exists";
     }
     $attrs = array();
     $attrs["gn"] = $params['customfields']["givenname"];
@@ -372,7 +372,7 @@ function zimbraSingle_CreateAccount($params)
     $attrs["displayName"] = $attrs["gn"] . " " . $attrs["sn"];
     $passDecrypt = localAPI('DecryptPassword', array('password2' => $params['customfields']['password']));
     if ($passDecrypt['result'] == 'success') {
-        $params['password'] = $passDecrypt['password'];
+        $params['customfields']['password'] = $passDecrypt['password'];
     } else {
         logModuleCall(
             'zimbrasingle',
@@ -395,16 +395,16 @@ function zimbraSingle_CreateAccount($params)
         return "Error: serviceclass not available";
     }
     $attrs['zimbraCOSId'] = $cosID;
-    $id = $apiAccountManager->createAccount($params['username'], $params['password'], $attrs);
+    $id = $apiAccountManager->createAccount($accountName, $params['customfields']['password'], $attrs);
     if(is_a($id, "Exception")) {
         logModuleCall(
             'zimbrasingle',
             __FUNCTION__,
             $params,
-            "Error: account " . $params['username'] . " not created",
+            "Error: account $accountName not created",
             $id
         );
-        return "Error: account " . $params['username'] . " not created";
+        return "Error: account $accountName not created";
     }
     return 'success';
 }