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

Merge branch 'MDL-13572_validate_email_21' of git://github.com/andyjdavis/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-01-03 09:57:23 +13:00
parent aff96ba72d e776484153
commit 39f8f2e181
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/output/email/message_output_email.php
+9 -2
View File
@@ -68,12 +68,19 @@ class message_output_email extends message_output {
* @param object $mform preferences form class
*/
function config_form($preferences){
global $USER;
$string = get_string('email','message_email').': <input size="30" name="email_email" value="'.$preferences->email_email.'" />';
global $USER, $OUTPUT;
$inputattributes = array('size'=>'30', 'name'=>'email_email', 'value'=>$preferences->email_email);
$string = get_string('email','message_email') . ': ' . html_writer::empty_tag('input', $inputattributes);
if (empty($preferences->email_email) && !empty($preferences->userdefaultemail)) {
$string .= ' ('.get_string('default').': '.$preferences->userdefaultemail.')';
}
if (!empty($preferences->email_email) && !validate_email($preferences->email_email)) {
$string .= $OUTPUT->container(get_string('invalidemail'), 'error');
}
return $string;
}