From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
server/lib/classes/monitor_tools.inc.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index f120bcb..dab75b5 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -879,7 +879,7 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('zypper --non-interactive up');
+ $data['output'] = shell_exec('zypper lu');
} else {
/*
* It is not Debian/Ubuntu, so there is no data and no state
@@ -1020,7 +1020,7 @@
/*
* Fetch the output
*/
- $data['output'] = shell_exec('mpt-status --autoload -n');
+ $data['output'] = shell_exec('mpt-status --autoload');
/*
* Then calc the state.
@@ -1032,7 +1032,7 @@
* The output contains information for every RAID and every HDD.
* We only need the state of the RAID
*/
- if (strpos($item, 'raidlevel:') !== false) {
+ if (strpos($item, 'state ') !== false) {
/*
* We found a raid, process the state of it
*/
@@ -1719,7 +1719,13 @@
* So we can do a deepter test and try to get data over this connection.
* (if apache hangs, we get a connection but a timeout by trying to GET the data!)
*/
- fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ // fwrite($fp, "GET / HTTP/1.0\r\n\r\n");
+ $out = "GET / HTTP/1.1\r\n";
+ $out .= "Host: localhost\r\n";
+ $out .= "User-Agent: Mozilla/5.0 (ISPConfig monitor)\r\n";
+ $out .= "Accept: application/xml,application/xhtml+xml,text/html\r\n";
+ $out .= "Connection: Close\r\n\r\n";
+ fwrite($fp, $out);
stream_set_timeout($fp, 5); // Timeout after 5 seconds
$res = fread($fp, 10); // try to get 10 bytes (enough to test!)
$info = stream_get_meta_data($fp);
--
Gitblit v1.9.1