MDL-84275 factor_totp: format site fullname for authenticator setup.

paulholden · Jan 21, 2025 · 64d6d74 · 64d6d74
1 parent e6c92dc
commit 64d6d74
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/admin/tool/mfa/factor/totp/classes/factor.php b/admin/tool/mfa/factor/totp/classes/factor.php
@@ -34,6 +34,7 @@
 use OTPHP\TOTP;
 use stdClass;
 use core\clock;
+use core\context\system;
 use core\di;
 
 /**
@@ -90,7 +91,7 @@ public function __construct(string $name) {
     public function generate_totp_uri(string $secret): string {
         global $USER, $SITE, $CFG;
         $host = parse_url($CFG->wwwroot, PHP_URL_HOST);
-        $sitename = str_replace(':', '', $SITE->fullname);
+        $sitename = str_replace(':', '', format_string($SITE->fullname, true, ['context' => system::instance()]));
         $issuer = $sitename.' '.$host;
         $totp = TOTP::create($secret, clock: $this->clock);
         $totp->setLabel($USER->username);
@@ -190,13 +191,15 @@ public function setup_factor_form_definition_after_data(MoodleQuickForm $mform):
         $secret = wordwrap($secret, 4, ' ', true) . '</code>';
         $secret = \html_writer::tag('code', $secret);
 
+        $sitefullname = format_string($SITE->fullname, true, ['context' => system::instance()]);
+
         $manualtable = new \html_table();
         $manualtable->id = 'manualattributes';
         $manualtable->attributes['class'] = 'generaltable table table-bordered table-sm w-auto';
         $manualtable->attributes['style'] = 'width: auto;';
         $manualtable->data = [
             [get_string('setupfactor:key', 'factor_totp'), $secret],
-            [get_string('setupfactor:account', 'factor_totp'), "$SITE->fullname ($USER->username)"],
+            [get_string('setupfactor:account', 'factor_totp'), "{$sitefullname} ({$USER->username})"],
             [get_string('setupfactor:mode', 'factor_totp'), get_string('setupfactor:mode:timebased', 'factor_totp')],
         ];