Merge branch 'master' of git://anongit.kde.org/owncloud

This commit is contained in:
Michael Gapczynski 2011-08-22 11:33:07 -04:00
commit dd9f4a3e3c
2 changed files with 12 additions and 8 deletions

View File

@ -1,5 +1,7 @@
ErrorDocument 404 //owncloud/core/templates/404.php
php_value upload_max_filesize 512M
php_value post_max_size 512M
SetEnv htaccessWorking true
<IfModule mod_php5.c>
php_value upload_max_filesize 512M
php_value post_max_size 512M
SetEnv htaccessWorking true
</IfModule>
Options -Indexes

View File

@ -273,12 +273,14 @@ class OC_Setup {
* create .htaccess files for apache hosts
*/
private static function createHtaccess() {
global $SERVERROOT;
global $WEBROOT;
$SERVERROOT=OC::$SERVERROOT;
$WEBROOT=OC::$WEBROOT;
$content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
$content.= "php_value upload_max_filesize 20M\n";//upload limit
$content.= "php_value post_max_size 20M\n";
$content.= "SetEnv htaccessWorking true\n";
$content.= '<IfModule mod_php5.c>';
$content.= 'php_value upload_max_filesize 512M';//upload limit
$content.= 'php_value post_max_size 512M';
$content.= 'SetEnv htaccessWorking true';
$content.= '</IfModule>';
$content.= "Options -Indexes\n";
@file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it