bugfixing

zimbraSingle.inc

@@ -24,48 +24,27 @@ function zimbraSingleGetAccess()
 {
     $accessData = array('zimbraServer' => '', 'adminUser' => '', 'adminPass' => '');
     $whmcs = App::self();
+    $serverGroupID = $whmcs->get_req_var('servergroup');
     $action = $whmcs->get_req_var('action');
     if($action == 'module-settings') {
-        $idSelector = 'packageid';
-    } else {
-        $idSelector = 'id';
-    }
-    $id = $whmcs->get_req_var('id');
-    logModuleCall(
-        'zimbrasingle',
-        __FUNCTION__,
-        $idSelector,
-        "Debug",
-        $id
-    );
-    $serverGroupID = $whmcs->get_req_var('servergroup');
-    if($id) {
-        $serverIDObj = Capsule::table('tblhosting')
-            ->select('server')
-            ->where($idSelector, '=', $id)
+        $productID = $whmcs->get_req_var('id');
+        $serverGroupIDObj = Capsule::table('tblproducts')
+            ->select('servergroup')
+            ->where('id', '=', $productID)
             ->get();
-            $serverID = $serverIDObj[0]->server;
-    } elseif($serverGroupID) {
+        $serverGroupID = $serverGroupIDObj[0]->servergroup;
         $serverIDObj = Capsule::table('tblservergroupsrel')
             ->select('serverid')
             ->where('groupid', '=', $serverGroupID)
             ->get();
         $serverID = $serverIDObj[0]->serverid;
-    } elseif($packageid) {
+    } else {
+        $id = $whmcs->get_req_var('id');
         $serverIDObj = Capsule::table('tblhosting')
             ->select('server')
-            ->where('packageid', '=', $packageid)
+            ->where('id', '=', $id)
             ->get();
             $serverID = $serverIDObj[0]->server;
-    } else {
-        logModuleCall(
-            'zimbrasingle',
-            __FUNCTION__,
-            $params,
-            "Error: could not get accessdata",
-            ""
-        );
-        return false;
     }
     $server = Capsule::table('tblservers')
         ->select('ipaddress', 'username', 'password')