Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle …

…into MOODLE_23_STABLE
moodle · Jan 6, 2013 · d9402ac · d9402ac
2 parents 70badb4 + 2e505a0
commit d9402ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/admin/tool/uploaduser/index.php b/admin/tool/uploaduser/index.php
@@ -285,7 +285,11 @@
             $userserrors++;
             continue;
         }
-
+        if ($user->username !== clean_param($user->username, PARAM_USERNAME)) {
+            $upt->track('status', get_string('invalidusername', 'error', 'username'), 'error');
+            $upt->track('username', $errorstr, 'error');
+            $userserrors++;
+        }
         if ($existinguser = $DB->get_record('user', array('username'=>$user->username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
             $upt->track('id', $existinguser->id, 'normal', false);
         }

diff --git a/lang/en/error.php b/lang/en/error.php
@@ -329,6 +329,7 @@
 $string['invaliduser'] = 'Invalid user';
 $string['invaliduserid'] = 'Invalid user id';
 $string['invaliduserfield'] = 'Invalid user field: {$a}';
+$string['invalidusername'] = 'The given username contains invalid characters';
 $string['invalidxmlfile'] = '"{$a}" is not a valid XML file';
 $string['iplookupfailed'] = 'Cannot find geo information about this IP address {$a}';
 $string['iplookupprivate'] = 'Cannot display lookup of private IP address';