From 8793b32c8e8745e04571a30735b210f68b23ef92 Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Mon, 24 Nov 2008 12:51:48 -0500
Subject: [PATCH] Monitor Module now only shows the state of the "active" services Monitor Module now has system state

---
 interface/web/monitor/show_data.php |  305 +++++---------------------------------------------
 1 files changed, 34 insertions(+), 271 deletions(-)

diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index bee721b..37c77dc 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -30,6 +30,7 @@
 
 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');
@@ -38,58 +39,42 @@
 /* Get the dataType to show */
 $dataType = $_GET["type"];
 
-/* Change the Server if needed */
-if (isset($_GET['server'])){
-	$server = explode('|', $_GET['server'], 2);
-	$_SESSION['monitor']['server_id'] = $server[0];
-	$_SESSION['monitor']['server_name'] = $server[1];
-}
-	
-
 $output = '';
 
 switch($dataType) {
-	case 'server_load':
-		$template = 'templates/show_data.htm';
-		$output .= showServerLoad();
-		$title = $app->lng("Server Load").' (Server: ' . $_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'] . ')';
-		$description = '';
-		break;
-	case 'mem_usage':
-		$template = 'templates/show_data.htm';
-		$output .= showMemUsage();
-		$title = $app->lng("Memory usage").' (Server: ' . $_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'] . ')';
-		$description = '';
-		break;
-	case 'services':
-		$template = 'templates/show_data.htm';
-		$output .= showServices();
-		$title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
-		$description = '';
-		break;
-	case 'overview':
-		$template = 'templates/show_data.htm';
-		$output .= showServerLoad();
-		$output .= '&nbsp;'. showDiskUsage();
-		$output .= '&nbsp;'.showServices();
-		$title = $app->lng("System Monitor").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
-		$description = '';
-		break;
-	default:
-		$template = '';
-		break;
+    case 'server_load':
+        $template = 'templates/show_data.htm';
+        $output .= showServerLoad();
+        $title = $app->lng("Server Load").' (Server: ' . $_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'] . ')';
+        $description = '';
+        break;
+    case 'mem_usage':
+        $template = 'templates/show_data.htm';
+        $output .= showMemUsage();
+        $title = $app->lng("Memory usage").' (Server: ' . $_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'] . ')';
+        $description = '';
+        break;
+    case 'services':
+        $template = 'templates/show_data.htm';
+        $output .= showServices();
+        $title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
+    default:
+        $template = '';
+        break;
 }
 
 
@@ -105,226 +90,4 @@
 
 $app->tpl_defaults();
 $app->tpl->pparse();
-
-
-
-
-function showServerLoad(){
-	global $app;
-	
-	/* fetch the Data from the DB */
-	$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-	
-	if(isset($record['data'])) {
-		$data = unserialize($record['data']);
-	
-		/*
-	 	Format the data 
-		*/
-		$html .= 
-		'<table id="system_load">
-			<tr>
-			<td>' . $app->lng("Server online since").':</td>
-			<td>' . $data['up_days'] . ' days, ' . $data['up_hours'] . ':' . $data['up_minutes'] . ' hours</center></td>
-			</tr>
-			<tr>
-			<td>' . $app->lng("Users online").':</td>
-			<td>' . $data['user_online'] . '</td>
-			</tr>' .
-			'<tr>
-			<td>' . $app->lng("System load 1 minute") . ':</td>
-			<td>' . $data['load_1'] . '</td>
-			</tr>
-			<tr>
-			<td>' . $app->lng("System load 5 minutes") . ':</td>
-			<td>' . $data['load_5'] . '</td>
-			</tr>
-			<tr>
-			<td>'.$app->lng("System load 15 minutes").':</td>
-			<td>' . $data['load_15'] . '</td>
-			</tr>
-			</table>';
-	} else {
-		$html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
-	}
-	
-	return $html;
-}
-
-function showDiskUsage () {
-	global $app;
-
-	/* fetch the Data from the DB */
-	$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-	
-	if(isset($record['data'])) {
-		$data = unserialize($record['data']);
-	
-		/*
-	 	Format the data 
-		*/
-		$html .= '<table id="system_disk">';
-		foreach($data as $line) {
-			$html .= '<tr>';
-			foreach ($line as $item) {
-				$html .= '<td>' . $item . '</td>';
-			}
-			$html .= '</tr>';
-		}
-		$html .= '</table>';
-	} else {
-		$html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
-	}
-	
-
-	return $html;
-}
-
-
-function showMemUsage ()
-{
-	global $app;
-	
-	/* fetch the Data from the DB */
-	$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-	
-	if(isset($record['data'])) {
-		$data = unserialize($record['data']);
-	
-		/*
-	 	Format the data 
-		*/
-		$html .= '<table id="system_memusage">';
-	
-		foreach($data as $key => $value){
-			if ($key != '') {
-				$html .= '<tr>
-					<td>' . $key . ':</td>
-					<td>' . $value . '</td>
-					</tr>';
-			}
-		}
-		$html .= '</table>';
-	} else {
-		$html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
-	}
-	
-	return $html;
-}
-
-function showCpuInfo ()
-{
-	global $app;
-
-	/* fetch the Data from the DB */
-	$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-	
-	if(isset($record['data'])) {
-		$data = unserialize($record['data']);
-	
-		/*
-	 	Format the data 
-		*/
-		$html .= '<table id="system_cpu">';
-		foreach($data as $key => $value){
-			if ($key != '') {
-				$html .= '<tr>
-					<td>' . $key . ':</td>
-					<td>' . $value . '</td>
-					</tr>';
-			}
-		}
-		$html .= '</table>';
-	} else {
-		$html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
-	}
-	
-	return $html;
-}
-
-function showServices ()
-{
-	global $app;
-	
-	/* fetch the Data from the DB */
-	$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
-	
-	if(isset($record['data'])) {
-		$data = unserialize($record['data']);
-	
-		/*
-	 	Format the data 
-		*/
-		$html .= '<table id="system_services">';
-	
-		if($data['webserver'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>Web-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-	
-		if($data['ftpserver'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>FTP-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-		if($data['smtpserver'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>SMTP-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-		if($data['pop3server'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>POP3-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-		if($data['bindserver'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>DNS-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-		if($data['mysqlserver'] == true) {
-			$status = '<span class="online">Online</span>';
-		} else {
-			$status = '<span class="offline">Offline</span>';
-		}
-		$html .= '<tr>
-			<td>mySQL-Server:</td>
-			<td>'.$status.'</td>
-			</tr>';
-	
-	
-		$html .= '</table></div>';
-	} else {
-		$html = '<p>'.$app->lng("no_data_services_txt").'</p>';
-	}
-	
-	
-	return $html;
-}
 ?>
\ No newline at end of file

--
Gitblit v1.9.1