From b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Mar 2010 06:04:32 -0400
Subject: [PATCH] Fixed: FS#1124 - Traffic quota on some systems not working
---
server/cron_daily.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 74adff9..dbedbff 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -251,7 +251,7 @@
foreach($records as $rec) {
$web_traffic_quota = $rec['traffic_quota'];
- $domain = $rec['web_domain'];
+ $domain = $rec['domain'];
// get the client
/*
@@ -264,7 +264,7 @@
*/
//* get the traffic
- $tmp = $app->db->query("SELECT traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
+ $tmp = $app->db->queryOneRecord("SELECT traffic_bytes FROM web_traffic WHERE traffic_date like '$current_month%' AND hostname = '$domain'");
$web_traffic = $tmp['traffic_bytes']/1024/1024;
//* Website is over quota, we will disable it
@@ -272,12 +272,12 @@
($client_traffic_quota > 0 && $web_traffic > $client_traffic_quota) ||
($reseller_traffic_quota > 0 && $web_traffic > $reseller_traffic_quota)) {*/
if($web_traffic_quota > 0 && $web_traffic > $web_traffic_quota) {
- $app->db->datalogUpdate('web_domain', "traffic_quota_lock = 'y',active = 'n'", 'domain_id', $rec['domain_id']);
+ $app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'y',active = 'n'", 'domain_id', $rec['domain_id']);
$app->log("Traffic quota for ".$rec['domain_id']." Exceeded. Disabling website.",LOGLEVEL_DEBUG);
} else {
//* unlock the website, if traffic is lower then quota
if($rec['traffic_quota_lock'] == 'y') {
- $app->db->datalogUpdate('web_domain', "traffic_quota_lock = 'n',active = 'y'", 'domain_id', $rec['domain_id']);
+ $app->dbmaster->datalogUpdate('web_domain', "traffic_quota_lock = 'n',active = 'y'", 'domain_id', $rec['domain_id']);
$app->log("Traffic quota for ".$rec['domain_id']." ok again. Enabling website.",LOGLEVEL_DEBUG);
}
}
--
Gitblit v1.9.1