From 343534a855907b90477a1e62c9284caa30273d08 Mon Sep 17 00:00:00 2001 From: Yuliya Bozhko Date: Wed, 18 Dec 2013 10:42:25 +1300 Subject: [PATCH] MDL-41810 badges: Remove hardcoded references to backpack.openbadges.org --- badges/backpack_form.php | 6 +++--- badges/backpackconnect.php | 5 +++-- badges/lib/backpacklib.php | 6 ------ badges/upgrade.txt | 3 +++ lib/badgeslib.php | 11 ++++++++--- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/badges/backpack_form.php b/badges/backpack_form.php index ad9d427feb1..1941738e248 100644 --- a/badges/backpack_form.php +++ b/badges/backpack_form.php @@ -45,7 +45,7 @@ class edit_backpack_form extends moodleform { $mform->addElement('html', html_writer::tag('span', '', array('class' => 'notconnected', 'id' => 'connection-error'))); $mform->addElement('header', 'backpackheader', get_string('backpackconnection', 'badges')); $mform->addHelpButton('backpackheader', 'backpackconnection', 'badges'); - $mform->addElement('static', 'url', get_string('url'), BADGE_BACKPACKURL); + $mform->addElement('static', 'url', get_string('url'), 'http://' . BADGE_BACKPACKURL); $status = html_writer::tag('span', get_string('notconnected', 'badges'), array('class' => 'notconnected', 'id' => 'connection-status')); $mform->addElement('static', 'status', get_string('status'), $status); @@ -67,7 +67,7 @@ class edit_backpack_form extends moodleform { $mform->addElement('hidden', 'userid', $USER->id); $mform->setType('userid', PARAM_INT); - $mform->addElement('hidden', 'backpackurl', BADGE_BACKPACKURL); + $mform->addElement('hidden', 'backpackurl', 'http://' . BADGE_BACKPACKURL); $mform->setType('backpackurl', PARAM_URL); } @@ -118,7 +118,7 @@ class edit_collections_form extends moodleform { $mform->addElement('header', 'backpackheader', get_string('backpackconnection', 'badges')); $mform->addHelpButton('backpackheader', 'backpackconnection', 'badges'); - $mform->addElement('static', 'url', get_string('url'), BADGE_BACKPACKURL); + $mform->addElement('static', 'url', get_string('url'), 'http://' . BADGE_BACKPACKURL); $status = html_writer::tag('span', get_string('connected', 'badges'), array('class' => 'connected')); $mform->addElement('static', 'status', get_string('status'), $status); diff --git a/badges/backpackconnect.php b/badges/backpackconnect.php index bbcc78f64d8..e7616ec996f 100644 --- a/badges/backpackconnect.php +++ b/badges/backpackconnect.php @@ -29,6 +29,7 @@ define('AJAX_SCRIPT', true); require_once(dirname(dirname(__FILE__)) . '/config.php'); require_once($CFG->dirroot . '/badges/lib/backpacklib.php'); require_once($CFG->libdir . '/filelib.php'); +require_once($CFG->libdir . '/badgeslib.php'); require_sesskey(); require_login(); @@ -86,7 +87,7 @@ if (!isset($data->status) || $data->status != 'okay') { // Make sure email matches a backpack. $check = new stdClass(); -$check->backpackurl = BADGE_BACKPACKURL; +$check->backpackurl = 'http://' . BADGE_BACKPACKURL; $check->email = $data->email; $bp = new OpenBadgesBackpackHandler($check); @@ -105,7 +106,7 @@ if (isset($request->status) && $request->status == 'missing') { $obj = new stdClass(); $obj->userid = $USER->id; $obj->email = $data->email; -$obj->backpackurl = BADGE_BACKPACKURL; +$obj->backpackurl = 'http://' . BADGE_BACKPACKURL; $obj->backpackuid = $backpackuid; $obj->autosync = 0; $obj->password = ''; diff --git a/badges/lib/backpacklib.php b/badges/lib/backpacklib.php index 6e6b3da55f0..4ecf084257e 100644 --- a/badges/lib/backpacklib.php +++ b/badges/lib/backpacklib.php @@ -26,12 +26,6 @@ defined('MOODLE_INTERNAL') || die(); -/* - * URL of backpack. Currently only the Open Badges backpack - * is supported. - */ -define('BADGE_BACKPACKURL', 'http://backpack.openbadges.org'); - global $CFG; require_once($CFG->libdir . '/filelib.php'); diff --git a/badges/upgrade.txt b/badges/upgrade.txt index 1a48ffd9cfc..e69de465102 100644 --- a/badges/upgrade.txt +++ b/badges/upgrade.txt @@ -10,3 +10,6 @@ information provided here is intended especially for developers. * New optional parameter $filtered in review() allows to indicate that some expensive checks can be skipped if the list of users has been initially filtered based on met criteria. + +* BADGE_BACKPACKURL constant has been moved from badges/lib/backpacklib.php to lib/badgeslib.php, and URI scheme + name ('http://') has been removed. diff --git a/lib/badgeslib.php b/lib/badgeslib.php index 8d1bf9e5fe3..7cd790406fd 100644 --- a/lib/badgeslib.php +++ b/lib/badgeslib.php @@ -93,6 +93,11 @@ define('BADGE_MESSAGE_DAILY', 2); define('BADGE_MESSAGE_WEEKLY', 3); define('BADGE_MESSAGE_MONTHLY', 4); +/* + * URL of backpack. Currently only the Open Badges backpack is supported. + */ +define('BADGE_BACKPACKURL', 'backpack.openbadges.org'); + /** * Class that represents badge. * @@ -1145,7 +1150,7 @@ function badges_check_backpack_accessibility() { // Using fake assertion url to check whether backpack can access the web site. $fakeassertion = new moodle_url('/badges/assertion.php', array('b' => 'abcd1234567890')); - // Curl request to http://backpack.openbadges.org/baker. + // Curl request to backpack baker. $curl = new curl(); $options = array( 'FRESH_CONNECT' => true, @@ -1153,7 +1158,7 @@ function badges_check_backpack_accessibility() { 'HEADER' => 0, 'CONNECTTIMEOUT' => 2, ); - $location = 'http://backpack.openbadges.org/baker'; + $location = 'http://' . BADGE_BACKPACKURL . '/baker'; $out = $curl->get($location, array('assertion' => $fakeassertion->out(false)), $options); $data = json_decode($out); @@ -1222,7 +1227,7 @@ function badges_setup_backpack_js() { if (!empty($CFG->badges_allowexternalbackpack)) { $PAGE->requires->string_for_js('error:backpackproblem', 'badges'); $protocol = (strpos($CFG->wwwroot, 'https://') === 0) ? 'https://' : 'http://'; - $PAGE->requires->js(new moodle_url($protocol . 'backpack.openbadges.org/issuer.js'), true); + $PAGE->requires->js(new moodle_url($protocol . BADGE_BACKPACKURL . '/issuer.js'), true); $PAGE->requires->js('/badges/backpack.js', true); } }