From 51a35bb1cbccc3e5dde610e41c8cc89321d33e93 Mon Sep 17 00:00:00 2001
From: MichaIng <28480705+MichaIng@users.noreply.github.com>
Date: Mon, 19 Aug 2019 15:50:48 +0200
Subject: [PATCH] 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>
---
lib/private/Setup.php | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index d40e03062be..7811754ddce 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -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);
--
GitLab