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

Merge branch 'MDL-36838-FF17-MNETSSO-23' of git://github.com/peterbulmer/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-28 17:36:09 +08:00
parent a38a5cefb3 166d3b60d3
commit 78601ea6fe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/mnet/auth.php
+6 -6
View File
@@ -46,10 +46,10 @@ class auth_plugin_mnet extends auth_plugin_base {
}
/**
* Return user data for the provided token, compare with user_agent string.
* Return user data for the provided token
*
* @param string $token The unique ID provided by remotehost.
* @param string $UA User Agent string.
* @param string $UA User Agent string (as seen by SP) - ignored
* @return array $userdata Array of user info for remote host
*/
function user_authorise($token, $useragent) {
@@ -57,7 +57,7 @@ class auth_plugin_mnet extends auth_plugin_base {
$remoteclient = get_mnet_remote_client();
require_once $CFG->dirroot . '/mnet/xmlrpc/serverlib.php';
$mnet_session = $DB->get_record('mnet_session', array('token'=>$token, 'useragent'=>$useragent));
$mnet_session = $DB->get_record('mnet_session', array('token'=>$token));
if (empty($mnet_session)) {
throw new mnet_server_exception(1, 'authfail_nosessionexists');
}
@@ -1087,14 +1087,14 @@ class auth_plugin_mnet extends auth_plugin_base {
* calls the function (over xmlrpc) provides us with the mnethostid we need.
*
* @param string $username Username for session to kill
* @param string $useragent SHA1 hash of user agent to look for
* @param string $useragent SHA1 hash of user agent as seen by IdP - ignored
* @return bool True on success
*/
function kill_child($username, $useragent) {
global $CFG, $DB;
$remoteclient = get_mnet_remote_client();
$session = $DB->get_record('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id, 'useragent'=>$useragent));
$DB->delete_records('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id, 'useragent'=>$useragent));
$session = $DB->get_record('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id));
$DB->delete_records('mnet_session', array('username'=>$username, 'mnethostid'=>$remoteclient->id));
if (false != $session) {
session_kill($session->session_id);
return true;