From b125fabc24d1236dda389b451650c1deb1e8883a Mon Sep 17 00:00:00 2001
From: florian030 <florian@schaal-24.de>
Date: Mon, 17 Feb 2014 10:39:09 +0100
Subject: [PATCH] add domain and username to db-size-monitoring
---
interface/lib/classes/tools_monitor.inc.php | 12 ++++++------
.../classes/cron.d/100-monitor_database_size.inc.php | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php
index 19f2ccd5a9..8b52afde04 100644
--- a/interface/lib/classes/tools_monitor.inc.php
+++ b/interface/lib/classes/tools_monitor.inc.php
@@ -124,9 +124,7 @@ class tools_monitor {
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'database_size' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
- /*
- Format the data
- */
+ //* format the data
$html =
'<div class="systemmonitor-state state-'.$record['state'].'">
<div class="systemmonitor-content icons32 ico-'.$record['state'].'">
@@ -136,13 +134,15 @@ class tools_monitor {
<td>'.$app->lng("monitor_database_name_txt").'</td>
<td>'.$app->lng("monitor_database_size_txt").'</td>
<td>'.$app->lng("monitor_database_client_txt").'</td>
+ <td>'.$app->lng("monitor_database_domain_txt").'</td>
</tr>';
foreach($data as $line) {
$html .= '<tr>';
if ($line['size'] > 0) $line['size'] = $app->functions->formatBytes($line['size']);
- $t=$app->db->queryOneRecord("SELECT username FROM client WHERE sys_groupid = ".$line['client_id']);
- $line['client_id']=$t['username'];
- unset($t);
+ //* get the username
+ $line['sys_groupid']=$app->db->queryOneRecord("SELECT client.username FROM web_database, sys_group, client WHERE web_database.sys_groupid = sys_group.groupid AND sys_group.client_id = client.client_id AND web_database.database_name='".$line['name']."'")['username'];
+ //* get the domain
+ $line['domain']=$app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id=(SELECT parent_domain_id FROM web_database WHERE database_name='".$line['name']."')")['domain'];
foreach ($line as $item) {
$html .= '<td>' . $item . '</td>';
}
diff --git a/server/lib/classes/cron.d/100-monitor_database_size.inc.php b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
index 6ec22d8b24..81d1490b7b 100644
--- a/server/lib/classes/cron.d/100-monitor_database_size.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_database_size.inc.php
@@ -84,7 +84,7 @@ class cronjob_monitor_database_size extends cronjob {
for ($i = 0; $i < sizeof($records); $i++) {
$data[$i]['name'] = $records[$i]['database_name'];
$data[$i]['size'] = $app->db->getDatabaseSize($data[$i]['name']);
- $data[$i]['client_id'] = $records[$i]['sys_groupid'];
+ $data[$i]['sys_groupid'] = $records[$i]['sys_groupid'];
}
}
--
GitLab