Merge pull request #3100 from owncloud/ensure_index_php

Fix for #3049
This commit is contained in:
Daniel Molkentin 2013-04-24 07:14:33 -07:00
commit ff6fb0906b
3 changed files with 8 additions and 0 deletions

View File

@ -32,5 +32,8 @@ RewriteRule ^remote/(.*) remote.php [QSA,L]
AddType image/svg+xml svg svgz AddType image/svg+xml svg svgz
AddEncoding gzip svgz AddEncoding gzip svgz
</IfModule> </IfModule>
<IfModule dir_module>
DirectoryIndex index.php index.html
</IfModule>
AddDefaultCharset utf-8 AddDefaultCharset utf-8
Options -Indexes Options -Indexes

View File

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<script type="text/javascript"> window.location.href="index.php"; </script>
<meta http-equiv="refresh" content="0; URL=index.php"> <meta http-equiv="refresh" content="0; URL=index.php">
</head> </head>
</html> </html>

View File

@ -828,6 +828,10 @@ class OC_Setup {
$content.= "AddType image/svg+xml svg svgz\n"; $content.= "AddType image/svg+xml svg svgz\n";
$content.= "AddEncoding gzip svgz\n"; $content.= "AddEncoding gzip svgz\n";
$content.= "</IfModule>\n"; $content.= "</IfModule>\n";
$content.= "<IfModule dir_module>\n";
$content.= "DirectoryIndex index.php index.html\n";
$content.= "</IfModule>\n";
$content.= "AddDefaultCharset utf-8\n";
$content.= "Options -Indexes\n"; $content.= "Options -Indexes\n";
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it @file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it