mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor syntax 

+ Use Apache syntax with cases according to official docs: https://github.com/nextcloud/server/pull/16792/files#r315207691
+ Add missing whitespace for concatenating strings to variable: https://github.com/nextcloud/server/pull/16792/files#r315207520
+ Apache 2.5 will be released as 2.6: https://github.com/nextcloud/server/pull/16792/files#r315206147

Signed-off-by: Micha Felle <micha@dietpi.com>
This commit is contained in:
MichaIng 2019-08-19 15:50:48 +02:00 committed by GitHub
parent a849b329a7
commit 51a35bb1cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/private/Setup.php
View File

@ -542,27 +542,27 @@ class Setup {
//Require all denied
$now = date('Y-m-d H:i:s');
$content = "# Generated by Nextcloud on $now\n";
$content.= "# Section for Apache 2.4 and 2.5\n";
$content.= "<ifModule mod_authz_core.c>\n";
$content.= " Require all denied\n";
$content.= "</ifModule>\n";
$content.= "<ifModule mod_access_compat.c>\n";
$content.= " Deny from all\n";
$content.= " Satisfy All\n";
$content.= "</ifModule>\n\n";
$content.= "# Section for Apache 2.2\n";
$content.= "<ifModule !mod_authz_core.c>\n";
$content.= " <ifModule !mod_access_compat.c>\n";
$content.= " <ifModule mod_authz_host.c>\n";
$content.= " Deny from all\n";
$content.= " </ifModule>\n";
$content.= " Satisfy All\n";
$content.= " </ifModule>\n";
$content.= "</ifModule>\n\n";
$content.= "# Section for Apache 2.2 to 2.5\n";
$content.= "<ifModule mod_autoindex.c>\n";
$content.= " IndexIgnore *\n";
$content.= "</ifModule>";
$content .= "# Section for Apache 2.4 to 2.6\n";
$content .= "<IfModule mod_authz_core.c>\n";
$content .= " Require all denied\n";
$content .= "</IfModule>\n";
$content .= "<IfModule mod_access_compat.c>\n";
$content .= " Deny from all\n";
$content .= " Satisfy All\n";
$content .= "</IfModule>\n\n";
$content .= "# Section for Apache 2.2\n";
$content .= "<IfModule !mod_authz_core.c>\n";
$content .= " <IfModule !mod_access_compat.c>\n";
$content .= " <IfModule mod_authz_host.c>\n";
$content .= " Deny from all\n";
$content .= " <IifModule>\n";
$content .= " Satisfy All\n";
$content .= " </IfModule>\n";
$content .= "</IfModule>\n\n";
$content .= "# Section for Apache 2.2 to 2.6\n";
$content .= "<IfModule mod_autoindex.c>\n";
$content .= " IndexIgnore *\n";
$content .= "</IfModule>";
$baseDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
file_put_contents($baseDir . '/.htaccess', $content);