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

MDL-26992 fix broken upload users templates

Browse Source
This commit is contained in:
Petr Skoda
2011-03-27 23:48:41 +02:00
parent 92a387b467
commit 43070e6193
2 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/uploaduser.php
+17 -6
View File
@@ -307,6 +307,9 @@ if ($formdata = $mform2->is_cancelled()) {
// process templates
$user->$field = uu_process_template($formdata->$field, $user);
$formdefaults[$field] = true;
if (in_array($field, $upt->columns)) {
$upt->track($field, s($user->$field), 'normal');
}
}
}
foreach ($PRF_FIELDS as $field) {
@@ -614,7 +617,13 @@ if ($formdata = $mform2->is_cancelled()) {
$isinternalauth = $auth->is_internal();
if ($DB->record_exists('user', array('email'=>$user->email))) {
if (empty($user->email)) {
$upt->track('email', get_string('invalidemail'), 'error');
$upt->track('status', $strusernotaddederror, 'error');
$userserrors++;
continue;
} else if ($DB->record_exists('user', array('email'=>$user->email))) {
if ($noemailduplicates) {
$upt->track('email', $stremailduplicate, 'error');
$upt->track('status', $strusernotaddederror, 'error');
@@ -898,11 +907,13 @@ while ($linenum <= $previewrows and $fields = $cir->next()) {
$rowcols['status'][] = get_string('missingusername');
}
if (!validate_email($rowcols['email'])) {
$rowcols['status'][] = get_string('invalidemail');
}
if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
$rowcols['status'][] = $stremailduplicate;
if (isset($rowcols['email'])) {
if (!validate_email($rowcols['email'])) {
$rowcols['status'][] = get_string('invalidemail');
}
if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
$rowcols['status'][] = $stremailduplicate;
}
}
$rowcols['status'] = implode('<br />', $rowcols['status']);
$data[] = $rowcols;