L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-14679 towards /user conversion

Browse Source
This commit is contained in:
skodak
2008-05-30 22:11:31 +00:00
parent 1d8bf5f0ab
commit 5d910388bb
19 changed files with 132 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/editadvanced_form.php
+6 -6
View File
@@ -53,11 +53,11 @@ class user_editadvanced_form extends moodleform {
}
function definition_after_data() {
global $USER, $CFG;
global $USER, $CFG, $DB;
$mform =& $this->_form;
if ($userid = $mform->getElementValue('id')) {
$user = get_record('user', 'id', $userid);
$user = $DB->get_record('user', array('id'=>$userid));
} else {
$user = false;
}
@@ -108,12 +108,12 @@ class user_editadvanced_form extends moodleform {
}
function validation($usernew, $files) {
global $CFG;
global $CFG, $DB;
$usernew = (object)$usernew;
$usernew->username = trim($usernew->username);
$user = get_record('user', 'id', $usernew->id);
$user = $DB->get_record('user', array('id'=>$usernew->id));
$err = array();
if (!empty($usernew->newpassword)) {
@@ -128,7 +128,7 @@ class user_editadvanced_form extends moodleform {
$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)) {
if ($DB->record_exists('user', array('username'=>$usernew->username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
$err['username'] = get_string('usernameexists');
}
//check allowed characters
@@ -147,7 +147,7 @@ class user_editadvanced_form extends moodleform {
if (!$user or $user->email !== $usernew->email) {
if (!validate_email($usernew->email)) {
$err['email'] = get_string('invalidemail');
} else if (record_exists('user', 'email', $usernew->email, 'mnethostid', $CFG->mnet_localhost_id)) {
} else if ($DB->record_exists('user', array('email'=>$usernew->email, 'mnethostid'=>$CFG->mnet_localhost_id))) {
$err['email'] = get_string('emailexists');
}
}