moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-65959 badges: Do not use badge user preference after verification

Browse source
This commit is contained in:
Peter Dias 2020-05-07 08:40:05 +08:00
parent 3cae9421a8
commit 96ec45cb17
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
badges/backpack-add.php
View file

@ -49,7 +49,7 @@ if (!empty($issuedbadge->recipient->id)) {
$badge = new badge($badgeid); $badge = new badge($badgeid);
$backpack = $DB->get_record('badge_backpack', array('userid' => $USER->id)); $backpack = $DB->get_record('badge_backpack', array('userid' => $USER->id));
$sitebackpack = badges_get_site_primary_backpack(); $sitebackpack = badges_get_site_primary_backpack();
$userbackpack = badges_get_site_backpack($backpack->externalbackpackid); $userbackpack = badges_get_site_backpack($backpack->externalbackpackid, $USER->id);
$assertion = new core_badges_assertion($id, $sitebackpack->apiversion); $assertion = new core_badges_assertion($id, $sitebackpack->apiversion);
$api = new \core_badges\backpack_api($sitebackpack); $api = new \core_badges\backpack_api($sitebackpack);
$api->authenticate(); $api->authenticate();

2
badges/backpackemailverify.php
View file

@ -67,6 +67,8 @@ if (!is_null($storedsecret)) {
// Remove the verification vars and redirect to the mypackpack page. // Remove the verification vars and redirect to the mypackpack page.
unset_user_preference('badges_email_verify_secret'); unset_user_preference('badges_email_verify_secret');
unset_user_preference('badges_email_verify_address'); unset_user_preference('badges_email_verify_address');
unset_user_preference('badges_email_verify_backpackid');
unset_user_preference('badges_email_verify_password');
redirect(new moodle_url($redirect), get_string('backpackemailverifysuccess', 'badges'), redirect(new moodle_url($redirect), get_string('backpackemailverifysuccess', 'badges'),
null, \core\output\notification::NOTIFY_SUCCESS); null, \core\output\notification::NOTIFY_SUCCESS);
} else { } else {

16
lib/badgeslib.php
View file

@ -922,12 +922,13 @@ function badges_open_badges_backpack_api() {
} }
/** /**
* Get a site backpacks by id or url. * Get a site backpacks by id for a particular user or site (if userid is 0)
* *
* @param int $id The backpack id. * @param int $id The backpack id.
* @param int $userid The owner of the backpack, 0 if it's a sitewide backpack else a user's site backpack
* @return array(stdClass) * @return array(stdClass)
*/ */
function badges_get_site_backpack($id) { function badges_get_site_backpack($id, int $userid = 0) {
global $DB; global $DB;
$sql = "SELECT beb.*, bb.id AS badgebackpack, bb.password, bb.email AS backpackemail $sql = "SELECT beb.*, bb.id AS badgebackpack, bb.password, bb.email AS backpackemail
@ -935,7 +936,7 @@ function badges_get_site_backpack($id) {
LEFT JOIN {badge_backpack} bb ON bb.externalbackpackid = beb.id AND bb.userid=:userid LEFT JOIN {badge_backpack} bb ON bb.externalbackpackid = beb.id AND bb.userid=:userid
WHERE beb.id=:id"; WHERE beb.id=:id";
return $DB->get_record_sql($sql, ['id' => $id, 'userid' => 0]); return $DB->get_record_sql($sql, ['id' => $id, 'userid' => $userid]);
} }
/** /**
@ -957,11 +958,7 @@ function badges_get_site_primary_backpack() {
function badges_get_site_backpacks() { function badges_get_site_backpacks() {
global $DB, $CFG; global $DB, $CFG;
$sql = "SELECT beb.*, bb.id as badgebackpack, bb.password, bb.email as backpackemail $all = $DB->get_records('badge_external_backpack');
FROM {badge_external_backpack} beb
LEFT JOIN {badge_backpack} bb ON bb.externalbackpackid = beb.id
WHERE bb.id IS NULL OR bb.userid=:userid";
$all = $DB->get_records_sql($sql, ['userid' => 0]);
foreach ($all as $key => $bp) { foreach ($all as $key => $bp) {
if ($bp->id == $CFG->badges_site_backpack) { if ($bp->id == $CFG->badges_site_backpack) {
@ -994,6 +991,7 @@ function badges_get_badge_api_versions() {
function badges_get_default_issuer() { function badges_get_default_issuer() {
global $CFG, $SITE; global $CFG, $SITE;
$sitebackpack = badges_get_site_primary_backpack();
$issuer = array(); $issuer = array();
$issuerurl = new moodle_url('/'); $issuerurl = new moodle_url('/');
$issuer['name'] = $CFG->badges_defaultissuername; $issuer['name'] = $CFG->badges_defaultissuername;
@ -1001,7 +999,7 @@ function badges_get_default_issuer() {
$issuer['name'] = $SITE->fullname ? $SITE->fullname : $SITE->shortname; $issuer['name'] = $SITE->fullname ? $SITE->fullname : $SITE->shortname;
} }
$issuer['url'] = $issuerurl->out(false); $issuer['url'] = $issuerurl->out(false);
$issuer['email'] = $CFG->badges_defaultissuercontact; $issuer['email'] = $sitebackpack->backpackemail ?? $CFG->badges_defaultissuercontact;
$issuer['@context'] = OPEN_BADGES_V2_CONTEXT; $issuer['@context'] = OPEN_BADGES_V2_CONTEXT;
$issuerid = new moodle_url('/badges/issuer_json.php'); $issuerid = new moodle_url('/badges/issuer_json.php');
$issuer['id'] = $issuerid->out(false); $issuer['id'] = $issuerid->out(false);