cleanup

zimbraSingle.php

@@ -399,6 +399,16 @@ function zimbraSingle_CreateAccount($params)
 {
     $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
+    if(is_a($login, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error: cannot login to " . $params['serverip'],
+            $login
+        );
+        return $login->getMessage();
+    }
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
     $apiAccountManager = new Zm_Account($api);
     $accountExists = $apiAccountManager->accountExists($accountName);
@@ -481,7 +491,7 @@ function zimbraSingle_SuspendAccount($params)
             'zimbrasingle',
             __FUNCTION__,
             $params,
-            "Error: cannot login to " . $accessData['zimbraServer'],
+            "Error: cannot login to " . $params['serverip'],
             $login
         );
         return $login->getMessage();
@@ -524,7 +534,7 @@ function zimbraSingle_UnsuspendAccount($params)
             'zimbrasingle',
             __FUNCTION__,
             $params,
-            "Error: cannot login to " . $accessData['zimbraServer'],
+            "Error: cannot login to " . $params['serverip'],
             $login
         );
         return $login->getMessage();
@@ -566,7 +576,7 @@ function zimbraSingle_TerminateAccount($params)
             'zimbrasingle',
             __FUNCTION__,
             $params,
-            "Error: cannot login to " . $accessData['zimbraServer'],
+            "Error: cannot login to " . $params['serverip'],
             $login
         );
         return $login->getMessage();
@@ -626,7 +636,7 @@ function zimbraSingle_ChangePackage($params)
             'zimbrasingle',
             __FUNCTION__,
             $params,
-            "Error: cannot login to " . $accessData['zimbraServer'],
+            "Error: cannot login to " . $params['serverip'],
             $login
         );
         return $login->getMessage();
@@ -658,6 +668,7 @@ function zimbraSingle_ChangePackage($params)
  */
 function zimbraSingle_ConfigOptions($params)
 {
+    $whmcs = App::self();
     logModuleCall(
         'zimbrasingle',
         __FUNCTION__,