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

Merge pull request #23374 from owncloud/fix-htaccess-issues 

Write .htaccess update only if not already written
This commit is contained in:
Thomas Müller 2016-03-21 09:43:18 +01:00
parent 35bc315f59 e867a7d54d
commit b9da594bd9
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/setup.php
View File

@ -411,14 +411,12 @@ class Setup {
$htaccessContent = file_get_contents($setupHelper->pathToHtaccess());
$content = "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####\n";
if (strpos($htaccessContent, 'ErrorDocument 403') === false) {
if(strpos($htaccessContent, $content) === false) {
//custom 403 error page
$content.= "\nErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php";
}
if (strpos($htaccessContent, 'ErrorDocument 404') === false) {
//custom 404 error page
$content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";
}
// Add rewrite base
$webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/';
@ -439,6 +437,8 @@ class Setup {
}
}
}
public static function protectDataDirectory() {
//Require all denied
$now = date('Y-m-d H:i:s');