mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46976-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-01-19 11:59:30 +08:00
commit a8d8e315ec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
login/forgot_password_form.php
View File

@ -54,7 +54,7 @@ class login_forgot_password_form extends moodleform {
$mform->addElement('header', 'searchbyemail', get_string('searchbyemail'), '');
$mform->addElement('text', 'email', get_string('email'));
$mform->setType('email', PARAM_RAW);
$mform->setType('email', PARAM_RAW_TRIMMED);
$submitlabel = get_string('search');
$mform->addElement('submit', 'submitbuttonemail', $submitlabel);

4
login/signup_form.php
View File

@ -53,11 +53,11 @@ class login_signup_form extends moodleform {
$mform->addElement('header', 'supplyinfo', get_string('supplyinfo'),'');
$mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="25"');
$mform->setType('email', PARAM_NOTAGS);
$mform->setType('email', PARAM_RAW_TRIMMED);
$mform->addRule('email', get_string('missingemail'), 'required', null, 'server');
$mform->addElement('text', 'email2', get_string('emailagain'), 'maxlength="100" size="25"');
$mform->setType('email2', PARAM_NOTAGS);
$mform->setType('email2', PARAM_RAW_TRIMMED);
$mform->addRule('email2', get_string('missingemail'), 'required', null, 'server');
$namefields = useredit_get_required_name_fields();

2
user/editlib.php
View File

@ -215,7 +215,7 @@ function useredit_shared_definition(&$mform, $editoroptions = null, $filemanager
} else {
$mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
$mform->addRule('email', $strrequired, 'required', null, 'client');
$mform->setType('email', PARAM_EMAIL);
$mform->setType('email', PARAM_RAW_TRIMMED);
}
$mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="21"');