From f1c4cdd6a7c963d7357a7ea30e7413f2dbdd4ccc Mon Sep 17 00:00:00 2001
From: Dominik Mueller <info@profi-webdesign.net>
Date: Wed, 05 Mar 2014 09:14:38 -0500
Subject: [PATCH] Changed Quota-Functions from sys_group to client_id
---
interface/lib/classes/quota_lib.inc.php | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 1031cdc..55b2aa8 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -1,7 +1,7 @@
<?php
class quota_lib {
- public function get_quota_data($groupid = null, $readable = true) {
+ public function get_quota_data($clientid = null, $readable = true) {
global $app;
$tmp_rec = $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'harddisk_quota' ORDER BY created DESC");
@@ -13,8 +13,8 @@
}
//print_r($monitor_data);
- if($groupid != null){
- $sql_where = " AND sys_groupid = ".$groupid;
+ if($clientid != null){
+ $sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
}
// select websites belonging to client
@@ -93,7 +93,7 @@
return $sites;
}
- public function get_mailquota_data($groupid = null, $readable = true) {
+ public function get_mailquota_data($clientid = null, $readable = true) {
global $app;
$tmp_rec = $app->db->queryAllRecords("SELECT data from monitor_data WHERE type = 'email_quota' ORDER BY created DESC");
@@ -110,12 +110,9 @@
}
}
//print_r($monitor_data);
- if($_SESSION["s"]["user"]["typ"] != 'admin'){
- $sql_where = " AND sys_groupid = ".intval($_SESSION['s']['user']['default_group']);
- }
- if($groupid != null){
- $sql_where = " AND sys_groupid = ".$groupid;
+ if($clientid != null){
+ $sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
}
@@ -129,28 +126,30 @@
$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];
-
- // colours
- $emails[$i]['display_colour'] = '#000000';
- if($emails[$i]['quota'] > 0){
- $used_ratio = $emails[$i]['used']/$emails[$i]['quota'];
- } else {
- $used_ratio = 0;
- }
- if($used_ratio >= 0.8) $emails[$i]['display_colour'] = '#fd934f';
- if($used_ratio >= 1) $emails[$i]['display_colour'] = '#cc0000';
-
- if($emails[$i]['quota'] == 0){
- $emails[$i]['quota'] = $app->lng('unlimited');
- } else {
- $emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 4).' MB';
- }
-
-
- if($emails[$i]['used'] < 1544000) {
- $emails[$i]['used'] = round($emails[$i]['used'] / 1024, 4).' KB';
- } else {
- $emails[$i]['used'] = round($emails[$i]['used'] / 1048576, 4).' MB';
+
+ if ($readable) {
+ // colours
+ $emails[$i]['display_colour'] = '#000000';
+ if($emails[$i]['quota'] > 0){
+ $used_ratio = $emails[$i]['used']/$emails[$i]['quota'];
+ } else {
+ $used_ratio = 0;
+ }
+ if($used_ratio >= 0.8) $emails[$i]['display_colour'] = '#fd934f';
+ if($used_ratio >= 1) $emails[$i]['display_colour'] = '#cc0000';
+
+ if($emails[$i]['quota'] == 0){
+ $emails[$i]['quota'] = $app->lng('unlimited');
+ } else {
+ $emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 4).' MB';
+ }
+
+
+ if($emails[$i]['used'] < 1544000) {
+ $emails[$i]['used'] = round($emails[$i]['used'] / 1024, 4).' KB';
+ } else {
+ $emails[$i]['used'] = round($emails[$i]['used'] / 1048576, 4).' MB';
+ }
}
}
}
--
Gitblit v1.9.1