From 1ab3490ec9e49ce813b2a7d5d0bbefc221253a84 Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Mon, 16 Jan 2006 23:54:52 +0000
Subject: [PATCH] admin/uploaduser: fix password update bug, safer renames,
 optimized execution

    This patch bundles 3 changes:

    + password inserts/updates were not being md5()d
    + skip the user altogether when the rename fails, to
      avoid clobbering the existing user account
    + get_courses() has moved outside the main loop so
      it is called only once -- huge difference in
      performance and number of DB queries
---
 admin/uploaduser.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index c1fe4ca84aa..fce01dcd94e 100755
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -158,6 +158,10 @@
         $renames      = 0;
         $renameerrors = 0;
 
+        // Will use this course array a lot
+        // so fetch it early and keep it in memory
+        $courses = get_courses("all",'c.sortorder','c.id,c.shortname,c.fullname,c.sortorder');
+
         while (!feof ($fp)) {
             foreach ($optionalDefaults as $key => $value) {
                 $user->$key = addslashes($adminuser->$key);
@@ -183,7 +187,7 @@
                               'uploaduser.php?sesskey='.$USER->sesskey);
                     }
                     // password needs to be encrypted
-                    else if ($name == "password" && !empty($user->password)) {
+                    else if ($name == "password" && !empty($value)) {
                         $user->password = md5($value);
                     }
                     else if ($name == "username") {
@@ -208,7 +212,7 @@
                 $addgroup[2] = $user->group3;
                 $addgroup[3] = $user->group4;
                 $addgroup[4] = $user->group5;
-                $courses = get_courses("all",'c.sortorder','c.id,c.shortname,c.fullname,c.sortorder');
+
                 for ($i=0; $i<5; $i++) {
                     $courseid[$i]=0;
                 }
@@ -237,6 +241,7 @@
                         } else {
                             notify(get_string('usernotrenamedexists', 'error') . " : $user->oldusername $user->username");
                             $renameerrors++;
+                            continue;
                         }
                     } else {
                         notify(get_string('usernotrenamedmissing', 'error') . " : $user->oldusername $user->username");