Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-20 0832c839f8141f9f52ce3328db3da2607a394eae

 interface/web/sites/user_quota_stats.php

@@ -43,6 +43,9 @@
      $rec['bgcolor'] = $this->DataRowColor;
      $username = $rec['system_user'];

      $server = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$rec['server_id']);
      $rec['domain'] = $rec['domain'].($server['server_name'] != '' ? ' ('.$server['server_name'].')' : '');
		
      $rec['used'] = $monitor_data['user'][$username]['used'];
      $rec['used_sort'] = $rec['used'];
      $rec['soft'] = $monitor_data['user'][$username]['soft'];