From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 01 Jul 2016 03:53:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/sites/database_quota_stats.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/web/sites/database_quota_stats.php b/interface/web/sites/database_quota_stats.php index 5e95fdc..a87a33d 100644 --- a/interface/web/sites/database_quota_stats.php +++ b/interface/web/sites/database_quota_stats.php @@ -29,7 +29,7 @@ foreach($tmp_array as $database_name => $data) { $db_name = $data['database_name']; - $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name); + $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.groupid = web_database.sys_groupid AND sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name); if(is_array($temp) && !empty($temp)) { $monitor_data[$server_id.'.'.$db_name]['database_name'] = $data['database_name']; $monitor_data[$server_id.'.'.$db_name]['client'] = isset($temp['username']) ? $temp['username'] : ''; @@ -80,7 +80,8 @@ $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $sys_group['client_id']); $rec['client'] = $client['username']; $rec['used'] = 'n/a'; - $rec['quota'] = 'n/a'; + if (empty($rec['database_quota'])) $rec['database_quota'] = 0; + $rec['quota'] = $rec['database_quota']; } $rec['id'] = $rec[$this->idx_key]; -- Gitblit v1.9.1