cleanup

zimbraSingle.php

@@ -669,14 +669,40 @@ function zimbraSingle_ChangePackage($params)
 function zimbraSingle_ConfigOptions($params)
 {
     $whmcs = App::self();
+    $serverGroupID = $whmcs->get_req_var('servergroup');
+    $serverIDObj = Capsule::table('tblservergroupsrel')
+        ->select('serverid')
+        ->where('groupid', '=', $serverGroupID)
+        ->get();
+    $serverID = $serverIDObj[0]->serverid;
     logModuleCall(
         'zimbrasingle',
         __FUNCTION__,
-        $params,
-        "Debug",
-        $whmcs
+        $serverGroupID,
+        "Debug" ,
+        $serverID
     );
-    $accessData = zimbraSingleGetAccess();
+    $server = Capsule::table('tblservers')
+        ->select('ipaddress', 'username', 'password')
+        ->where('id', '=', $serverID)
+        ->where('active', '=', 1)
+        ->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'];
+    } else {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $adminPassCrypt,
+            "Error: cloud not decrypt admin password" ,
+            $adminPassDecrypt
+        );
+        return false;
+    }
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {