MDL-68060 registration: Improve the sites directory location check

This allows to define the custom HUB_MOODLEORGHUBURL with HTTP Basic Auth credentials so that the registration features can be tested against our staging site.
moodle · Feb 26, 2020 · 5aea4d9 · 5aea4d9
1 parent 199ff6c
commit 5aea4d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/admin/registration/confirmregistration.php b/admin/registration/confirmregistration.php
@@ -45,7 +45,7 @@
 
 admin_externalpage_setup('registrationmoodleorg');
 
-if ($url !== HUB_MOODLEORGHUBURL) {
+if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
     // Allow other plugins to confirm registration on custom hubs. Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');

diff --git a/admin/registration/renewregistration.php b/admin/registration/renewregistration.php
@@ -39,7 +39,7 @@
 
 admin_externalpage_setup('registrationmoodleorg');
 
-if ($url !== HUB_MOODLEORGHUBURL) {
+if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
     // Allow other plugins to renew registration on custom hubs. Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');