2FA: Add usernames to QR codes

sections/user/2fa.php

@@ -117,7 +117,7 @@ View::show_header("Two-factor Authentication Settings", 'u2f');
           <p>To enable it, add the secret key below to your 2FA client either manually or by scanning the QR code, then enter a verification code generated by your 2FA client and click the "Enable 2FA" button.</p>
           <form method="post">
             <input type="text" size="60" name="twofasecret" id="twofasecret" value="<?=$TwoFASecret?>" readonly><br>
-            <img src="<?=$TwoFA->getQRCodeImageAsDataUri(SITE_NAME, $TwoFASecret)?>"><br>
+            <img src="<?=$TwoFA->getQRCodeImageAsDataUri(SITE_NAME.':'.$LoggedUser['Username'], $TwoFASecret)?>"><br>
             <input type="text" size="20" maxlength="6" pattern="[0-9]{0,6}" name="twofa" id="twofa" placeholder="Verification Code" autocomplete="off"><br><br>
             <button type="submit" name="type" value="2FA-E">Enable 2FA</button>
           </form>
@@ -130,7 +130,7 @@ View::show_header("Two-factor Authentication Settings", 'u2f');
           <input type="hidden" name="type" value="2FA-D">
           <p>2FA is enabled for this account with the following secret:</p>
           <input type="text" size="20" name="twofasecret" id="twofasecret" value="<?=$TwoFASecret?>" readonly><br>
-          <img src="<?=$TwoFA->getQRCodeImageAsDataUri(SITE_NAME, $TwoFASecret)?>"><br><br>
+          <img src="<?=$TwoFA->getQRCodeImageAsDataUri(SITE_NAME.':'.$LoggedUser['Username'], $TwoFASecret)?>"><br><br>
           <p>To disable 2FA, click the button below.</p>
           <button type="submit" name="type" value="2FA-D">Disable 2FA</button>
         </form>
@@ -162,11 +162,11 @@ View::show_header("Two-factor Authentication Settings", 'u2f');
           <input type="hidden" name="u2f-sigs" value='<?=json_encode($U2FSigs)?>'>
           <input type="hidden" name="u2f-response">
           <input type="hidden" value="U2F-E">
+          <p>Universal Two Factor is enabled.</p>
+          <p>To add an additional U2F token, plug it in and press the button on it</p>
+          <p>To disable U2F completely and deregister all tokens, press the button below</p>
+          <button type="submit" name="type" value="U2F-D">Disable U2F</button>
         </form>
-        <p>Universal Two Factor is enabled.</p>
-        <p>To add an additional U2F token, plug it in and press the button on it</p>
-        <p>To disable U2F completely and deregister all tokens, press the button below</p>
-        <button type="submit" name="type" value="U2F-D">Disable U2F</button>
 <?    } ?>
       </div>
     </div>