Use $CFG->directorypermissions for new directories

diff --git a/user/lib.php b/user/lib.php
index 1a55dafd523664f75b872b63be4bbb974a3b4847..4f25cc7c2635c6b487b8e5b5f8d058089c09e8a6 100644 (file)
--- a/user/lib.php
+++ b/user/lib.php
@@ -63,13 +63,13 @@ function save_user_image($userid, $filename) {
     umask(0000);
 
     if (!file_exists("$CFG->dataroot/users")) {
-        if (! mkdir("$CFG->dataroot/users", 0777)) {
+        if (! mkdir("$CFG->dataroot/users", $CFG->directorypermissions)) {
             return false;
         }
     }
 
     if (!file_exists("$CFG->dataroot/users/$userid")) {
-        if (! mkdir("$CFG->dataroot/users/$userid", 0777)) {
+        if (! mkdir("$CFG->dataroot/users/$userid", $CFG->directorypermissions)) {
             return false;
         }
     }
@@ -80,9 +80,15 @@ function save_user_image($userid, $filename) {
         return false;
     }
 
-    chmod($originalfile, 0777);
+    chmod($originalfile, 0666);
 
     $imageinfo = GetImageSize($originalfile);
+    
+    if (empty($imageinfo)) {
+        unlink($originalfile);
+        return false;
+    }
+    
     $image->width  = $imageinfo[0];
     $image->height = $imageinfo[1];
     $image->type   = $imageinfo[2];