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

make sure we fill all context parameters in any case

Browse Source
This commit is contained in:
Chris Vigelius
2015-07-06 21:21:07 +02:00
parent 9dbc04678c
commit 89c4b969d1
4 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -318,8 +318,10 @@ class apache extends HttpConfigBase {
if ($row_ipsandports['specialsettings'] != '') {
$this->virtualhosts_data[$vhosts_filename] .= $this->processSpecialConfigTemplate(
$row_ipsandports['specialsettings'],
$row_ipsandports,
$domain) . "\n";
$domain,
$row_ipsandports['ip'],
$row_ipsandports['port'],
$row_ipsandports['ssl'] == '1') . "\n";
}
if ($row_ipsandports['ssl'] == '1' && Settings::Get('system.use_ssl') == '1') {
@@ -689,8 +691,10 @@ class apache extends HttpConfigBase {
if ($ipandport['default_vhostconf_domain'] != '') {
$_vhost_content .= $this->processSpecialConfigTemplate(
$ipandport['default_vhostconf_domain'],
$ipandport,
$domain) . "\n";
$domain,
$domain['ip'],
$domain['port'],
$ssl_vhost) . "\n";
}
$ipportlist .= $ipport;
}
@@ -802,8 +806,10 @@ class apache extends HttpConfigBase {
if ($domain['specialsettings'] != '') {
$vhost_content .= $this->processSpecialConfigTemplate(
$domain['specialsettings'],
$ipandport,
$domain) . "\n";
$domain,
$domain['ip'],
$domain['port'],
$ssl_vhost) . "\n";
}
if ($_vhost_content != '') {
@@ -813,8 +819,10 @@ class apache extends HttpConfigBase {
if (Settings::Get('system.default_vhostconf') != '') {
$vhost_content .= $this->processSpecialConfigTemplate(
Settings::Get('system.default_vhostconf'),
$ipandport,
$domain) . "\n";
$domain,
$domain['ip'],
$domain['port'],
$ssl_vhost) . "\n";
}
}