Some changes that may help on safe mode ... see bug 2093

The new directory permissions maintain group mode better,
and the manual chown is now removed to prevent safe mode
from getting upset.

diff --git a/config-dist.php b/config-dist.php
index b28ce14cfb82b67a425690ff7cff45da720856ed..ccdefda0e6e5817a8d2de23e6932f4150d77848c 100644 (file)
--- a/config-dist.php
+++ b/config-dist.php
@@ -110,7 +110,7 @@ $CFG->dataroot  = '/home/example/moodledata';
 // to make sure the web server process (eg Apache) can access the files.
 // NOTE: the prefixed 0 is important, and don't use quotes.
 
-$CFG->directorypermissions = 0777;
+$CFG->directorypermissions = 02777;
 
 
 //=========================================================================

diff --git a/install.php b/install.php
index 62bba9b3011557ee50da1569a77a71e216254cf7..17f1b64cf100d34b3d71c7528308f9fbf784181d 100644 (file)
--- a/install.php
+++ b/install.php
@@ -68,7 +68,7 @@ if ( empty($INSTALL['language']) and empty($_POST['language']) ) {
 $SESSION->lang = (!empty($_POST['language'])) ? $_POST['language'] : $INSTALL['language'];
 $CFG->dirroot = $INSTALL['dirroot'];
 $CFG->dataroot = $INSTALL['dataroot'];
-$CFG->directorypermissions = 0777;
+$CFG->directorypermissions = 02777;
 
 
 /// Include some moodle libraries
@@ -306,7 +306,7 @@ if ($nextstage == 5) {
     $str .= '$CFG->admin     = \''.$INSTALL['admindirname']."';\r\n";
     $str .= "\r\n";
 
-    $str .= '$CFG->directorypermissions = 0777;'."\r\n";
+    $str .= '$CFG->directorypermissions = 02777;'."\r\n";
     $str .= "\r\n";
 
     $str .= 'require_once("$CFG->dirroot/lib/setup.php");'."\r\n";

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 362ae3ca79599eee8b69c35c45f847b82f4ec47d..9c2b498a4ee943ef34a085984a636281ccfbd66f 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2579,7 +2579,7 @@ function make_upload_directory($directory, $shownotices=true) {
                 }
                 return false;
             }
-            @chmod($currdir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
+            //@chmod($currdir, $CFG->directorypermissions);  // Just in case mkdir didn't do it
         }
     }