Merged revisions 2741-2788 from SVN stable branch.

tbrehm

2011-11-21 edf806b98d675a2037b019644aff76b7e8b7738c

 server/lib/classes/monitor_tools.inc.php

@@ -151,7 +151,7 @@

    //** Email Quota
    public function monitorEmailQuota() {
        global $conf;
        global $conf, $app;

      //* Initialize data array
      $data = array();
@@ -164,8 +164,31 @@

      //* The state of the email_quota.
      $state = 'ok';
		
      $mailboxes = $app->db->queryAllRecords("SELECT email FROM mail_user WHERE server_id = $server_id");
      if(is_array($mailboxes)) {
         foreach($mailboxes as $mb) {
            $email = $mb['email'];
            $email_parts = explode('@',$mb['email']);
            $filename = '/var/vmail/'.$email_parts[1].'/'.$email_parts[0].'/.quotausage';
            if(file_exists($filename)) {
               $quotafile = file($filename);
               $data[$email]['used'] = trim($quotafile['1']);
               unset($quotafile);
            } else {
               exec('du -s '.escapeshellcmd('/var/vmail/'.$email_parts[1].'/'.$email_parts[0]),$out);
               $parts = explode(' ',$out[0]);
               $data[$email]['used'] = intval($parts[0])*1024;
               unset($out);
               unset($parts);
            }
         }
      }
		
      unset($mailboxes);

        //* Dovecot quota check Courier in progress lathama@gmail.com
      /*
        if($dir = opendir("/var/vmail")){
            while (($quotafiles = readdir($dir)) !== false){
                if(preg_match('/.\_quota$/', $quotafiles)){
@@ -177,6 +200,7 @@
            }
            closedir($dir);
        }
      */
      $res['server_id'] = $server_id;
      $res['type'] = $type;
      $res['data'] = $data;