From 89c4b969d1bd3a0d7d89886c827796fcf4277324 Mon Sep 17 00:00:00 2001 From: Chris Vigelius Date: Mon, 6 Jul 2015 21:21:07 +0200 Subject: [PATCH] make sure we fill all context parameters in any case --- scripts/classes/class.HttpConfigBase.php | 8 +++---- .../jobs/cron_tasks.inc.http.10.apache.php | 24 ++++++++++++------- .../jobs/cron_tasks.inc.http.20.lighttpd.php | 24 ++++++++++++------- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 24 ++++++++++++------- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/scripts/classes/class.HttpConfigBase.php b/scripts/classes/class.HttpConfigBase.php index a03001e4..fb91a098 100644 --- a/scripts/classes/class.HttpConfigBase.php +++ b/scripts/classes/class.HttpConfigBase.php @@ -23,13 +23,13 @@ class HttpConfigBase { * @param $template * @return string */ - protected function processSpecialConfigTemplate($template, $ipandport, $domain) { + protected function processSpecialConfigTemplate($template, $domain, $ip, $port, $is_ssl_vhost) { $templateVars = array( 'DOMAIN' => $domain['domain'], 'CUSTOMER' => $domain['loginname'], - 'IP' => $ipandport['ip'], - 'PORT' => $ipandport['port'], - 'IS_SSL' => ($domain['ssl'])?'ssl':'', + 'IP' => $ip, + 'PORT' => $port, + 'IS_SSL' => ($is_ssl_vhost)?'ssl':'', 'DOCROOT' => $domain['documentroot'] ); return replace_variables($template, $templateVars); diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 4cd96393..08528b6c 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -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"; } } diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index b80b9614..e93270f6 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -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); diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index a06067cd..700dd220 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -191,10 +191,12 @@ class nginx extends HttpConfigBase { if ($row_ipsandports['specialsettings'] != '') { $this->nginx_data[$vhost_filename].= $this->processSpecialConfigTemplate( $row_ipsandports['specialsettings'], - $row_ipsandports, array('domain'=> Settings::Get('system.hostname'), 'loginname' => Settings::Get('phpfpm.vhost_httpuser'), - 'documentroot'=> $mypath)). "\n"; + 'documentroot'=> $mypath), + $row_ipsandports['ip'], + $row_ipsandports['port'], + $row_ipsandports['ssl'] == '1'). "\n"; } /** @@ -372,8 +374,10 @@ class nginx 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"; } $vhost_content.= "\t" . 'listen ' . $ipport . ($ssl_vhost == true ? ' ssl' : '') . ';' . "\n"; @@ -437,8 +441,10 @@ class nginx extends HttpConfigBase { if ($domain['specialsettings'] != "") { $vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate( $domain['specialsettings'], - $ipandport, - $domain + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost )); } @@ -450,8 +456,10 @@ class nginx extends HttpConfigBase { $vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate( Settings::Get('system.default_vhostconf'), - $ipandport, - $domain)."\n"); + $domain, + $domain['ip'], + $domain['port'], + $ssl_vhost)."\n"); } } }