From 62bb387c308bba908851c20a48a37437506398e4 Mon Sep 17 00:00:00 2001 From: Penny Leach Date: Mon, 11 Jan 2010 22:34:02 +0000 Subject: [PATCH] mnet: MDL-20059 fix up login/mnet_email.php in a few places --- lang/en_utf8/mnet.php | 2 ++ login/mnet_email.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php index b1824dc1b8..ec8751b666 100644 --- a/lang/en_utf8/mnet.php +++ b/lang/en_utf8/mnet.php @@ -243,6 +243,8 @@ $string['loginlinkmnetuser'] = '
If you are a Moodle Network remote user an $string['certdetails'] = 'Cert Details'; $string['mnetidprovider'] = 'MNET ID Provider'; $string['mnetidprovidermsg'] = 'You should be able to login at your $a provider.'; +$string['mnetidproviderdesc'] = 'You can use this facility to retrieve a link that you can log in at, if you can provide the correct email address to match the username you previously tried to log in with.'; +$string['mnetidprovidernotfound'] = 'Sorry, but no further information could be found.'; $string['findlogin'] = 'Find Login'; $string['error7020'] = 'This error normally occurs if the remote site has created a record for you with the wrong wwwroot, for example, http://yoursite.com instead of http://www.yoursite.com. You should contact the administrator of the remote site with your wwwroot (as specified in config.php) asking her to update her record for your host.'; diff --git a/login/mnet_email.php b/login/mnet_email.php index 5ba65057a1..76bff2f414 100644 --- a/login/mnet_email.php +++ b/login/mnet_email.php @@ -20,14 +20,18 @@ $PAGE->set_heading($mnetidprovider); $PAGE->set_focuscontrol('email'); echo $OUTPUT->header(); +echo $OUTPUT->notification(get_string('mnetidproviderdesc', 'mnet')); if ($form = data_submitted() and confirm_sesskey()) { - if ($user = $DB->get_record('user', array('username'=>$username, 'email'=>$form->email))) { + if ($user = $DB->get_record_select('user', 'username = ? AND email = ? AND mnethostid != ?', array($username,$form->email, $CFG->mnet_localhost_id))) { if (!empty($user->mnethostid) and $host = $DB->get_record('mnet_host', array('id'=>$user->mnethostid))) { $link = "wwwroot}/login/\">{$host->name}"; notice(get_string('mnetidprovidermsg','mnet',$link)); } } + if (empty($link)) { + notice(get_string('mnetidprovidernotfound', 'mnet')); + } } echo '

 

'; -- 2.39.5