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

Merge branch 'master' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2014-09-22 10:17:46 +02:00
parent 559fb4d4a4 a47b1e7f5d
commit cbab67a2fd
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -598,13 +598,17 @@ class nginx {
$path_options .= "\t".'# '.$path."\n"; $path_options .= "\t".'# '.$path."\n";
if ($path == '/') { if ($path == '/') {
$this->vhost_root_autoindex = true; if ($row['options_indexes'] != '0') {
$this->vhost_root_autoindex = true;
}
$path_options .= "\t".'location ' . $path . ' {' . "\n"; $path_options .= "\t".'location ' . $path . ' {' . "\n";
if ($this->vhost_root_autoindex) { if ($this->vhost_root_autoindex) {
$path_options .= "\t\t" . 'autoindex on;' . "\n"; $path_options .= "\t\t" . 'autoindex on;' . "\n";
$this->vhost_root_autoindex = false; $this->vhost_root_autoindex = false;
} }
$path_options.= "\t\t" . 'index index.php index.html index.htm;'."\n"; else {
$path_options.= "\t\t" . 'index index.php index.html index.htm;'."\n";
}
// $path_options.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n"; // $path_options.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n";
// check if we have a htpasswd for this path // check if we have a htpasswd for this path
// (damn nginx does not like more than one // (damn nginx does not like more than one
@@ -631,11 +635,13 @@ class nginx {
$this->vhost_root_autoindex = false; $this->vhost_root_autoindex = false;
} else { } else {
$path_options .= "\t".'location ' . $path . ' {' . "\n"; $path_options .= "\t".'location ' . $path . ' {' . "\n";
if ($this->vhost_root_autoindex) { if ($this->vhost_root_autoindex || $row['options_indexes'] != '0') {
$path_options .= "\t\t" . 'autoindex on;' . "\n"; $path_options .= "\t\t" . 'autoindex on;' . "\n";
$this->vhost_root_autoindex = false; $this->vhost_root_autoindex = false;
} }
$path_options .= "\t\t" . 'index index.php index.html index.htm;'."\n"; else {
$path_options .= "\t\t" . 'index index.php index.html index.htm;'."\n";
}
$path_options .= "\t".'} ' . "\n"; $path_options .= "\t".'} ' . "\n";
} }
// } // }