From 0d0842dc0ede4940664c931ac357048ad249b21c Mon Sep 17 00:00:00 2001 From: Penny Leach Date: Mon, 11 Jan 2010 22:05:45 +0000 Subject: [PATCH] mnet/login: MDL-21018 - be a bit more picky about when to show the link to mnet_email.php Merged from MOODLE_19_STABLE --- login/index.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/login/index.php b/login/index.php index b223ab45e9..8fbd5d62f0 100644 --- a/login/index.php +++ b/login/index.php @@ -236,10 +236,16 @@ if (empty($CFG->usesid) and $testcookies and (get_moodle_cookie() == '')) { / $errorcode = 3; } - // TODO: if the user failed to authenticate, check if the username corresponds to a remote mnet user if ( !empty($CFG->mnet_dispatcher_mode) && $CFG->mnet_dispatcher_mode === 'strict' - && is_enabled_auth('mnet')) { + && is_enabled_auth('mnet') + && $DB->record_exists_sql('SELECT h.id FROM {mnet_host} h + INNER JOIN {mnet_host2service} m ON h.id=m.hostid + INNER JOIN {mnet_service} s ON s.id=m.serviceid + WHERE s.name=? AND h.deleted=? AND m.publish = ?', + array('sso_sp', 0, 1)) + && $DB->record_exists_select('user', 'username = ? AND mnethostid != ?', array($frm->username, $CFG->mnet_localhost_id)) + ) { $errormsg .= get_string('loginlinkmnetuser', 'mnet', "mnet_email.php?u=$frm->username"); } } -- 2.39.5