Permalink
Browse files

Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/…

…moodle
  • Loading branch information...
dmonllao committed Aug 1, 2017
2 parents 5c5b130 + 5ac72c9 commit 2c04945c586608aea8394665f7c01e82fd43d2d8
@@ -128,7 +128,7 @@ public function definition() {
//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]);
}
}
@@ -784,7 +784,7 @@ protected function registration_warning($registered) {
if (has_capability('moodle/site:config', context_system::instance())) {
$registerbutton = $this->single_button(new moodle_url('/admin/registration/register.php',
array('huburl' => HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.org')),
array('huburl' => HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.net')),
get_string('register', 'admin'));
$str = 'registrationwarning';
} else {
@@ -11,7 +11,7 @@
$ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));
$ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'),
"$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org&sesskey=" . sesskey()));
"$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.net&sesskey=" . sesskey()));
$ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'),
"$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true));
$ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'),
@@ -109,6 +109,13 @@ public function definition() {
$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();
@@ -2214,6 +2214,7 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017072000.02);
}
<<<<<<< HEAD
if ($oldversion < 2017072700.01) {
// Changing nullability of field email on table oauth2_system_account to null.
$table = new xmldb_table('oauth2_system_account');
@@ -2226,5 +2227,34 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017072700.01);
}
if ($oldversion < 2017072700.02) {
// 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, 2017072700.02);
}
return true;
}
@@ -488,13 +488,14 @@
/**
* 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
@@ -41,7 +41,7 @@
$string['nopermissiontomanagedevices'] = 'You don\'t have permission to manage devices.';
$string['notconfigured'] = 'The Airnotifier server hasn\'t been configured so Airnotifier messages cannot be sent';
$string['pluginname'] = 'Mobile';
$string['sitemustberegistered'] = 'In order to use the public Airnotifier instance you must register your site with Moodle.org';
$string['sitemustberegistered'] = 'In order to use the public Airnotifier instance you must register your site with Moodle.net';
$string['showhide'] = 'Enable/disable the device.';
$string['requestaccesskey'] = 'Request access key';
$string['unknowndevice'] = 'Unknown device';
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2017072700.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2017072700.02; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.

0 comments on commit 2c04945

Please sign in to comment.