From 4501eb2723f9b1ce5a4e25f3775ed611878d422b Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 6 Dec 2022 08:26:42 +0100 Subject: [PATCH] fix correct increasing of used customers and recalculat resources Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Customers.php | 2 ++ lib/Froxlor/User.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php index c99645d6..012c4b14 100644 --- a/lib/Froxlor/Api/Commands/Customers.php +++ b/lib/Froxlor/Api/Commands/Customers.php @@ -584,6 +584,8 @@ class Customers extends ApiCommand implements ResourceEntity $customerid = Database::lastInsertId(); $ins_data['customerid'] = $customerid; + Admins::increaseUsage($this->getUserDetail('adminid'), 'customers_used'); + // update admin resource-usage if ($mysqls != '-1') { Admins::increaseUsage($this->getUserDetail('adminid'), 'mysqls_used', '', (int)$mysqls); diff --git a/lib/Froxlor/User.php b/lib/Froxlor/User.php index 5d87e8a5..5ad88a8b 100644 --- a/lib/Froxlor/User.php +++ b/lib/Froxlor/User.php @@ -263,7 +263,9 @@ class User foreach ($resource_fields as $field) { if ($field == 'diskspace_used') { // admin/reseller-usage == what has been assign to the customer - $admin[$field . '_new'] += $acustomer['diskspace']; + if (($acustomer['diskspace'] / 1024) != -1) { + $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)];