From 31f6ceb52bc4422c8a9a0ed8c6b167b3089bb6a6 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 30 Aug 2012 12:59:31 -0400
Subject: [PATCH] Changed: tools.inc.php removed from different places and converted to class where neccessary Fixed: Subtemplates can now be given on client creation in remoting (i.e. 10/34/21 for multiple addons) Changed: template applying moved to separate class Fixed: force_suexec was not taken from templates
---
interface/web/monitor/show_data.php | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index daf18ca..1cd4baf 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -30,11 +30,11 @@
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
-require_once('tools.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('monitor');
+$app->uses('tools_monitor');
/* Get the dataType to show */
$dataType = $_GET["type"];
@@ -49,85 +49,85 @@
switch($dataType) {
case 'server_load':
$template = 'templates/show_data.htm';
- $output .= showServerLoad();
- $time = getDataTime('server_load');
+ $output .= $app->tools_monitor->showServerLoad();
+ $time = $app->tools_monitor->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();
- $time = getDataTime('disk_usage');
+ $output .= $app->tools_monitor->showDiskUsage();
+ $time = $app->tools_monitor->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();
- $time = getDataTime('mem_usage');
+ $output .= $app->tools_monitor->showMemUsage();
+ $time = $app->tools_monitor->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();
- $time = getDataTime('cpu_info');
+ $output .= $app->tools_monitor->showCpuInfo();
+ $time = $app->tools_monitor->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();
- $time = getDataTime('services');
+ $output .= $app->tools_monitor->showServices();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showOpenVzBeanCounter();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showSystemUpdate();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showMailq();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showRaidState();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showRKHunter();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showFail2ban();
+ $time = $app->tools_monitor->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');
+ $output .= $app->tools_monitor->showIPTables();
+ $time = $app->tools_monitor->getDataTime('iptables_rules');
$title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
--
Gitblit v1.9.1