maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

correct recalculation of resource usage for admins

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-11-06 11:55:18 +01:00
parent 1f70327112
commit c05245c891
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Froxlor/User.php
View File

@@ -122,15 +122,14 @@ class User
self::addResourceCountEx($admin_resources[$cur_adm], $customer, 'traffic_used', 'traffic_used'); // !!! yes, USED and USED self::addResourceCountEx($admin_resources[$cur_adm], $customer, 'traffic_used', 'traffic_used'); // !!! yes, USED and USED
foreach ([ foreach ([
'mysqls', 'mysqls',
'ftps', 'ftps',
'emails', 'emails',
'email_accounts', 'email_accounts',
'email_forwarders', 'email_forwarders',
'email_quota', 'email_quota',
'subdomains' 'subdomains'
] as $field ] as $field) {
) {
self::addResourceCount($admin_resources[$cur_adm], $customer, $field . '_used', $field); self::addResourceCount($admin_resources[$cur_adm], $customer, $field . '_used', $field);
} }
@@ -262,7 +261,17 @@ class User
// now get the customer resource usage which we have re-calculated previously // now get the customer resource usage which we have re-calculated previously
foreach ($admin_customers as $acustomer) { foreach ($admin_customers as $acustomer) {
foreach ($resource_fields as $field) { foreach ($resource_fields as $field) {
$admin[$field . '_new'] += $acustomer[$field]; if ($field == 'diskspace_used') {
// admin/reseller-usage == what has been assign to the customer
$admin[$field . '_new'] += $acustomer['diskspace'];
} else if ($field != 'traffic_used') {
if ($acustomer[str_replace("_used", "", $field)] != '-1') {
$admin[$field . '_new'] += $acustomer[str_replace("_used", "", $field)];
}
} else {
// traffic is always the current usage, not the assigned value
$admin[$field . '_new'] += $acustomer[$field];
}
} }
// check for std-subdomain // check for std-subdomain
if ($acustomer['standardsubdomain'] > 0) { if ($acustomer['standardsubdomain'] > 0) {
@@ -326,9 +335,9 @@ class User
{ {
self::initArrField($used_field, $arr, 0); self::initArrField($used_field, $arr, 0);
if ($field == 'diskspace' && ($customer_arr[$field] / 1024) != '-1') { if ($field == 'diskspace' && ($customer_arr[$field] / 1024) != '-1') {
$arr[$used_field] += intval($customer_arr[$used_field]); $arr[$used_field] += intval($customer_arr[$field]);
} elseif ($field == 'traffic_used') { } elseif ($field == 'traffic_used') {
$arr[$used_field] += intval($customer_arr[$used_field]); $arr[$used_field] += intval($customer_arr[$field]);
} }
} }