From 2e42ef2043d0ff2c68406320a84c60590b74d2d1 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 6 Nov 2013 09:41:01 +0100 Subject: [PATCH] fix creation of vhosts-config if email_only==1 (means, don't create a config) Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.10.apache.php | 2 +- scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 2 +- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index abec451c..f4afc5fe 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -809,7 +809,7 @@ class apache GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $result_domains = $this->db->query($query); diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index e4f7bd09..a5c9dc9a 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -324,7 +324,7 @@ class lighttpd GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $included_vhosts = array(); diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 2c45e543..10187b1b 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -284,7 +284,7 @@ class nginx GROUP BY `id_domain` ) AS p ON p.`id_domain` = `d`.`id` - WHERE `d`.`aliasdomain` IS NULL + WHERE `d`.`aliasdomain` IS NULL AND `d`.`email_only` = '0' ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;"; $result_domains = $this->db->query($query);