Merged revisions 2741-2788 from SVN stable branch.

tbrehm

2011-11-21 edf806b98d675a2037b019644aff76b7e8b7738c

 server/lib/classes/monitor_tools.inc.php

@@ -175,7 +175,13 @@
               $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);
            }
         }
      }
      
@@ -887,9 +893,6 @@
         $state = 'no_state';
         $data['output'] = '';
      }
		
      //* Encode data
      $data['output'] = htmlentities($data['output']);

      /*
       * Return the Result