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

darn, traffic_used is being calculated in the traffic cron, need to re-check what the heck is wrong there (if after all)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-09 18:49:45 +01:00
parent 220fb17824
commit 3e54fd765c
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
admin_customers.php
View File

@@ -808,10 +808,6 @@ if ($page == 'customers'
$admin_update_query.= ", `diskspace_used` = `diskspace_used` + 0" . (int)$diskspace;
}
if (($traffic / 1024 / 1024) != '-1') {
$admin_update_query.= ", `traffic_used` = `traffic_used` + 0" . (int)$traffic;
}
if ($number_of_aps_packages != '-1') {
$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` + 0" . (int)$number_of_aps_packages;
}
@@ -1218,7 +1214,6 @@ if ($page == 'customers'
$traffic = $traffic * 1024 * 1024;
if (((($userinfo['diskspace_used'] + $diskspace - $result['diskspace']) > $userinfo['diskspace']) && ($userinfo['diskspace'] / 1024) != '-1')
|| ((($userinfo['traffic_used'] + $traffic - $result['traffic']) > $userinfo['traffic']) && ($userinfo['traffic'] / 1024 / 1024) != '-1')
|| ((($userinfo['mysqls_used'] + $mysqls - $result['mysqls']) > $userinfo['mysqls']) && $userinfo['mysqls'] != '-1')
|| ((($userinfo['emails_used'] + $emails - $result['emails']) > $userinfo['emails']) && $userinfo['emails'] != '-1')
|| ((($userinfo['email_accounts_used'] + $email_accounts - $result['email_accounts']) > $userinfo['email_accounts']) && $userinfo['email_accounts'] != '-1')
@@ -1229,7 +1224,6 @@ if ($page == 'customers'
|| ((($userinfo['tickets_used'] + $tickets - $result['tickets']) > $userinfo['tickets']) && $userinfo['tickets'] != '-1')
|| ((($userinfo['subdomains_used'] + $subdomains - $result['subdomains']) > $userinfo['subdomains']) && $userinfo['subdomains'] != '-1')
|| (($diskspace / 1024) == '-1' && ($userinfo['diskspace'] / 1024) != '-1')
|| (($traffic / 1024 / 1024) == '-1' && ($userinfo['traffic'] / 1024 / 1024) != '-1')
|| ((($userinfo['aps_packages'] + $number_of_aps_packages - $result['aps_packages']) > $userinfo['aps_packages']) && $userinfo['aps_packages'] != '-1' && $settings['aps']['aps_active'] == '1')
|| ($mysqls == '-1' && $userinfo['mysqls'] != '-1')
|| ($emails == '-1' && $userinfo['emails'] != '-1')
@@ -1615,17 +1609,6 @@ if ($page == 'customers'
}
}
if (($traffic / 1024 / 1024) != '-1' || ($result['traffic'] / 1024 / 1024) != '-1') {
$admin_update_query.= ", `traffic_used` = `traffic_used` ";
if (($traffic / 1024 / 1024) != '-1') {
$admin_update_query.= " + 0" . (int)$traffic . " ";
}
if (($result['traffic'] / 1024 / 1024) != '-1') {
$admin_update_query.= " - 0" . (int)$result['traffic'] . " ";
}
}
if ($number_of_aps_packages != '-1' || $result['aps_packages'] != '-1') {
$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` ";