From 81d79a79e4b29e9314b64b2e4c49b48ae8319767 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 11 Oct 2011 08:50:45 -0400
Subject: [PATCH] - WebDAV Users: show only domains that run on Apache (because nginx does not have full WebDAV support).

---
 server/mods-available/monitor_core_module.inc.php | 2022 +++++++++++++++++++++-------------------------------------
 1 files changed, 737 insertions(+), 1,285 deletions(-)

diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 717e378..ec85bed 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -1,1367 +1,819 @@
 <?php
+
 /*
-Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
-All rights reserved.
+  Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
+  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+  Redistribution and use in source and binary forms, with or without modification,
+  are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+  OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 class monitor_core_module {
-    /* TODO: this should be a config - var instead of a "constant" */
-    var $interval = 5; // do the monitoring every 5 minutes
 
-    var $module_name = 'monitor_core_module';
-    var $class_name = 'monitor_core_module';
-    /* No actions at this time. maybe later... */
-    var $actions_available = array();
+	var $interval = 5; // do the monitoring every 5 minutes
+	var $module_name = 'monitor_core_module';
+	var $class_name = 'monitor_core_module';
+	/* No actions at this time. maybe later... */
+	var $actions_available = array();
+	/** The Tools */
+	private $_tools = null;
 
-    //* This function is called during ispconfig installation to determine
-	//  if a symlink shall be created for this plugin.
-	function onInstall() {
+	/**
+	 * This function is called during ispconfig installation to determine
+	 * if a symlink shall be created for this plugin.
+	 */
+	public function onInstall() {
 		global $conf;
-		
 		return true;
-		
 	}
-	
-	/*
-        This function is called when the module is loaded
-    */
-    function onLoad() {
-        global $app;
 
-        /*
-        Annonce the actions that where provided by this module, so plugins
-        can register on them.
-        */
-        /* none at them moment */
-        //$app->plugins->announceEvents($this->module_name,$this->actions_available);
-
-        /*
-        As we want to get notified of any changes on several database tables,
-        we register for them.
-
-        The following function registers the function "functionname"
-            to be executed when a record for the table "dbtable" is
-            processed in the sys_datalog. "classname" is the name of the
-            class that contains the function functionname.
-        */
-        /* none at them moment */
-        //$app->modules->registerTableHook('mail_access','mail_module','process');
-
-        /*
-        Do the monitor every n minutes and write the result in the db
-        */
-        $min = date('i');
-        if (($min % $this->interval) == 0)
-        {
-            $this->doMonitor();
-        }
-    }
-
-    /*
-     This function is called when a change in one of the registered tables is detected.
-     The function then raises the events for the plugins.
-    */
-    function process($tablename, $action, $data) {
-        //		global $app;
-        //
-        //		switch ($tablename) {
-        //			case 'mail_access':
-        //				if($action == 'i') $app->plugins->raiseEvent('mail_access_insert',$data);
-        //				if($action == 'u') $app->plugins->raiseEvent('mail_access_update',$data);
-        //				if($action == 'd') $app->plugins->raiseEvent('mail_access_delete',$data);
-        //				break;
-        //		} // end switch
-    } // end function
-
-    /*
-    This method is called every n minutes, when the module ist loaded.
-    The method then does a system-monitoring
-    */
-    // TODO: what monitoring is done should be a config-var
-    function doMonitor()
-    {
-        /* Calls the single Monitoring steps */
-        $this->monitorServer();
-        $this->monitorDiskUsage();
-        $this->monitorMemUsage();
-        $this->monitorCpu();
-        $this->monitorServices();
-        $this->monitorMailLog();
-        $this->monitorMailWarnLog();
-        $this->monitorMailErrLog();
-        $this->monitorMessagesLog();
-        $this->monitorISPCCronLog();
-        $this->monitorFreshClamLog();
-        $this->monitorClamAvLog();
-        $this->monitorIspConfigLog();
-        $this->monitorSystemUpdate();
-        $this->monitorMailQueue();
-        $this->monitorRaid();
-        $this->monitorRkHunter();
-		$this->monitorFail2ban();
-        $this->monitorSysLog();
-    }
-
-    function monitorServer(){
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'server_load';
-
-        /*
-        Fetch the data into a array
-        */
-        $procUptime = shell_exec("cat /proc/uptime | cut -f1 -d' '");
-        $data['up_days'] = floor($procUptime/86400);
-        $data['up_hours'] = floor(($procUptime-$data['up_days']*86400)/3600);
-        $data['up_minutes'] = floor(($procUptime-$data['up_days']*86400-$data['up_hours']*3600)/60);
-
-        $data['uptime'] = shell_exec("uptime");
-
-        $tmp = explode(",", $data['uptime'], 4);
-        $tmpUser = explode(" ", trim($tmp[2]));
-        $data['user_online'] = intval($tmpUser[0]);
-
-        $loadTmp = explode(":" , trim($tmp[3]));
-        $load = explode(",",  $loadTmp[1]);
-        $data['load_1'] = floatval(trim($load[0]));
-        $data['load_5'] = floatval(trim($load[1]));
-        $data['load_15'] = floatval(trim($load[2]));
-
-        /** The state of the server-load. */
-        $state = 'ok';
-        if ($data['load_1'] > 20 ) $state = 'info';
-        if ($data['load_1'] > 50 ) $state = 'warning';
-        if ($data['load_1'] > 100 ) $state = 'critical';
-        if ($data['load_1'] > 150 ) $state = 'error';
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-    function monitorDiskUsage() {
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'disk_usage';
-
-        /** The state of the disk-usage */
-        $state = 'ok';
-
-        /** Fetch the data of ALL devices into a array (needed for monitoring!)*/
-        $dfData = shell_exec("df -hT");
-
-        // split into array
-        $df = explode("\n", $dfData);
-
-        /*
-         * ignore the first line, process the rest
-         */
-        for($i=1; $i <= sizeof($df); $i++){
-            if ($df[$i] != '')
-            {
-                /*
-                 * Make a array of the data
-                 */
-                $s = preg_split ("/[\s]+/", $df[$i]);
-                $data[$i]['fs'] = $s[0];
-                $data[$i]['type'] = $s[1];
-                $data[$i]['size'] = $s[2];
-                $data[$i]['used'] = $s[3];
-                $data[$i]['available'] = $s[4];
-                $data[$i]['percent'] = $s[5];
-                $data[$i]['mounted'] = $s[6];
-                /*
-                 * 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');
-            }
-        }
-
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-
-    function monitorMemUsage()
-    {
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'mem_usage';
-
-        /*
-        Fetch the data into a array
-        */
-        $miData = shell_exec("cat /proc/meminfo");
-
-        $memInfo = explode("\n", $miData);
-
-        foreach($memInfo as $line){
-            $part = preg_split("/:/", $line);
-            $key = trim($part[0]);
-            $tmp = explode(" ", trim($part[1]));
-            $value = 0;
-            if ($tmp[1] == 'kB') $value = $tmp[0] * 1024;
-            $data[$key] = $value;
-        }
-
-        /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
-         */
-        $state = 'no_state';
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-
-    function monitorCpu()
-    {
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'cpu_info';
-
-        /*
-        Fetch the data into a array
-        */
-        $cpuData = shell_exec("cat /proc/cpuinfo");
-        $cpuInfo = explode("\n", $cpuData);
-		$processor = 0;
-
-        foreach($cpuInfo as $line){
-            
-			$part = preg_split("/:/", $line);
-            $key = trim($part[0]);
-            $value = trim($part[1]);
-			if($key == 'processor') $processor = intval($value);
-            $data[$key.' '.$processor] = $value;
-        }
-
-        /* the cpu has no state. It is, what it is */
-        $state = 'no_state';
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-
-    function monitorServices()
-    {
-        global $app;
-        global $conf;
-
-        /** the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** get the "active" Services of the server from the DB */
-        $services = $app->dbmaster->queryOneRecord("SELECT * FROM server WHERE server_id = " . $server_id);
-
-        /* The type of the Monitor-data */
-        $type = 'services';
-
-        /** the State of the monitoring */
-        /* ok, if ALL aktive services are running,
-         * error, if not
-         * There is no other state!
-         */
-        $state = 'ok';
-
-        /* Monitor Webserver */
-        $data['webserver'] = -1; // unknown - not needed
-        if ($services['web_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 80)) {
-                $data['webserver'] = 1;
-            } else {
-                $data['webserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor FTP-Server */
-        $data['ftpserver'] = -1; // unknown - not needed
-        if ($services['file_server'] == 1)
-        {
-            if($this->_checkFtp('localhost', 21)) {
-                $data['ftpserver'] = 1;
-            } else {
-                $data['ftpserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor SMTP-Server */
-        $data['smtpserver'] = -1; // unknown - not needed
-        if ($services['mail_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 25)) {
-                $data['smtpserver'] = 1;
-            } else {
-                $data['smtpserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor POP3-Server */
-        $data['pop3server'] = -1; // unknown - not needed
-        if ($services['mail_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 110)) {
-                $data['pop3server'] = 1;
-            } else {
-                $data['pop3server'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor IMAP-Server */
-        $data['imapserver'] = -1; // unknown - not needed
-        if ($services['mail_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 143)) {
-                $data['imapserver'] = 1;
-            } else {
-                $data['imapserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor BIND-Server */
-        $data['bindserver'] = -1; // unknown - not needed
-        if ($services['dns_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 53)) {
-                $data['bindserver'] = 1;
-            } else {
-                $data['bindserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-        /* Monitor MYSQL-Server */
-        $data['mysqlserver'] = -1; // unknown - not needed
-        if ($services['db_server'] == 1)
-        {
-            if($this->_checkTcp('localhost', 3306)) {
-                $data['mysqlserver'] = 1;
-            } else {
-                $data['mysqlserver'] = 0;
-                $state = 'error'; // because service is down
-            }
-        }
-
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-
-    function monitorSystemUpdate(){
-        /*
-         *  This monitoring is expensive, so do it only once a hour
-         */
-        $min = date('i');
-        if ($min != 0) return;
-
-        /*
-         * OK - here we go...
-         */
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'system_update';
-
-        /* This monitoring is only available at debian or Ubuntu */
-        if(file_exists('/etc/debian_version')){
-
-            /*
-             * first update the "update-database"
-             */
-            shell_exec('apt-get update');
-
-            /*
-             * Then test the upgrade.
-             * if there is any output, then there is a needed update
-             */
-            $aptData = shell_exec('apt-get -s -qq dist-upgrade');
-            if ($aptData == '')
-            {
-                /* There is nothing to update! */
-                $state = 'ok';
-            }
-            else
-            {
-                /* There is something to update! */
-                $state = 'warning';
-            }
-
-            /*
-             * Fetch the output
-             */
-            $data['output'] = shell_exec('apt-get -s -q dist-upgrade');
-        }
-        else {
-            /*
-             * It is not debian/Ubuntu, so there is no data and no state
-             *
-             * no_state, NOT unknown, because "unknown" is shown as state
-             * inside the GUI. no_state is hidden.
-             *
-             * We have to write NO DATA inside the DB, because the GUI
-             * could not know, if there is any dat, or not...
-             */
-            $state = 'no_state';
-            $data['output']= '';
-        }
-
-        /*
-         * Insert the data into the database
-         */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 0, 2);
-    }
-
-    function monitorMailQueue(){
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'mailq';
-
-        /* Get the data from the mailq */
-        $data['output'] = shell_exec('mailq');
-
-        /*
-         *  The last line has more informations
-         */
-        $tmp = explode("\n", $data['output']);
-        $more = $tmp[sizeof($tmp) - 1];
-        $this->_getIntArray($more);
-        $data['bytes'] = $res[0];
-        $data['requests'] = $res[1];
-
-        /** The state of the mailq. */
-        $state = 'ok';
-        if ($data['requests'] > 2000 ) $state = 'info';
-        if ($data['requests'] > 5000 ) $state = 'warning';
-        if ($data['requests'] > 8000 ) $state = 'critical';
-        if ($data['requests'] > 10000 ) $state = 'error';
-
-        /*
-         * Insert the data into the database
-         */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-
-    function monitorRaid(){
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'raid_state';
-
-        /* This monitoring is only available if mdadm is installed */
-        $location = shell_exec('which mdadm');
-        if($location != ''){
-            /*
-             * Fetch the output
-             */
-            $data['output'] = shell_exec('cat /proc/mdstat');
-
-            /*
-             * Then calc the state.
-             */
-            $tmp = explode("\n", $data['output']);
-            $state = 'ok';
-            for ($i = 0; $i < sizeof($tmp); $i++){
-                /* fetch the next line */
-                $line = $tmp[$i];
-
-                if ((strpos($line, '[U_]') !== false) || (strpos($line, '[_U]') !== false))
-                {
-                    /* One Disk is not working.
-                     * if the next line starts with "[>" or "[=" then
-                     * recovery (resync) is in state and the state is
-                     * information instead of critical
-                     */
-                    $nextLine = $tmp[$i+1];
-                    if ((strpos($nextLine, '[>') === false) && (strpos($nextLine, '[=') === false)) {
-                        $state = $this->_setState($state, 'critical');
-                    }
-                    else
-                    {
-                        $state = $this->_setState($state, 'info');
-                    }
-                }
-                if (strpos($line, '[__]') !== false)
-                {
-                    /* both Disk are not working */
-                    $state = $this->_setState($state, 'error');
-                }
-                if (strpos($line, '[UU]') !== false)
-                {
-                    /* The disks are OK.
-                     * if the next line starts with "[>" or "[=" then
-                     * recovery (resync) is in state and the state is
-                     * information instead of ok
-                     */
-                    $nextLine = $tmp[$i+1];
-                    if ((strpos($nextLine, '[>') === false) && (strpos($nextLine, '[=') === false)) {
-                        $state = $this->_setState($state, 'ok');
-                    }
-                    else
-                    {
-                        $state = $this->_setState($state, 'info');
-                    }
-                }
-            }
-
-        }
-        else {
-            /*
-             * mdadm is not installed, so there is no data and no state
-             *
-             * no_state, NOT unknown, because "unknown" is shown as state
-             * inside the GUI. no_state is hidden.
-             *
-             * We have to write NO DATA inside the DB, because the GUI
-             * could not know, if there is any dat, or not...
-             */
-            $state = 'no_state';
-            $data['output']= '';
-        }
-
-        /*
-         * Insert the data into the database
-         */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-    function monitorRkHunter(){
-        /*
-         *  This monitoring is expensive, so do it only once a hour
-         */
-        $min = date('i');
-        if ($min != 0) return;
-
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'rkhunter';
-
-        /* This monitoring is only available if rkhunter is installed */
-        $location = shell_exec('which rkhunter');
-        if($location != ''){
-            /*
-             * Fetch the output
-             */
-            $data['output'] = shell_exec('rkhunter --update --checkall --nocolors --skip-keypress');
-
-            /*
-             * At this moment, there is no state (maybe later)
-             */
-            $state = 'no_state';
-        }
-        else {
-            /*
-             * rkhunter is not installed, so there is no data and no state
-             *
-             * no_state, NOT unknown, because "unknown" is shown as state
-             * inside the GUI. no_state is hidden.
-             *
-             * We have to write NO DATA inside the DB, because the GUI
-             * could not know, if there is any dat, or not...
-             */
-            $state = 'no_state';
-            $data['output']= '';
-        }
-
-        /*
-         * Insert the data into the database
-         */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 0, 2);
-    }
-
-    function monitorFail2ban(){
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'log_fail2ban';
-
-        /* This monitoring is only available if fail2ban is installed */
-        $location = shell_exec('which fail2ban-client');
-        if($location != ''){
-			/*  Get the data of the log */
-			$data = $this->_getLogData($type);
-
-            /*
-             * At this moment, there is no state (maybe later)
-             */
-            $state = 'no_state';
-        }
-        else {
-            /*
-             * fail2ban is not installed, so there is no data and no state
-             *
-             * no_state, NOT unknown, because "unknown" is shown as state
-             * inside the GUI. no_state is hidden.
-             *
-             * We have to write NO DATA inside the DB, because the GUI
-             * could not know, if there is any dat, or not...
-             */
-            $state = 'no_state';
-            $data = '';
-        }
-
-        /*
-         * Insert the data into the database
-         */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-    function monitorSysLog(){
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'sys_log';
+	/**
+	 * This function is called when the module is loaded
+	 */
+	public function onLoad() {
+		global $app;
 
 		/*
-		 * is there any warning or error for this server?
+		 * Do the monitor every n minutes and write the result to the db
 		 */
-		$state = 'ok';
-        $dbData = $app->dbmaster->queryAllRecords("SELECT loglevel FROM sys_log WHERE server_id = " . $server_id . " AND loglevel > 0");
-		if (is_array($dbData)) {
-		    foreach($dbData as $item){
-			if ($item['loglevel'] == 1) $state = $this->_setState($state, 'warning');
-			if ($item['loglevel'] == 2) $state = $this->_setState($state, 'error');
-		    }
+		$min = @date('i');
+		if (($min % $this->interval) == 0) {
+			$this->_doMonitor();
 		}
+	}
 
-		/** There is no monitor-data because the data is in the sys_log table */
-        $data['output']= '';
+	/**
+	 * This function is called when a change in one of the registered tables is detected.
+	 * The function then raises the events for the plugins.
+	 */
+	public function process($tablename, $action, $data) {
+		// not needed
+	}
+
+	/**
+	 * This method is called every n minutes, when the module ist loaded.
+	 * The method then does a system-monitoring
+	 */
+	// TODO: what monitoring is done should be a config-var
+	private function _doMonitor() {
+		global $app;
+		/*
+		 * We need the tools in almost every method, so initialize them once...
+		 */
+		$app->load('monitor_tools');
+		$this->_tools = new monitor_tools();
+
+		/*
+		 * Calls the single Monitoring steps 
+		 */
+		$this->_monitorEmailQuota();
+		$this->_monitorHDQuota();
+		$this->_monitorServer();
+		$this->_monitorOsVer();
+		$this->_monitorIspcVer();
+		$this->_monitorDiskUsage();
+		$this->_monitorMemUsage();
+		$this->_monitorCpu();
+		$this->_monitorServices();
+		if (@file_exists('/proc/user_beancounters')) {
+			$this->_monitorOpenVzHost();
+			$this->_monitorOpenVzUserBeancounter();
+		}
+		$this->_monitorMailLog();
+		$this->_monitorMailWarnLog();
+		$this->_monitorMailErrLog();
+		$this->_monitorMessagesLog();
+		$this->_monitorISPCCronLog();
+		$this->_monitorFreshClamLog();
+		$this->_monitorClamAvLog();
+		$this->_monitorIspConfigLog();
+		$this->_monitorSystemUpdate();
+		$this->_monitorMailQueue();
+		$this->_monitorRaid();
+		$this->_monitorRkHunter();
+		$this->_monitorFail2ban();
+		$this->_monitorIPTables();
+		$this->_monitorSysLog();
+	}
+
+    private function _monitorEmailQuota() {
+        global $app;
+
+        /*
+         * First we get the Monitoring-data from the tools
+         */
+        $res = $this->_tools->monitorEmailQuota();
 
         /*
          * Insert the data into the database
          */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
+        $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+                'VALUES (' .
+                $res['server_id'] . ', ' .
+                "'" . $app->dbmaster->quote($res['type']) . "', " .
+                'UNIX_TIMESTAMP(), ' .
+                "'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+                "'" . $res['state'] . "'" .
+                ')';
         $app->dbmaster->query($sql);
 
         /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
+        $this->_delOldRecords($res['type'], $res['server_id']);
     }
 
-	function monitorMailLog()
-    {
+	private function _monitorHDQuota() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorHDQuota();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorServer() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorServer();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorOsVer() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorOsVer();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorIspcVer() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorIspcVer();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorDiskUsage() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorDiskUsage();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorMemUsage() {
+		global $app;
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMemUsage();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorCpu() {
+		global $app;
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorCpu();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorServices() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorServices();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorOpenVzHost() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorOpenVzHost();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorOpenVzUserBeancounter() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorOpenVzUserBeancounter();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorSystemUpdate() {
+		/*
+		 *  This monitoring is expensive, so do it only once an hour
+		 */
+		$min = @date('i');
+		if ($min != 0)
+			return;
+
+		/*
+		 * OK - here we go...
+		 */
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorSystemUpdate();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorMailQueue() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMailQueue();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorRaid() {
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorRaid();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorRkHunter() {
+		/*
+		 *  This monitoring is expensive, so do it only once a day
+		 */
+		$min = @date('i');
+		$hour = @date('H');
+		if (!($min == 0 && $hour == 23))
+			return;
+		/*
+		 * OK . here we go...
+		 */
+		global $app;
+
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorRkHunter();
+
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
+
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
+
+	private function _monitorFail2ban() {
         global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'log_mail';
-
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
 
         /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
+         * First we get the Monitoring-data from the tools
          */
-        $state = 'no_state';
+        $res = $this->_tools->monitorFail2ban();
 
         /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
+         * Insert the data into the database
+         */
+        $sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+                'VALUES (' .
+                $res['server_id'] . ', ' .
+                "'" . $app->dbmaster->quote($res['type']) . "', " .
+                'UNIX_TIMESTAMP(), ' .
+                "'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+                "'" . $res['state'] . "'" .
+                ')';
         $app->dbmaster->query($sql);
 
         /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-    function monitorMailWarnLog()
-    {
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'log_mail_warn';
-
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
-
-        /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
-         */
-        $state = 'no_state';
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-
-    function monitorMailErrLog()
-    {
-        global $app;
-        global $conf;
-
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
-
-        /** The type of the data */
-        $type = 'log_mail_err';
-
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
-
-        /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
-         */
-        $state = 'no_state';
-
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
-
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
+        $this->_delOldRecords($res['type'], $res['server_id']);
     }
 
 
-    function monitorMessagesLog()
-    {
-        global $app;
-        global $conf;
+	private function _monitorIPTables() {
+		global $app;
 
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorIPTables();
 
-        /** The type of the data */
-        $type = 'log_messages';
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
-         */
-        $state = 'no_state';
+	private function _monitorSysLog() {
+		global $app;
 
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorSysLog();
 
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-    function monitorISPCCronLog()
-    {
-        global $app;
-        global $conf;
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
+	private function _monitorMailLog() {
+		global $app;
 
-        /** The type of the data */
-        $type = 'log_ispc_cron';
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMailLog();
 
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /*
-         * actually this info has no state.
-         * maybe someone knows better...???...
-         */
-        $state = 'no_state';
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
+	private function _monitorMailWarnLog() {
+		global $app;
 
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
-    
-    function monitorFreshClamLog()
-    {
-        global $app;
-        global $conf;
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMailWarnLog();
 
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /** The type of the data */
-        $type = 'log_freshclam';
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
+	private function _monitorMailErrLog() {
+		global $app;
 
-        /* Get the data from the LAST log-Entry.
-         * if there can be found:
-         * WARNING: Your ClamAV installation is OUTDATED!
-         * then the clamav is outdated. This is a warning!
-         */
-        $state = 'ok';
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMailErrLog();
 
-        $tmp = explode("\n", $data);
-        $lastLog = array();
-        if ($tmp[sizeof($tmp)-1] == "")
-        {
-            /* the log ends with an empty line remove this */
-            array_pop($tmp);
-        }
-        if (strpos($tmp[sizeof($tmp)-1], "-------------") !== false)
-        {
-            /* the log ends with "-----..." remove this */
-            array_pop($tmp);
-        }
-        for ($i = sizeof($tmp) -1; $i > 0; $i--){
-            if (strpos($tmp[$i], "---------") === false){
-                /* no delimiter found, so add this to the last-log */
-                $lastLog[] = $tmp[$i];
-            }
-            else
-            {
-                /* delimiter found, so there is no more line left! */
-                break;
-            }
-        }
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /*
-         * Now we have the last log in the array.
-         * Check if the outdated-string is found...
-         */
-        foreach($lastLog as $line){
-            if (strpos(strtolower($line), "outdated") !== false) {
-                 $state = $this->_setState($state, 'warning');
-            }
-        }
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
+	private function _monitorMessagesLog() {
+		global $app;
 
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorMessagesLog();
 
-    function monitorClamAvLog()
-    {
-        global $app;
-        global $conf;
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /** The type of the data */
-        $type = 'log_clamav';
+	private function _monitorISPCCronLog() {
+		global $app;
 
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorISPCCronLog();
 
-        // Todo: the state should be calculated.
-        $state = 'ok';
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
+	private function _monitorFreshClamLog() {
+		global $app;
 
-    function monitorIspConfigLog()
-    {
-        global $app;
-        global $conf;
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorFreshClamLog();
 
-        /* the id of the server as int */
-        $server_id = intval($conf["server_id"]);
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /** The type of the data */
-        $type = 'log_ispconfig';
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-        /* Get the data of the log */
-        $data = $this->_getLogData($type);
+	private function _monitorClamAvLog() {
+		global $app;
 
-        // Todo: the state should be calculated.
-        $state = 'ok';
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorClamAvLog();
 
-        /*
-        Insert the data into the database
-        */
-        $sql = "INSERT INTO monitor_data (server_id, type, created, data, state) " .
-            "VALUES (".
-        $server_id . ", " .
-            "'" . $app->dbmaster->quote($type) . "', " .
-        time() . ", " .
-            "'" . $app->dbmaster->quote(serialize($data)) . "', " .
-            "'" . $state . "'" .
-            ")";
-        $app->dbmaster->query($sql);
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        /* The new data is written, now we can delete the old one */
-        $this->_delOldRecords($type, 10);
-    }
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
+	private function _monitorIspConfigLog() {
+		global $app;
 
-    function _getLogData($log){
-        switch($log) {
-            case 'log_mail':
-                $logfile = '/var/log/mail.log';
-                break;
-            case 'log_mail_warn':
-                $logfile = '/var/log/mail.warn';
-                break;
-            case 'log_mail_err':
-                $logfile = '/var/log/mail.err';
-                break;
-            case 'log_messages':
-                $logfile = '/var/log/messages';
-                break;
-            case 'log_ispc_cron':
-                $logfile = '/var/log/ispconfig/cron.log';
-                break;
-            case 'log_freshclam':
-                $logfile = '/var/log/clamav/freshclam.log';
-                break;
-            case 'log_clamav':
-                $logfile = '/var/log/clamav/clamav.log';
-                break;
-            case 'log_fail2ban':
-                $logfile = '/var/log/fail2ban.log';
-                break;
-            case 'log_ispconfig':
-                $logfile = '/var/log/ispconfig/ispconfig.log';
-                break;
-            default:
-                $logfile = '';
-                break;
-        }
+		/*
+		 * First we get the Monitoring-data from the tools
+		 */
+		$res = $this->_tools->monitorIspConfigLog();
 
-        // Getting the logfile content
-        if($logfile != '') {
-            $logfile = escapeshellcmd($logfile);
-            if(stristr($logfile, ';')) {
-                $log = 'Logfile path error.';
-            }
-            else
-            {
-                $log = '';
-                if(is_readable($logfile)) {
-                    if($fd = popen("tail -n 100 $logfile", 'r')) {
-                        while (!feof($fd)) {
-                            $log .= fgets($fd, 4096);
-                            $n++;
-                            if($n > 1000) break;
-                        }
-                        fclose($fd);
-                    }
-                } else {
-                    $log = 'Unable to read '.$logfile;
-                }
-            }
-        }
+		/*
+		 * Insert the data into the database
+		 */
+		$sql = 'INSERT INTO monitor_data (server_id, type, created, data, state) ' .
+				'VALUES (' .
+				$res['server_id'] . ', ' .
+				"'" . $app->dbmaster->quote($res['type']) . "', " .
+				'UNIX_TIMESTAMP(), ' .
+				"'" . $app->dbmaster->quote(serialize($res['data'])) . "', " .
+				"'" . $res['state'] . "'" .
+				')';
+		$app->dbmaster->query($sql);
 
-        return $log;
-    }
+		/* The new data is written, now we can delete the old one */
+		$this->_delOldRecords($res['type'], $res['server_id']);
+	}
 
-    function _checkTcp ($host,$port) {
+	/**
+	 * Deletes Records older than 4 minutes.
+	 * The monitor writes new data every 5 minutes or longer (4 hour, 1 day).
+	 * So if i delete all Date older than 4 minutes i can be sure, that all old data
+	 * are deleted...
+	 */
+	private function _delOldRecords($type, $serverId) {
+		global $app;
 
-        $fp = @fsockopen ($host, $port, $errno, $errstr, 2);
+		$now = time();
+		$old = $now - (4 * 60); // 4 minutes
+		/*
+		 * ATTENTION if i do NOT pay attention of the server id, i delete all data (of the type)
+		 * of ALL servers. This means, if i have a multiserver-environment and a server has a 
+		 * time not synced with the others (for example, all server has 11:00 and ONE server has
+		 * 10:45) then the actual data of this server (with the time-stamp 10:45) get lost
+		 * even though it is the NEWEST data of this server. To avoid this i HAVE to include
+		 * the server-id!
+		 */
+		$sql = 'DELETE FROM monitor_data ' .
+				'WHERE ' .
+				'  type =' . "'" . $app->dbmaster->quote($type) . "' " .
+				'AND ' .
+				'  created < ' . $old . ' ' .
+				'AND ' .
+				'  server_id = ' . $serverId;
+		$app->dbmaster->query($sql);
+	}
 
-        if ($fp) {
-            fclose($fp);
-            return true;
-        } else {
-            return false;
-        }
-    }
+}
 
-    function _checkUdp ($host,$port) {
-
-        $fp = @fsockopen ('udp://'.$host, $port, $errno, $errstr, 2);
-
-        if ($fp) {
-            fclose($fp);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    function _checkFtp ($host,$port){
-
-        $conn_id = @ftp_connect($host, $port);
-
-        if($conn_id){
-            @ftp_close($conn_id);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /*
-     Deletes Records older than n.
-    */
-    function _delOldRecords($type, $min, $hour=0, $days=0) {
-        global $app;
-
-        $now = time();
-        $old = $now - ($min * 60) - ($hour * 60 * 60) - ($days * 24 * 60 * 60);
-        $sql = "DELETE FROM monitor_data " .
-            "WHERE " .
-            "type =" . "'" . $app->dbmaster->quote($type) . "' " .
-            "AND " .
-            "created < " . $old;
-        $app->dbmaster->query($sql);
-    }
-
-    /*
-     * Set the state to the given level (or higher, but not lesser).
-     * * If the actual state is critical and you call the method with ok,
-     *   then the state is critical.
-     *
-     * * If the actual state is critical and you call the method with error,
-     *   then the state is error.
-     */
-    function _setState($oldState, $newState)
-    {
-        /*
-         * Calculate the weight of the old state
-         */
-        switch ($oldState) {
-            case 'no_state': $oldInt = 0;
-                break;
-            case 'ok': $oldInt = 1;
-                break;
-            case 'unknown': $oldInt = 2;
-                break;
-            case 'info': $oldInt = 3;
-                break;
-            case 'warning': $oldInt = 4;
-                break;
-            case 'critical': $oldInt = 5;
-                break;
-            case 'error': $oldInt = 6;
-                break;
-        }
-        /*
-         * Calculate the weight of the new state
-         */
-        switch ($newState) {
-            case 'no_state': $newInt = 0 ;
-                break;
-            case 'ok': $newInt = 1 ;
-                break;
-            case 'unknown': $newInt = 2 ;
-                break;
-            case 'info': $newInt = 3 ;
-                break;
-            case 'warning': $newInt = 4 ;
-                break;
-            case 'critical': $newInt = 5 ;
-                break;
-            case 'error': $newInt = 6 ;
-                break;
-        }
-
-        /*
-         * Set to the higher level
-         */
-        if ($newInt > $oldInt){
-            return $newState;
-        }
-        else
-        {
-            return $oldState;
-        }
-    }
-
-    function _getIntArray($line){
-        /** The array of float found */
-        $res = array();
-        /* First build a array from the line */
-        $data = explode(' ', $line);
-        /* then check if any item is a float */
-        foreach ($data as $item) {
-            if ($item . '' == (int)$item . ''){
-                $res[] = $item;
-            }
-        }
-        return $res;
-    }
-
-
-} // end class
-
-?>
+?>
\ No newline at end of file

--
Gitblit v1.9.1