fix: corrected possible type error, closes #2930

thorsten · Apr 30, 2024 · f6365c5 · f6365c5
1 parent be50862
commit f6365c5
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/phpmyfaq/ucp.php b/phpmyfaq/ucp.php
@@ -52,15 +52,21 @@
         $gravatarImg = '';
     }
 
-    $tfa = new TwoFactor($faqConfig);
-    $secret = $tfa->getSecret(CurrentUser::getFromSession($faqConfig));
-    if ('' === $secret) {
-        try {
-            $secret = $tfa->generateSecret();
-        } catch (TwoFactorAuthException $e) {
-            $faqConfig->getLogger()->error('Cannot generate 2FA secret: ' . $e->getMessage());
+    $qrCode = '';
+    try {
+        $tfa = new TwoFactor($faqConfig);
+        $secret = $tfa->getSecret(CurrentUser::getFromSession($faqConfig));
+        if ('' === $secret) {
+            try {
+                $secret = $tfa->generateSecret();
+            } catch (TwoFactorAuthException $e) {
+                $faqConfig->getLogger()->error('Cannot generate 2FA secret: ' . $e->getMessage());
+            }
+            $tfa->saveSecret($secret);
         }
-        $tfa->saveSecret($secret);
+        $qrCode = $tfa->getQrCode($secret);
+    } catch (TwoFactorAuthException $e) {
+        // handle exception
     }
 
     $template->parse(
@@ -87,7 +93,7 @@
             'msgTwofactorConfig' => Translation::get('msgTwofactorConfig'),
             'msgTwofactorConfigModelTitle' => Translation::get('msgTwofactorConfigModelTitle'),
             'twofactor_secret' => $secret,
-            'qr_code_secret' => $tfa->getQrCode($secret),
+            'qr_code_secret' => $qrCode,
             'qr_code_secret_alt' => Translation::get('qr_code_secret_alt'),
             'msgTwofactorNewSecret' => Translation::get('msgTwofactorNewSecret'),
         ]