From: martin <martin>
Date: Thu, 8 Aug 2002 07:20:38 +0000 (+0000)
Subject: Damn .. this bug was stopping the admin user being created properly.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=df8fa8f1eeb354da5c9b9747b534868ce03e9d5f;p=moodle.git

Damn .. this bug was stopping the admin user being created properly.
(Checking for uploaded file)
---

diff --git a/admin/user.php b/admin/user.php
index 2f31ce983e..a4d3274b95 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -89,15 +89,15 @@
 
 		    $timenow = time();
 
-            if ($imagefile && $imagefile!="none") { 
-                $imageinfo = GetImageSize($imagefile);
+            if ($filename = valid_uploaded_file($imagefile)) { 
+                $imageinfo = GetImageSize($filename);
                 $image->width  = $imageinfo[0];
                 $image->height = $imageinfo[1];
                 $image->type   = $imageinfo[2];
     
                 switch ($image->type) {
-                    case 2: $im = ImageCreateFromJPEG($imagefile); break;
-                    case 3: $im = ImageCreateFromPNG($imagefile); break;
+                    case 2: $im = ImageCreateFromJPEG($filename); break;
+                    case 3: $im = ImageCreateFromPNG($filename); break;
                     default: error("Image must be in JPG or PNG format");
                 }
                 if (function_exists("ImageCreateTrueColor")) {