MDL-83239 tool_mfa: do not assign plugin renderer to $OUTPUT

PhMemmel · Sep 23, 2024 · 59aba66 · 59aba66
1 parent da80258
commit 59aba66
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/admin/tool/mfa/action.php b/admin/tool/mfa/action.php
@@ -78,7 +78,6 @@
         }
 
         $PAGE->navbar->add(get_string('setupfactor', 'factor_'.$factor));
-        $OUTPUT = $PAGE->get_renderer('tool_mfa');
         $form = new setup_factor_form($currenturl, ['factorname' => $factor]);
 
         if ($form->is_submitted()) {
@@ -114,7 +113,6 @@
         }
 
         $PAGE->navbar->add(get_string('action:revoke', 'factor_'.$factor));
-        $OUTPUT = $PAGE->get_renderer('tool_mfa');
 
         $revokeparams = [
             'factorname' => $factorobject->get_display_name(),

diff --git a/admin/tool/mfa/classes/manager.php b/admin/tool/mfa/classes/manager.php
@@ -107,12 +107,12 @@ public static function display_debug_notification(): void {
             }
 
             // Status.
-            $OUTPUT = $PAGE->get_renderer('tool_mfa');
+            $renderer = $PAGE->get_renderer('tool_mfa');
             // If toggle has been flipped, fall to default pending badge.
             if ($weighttoggle) {
-                $state = $OUTPUT->get_state_badge('');
+                $state = $renderer->get_state_badge('');
             } else {
-                $state = $OUTPUT->get_state_badge($factor->get_state());
+                $state = $renderer->get_state_badge($factor->get_state());
             }
 
             $table->data[] = [
@@ -135,7 +135,7 @@ public static function display_debug_notification(): void {
             '',
             '<b>' . get_string('overall', 'tool_mfa') . '</b>',
             self::get_cumulative_weight(),
-            $OUTPUT->get_state_badge($finalstate),
+            $renderer->get_state_badge($finalstate),
         ];
 
         $html .= \html_writer::table($table);

diff --git a/admin/tool/mfa/user_preferences.php b/admin/tool/mfa/user_preferences.php
@@ -43,7 +43,7 @@
     $PAGE->navbar->add($node->get_content(), $node->action());
 }
 $PAGE->navbar->add(get_string('preferences:header', 'tool_mfa'), new \moodle_url('/admin/tool/mfa/user_preferences.php'));
-$OUTPUT = $PAGE->get_renderer('tool_mfa');
+$renderer = $PAGE->get_renderer('tool_mfa');
 
 echo $OUTPUT->header();
 if (!empty($action)) {
@@ -58,10 +58,9 @@
     }
 }
 
-echo $OUTPUT->active_factors();
-echo $OUTPUT->available_factors();
+echo $renderer->active_factors();
+echo $renderer->available_factors();
 
-$renderer = $PAGE->get_renderer('tool_mfa');
 echo $renderer->get_support_link();
 
 \tool_mfa\manager::display_debug_notification();