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

Fixed problems with merging oneline blocks, fixes #1360

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2014-01-27 20:26:45 +01:00
parent c69a05efa5
commit b5d56f9992
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,6 +437,7 @@ class nginx {
protected function mergeVhostBlocks($vhost_content) {
$vhost_content = str_replace(array("{", "}"), array("{\n", "\n}"), $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);'));
@@ -445,6 +446,7 @@ class nginx {
$isOpen = false;
$addAfter = false;
foreach ($vhost_content as $line) {
$line = trim($line);
if (substr_count($line, "{") != 0 && substr_count($line, "}") == 0 && substr_count($line, "server") == 0 && $isOpen === false) {
$isOpen = true;
$addAfter = array_search($line, $new_vhost_content);
@@ -994,4 +996,6 @@ class nginx {
}
}
}
}