From 4452e73b4867aa7fd49d5066937ebcc0bc84b3d6 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 29 Jan 2015 19:47:50 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/lib/classes/quota_lib.inc.php | 90 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 55b2aa8..da3c7c6 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -13,12 +13,9 @@
}
//print_r($monitor_data);
- if($clientid != null){
- $sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
- }
+ // select all websites or websites belonging to client
+ $sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".(($clientid != null)?" AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)":''), $clientid);
- // select websites belonging to client
- $sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND type = 'vhost'".$sql_where);
//print_r($sites);
if(is_array($sites) && !empty($sites)){
for($i=0;$i<sizeof($sites);$i++){
@@ -38,7 +35,13 @@
if (!is_numeric($sites[$i]['soft'])) $sites[$i]['soft']=$sites[$i]['soft'][1];
if (!is_numeric($sites[$i]['hard'])) $sites[$i]['hard']=$sites[$i]['hard'][1];
if (!is_numeric($sites[$i]['files'])) $sites[$i]['files']=$sites[$i]['files'][1];
-
+
+ $sites[$i]['used_raw'] = $sites[$i]['used'];
+ $sites[$i]['soft_raw'] = $sites[$i]['soft'];
+ $sites[$i]['hard_raw'] = $sites[$i]['hard'];
+ $sites[$i]['files_raw'] = $sites[$i]['files'];
+ $sites[$i]['used_percentage'] = ($sites[$i]['soft'] > 0 && $sites[$i]['used'] > 0 ? round($sites[$i]['used'] * 100 / $sites[$i]['soft']) : 0);
+
if ($readable) {
// colours
$sites[$i]['display_colour'] = '#000000';
@@ -111,13 +114,9 @@
}
//print_r($monitor_data);
- if($clientid != null){
- $sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
- }
+ // select all email accounts or email accounts belonging to client
+ $emails = $app->db->queryAllRecords("SELECT * FROM mail_user".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $clientid);
-
- // select email accounts belonging to client
- $emails = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE 1".$sql_where);
//print_r($emails);
if(is_array($emails) && !empty($emails)){
for($i=0;$i<sizeof($emails);$i++){
@@ -126,6 +125,11 @@
$emails[$i]['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
if (!is_numeric($emails[$i]['used'])) $emails[$i]['used']=$emails[$i]['used'][1];
+
+ $emails[$i]['quota_raw'] = $emails[$i]['quota'];
+ $emails[$i]['used_raw'] = $emails[$i]['used'];
+ $emails[$i]['used_percentage'] = ($emails[$i]['quota'] > 0 && $emails[$i]['used'] > 0 ? round($emails[$i]['used'] * 100 / $emails[$i]['quota']) : 0);
+
if ($readable) {
// colours
@@ -156,4 +160,66 @@
return $emails;
}
+
+ public function get_databasequota_data($clientid = null, $readable = true) {
+ global $app;
+
+ $tmp_rec = $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'database_size' ORDER BY created DESC");
+ $monitor_data = array();
+ if(is_array($tmp_rec)) {
+ foreach ($tmp_rec as $tmp_mon) {
+ $tmp_array = unserialize($app->db->unquote($tmp_mon['data']));
+ if(is_array($tmp_array)) {
+ foreach($tmp_array as $key => $data) {
+ if(!isset($monitor_data[$data['database_name']]['size'])) $monitor_data[$data['database_name']]['size'] = $data['size'];
+ }
+ }
+ }
+ }
+ //print_r($monitor_data);
+
+ // select all databases belonging to client
+ $databases = $app->db->queryAllRecords("SELECT * FROM web_database".(($clientid != null)? " WHERE sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=?)" : ''), $clientid);
+
+ //print_r($databases);
+ if(is_array($databases) && !empty($databases)){
+ for($i=0;$i<sizeof($databases);$i++){
+ $databasename = $databases[$i]['database_name'];
+
+ $databases[$i]['used'] = isset($monitor_data[$databasename]['size']) ? $monitor_data[$databasename]['size'] : 0;
+
+ $databases[$i]['quota_raw'] = $databases[$i]['database_quota'];
+ $databases[$i]['used_raw'] = $databases[$i]['used'];
+ $databases[$i]['used_percentage'] = (($databases[$i]['database_quota'] > 0) && ($databases[$i]['used'] > 0)) ? round($databases[$i]['used'] * 100 / $databases[$i]['database_quota']) : 0;
+
+ if ($readable) {
+ // colours
+ $databases[$i]['display_colour'] = '#000000';
+ if($databases[$i]['database_quota'] > 0){
+ $used_ratio = $databases[$i]['used']/$databases[$i]['database_quota'];
+ } else {
+ $used_ratio = 0;
+ }
+ if($used_ratio >= 0.8) $databases[$i]['display_colour'] = '#fd934f';
+ if($used_ratio >= 1) $databases[$i]['display_colour'] = '#cc0000';
+
+ if($databases[$i]['database_quota'] == 0){
+ $databases[$i]['database_quota'] = $app->lng('unlimited');
+ } else {
+ $databases[$i]['database_quota'] = round($databases[$i]['database_quota'] / 1048576, 4).' MB';
+ }
+
+
+ if($databases[$i]['used'] < 1544000) {
+ $databases[$i]['used'] = round($databases[$i]['used'] / 1024, 4).' KB';
+ } else {
+ $databases[$i]['used'] = round($databases[$i]['used'] / 1048576, 4).' MB';
+ }
+ }
+ }
+ }
+
+ return $databases;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1