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

Merge branch 'MDL-29931' of git://github.com/mouneyrac/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-11-10 01:43:07 +01:00
parent 9fc402e47d dab3977a54
commit af85aa7bb6
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
login/token.php
+3 -8
View File
@@ -95,16 +95,11 @@ if (!empty($user)) {
//Check if a token has already been created for this user and this service
//Note: this could be an admin created or an user created token.
// It does not really matter we take the first one that is valid.
$tokenssql = "SELECT t.id, t.sid, t.token, t.validuntil, t.iprestriction,
s.restrictedusers, s.id as serviceid, s.requiredcapability
$tokenssql = "SELECT t.id, t.sid, t.token, t.validuntil, t.iprestriction
FROM {external_tokens} t
JOIN {external_services} s
ON t.externalserviceid = s.id
WHERE s.shortname = ?
AND s.enabled = 1
AND t.userid = ?
WHERE t.userid = ? AND t.externalserviceid = ?
ORDER BY t.timecreated ASC";
$tokens = $DB->get_records_sql($tokenssql, array($serviceshortname, $user->id, time()));
$tokens = $DB->get_records_sql($tokenssql, array($user->id, $service->id));
//A bit of sanity checks
foreach ($tokens as $key=>$token) {