Commit 9c7f6158 authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#1904 - Traffic quota exceeded message in web does not get away after...

Fixed: FS#1904 - Traffic quota exceeded message in web does not get away after traffic set to unlimited
parent 236d7964
......@@ -406,7 +406,7 @@ if ($app->dbmaster == $app->db) {
$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) {
......
......@@ -298,7 +298,11 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//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';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment