From 66c3bc24f069a2854bdf1eeebb6dcb51f6ef0afb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:30:28 -0400
Subject: [PATCH] Implemented: FS#757 - Add "custom" option to transports

---
 server/mods-available/monitor_core_module.inc.php |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 162fd86..044f079 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -219,10 +219,14 @@
                  * calculate the state
                  */
                 $usePercent = floatval($data[$i]['percent']);
-                if ($usePercent > 75) $state = $this->_setState($state, 'info');
-                if ($usePercent > 80) $state = $this->_setState($state, 'warning');
-                if ($usePercent > 90) $state = $this->_setState($state, 'critical');
-                if ($usePercent > 95) $state = $this->_setState($state, 'error');
+				
+				//* We dont want to check the cdrom drive as a cd / dvd is always 100% full
+				if($data[$i]['type'] != 'iso9660' && $data[$i]['type'] != 'cramfs' && $data[$i]['type'] != 'udf') {
+                	if ($usePercent > 75) $state = $this->_setState($state, 'info');
+                	if ($usePercent > 80) $state = $this->_setState($state, 'warning');
+                	if ($usePercent > 90) $state = $this->_setState($state, 'critical');
+                	if ($usePercent > 95) $state = $this->_setState($state, 'error');
+				}
             }
         }
 
@@ -694,10 +698,11 @@
 
     function monitorRkHunter(){
         /*
-         *  This monitoring is expensive, so do it only once a hour
+         *  This monitoring is expensive, so do it only once a day
          */
         $min = date('i');
-        if ($min != 0) return;
+        $hour = date('H');
+        if (!($min == 0 && $hour == 23)) return;
 
         global $app;
         global $conf;

--
Gitblit v1.9.1