From 39edfec85487f7de81fbade3c31bf2de4fabff9f Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Mon, 15 Dec 2008 13:04:21 -0500
Subject: [PATCH] removed "options indexes"
---
interface/web/monitor/show_data.php | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index 37c77dc..de8cce0 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -45,31 +45,64 @@
case 'server_load':
$template = 'templates/show_data.htm';
$output .= showServerLoad();
+ $time = getDataTime('server_load');
$title = $app->lng("Server Load").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'disk_usage':
$template = 'templates/show_data.htm';
$output .= showDiskUsage();
+ $time = getDataTime('disk_usage');
$title = $app->lng("Disk usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'mem_usage':
$template = 'templates/show_data.htm';
$output .= showMemUsage();
+ $time = getDataTime('mem_usage');
$title = $app->lng("Memory usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'cpu_info':
$template = 'templates/show_data.htm';
$output .= showCpuInfo();
+ $time = getDataTime('cpu_info');
$title = $app->lng("CPU info").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'services':
$template = 'templates/show_data.htm';
$output .= showServices();
+ $time = getDataTime('services');
$title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+ case 'system_update':
+ $template = 'templates/show_data.htm';
+ $output .= showSystemUpdate();
+ $time = getDataTime('system_update');
+ $title = "Update State" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+ case 'mailq':
+ $template = 'templates/show_data.htm';
+ $output .= showMailq();
+ $time = getDataTime('mailq');
+ $title = "Mailq" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+ case 'raid_state':
+ $template = 'templates/show_data.htm';
+ $output .= showRaidState();
+ $time = getDataTime('raid_state');
+ $title = "RAID-State" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+ case 'rkhunter':
+ $template = 'templates/show_data.htm';
+ $output .= showRKHunter();
+ $time = getDataTime('rkhunter');
+ $title = "RKHunter-Log" . ' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
default:
@@ -81,12 +114,12 @@
// 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("title", $title);
+$app->tpl->setVar("description", $description);
+$app->tpl->setVar("time", $time);
$app->tpl_defaults();
$app->tpl->pparse();
--
Gitblit v1.9.1