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

Merge pull request #163 from BNoiZe/master

Browse Source 
More PDO migration. Merge multiple location-blocks of the same directory in ngnix, fixes #1309
This commit is contained in:
Michael Kaufmann
2013-11-26 09:25:22 -08:00
parent 567f789dab 589e422767
commit 35c3f3d71e
2 changed files with 211 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,23 +464,70 @@ class nginx
$vhost_content .= $this->settings['system']['default_vhostconf'] . "\n";
}
}
// merge duplicate / sections, #1193
$l_regex1 = "/(location\ \/\ \{)(.*)(\})/smU";
$l_regex2 = "/(location\ \/\ \{.*\})/smU";
$replace_by = '';
$replacements = preg_match_all($l_regex1,$vhost_content,$out);
if ($replacements > 1) {
foreach ($out[2] as $val) {
$replace_by .= $val."\n";
}
$vhost_content = preg_replace($l_regex2, "", $vhost_content, $replacements-1);
$vhost_content = preg_replace($l_regex2, "location / {\n\t\t". $replace_by ."\t}\n", $vhost_content);
}
}
$vhost_content .= '}' . "\n\n";
return $vhost_content;
return $this->mergeVhostBlocks($vhost_content);
}
protected function mergeVhostBlocks($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);'));
// Merge similar blocks
$new_vhost_content = array();
$isOpen = false;
$addAfter = false;
foreach ($vhost_content as $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);
if ($addAfter === false) {
$new_vhost_content[] = $line;
}
} elseif ($isOpen === true) {
if (substr_count($line, "}") != 0 && substr_count($line, "{") == 0) {
$isOpen = false;
if ($addAfter === false) {
$new_vhost_content[] = "}";
} else {
$addAfter = false;
}
} else {
if ($addAfter != false) {
for ($i = $addAfter; $i < count($new_vhost_content); $i++) {
if ($new_vhost_content[$i] == "}") {
$addAt = $i;
break;
}
}
array_splice($new_vhost_content, $addAt, 0, $line);
} else {
$new_vhost_content[] = $line;
}
}
} else {
$new_vhost_content[] = $line;
}
}
// Fix idention
$nextLevel = 0;
for ($i = 0; $i < count($new_vhost_content); $i++) {
if (substr_count($new_vhost_content[$i], "}") != 0 && substr_count($new_vhost_content[$i], "{") == 0) {
$nextLevel -= 1;
}
if ($nextLevel > 0) {
for ($j = 0; $j < $nextLevel; $j++) {
$new_vhost_content[$i] = " " . $new_vhost_content[$i];
}
}
if (substr_count($new_vhost_content[$i], "{") != 0 && substr_count($new_vhost_content[$i], "}") == 0) {
$nextLevel += 1;
}
}
return implode("\n", $new_vhost_content);
}
protected function composeSslSettings($domain) {