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

Merge branch 'MDL-76113-311' of https://github.com/snake/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2022-11-08 12:01:47 +08:00
parent 0e7caf93b5 28f06c0f27
commit 0742fb7b44
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enrol/lti/classes/tool_provider.php
+1 -1
View File
@@ -354,7 +354,7 @@ class tool_provider extends ToolProvider {
$userlog->serviceurl = $serviceurl;
$userlog->sourceid = $sourceid;
$userlog->consumerkey = $this->consumer->getKey();
$userlog->consumersecret = $tool->secret;
$userlog->consumersecret = $this->consumer->secret;
$userlog->lastgrade = 0;
$userlog->lastaccess = time();
$userlog->timecreated = time();
enrol/lti/db/upgrade.php
+21
View File
@@ -69,5 +69,26 @@ function xmldb_enrol_lti_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2021051701, 'enrol', 'lti');
}
if ($oldversion < 2021051702) {
// Update lti user information for LTI 2.0 users having the wrong consumer secret recorded.
// This applies to any LTI 2.0 user who has launched the tool (i.e. has lastaccess) and fixes a non-functional grade sync
// for LTI 2.0 consumers.
$sql = "SELECT lu.id, lc.secret
FROM {enrol_lti_users} lu
JOIN {enrol_lti_lti2_consumer} lc
ON (lu.consumerkey = lc.consumerkey256)
WHERE lc.ltiversion = :ltiversion
AND lu.consumersecret != lc.secret
AND lu.lastaccess IS NOT NULL";
$affectedltiusersrs = $DB->get_recordset_sql($sql, ['ltiversion' => 'LTI-2p0']);
foreach ($affectedltiusersrs as $ltiuser) {
$DB->set_field('enrol_lti_users', 'consumersecret', $ltiuser->secret, ['id' => $ltiuser->id]);
}
$affectedltiusersrs->close();
// Lti savepoint reached.
upgrade_plugin_savepoint(true, 2021051702, 'enrol', 'lti');
}
return true;
}
enrol/lti/version.php
+1 -1
View File
@@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2021051701; // The current plugin version (Date: YYYYMMDDXX).
$plugin->version = 2021051702; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2021051100; // Requires this Moodle version.
$plugin->component = 'enrol_lti'; // Full name of the plugin (used for diagnostics).