From decbf994c0e9ef7d2fd756ae944fcb849d432383 Mon Sep 17 00:00:00 2001 From: Penny Leach Date: Mon, 11 Jan 2010 22:05:47 +0000 Subject: [PATCH] mnet/login: MDL-21018 - be a bit more picky about when to show the link to mnet_email.php --- login/index.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/login/index.php b/login/index.php index 72a36b9f424..d7fb3bd03ca 100644 --- a/login/index.php +++ b/login/index.php @@ -235,10 +235,16 @@ httpsrequired(); $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') + && record_exists_sql("SELECT h.id FROM {$CFG->prefix}mnet_host h + INNER JOIN {$CFG->prefix}mnet_host2service m ON h.id=m.hostid + INNER JOIN {$CFG->prefix}mnet_service s ON s.id=m.serviceid + WHERE s.name='sso_sp' AND h.deleted=0 AND m.publish = 1") + && record_exists_select('user', "username = '{$frm->username}' AND mnethostid != {$CFG->mnet_localhost_id}") + ) { + $errormsg .= get_string('loginlinkmnetuser', 'mnet', "mnet_email.php?u=$frm->username"); } }