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

fix creation of vhosts-config if email_only==1 (means, don't create a config)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-06 09:41:01 +01:00
parent 849da2a423
commit 2e42ef2043
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -809,7 +809,7 @@ class apache
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$result_domains = $this->db->query($query); $result_domains = $this->db->query($query);

2
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -324,7 +324,7 @@ class lighttpd
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$included_vhosts = array(); $included_vhosts = array();

2
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -284,7 +284,7 @@ class nginx
GROUP BY `id_domain` GROUP BY `id_domain`
) AS p ON p.`id_domain` = `d`.`id` ) 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;"; ORDER BY `d`.`parentdomainid` DESC, `d`.`iswildcarddomain`, `d`.`domain` ASC;";
$result_domains = $this->db->query($query); $result_domains = $this->db->query($query);