From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.

---
 interface/web/monitor/show_data.php |   82 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index 37c77dc..daf18ca 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -39,37 +39,96 @@
 /* Get the dataType to show */
 $dataType = $_GET["type"];
 
+/* Get some translations */
+$monTransDate = $app->lng("monitor_settings_datafromdate_txt");
+$monTransSrv = $app->lng("monitor_settings_server_txt");
+
+
 $output = '';
 
 switch($dataType) {
     case 'server_load':
         $template = 'templates/show_data.htm';
         $output .= showServerLoad();
-        $title = $app->lng("Server Load").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $time = getDataTime('server_load');
+        $title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
     case 'disk_usage':
         $template = 'templates/show_data.htm';
         $output .= showDiskUsage();
-        $title = $app->lng("Disk usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $time = getDataTime('disk_usage');
+        $title = $app->lng("Disk usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
     case 'mem_usage':
         $template = 'templates/show_data.htm';
         $output .= showMemUsage();
-        $title = $app->lng("Memory usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $time = getDataTime('mem_usage');
+        $title = $app->lng("Memory usage").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
     case 'cpu_info':
         $template = 'templates/show_data.htm';
         $output .= showCpuInfo();
-        $title = $app->lng("CPU info").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $time = getDataTime('cpu_info');
+        $title = $app->lng("monitor_title_cpuinfo_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
     case 'services':
         $template = 'templates/show_data.htm';
         $output .= showServices();
-        $title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $time = getDataTime('services');
+        $title = $app->lng("Status of services").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'openvz_beancounter':
+        $template = 'templates/show_data.htm';
+        $output .= showOpenVzBeanCounter();
+        $time = getDataTime('openvz_beancounter');
+        $title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'system_update':
+        $template = 'templates/show_data.htm';
+        $output .= showSystemUpdate();
+        $time = getDataTime('system_update');
+        $title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'mailq':
+        $template = 'templates/show_data.htm';
+        $output .= showMailq();
+        $time = getDataTime('mailq');
+        $title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'raid_state':
+        $template = 'templates/show_data.htm';
+        $output .= showRaidState();
+        $time = getDataTime('raid_state');
+        $title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'rkhunter':
+        $template = 'templates/show_data.htm';
+        $output .= showRKHunter();
+        $time = getDataTime('rkhunter');
+        $title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'fail2ban':
+        $template = 'templates/show_data.htm';
+        $output .= showFail2ban();
+        $time = getDataTime('log_fail2ban');
+        $title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    case 'iptables':
+        $template = 'templates/show_data.htm';
+        $output .= showIPTables();
+        $time = getDataTime('iptables_rules');
+        $title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
     default:
@@ -81,13 +140,14 @@
 // Loading the template
 $app->uses('tpl');
 $app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl',$template);
+$app->tpl->setInclude('content_tpl', $template);
 
-$app->tpl->setVar("output",$output);
-$app->tpl->setVar("title",$title);
-$app->tpl->setVar("description",$description);
-
+$app->tpl->setVar("output", $output);
+$app->tpl->setVar("list_head_txt", $title);
+$app->tpl->setVar("list_desc_txt", $description);
+$app->tpl->setVar("time", $time);
+$app->tpl->setVar("monTransDate", $monTransDate);
 
 $app->tpl_defaults();
 $app->tpl->pparse();
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1