DRY for creating htaccess to protect data-directory

remotes/origin/stable5
Bart Visscher 13 years ago
parent 246d7ea2ea
commit 6d09752940
  1. 4
      lib/base.php
  2. 4
      lib/setup.php

@ -225,9 +225,7 @@ class OC{
if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
if(!OC_Util::ishtaccessworking()) {
if(!file_exists(OC::$SERVERROOT.'/data/.htaccess')) {
$content = "deny from all\n";
$content.= "IndexIgnore *";
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);
OC_Setup::protectDataDirectory();
}
}
}

@ -559,6 +559,10 @@ class OC_Setup {
$content.= "Options -Indexes\n";
@file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it
self::protectDataDirectory();
}
public static function protectDataDirectory() {
$content = "deny from all\n";
$content.= "IndexIgnore *";
file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);

Loading…
Cancel
Save