From: skodak <skodak>
Date: Fri, 26 Jan 2007 16:19:33 +0000 (+0000)
Subject: MDL-8096 - added proper trimming of usernames; site:config capability is now neede... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=04f639a0f4641b93d23fc60340578dee06c3da48;p=moodle.git

MDL-8096 - added proper trimming of usernames; site:config capability is now neede to change definition of custom profile fields
---

diff --git a/user/editadvanced.php b/user/editadvanced.php
index e1982df24c..bebcc019ce 100644
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -69,6 +69,7 @@
             $authplugin = get_auth_plugin($usernew->auth);
         }
 
+        $usernew->username     = trim($usernew->username);
         $usernew->timemodified = time();
 
         if ($usernew->id == -1) {
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 896dc22a6b..88a9879418 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -93,10 +93,15 @@ class user_editadvanced_form extends moodleform {
         global $CFG;
 
         $usernew = (object)$usernew;
-        $user    = get_record('user', 'id', $usernew->id);
-        $err     = array();
+        $usernew->username = trim($usernew->username);
 
-        if (!$user or $user->username !== $usernew->username) {
+        $user = get_record('user', 'id', $usernew->id);
+        $err = array();
+
+        if (empty($usernew->username)) {
+            //might be only whitespace
+            $err['username'] = get_string('required');
+        } else if (!$user or $user->username !== $usernew->username) {
             //check new username does not exist
             if (record_exists('user', 'username', $usernew->username, 'mnethostid', $CFG->mnet_localhost_id)) {
                 $err['username'] = get_string('usernameexists');