Skip to content
Browse files

Merge branch 'MDL-13572_validate_email_21' of git://github.com/andyjd…

…avis/moodle into MOODLE_21_STABLE
  • Loading branch information...
2 parents aff96ba + e776484 commit 39f8f2e181cacd24e411a7994a4aeed30fcae1dc Sam Hemelryk committed Jan 3, 2012
Showing with 9 additions and 2 deletions.
  1. +9 −2 message/output/email/message_output_email.php
View
11 message/output/email/message_output_email.php
@@ -68,12 +68,19 @@ function send_message($eventdata) {
* @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;
}

0 comments on commit 39f8f2e

Please sign in to comment.
Something went wrong with that request. Please try again.