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

Remove comments from special vhost settings, fixes #1422

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-05-18 12:38:50 +02:00
parent 41f971a4d5
commit ca4dd8a75d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,7 +441,9 @@ class nginx {
protected function mergeVhostBlocks($vhost_content) { protected function mergeVhostBlocks($vhost_content) {
$vhost_content = str_replace(array("{", "}"), array("{\n", "\n}"), $vhost_content); $vhost_content = str_replace("\r", "\n", $vhost_content); // Remove windows linebreaks
$vhost_content = preg_replace('/^[\s\t]*#.*/m', "", $vhost_content); // Remove comments
$vhost_content = str_replace(array("{", "}"), array("{\n", "\n}"), $vhost_content); // Break blocks into lines
$vhost_content = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost_content)))); $vhost_content = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost_content))));
$vhost_content = array_filter($vhost_content, create_function('$a','return preg_match("#\S#", $a);')); $vhost_content = array_filter($vhost_content, create_function('$a','return preg_match("#\S#", $a);'));
@@ -451,6 +453,7 @@ class nginx {
$addAfter = false; $addAfter = false;
foreach ($vhost_content as $line) { foreach ($vhost_content as $line) {
$line = trim($line); $line = trim($line);
if (substr_count($line, "{") != 0 && substr_count($line, "}") == 0 && substr_count($line, "server") == 0 && $isOpen === false) { if (substr_count($line, "{") != 0 && substr_count($line, "}") == 0 && substr_count($line, "server") == 0 && $isOpen === false) {
$isOpen = true; $isOpen = true;
$addAfter = array_search($line, $new_vhost_content); $addAfter = array_search($line, $new_vhost_content);