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

respect default_vhostconf_domain setting of all ip/port combinations

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-30 09:59:47 +02:00
parent de16c9c4a0
commit 5be9861bad
2 changed files with 91 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,6 +634,7 @@ class apache
$result = $this->db->query($query);
$ipportlist = '';
$_vhost_content = '';
while ($ipandport = $this->db->fetch_array($result)) {
$ipport = '';
@@ -658,6 +659,9 @@ class apache
$ipport = $domain['ip'].':'.$domain['port'].' ';
}
if ($ipandport['default_vhostconf_domain'] != '') {
$_vhost_content .= $ipandport['default_vhostconf_domain'] . "\n";
}
$ipportlist .= $ipport;
}
@@ -765,8 +769,8 @@ class apache
$vhost_content .= $domain['specialsettings'] . "\n";
}
if ($ipandport['default_vhostconf_domain'] != '') {
$vhost_content .= $ipandport['default_vhostconf_domain'] . "\n";
if ($_vhost_content != '') {
$vhost_content .= $_vhost_content;
}
if ($this->settings['system']['default_vhostconf'] != '') {