Upgrade: Adopt changes from MDL-81960 and MDL-82183 and use new classes.

lernlink · Jan 8, 2025 · f3c0d58 · f3c0d58
1 parent 888d449
commit f3c0d58
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2024-11-23 - Upgrade: Adopt changes from MDL-81960 and MDL-82183 and use new classes.
 * 2024-11-23 - Prepare compatibility for Moodle 4.5.
 
 ### v4.4-r2

diff --git a/locallib.php b/locallib.php
@@ -116,12 +116,12 @@ function tool_directsso_get_usable_urls() {
     }
 
     // Compose the HTML code.
-    $html = html_writer::start_tag('ul');
+    $html = \core\output\html_writer::start_tag('ul');
     foreach ($urls as $u) {
-        $url = new moodle_url('/admin/tool/directsso/login.php', $u);
-        $html .= html_writer::tag('li', html_writer::link($url, $url->out()));
+        $url = new \core\url('/admin/tool/directsso/login.php', $u);
+        $html .= \core\output\html_writer::tag('li', \core\output\html_writer::link($url, $url->out()));
     }
-    $html .= html_writer::end_tag('ul');
+    $html .= \core\output\html_writer::end_tag('ul');
 
     // Return.
     return $html;

diff --git a/login.php b/login.php
@@ -37,13 +37,13 @@
 
 // Set up page.
 $PAGE->set_context(context_system::instance());
-$PAGE->set_url(new moodle_url('/admin/tool/directsso/login.php', ['auth' => $auth, 'wantspage' => $wantspage]));
+$PAGE->set_url(new \core\url('/admin/tool/directsso/login.php', ['auth' => $auth, 'wantspage' => $wantspage]));
 
 // Get plugin config.
 $config = get_config('tool_directsso');
 
 // Prepare login page URL as fallback.
-$loginpageurl = new moodle_url('/login/index.php');
+$loginpageurl = new \core\url('/login/index.php');
 
 // Prepare wantsURL based on the submitted wantspage parameter.
 $allowedwantspages = explode(',', $config->allowedwantspages);
@@ -53,7 +53,7 @@
         // If the admin allowed this wantspage target.
         if (in_array(TOOL_DIRECTSSO_WANTSPAGE_FRONTPAGE, $allowedwantspages)) {
             // Remember wantsurl.
-            $wantsurl = new moodle_url('/?redirect=0');
+            $wantsurl = new \core\url('/?redirect=0');
             break;
 
             // Otherwise.
@@ -67,7 +67,7 @@
         // If the admin allowed this wantspage target.
         if (in_array(TOOL_DIRECTSSO_WANTSPAGE_DASHBOARD, $allowedwantspages)) {
             // Remember wantsurl.
-            $wantsurl = new moodle_url('/my');
+            $wantsurl = new \core\url('/my');
             break;
 
             // Otherwise.
@@ -86,7 +86,7 @@
             // If a valid course ID was given.
             if (!empty($courseid) && $DB->record_exists('course', ['id' => $courseid])) {
                 // Remember wantsurl.
-                $wantsurl = new moodle_url('/course/view.php', ['id' => $courseid]);
+                $wantsurl = new \core\url('/course/view.php', ['id' => $courseid]);
                 break;
 
                 // Otherwise.
@@ -116,15 +116,15 @@
         $issuerid = required_param('id', PARAM_INT);
 
         // And the page has one more parameter.
-        $PAGE->set_url(new moodle_url('/admin/tool/directsso/login.php',
+        $PAGE->set_url(new \core\url('/admin/tool/directsso/login.php',
                 ['auth' => $auth, 'id' => $issuerid, 'wantspage' => $wantspage]));
 
         // If the admin allowed this auth method.
         if (in_array('oauth2', $allowedauths)) {
             // Compose the URl, add the sesskey (as OAuth2 expects it together with the wantsurl)
             // and redirect to the OAuth login page.
             $redirectparams = ['wantsurl' => $wantsurl, 'sesskey' => sesskey(), 'id' => $issuerid];
-            $redirecturl = new moodle_url('/auth/oauth2/login.php', $redirectparams);
+            $redirecturl = new \core\url('/auth/oauth2/login.php', $redirectparams);
             redirect($redirecturl);
 
             // Otherwise.