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 web_database.sys_groupid = sys_group.groupid AND 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'] : '';
@@ -57,7 +57,9 @@
      if(!empty($monitor_data[$rec['server_id'].'.'.$database_name])){
         $rec['database'] = $monitor_data[$rec['server_id'].'.'.$database_name]['database_name'];
         $rec['client'] = $monitor_data[$rec['server_id'].'.'.$database_name]['client'];
         $rec['server_name'] = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $rec['server_id'])['server_name'];
         $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $rec['server_id']);
         $rec['server_name'] = $tmp['server_name'];
         unset($tmp);
         $rec['used'] = $monitor_data[$rec['server_id'].'.'.$database_name]['used'];
         $rec['quota'] = $monitor_data[$rec['server_id'].'.'.$database_name]['quota'];

@@ -71,14 +73,15 @@

         if ($rec['used'] > 0) $rec['used'] = $app->functions->formatBytes($rec['used']);
      } else {
         $web_database = $app->db->queryOneRecord("SELECT * FROM web_database WHERE database_id = ".$rec[$this->idx_key]);
         $web_database = $app->db->queryOneRecord("SELECT * FROM web_database WHERE database_id = ?", $rec[$this->idx_key]);
         $rec['database'] = $rec['database_name'];
         $rec['server_name'] = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $web_database['server_id'])['server_name'];
         $sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ".$web_database['sys_groupid']);
         $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ".$sys_group['client_id']);
         $sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", $web_database['sys_groupid']);
         $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $sys_group['client_id']);
         $rec['client'] = $client['username'];
         $rec['used'] = 'n/a';
         $rec['quota'] = 'n/a';
         if (empty($rec['database_quota'])) $rec['database_quota'] = 0;
         $rec['quota'] = $rec['database_quota'];
      }
      $rec['id'] = $rec[$this->idx_key];