From 49a76e223b6e97b298002be4a174e576c9e8ba86 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 09 Nov 2012 08:41:31 -0500
Subject: [PATCH] - Hide Options tab in subdomain and alias domain form if redirect_type != proxy. - Several changes in SEO redirects implementation.

---
 server/lib/classes/monitor_tools.inc.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index b5ca043..bfe0df2 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -117,7 +117,6 @@
 					$relname = "UNKNOWN";
 				}
 				$distver = $ver.$lts." ".$relname;
-				swriteln("Operating System: ".$distver."\n");
 			} elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
 				$distname = 'Debian';
 				$distver = '4.0';
@@ -136,7 +135,7 @@
 			} elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
 				$distname = 'Debian';
 				$distver = 'Wheezy/Sid';
-				$distid = 'debian70';
+				$distid = 'debian60';
 				$distbaseid = 'debian';
 			} else {
 				$distname = 'Debian';
@@ -1149,6 +1148,7 @@
 			$data['output'] = shell_exec('tw_cli info c0');
 
 			$state = 'ok';
+			if(is_array($data['output'])) {
 			foreach ($data['output'] as $item) {
 				if (strpos($item, 'RAID') !== false) {
 					if (strpos($item, ' VERIFYING ') !== false) {
@@ -1192,6 +1192,7 @@
 					}
 				}
 			}
+			}
 		}
 
 

--
Gitblit v1.9.1