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.20.lighttpd.php
View File

@@ -149,8 +149,10 @@ class lighttpd extends HttpConfigBase {
if ($row_ipsandports['specialsettings'] != '') {
$this->lighttpd_data[$vhost_filename].= $this->processSpecialConfigTemplate(
$row_ipsandports['specialsettings'],
$row_ipsandports,
$domain
$domain,
$row_ipsandports['ip'],
$row_ipsandports['port'],
$row_ipsandports['ssl'] == '1'
). "\n";
}
@@ -447,22 +449,28 @@ class lighttpd extends HttpConfigBase {
if ($domain['specialsettings'] != "") {
$vhost_content.= $this->processSpecialConfigTemplate(
$domain['specialsettings'],
$ipandport,
$domain). "\n";
$domain,
$domain['ip'],
$domain['port'],
$ssl_vhost). "\n";
}
if ($ipandport['default_vhostconf_domain'] != '') {
$vhost_content.= $this->processSpecialConfigTemplate(
$ipandport['default_vhostconf_domain'],
$ipandport,
$domain) . "\n";
$domain,
$domain['ip'],
$domain['port'],
$ssl_vhost) . "\n";
}
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";
}
}
$vhost_content.= $this->getLogFiles($domain);