Added global functions library which conatins a mail functin that supports ...

tbrehm

2011-01-13 5bbfc1b098302671bcbf2f754efc627d50eaa5c7

 server/mods-available/monitor_core_module.inc.php

@@ -203,8 +203,10 @@
      $this->monitorMemUsage();
      $this->monitorCpu();
      $this->monitorServices();
      $this->monitorOpenVzHost();
      $this->monitorOpenVzUserBeancounter();
      if(@file_exists('/proc/user_beancounters')) {
         $this->monitorOpenVzHost();
         $this->monitorOpenVzUserBeancounter();
      }
      $this->monitorMailLog();
      $this->monitorMailWarnLog();
      $this->monitorMailErrLog();
@@ -238,7 +240,7 @@
      $state = 'ok';
      
      /** Fetch the data for all users*/
      $dfData = shell_exec('repquota -asu');
      $dfData = shell_exec('repquota -au');

      // split into array
      $df = explode("\n", $dfData);
@@ -253,14 +255,22 @@
            */
            $s = preg_split ('/[\s]+/', $df[$i]);
            $username = $s[0];
            $data['user'][$username]['used'] = $s[2];
            $data['user'][$username]['soft'] = $s[3];
            $data['user'][$username]['hard'] = $s[4];
            if(substr($username,0,3) == 'web') {
            if(isset($data['user'][$username])) {
               $data['user'][$username]['used'] += $s[2];
               $data['user'][$username]['soft'] += $s[3];
               $data['user'][$username]['hard'] += $s[4];
            } else {
               $data['user'][$username]['used'] = $s[2];
               $data['user'][$username]['soft'] = $s[3];
               $data['user'][$username]['hard'] = $s[4];
            }
            }
         }
      }
      
      /** Fetch the data for all users*/
      $dfData = shell_exec('repquota -asg');
      $dfData = shell_exec('repquota -ag');

      // split into array
      $df = explode("\n", $dfData);
@@ -275,9 +285,17 @@
            */
            $s = preg_split ('/[\s]+/', $df[$i]);
            $groupname = $s[0];
            $data['group'][$groupname]['used'] = $s[1];
            $data['group'][$groupname]['soft'] = $s[2];
            $data['group'][$groupname]['hard'] = $s[3];
            if(substr($groupname,0,6) == 'client') {
            if(isset($data['group'][$groupname])) {
               $data['group'][$groupname]['used'] += $s[1];
               $data['group'][$groupname]['soft'] += $s[2];
               $data['group'][$groupname]['hard'] += $s[3];
            } else {
               $data['group'][$groupname]['used'] = $s[1];
               $data['group'][$groupname]['soft'] = $s[2];
               $data['group'][$groupname]['hard'] = $s[3];
            }
            }
         }
      }

@@ -1676,13 +1694,13 @@
         case 'log_freshclam':
            if($dist == 'debian') { $logfile = '/var/log/clamav/freshclam.log'; }
            elseif($dist == 'redhat') { $logfile = (is_file('/var/log/clamav/freshclam.log') ? '/var/log/clamav/freshclam.log' : '/var/log/freshclam.log'); }
            elseif($dist == 'suse') { $logfile = ''; }
            elseif($dist == 'suse') { $logfile = '/var/log/freshclam.log'; }
            elseif($dist == 'gentoo') { $logfile = '/var/log/clamav/freshclam.log'; }
            break;
         case 'log_clamav':
            if($dist == 'debian') { $logfile = '/var/log/clamav/clamav.log'; }
            elseif($dist == 'redhat') { $logfile = (is_file('/var/log/clamav/clamd.log') ? '/var/log/clamav/clamd.log' : '/var/log/maillog'); }
            elseif($dist == 'suse') { $logfile = ''; }
            elseif($dist == 'suse') { $logfile = '/var/log/clamd.log'; }
            elseif($dist == 'gentoo') { $logfile = '/var/log/clamav/clamd.log'; }
            break;
         case 'log_fail2ban':