Support reseller in dashboard

Author: helmo

interface/lib/classes/quota_lib.inc.php

@@ -14,7 +14,12 @@ public function get_quota_data($clientid = null, $readable = true) {
 		//print_r($monitor_data);
 
 		// select all websites or websites belonging to client
-		$sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":'') . " ORDER BY domain", $clientid);
+		$q = " SELECT * FROM web_domain
+						WHERE active = 'y' AND type = 'vhost'"
+						. 'AND sys_groupid ' . (($clientid != null) ? "= (SELECT default_group FROM sys_user WHERE client_id=?)"
+							: " IN (" . $_SESSION["s"]["user"]["groups"] . ")")
+			. " ORDER BY domain";
+		$sites = $app->db->queryAllRecords($q, $clientid);
 
 		//print_r($sites);
 		if(is_array($sites) && !empty($sites)){
@@ -209,7 +214,11 @@ public function get_mailquota_data($clientid = null, $readable = true) {
 		//print_r($monitor_data);
 
 		// select all email accounts or email accounts belonging to client
-		$emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : '') . " ORDER BY email", $clientid);
+		$q = " SELECT * FROM mail_user"
+					. "	WHERE sys_groupid " . (($clientid != null) ? "= (SELECT default_group FROM sys_user WHERE client_id=?)"
+							: " IN (" . $_SESSION["s"]["user"]["groups"] . ")")
+						. " ORDER BY email";
+		$emails = $app->db->queryAllRecords($q, $clientid);
 
 		//print_r($emails);
 		if(is_array($emails) && !empty($emails)) {
@@ -265,7 +274,11 @@ public function get_databasequota_data($clientid = null, $readable = true) {
 		//print_r($monitor_data);
 
 		// select all databases belonging to client
-		$databases = $app->db->queryAllRecords("SELECT * FROM web_database".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : '') . " ORDER BY database_name", $clientid);
+		$q = "SELECT * FROM web_database"
+						. " WHERE sys_groupid " . (($clientid != null) ? "= (SELECT default_group FROM sys_user WHERE client_id=?)"
+										: " IN (" . $_SESSION["s"]["user"]["groups"] . ")")
+						. " ORDER BY database_name";
+		$databases = $app->db->queryAllRecords($q, $clientid);
 
 		//print_r($databases);
 		if(is_array($databases) && !empty($databases)){

interface/web/dashboard/dashboard.php

@@ -214,12 +214,18 @@
 	}
 }
 
+if ($app->auth->is_admin() || $app->auth->is_reseller()) {
+	$limit_to_client_id = null;
+}
+else {
+	$limit_to_client_id = $_SESSION['s']['user']['client_id'];
+}
 
 /* Fill the left column */
 $leftcol = array();
 foreach($leftcol_dashlets as $name) {
 	if(isset($dashlet_list[$name])) {
-		$leftcol[]['content'] = $dashlet_list[$name]->show($_SESSION['s']['user']['client_id']);
+		$leftcol[]['content'] = $dashlet_list[$name]->show($limit_to_client_id);
 	}
 }
 $app->tpl->setloop('leftcol', $leftcol);
@@ -228,7 +234,7 @@
 $rightcol = array();
 foreach($rightcol_dashlets as $name) {
 	if(isset($dashlet_list[$name])) {
-		$rightcol[]['content'] = $dashlet_list[$name]->show();
+		$rightcol[]['content'] = $dashlet_list[$name]->show($limit_to_client_id);
 	}
 }
 $app->tpl->setloop('rightcol', $rightcol);

interface/web/dashboard/dashlets/limits.php

@@ -146,15 +146,13 @@ public function show($limit_to_client_id = 0)
             include $lng_file;
         }
         $tpl->setVar($wb);
-        if ($app->auth->is_admin()) {
-          $client_id = $limit_to_client_id;
-        } else {
-          $client_id = $_SESSION['s']['user']['client_id'];
-        }
-
-//        $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
-        $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $client_id);
 
+        if ($limit_to_client_id != null) {
+          $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $limit_to_client_id);
+        }
+        elseif ($limit_to_client_id == null && $app->auth->is_reseller()) {
+          $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $_SESSION['s']['user']['client_id']);
+        }
 
         $rows = array();
         foreach ($limits as $limit) {