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

Don't remove custom comments, add newline after blocks

Browse Source 
Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
This commit is contained in:
Roman Schmerold (BNoiZe)
2015-01-14 00:20:04 +01:00
parent f61567be81
commit 67f3263a2e
1 changed files with 2 additions and 2 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,7 +437,7 @@ class nginx {
} }
} }
} }
$vhost_content .= '}' . "\n\n"; $vhost_content .= "\n}\n\n";
return $vhost_content; return $vhost_content;
} }
@@ -449,7 +449,6 @@ class nginx {
// Clean user defined settings // Clean user defined settings
$vhost_usr = str_replace("\r", "\n", $vhost_usr); // Remove windows linebreaks $vhost_usr = str_replace("\r", "\n", $vhost_usr); // Remove windows linebreaks
$vhost_usr = preg_replace('/^[\s\t]*#.*/m', "", $vhost_usr); // Remove comments
$vhost_usr = str_replace(array("{", "}"), array("{\n", "\n}"), $vhost_usr); // Break blocks into lines $vhost_usr = str_replace(array("{", "}"), array("{\n", "\n}"), $vhost_usr); // Break blocks into lines
$vhost_usr = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost_usr)))); // Break into array items $vhost_usr = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost_usr)))); // Break into array items
$vhost_usr = array_filter($vhost_usr, create_function('$a','return preg_match("#\S#", $a);')); // Remove empty lines $vhost_usr = array_filter($vhost_usr, create_function('$a','return preg_match("#\S#", $a);')); // Remove empty lines
@@ -494,6 +493,7 @@ class nginx {
for ($i = 0; $i < count($vhost_frx); $i++) { for ($i = 0; $i < count($vhost_frx); $i++) {
if (substr_count($vhost_frx[$i], "}") != 0 && substr_count($vhost_frx[$i], "{") == 0) { if (substr_count($vhost_frx[$i], "}") != 0 && substr_count($vhost_frx[$i], "{") == 0) {
$nextLevel -= 1; $nextLevel -= 1;
$vhost_frx[$i] .= "\n";
} }
if ($nextLevel > 0) { if ($nextLevel > 0) {
for ($j = 0; $j < $nextLevel; $j++) { for ($j = 0; $j < $nextLevel; $j++) {