simplesamlphp / simplesamlphp-module-webauthn

templates/webauthn.tpl.php

Spacing +11 added lines, -11 removed lines

@@ -9,21 +9,21 @@ 
 
     <h1><?php echo htmlspecialchars($this->t('{webauthn:webauthn:heading1}')); ?></h1>
     <h2><?php echo htmlspecialchars($this->t('{webauthn:webauthn:accountEnabled}')); ?></h2>
-    <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) > 0): ?>
+    <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) > 0) : ?>
         <div id="currentTokens">
             <span id='tokencaption'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:tokenList}')); ?></span>
             <ul>
-                <?php foreach($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
-                    <?php if($this->data['FIDO2AuthSuccessful'] == false or $this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
+                <?php foreach ($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
+                    <?php if ($this->data['FIDO2AuthSuccessful'] == false or $this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
                         <li class='othertoken'><?php echo htmlspecialchars($this->data['token'][3]); ?></li>
                     <?php else: ?>
                         <li class='currenttoken'><?php echo htmlspecialchars($this->data['token'][3]); ?> <?php echo htmlspecialchars($this->t('{webauthn:webauthn:currentToken}')); ?></li>
                     <?php endif; ?>
-                <?php endforeach;?>
+                <?php endforeach; ?>
             </ul>
         </div>
     <?php endif; ?>
-    <?php if((isset($this->data['regURL'])?((is_array($this->data['regURL']) || $this->data['regURL'] instanceof Countable)?count($this->data['regURL']):strlen($this->data['regURL'])):0) > 0): ?>
+    <?php if ((isset($this->data['regURL']) ? ((is_array($this->data['regURL']) || $this->data['regURL'] instanceof Countable) ?count($this->data['regURL']) : strlen($this->data['regURL'])) : 0) > 0) : ?>
         <form id='regform' method='POST' action='<?php echo $this->data['regURL']; ?>'>
             <input type='hidden' id='resp' name='response_id' value='0'/>
             <input type='hidden' id='data' name='attestation_client_data_json' value='nix'/>
@@ -36,9 +36,9 @@ 
                 value='<?php echo htmlspecialchars($this->t('{webauthn:webauthn:newTokenDefaultName}')); ?> <?php echo htmlspecialchars((new DateTime("now"))->format('Y-m-d')); ?>' />
         </form>
         <div class='space'></div>
-        <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) > 0): ?>
-            <?php foreach($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
-                <?php if($this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
+        <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) > 0) : ?>
+            <?php foreach ($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
+                <?php if ($this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
                     <form class='deleteform' id='delete-<?php echo htmlspecialchars($index); ?>' method='POST' action='<?php echo $this->data['delURL']; ?>'>
                         <input type='hidden' id='credId-<?php echo htmlspecialchars($index); ?>' name='credId' value='<?php echo htmlspecialchars($this->data['token'][0]); ?>'/>
                         <button type='submit' id='submit-<?php echo htmlspecialchars($index); ?>' name='submit' value='DELETE'>
@@ -46,7 +46,7 @@ 
                         </button>
                     </form>
                 <?php endif; ?>
-            <?php endforeach;?>
+            <?php endforeach; ?>
             <div class='space'></div>
             <form id='nevermind' method='POST' action='<?php echo $this->data['delURL']; ?>'>
                 <button type='submit' id='submit-nevermind' name='submit' value='NEVERMIND'>
@@ -55,7 +55,7 @@ 
             </form>
         <?php endif; ?>
     <?php endif; ?>
-    <?php if((isset($this->data['authURL'])?((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable)?count($this->data['authURL']):strlen($this->data['authURL'])):0) > 0): ?>
+    <?php if ((isset($this->data['authURL']) ? ((is_array($this->data['authURL']) || $this->data['authURL'] instanceof Countable) ?count($this->data['authURL']) : strlen($this->data['authURL'])) : 0) > 0) : ?>
         <form id='authform' method='POST' action='<?php echo $this->data['authURL']; ?>'>
             <input type='hidden' id='resp' name='response_id' value='0'/>
             <input type='hidden' id='data_raw_b64' name='client_data_raw' value='garnix'/>
@@ -67,7 +67,7 @@ 
             <input type='hidden' id='operation' name='operation' value='AUTH'/>
             <input type='checkbox' id='credentialChange' name='credentialChange'>
             <label for='credentialChange'>
-                <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) < 2): ?>
+                <?php if ((isset($this->data['FIDO2Tokens']) ? ((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable) ?count($this->data['FIDO2Tokens']) : strlen($this->data['FIDO2Tokens'])) : 0) < 2) : ?>
                     <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsAdd}')); ?>
                 <?php else: ?>
                     <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}')); ?>

Braces +10 added lines, -4 removed lines

@@ -16,8 +16,11 @@ 
                 <?php foreach($this->data['FIDO2Tokens'] as $index => $this->data['token']): ?>
                     <?php if($this->data['FIDO2AuthSuccessful'] == false or $this->data['FIDO2AuthSuccessful'] != $this->data['token'][0]): ?>
                         <li class='othertoken'><?php echo htmlspecialchars($this->data['token'][3]); ?></li>
-                    <?php else: ?>
-                        <li class='currenttoken'><?php echo htmlspecialchars($this->data['token'][3]); ?> <?php echo htmlspecialchars($this->t('{webauthn:webauthn:currentToken}')); ?></li>
+                    <?php else {
+    : ?>
+                        <li class='currenttoken'><?php echo htmlspecialchars($this->data['token'][3]);
+}
+?> <?php echo htmlspecialchars($this->t('{webauthn:webauthn:currentToken}')); ?></li>
                     <?php endif; ?>
                 <?php endforeach;?>
             </ul>
@@ -69,8 +72,11 @@ 
             <label for='credentialChange'>
                 <?php if((isset($this->data['FIDO2Tokens'])?((is_array($this->data['FIDO2Tokens']) || $this->data['FIDO2Tokens'] instanceof Countable)?count($this->data['FIDO2Tokens']):strlen($this->data['FIDO2Tokens'])):0) < 2): ?>
                     <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsAdd}')); ?>
-                <?php else: ?>
-                    <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}')); ?>
+                <?php else {
+    : ?>
+                    <?php echo htmlspecialchars($this->t('{webauthn:webauthn:wantsModification}'));
+}
+?>
                 <?php endif; ?>
             </label><br/>
             <button type='button' id='authformSubmit'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:authTokenButton}')); ?></button>

www/managetoken.php

Switch Indentation +22 added lines, -22 removed lines

@@ -29,28 +29,28 @@
     throw new Exception("Attempt to access the token management page unauthenticated.");
 }
 switch ($_POST['submit']) {
-    case "NEVERMIND":
-        Auth\ProcessingChain::resumeProcessing($state);
-        break;
-    case "DELETE":
-        if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) {
-            throw new Exception("Attempt to delete the currently used credential despite UI preventing this.");
-        }
-        $store = $state['webauthn:store'];
-        $store->deleteTokenData($_POST['credId']);
-        if (array_key_exists('Registration', $state)) {
-            foreach ($state['FIDO2Tokens'] as $key => $value) {
-                if ($state['FIDO2Tokens'][$key][0] == $_POST['credId']) {
-                    unset($state['FIDO2Tokens'][$key]);
-                    break;
-                }
+        case "NEVERMIND":
+            Auth\ProcessingChain::resumeProcessing($state);
+            break;
+        case "DELETE":
+            if ($state['FIDO2AuthSuccessful'] == $_POST['credId']) {
+                throw new Exception("Attempt to delete the currently used credential despite UI preventing this.");
             }
+            $store = $state['webauthn:store'];
+            $store->deleteTokenData($_POST['credId']);
+            if (array_key_exists('Registration', $state)) {
+                foreach ($state['FIDO2Tokens'] as $key => $value) {
+                    if ($state['FIDO2Tokens'][$key][0] == $_POST['credId']) {
+                        unset($state['FIDO2Tokens'][$key]);
+                        break;
+                    }
+                }
 
-            StaticProcessHelper::saveStateAndRedirect($state);
-        } else {
-            Auth\ProcessingChain::resumeProcessing($state);
-        }
-        break;
-    default:
-        throw new Exception("Unknown submit button state.");
+                StaticProcessHelper::saveStateAndRedirect($state);
+            } else {
+                Auth\ProcessingChain::resumeProcessing($state);
+            }
+            break;
+        default:
+            throw new Exception("Unknown submit button state.");
 }

www/webauthn.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 $frontendData = [];
 $frontendData['challengeEncoded'] = $challengeEncoded;
 $frontendData['state'] = [];
-foreach (['Source', 'FIDO2Scope','FIDO2Username','FIDO2Displayname','requestTokenModel'] as $stateItem) {
+foreach (['Source', 'FIDO2Scope', 'FIDO2Username', 'FIDO2Displayname', 'requestTokenModel'] as $stateItem) {
     $frontendData['state'][$stateItem] = $state[$stateItem];
 }