cleanup

zimbraSingle.php

@@ -245,10 +245,9 @@ function zimbraSingle_TestConnection($params)
  */
 function zimbraSingle_ClientArea($params)
 {
-    $accessData = zimbraSingleGetAccess();
     $clientInfo = array();
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -353,12 +352,7 @@ function zimbraSingle_UsageUpdate($params) {
  */
 function zimbraSingle_ChangePassword($params)
 {
-    $accessData = zimbraSingleGetAccess();
-    if ($checkPW = zimbraSingleCheckPassword($params['password'])) {
-        return $checkPW;
-    }
-    $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -403,26 +397,8 @@ function zimbraSingle_ChangePassword($params)
  */
 function zimbraSingle_CreateAccount($params)
 {
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $params,
-        "Debug",
-        $whmcs
-    );
-    $accessData = zimbraSingleGetAccess();
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
-    if(is_a($login, "Exception")) {
-        logModuleCall(
-            'zimbrasingle',
-            __FUNCTION__,
-            $accessData,
-            "Error: cannot login to " . $accessData['zimbraServer'],
-            $login->getMessage()
-        );
-        return "Error: cannot login to " . $accessData['zimbraServer'];
-    }
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
     $apiAccountManager = new Zm_Account($api);
     $accountExists = $apiAccountManager->accountExists($accountName);
@@ -497,9 +473,8 @@ function zimbraSingle_CreateAccount($params)
  */
 function zimbraSingle_SuspendAccount($params)
 {
-    $accessData = zimbraSingleGetAccess();
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -541,9 +516,8 @@ function zimbraSingle_SuspendAccount($params)
  */
 function zimbraSingle_UnsuspendAccount($params)
 {
-    $accessData = zimbraSingleGetAccess();
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -584,9 +558,8 @@ function zimbraSingle_UnsuspendAccount($params)
  */
 function zimbraSingle_TerminateAccount($params)
 {
-    $accessData = zimbraSingleGetAccess();
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -645,9 +618,8 @@ function zimbraSingle_TerminateAccount($params)
  */
 function zimbraSingle_ChangePackage($params)
 {
-    $accessData = zimbraSingleGetAccess();
     $accountName = $params['customfields']['username'] . '@' . $params['customfields']['maildomain'];
-    $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
+    $api = new Zm_Auth($params['serverip'], $params['serverusername'], $params['serverpassword'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
         logModuleCall(
@@ -686,11 +658,13 @@ function zimbraSingle_ChangePackage($params)
  */
 function zimbraSingle_ConfigOptions($params)
 {
-    if(isset($_POST['packageconfigoption'])) {
-        if(zimbraSingleCreateCustomFields($_POST['packageconfigoption']) == false) {
-            return false;
-        };
-    }
+    logModuleCall(
+        'zimbrasingle',
+        __FUNCTION__,
+        $params,
+        "Debug",
+        $whmcs
+    );
     $accessData = zimbraSingleGetAccess();
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();