L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-61351 auth_shibboleth: removed redundant session handler class check

Browse Source
This commit is contained in:
Tim Schroeder
2018-07-16 17:20:36 +02:00
committed by Mark Nelson
parent 2542cb94e4
commit 4c66ff31c8
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/shibboleth/logout.php
+6 -19
View File
@@ -127,27 +127,14 @@ WSDL;
* @return SoapFault or void if everything was fine
*/
function LogoutNotification($spsessionid) {
global $CFG;
// Delete session of user using $spsessionid.
// The setting $CFG->session_handler_class may not be set. But if it is,
// it should override $CFG->dbsessions.
if (!empty($CFG->session_handler_class)) {
$sessionclass = $CFG->session_handler_class;
if (preg_match('/database/i', $sessionclass) === 1) {
return \auth_shibboleth\helper::logout_db_session($spsessionid);
} else if (preg_match('/file/i', $sessionclass) === 1) {
$sessionclass = \core\session\manager::get_handler_class();
switch ($sessionclass) {
case '\core\session\file':
return \auth_shibboleth\helper::logout_file_session($spsessionid);
} else {
throw new moodle_exception("Shibboleth logout not implemented for '$sessionclass'");
}
} else {
// Session handler class is not specified, check dbsessions instead.
if (!empty($CFG->dbsessions)) {
case '\core\session\database':
return \auth_shibboleth\helper::logout_db_session($spsessionid);
}
// Assume file sessions if dbsessions isn't used.
return \auth_shibboleth\helper::logout_file_session($spsessionid);
default:
throw new moodle_exception("Shibboleth logout not implemented for '$sessionclass'");
}
// If no SoapFault was thrown, the function will return OK as the SP assumes.
}