mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-53492 registration: use https://moodle.net as hub url

Browse Source
This commit is contained in:
Marina Glancy 2017-07-11 13:48:25 +08:00
parent 505bbe7cd6
commit 7d792aeee4
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/registration/forms.php
View File

@ -128,7 +128,7 @@ class hub_selector_form extends moodleform {
//remove moodle.org from the hub list
foreach ($hubs as $key => $hub) {
if ($hub['url'] == HUB_MOODLEORGHUBURL) {
if ($hub['url'] == HUB_MOODLEORGHUBURL || $hub['url'] == HUB_OLDMOODLEORGHUBURL) {
unset($hubs[$key]);
}
}

7
blocks/community/forms.php
View File

@ -109,6 +109,13 @@ class community_hub_search_form extends moodleform {
$mform->addElement('static', 'errorhub', '', $error);
}
// Hubdirectory returns old URL for the moodle.net hub, substitute it.
foreach ($hubs as $key => $hub) {
if ($hub['url'] === HUB_OLDMOODLEORGHUBURL) {
$hubs[$key]['url'] = HUB_MOODLEORGHUBURL;
}
}
//display list of registered on hub
$registrationmanager = new registration_manager();
$registeredhubs = $registrationmanager->get_registered_on_hubs();

29
lib/db/upgrade.php
View File

@ -2214,5 +2214,34 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017072000.02);
}
if ($oldversion < 2017072701.00) {
// If the site was previously registered with http://hub.moodle.org change the registration to
// point to https://moodle.net - this is the correct hub address using https protocol.
$oldhuburl = "http://hub.moodle.org";
$newhuburl = "https://moodle.net";
$cleanoldhuburl = preg_replace('/[^A-Za-z0-9_-]/i', '', $oldhuburl);
$cleannewhuburl = preg_replace('/[^A-Za-z0-9_-]/i', '', $newhuburl);
// Update existing registration.
$DB->execute("UPDATE {registration_hubs} SET hubname = ?, huburl = ? WHERE huburl = ?",
['Moodle.net', $newhuburl, $oldhuburl]);
// Update settings of existing registration.
$sqlnamelike = $DB->sql_like('name', '?');
$entries = $DB->get_records_sql("SELECT * FROM {config_plugins} where plugin=? and " . $sqlnamelike,
['hub', '%' . $DB->sql_like_escape('_' . $cleanoldhuburl)]);
foreach ($entries as $entry) {
$newname = substr($entry->name, 0, -strlen($cleanoldhuburl)) . $cleannewhuburl;
$DB->update_record('config_plugins', ['id' => $entry->id, 'name' => $newname]);
}
// Update published courses.
$DB->execute('UPDATE {course_published} SET huburl = ? WHERE huburl = ?', [$newhuburl, $oldhuburl]);
// Main savepoint reached.
upgrade_main_savepoint(true, 2017072701.00);
}
return true;
}

7
lib/moodlelib.php
View File

@ -488,13 +488,14 @@ define('HOMEPAGE_USER', 2);
/**
* Hub directory url (should be moodle.org)
*/
define('HUB_HUBDIRECTORYURL', "http://hubdirectory.moodle.org");
define('HUB_HUBDIRECTORYURL', "https://hubdirectory.moodle.org");
/**
* Moodle.org url (should be moodle.org)
* Moodle.net url (should be moodle.net)
*/
define('HUB_MOODLEORGHUBURL', "http://hub.moodle.org");
define('HUB_MOODLEORGHUBURL', "https://moodle.net");
define('HUB_OLDMOODLEORGHUBURL', "http://hub.moodle.org");
/**
* Moodle mobile app service name

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2017072700.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2017072701.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.