mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
mnet/login: MDL-21018 - be a bit more picky about when to show the link to mnet_email.php
Merged from MOODLE_19_STABLE
This commit is contained in:
parent
6006e06df0
commit
0d0842dc0e
@ -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");
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user