Merged revisions 3960-4065 from stable branch.

tbrehm

2013-07-31 615a0a96618fa99e7e452523145d6c0f238d4473

 interface/web/sites/user_quota_stats.php

@@ -42,6 +42,7 @@
      $username = $rec['system_user'];
      
      $rec['used'] = $monitor_data['user'][$username]['used'];
      $rec['used_sort'] = $rec['used'];
      $rec['soft'] = $monitor_data['user'][$username]['soft'];
      $rec['hard'] = $monitor_data['user'][$username]['hard'];
      $rec['files'] = $monitor_data['user'][$username]['files'];
@@ -95,8 +96,8 @@
}

$list = new list_action;
$list->SQLExtWhere = "type = 'vhost'";
$list->SQLOrderBy = 'ORDER BY domain';
$list->SQLExtWhere = "web_domain.type = 'vhost'";
$list->SQLOrderBy = 'ORDER BY web_domain.domain';
$list->onLoad();