From 9c7f615822006ab96870e7967a95d3e6cec62d64 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 03 Jan 2012 06:27:31 -0500
Subject: [PATCH] Fixed: FS#1904 - Traffic quota exceeded message in web does not get away after traffic set to unlimited
---
server/lib/classes/db_mysql.inc.php | 6 +++++-
server/cron_daily.php | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 05b66c9..9c52805 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -406,7 +406,7 @@
$current_month = date('Y-m');
//* Check website traffic quota
- $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE traffic_quota > 0 and type = 'vhost'";
+ $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE (traffic_quota > 0 or traffic_quota_lock = 'y') and type = 'vhost'";
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) {
foreach($records as $rec) {
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 3060bab..3c89c74 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -298,7 +298,11 @@
//print_r($diff_num);
//print_r($diffrec_full);
$diffstr = $app->db->quote(serialize($diffrec_full));
- $username = $app->db->quote($_SESSION['s']['user']['username']);
+ if(isset($_SESSION)) {
+ $username = $app->db->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
$dbidx = $primary_field.':'.$primary_id;
if($action == 'INSERT') $action = 'i';
--
Gitblit v1.9.1