From d99bab2d1dc1bfdf95ee0191932d5051eb885842 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 26 Dec 2004 14:45:39 +0000
Subject: [PATCH] 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.
---
 config-dist.php   | 2 +-
 install.php       | 4 ++--
 lib/moodlelib.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config-dist.php b/config-dist.php
index b28ce14cfb..ccdefda0e6 100644
--- 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 62bba9b301..17f1b64cf1 100644
--- 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 362ae3ca79..9c2b498a4e 100644
--- 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
         }
     }
 
-- 
2.39.5