simplesamlphp / simplesamlphp-module-webauthn

www/webauthn.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Utils;
-use SimpleSAML\XHTML\Template;;
+use SimpleSAML\XHTML\Template; ;
 
 $globalConfig = Configuration::getInstance();
 
@@ -58,7 +58,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];
 }
 $frontendData['usernameEncoded'] = $usernameEncoded;

templates/webauthn.php

Spacing +11 added lines, -11 removed lines

@@ -9,20 +9,20 @@ 
 
     <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'/>
@@ -38,22 +38,22 @@ 
                 value='<?php echo htmlspecialchars($this->t('{webauthn:webauthn:newTokenDefaultName}')); ?> <?php echo htmlspecialchars((new DateTime("now", new DateTimeZone("Europe/Luxembourg")))->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'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:removePrefix}')); ?> &quot;<?php echo htmlspecialchars($this->data['token'][3]); ?>&quot;</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'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:noChange}')); ?></button>
             </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'/>
@@ -63,7 +63,7 @@ 
             <!-- ignoring <input type='hidden' id='userhandle' name='userhandle' value='someuser'/> -->
             <input type='hidden' id='type' name='type' value='something'/>
             <input type='hidden' id='operation' name='operation' value='AUTH'/>
-            <input type='checkbox' id='credentialChange' name='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): ?>
+            <input type='checkbox' id='credentialChange' name='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}')); ?>

Braces +10 added lines, -4 removed lines

@@ -15,8 +15,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>
@@ -65,8 +68,11 @@ 
             <input type='hidden' id='operation' name='operation' value='AUTH'/>
             <input type='checkbox' id='credentialChange' name='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; ?></input><br/>
         <button type='button' id='authformSubmit'><?php echo htmlspecialchars($this->t('{webauthn:webauthn:authTokenButton}')); ?></button>
     </form>