From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/monitor/show_sys_state.php | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index e504763..d251cdc 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -29,7 +29,6 @@
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');
@@ -77,7 +76,7 @@
Attention: the core-module ist triggered every 5 minutes,
so reload every 2 minutes is impossible!
*/
-$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
+$refresh = (isset($_GET["refresh"]))?$app->functions->intval($_GET["refresh"]):0;
$refresh_values = array('0' => '- '.$app->lng("No Refresh").' -','5' => '5 '.$app->lng("minutes"),'10' => '10 '.$app->lng("minutes"),'15' => '15 '.$app->lng("minutes"),'30' => '30 '.$app->lng("minutes"),'60' => '60 '.$app->lng("minutes"));
$tmp = '';
@@ -222,9 +221,9 @@
/*
* Info of a VE inside a OpenVz-Host
*/
- $html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve">';
+ $html_ve = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">';
if ($osData != null) {
- $html_ve .= '<div class="icoDevice os-' . $osData['name'] . '"><p class="status"></p></div>';
+ $html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
}
else {
$html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
@@ -244,9 +243,9 @@
/*
* Info of a "normal" Server or a OpenVz-Host
*/
- $html_server = '<div class="systemmonitor-server state-' . $serverState . '">';
+ $html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
if ($osData != null) {
- $html_server .= '<div class="icoDevice os-' . $osData['name'] . '"><p class="status"></p></div>';
+ $html_server .= '<div class="icoDevice"><p class="status"></p></div>';
}
else {
$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
@@ -291,9 +290,9 @@
/*
* Finish all html's
*/
- $html_ve .= '</div></div></div>';
- $html_server .= '<div>##VE_INFO##</div></div></div></div>';
- $html_verbose .= '</div></div></div>';
+ $html_ve .= '</div></div>';
+ $html_server .= '<div>##VE_INFO##</div></div></div>';
+ $html_verbose .= '</div></div>';
/*
* create and return the result
--
Gitblit v1.9.1