Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/sites/database_quota_stats.php

@@ -29,7 +29,7 @@
      foreach($tmp_array as $database_name => $data) {
         $db_name = $data['database_name'];

         $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name);
         $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.groupid = web_database.sys_groupid AND sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name);
         if(is_array($temp) && !empty($temp)) {
            $monitor_data[$server_id.'.'.$db_name]['database_name'] = $data['database_name'];
            $monitor_data[$server_id.'.'.$db_name]['client'] = isset($temp['username']) ? $temp['username'] : '';
@@ -82,7 +82,6 @@
         $rec['used'] = 'n/a';
         if (empty($rec['database_quota'])) $rec['database_quota'] = 0;
         $rec['quota'] = $rec['database_quota'];
         $rec['quota'] = 'n/a';
      }
      $rec['id'] = $rec[$this->idx_key];