nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\Common\BlockCipher;
 use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS1.php

Unused Use Statements -2 removed lines

@@ -26,10 +26,8 @@
 
 use ParagonIE\ConstantTime\Base64;
 use ParagonIE\ConstantTime\Hex;
-use phpseclib\Crypt\AES;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
-use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;
 use phpseclib\Common\Functions\ASN1;
 

includes/libraries/Authentication/phpseclib/Net/SSH1.php

Unused Use Statements -1 removed lines

@@ -48,7 +48,6 @@
 
 namespace phpseclib\Net;
 
-use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
 use phpseclib\Crypt\TripleDES;

sources/items.queries.php

Unused Use Statements -1 removed lines

@@ -79,7 +79,6 @@
 // phpcrypt
 require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php';
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 // prepare Encryption class calls
 use \Defuse\Crypto\Crypto;

Braces +27 added lines, -11 removed lines

@@ -543,8 +543,11 @@ 
                                 )
                             );
                             // prepare display
-                            if (empty($tags)) $return_tags = "<span class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".strtolower($tag)."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".strtolower($tag)."</span></span>";
-                            else $return_tags .= "&nbsp;&nbsp;<span class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".strtolower($tag)."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".strtolower($tag)."</span></span>";
+                            if (empty($tags)) {
+                                $return_tags = "<span class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".strtolower($tag)."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".strtolower($tag)."</span></span>";
+                            } else {
+                                $return_tags .= "&nbsp;&nbsp;<span class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".strtolower($tag)."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".strtolower($tag)."</span></span>";
+                            }
                         }
                     }
 
@@ -765,8 +768,11 @@ 
                         // add roles for item
                         foreach (array_filter(explode(';', $dataReceived['restricted_to_roles'])) as $role) {
                             $role = explode("role_", $role);
-                            if (count($role) > 1) $role = $role[1];
-                            else $role = $role[0];
+                            if (count($role) > 1) {
+                                $role = $role[1];
+                            } else {
+                                $role = $role[0];
+                            }
                             DB::insert(
                                 prefix_table('restriction_to_roles'),
                                 array(
@@ -1314,8 +1320,11 @@ 
             $tags = "";
             $rows = DB::query("SELECT tag FROM ".prefix_table("tags")." WHERE item_id=%i", $_POST['id']);
             foreach ($rows as $record) {
-                if (empty($tags)) $tags = "<span style='' class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".$record['tag']."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".$record['tag']."</span></span>";
-                else $tags .= "&nbsp;&nbsp;<span style='' class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".$record['tag']."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".$record['tag']."</span></span>";
+                if (empty($tags)) {
+                    $tags = "<span style='' class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".$record['tag']."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".$record['tag']."</span></span>";
+                } else {
+                    $tags .= "&nbsp;&nbsp;<span style='' class='round-grey pointer tip' title='".addslashes($LANG['list_items_with_tag'])."' onclick='searchItemsWithTags(\"".$record['tag']."\")'><i class='fa fa-tag fa-sm'></i>&nbsp;<span class=\"item_tag\">".$record['tag']."</span></span>";
+                }
             }
 
             // TODO -> improve this check
@@ -1423,8 +1432,11 @@ 
                         $_POST['id']
                     );
                     foreach ($rows as $record) {
-                        if (empty($tmp)) $tmp = "<a class='round-grey' href='".$_SESSION['settings']['cpassman_url']."/index.php?page=kb&id=".$record['id']."'><i class='fa fa-map-pin fa-sm'></i>&nbsp;".$record['label']."</a>";
-                        else $tmp .= "&nbsp;<a class='round-grey' href='".$_SESSION['settings']['cpassman_url']."/index.php?page=kb&id=".$record['id']."'><i class='fa fa-map-pin fa-sm'></i>&nbsp;".$record['label']."</a>";
+                        if (empty($tmp)) {
+                            $tmp = "<a class='round-grey' href='".$_SESSION['settings']['cpassman_url']."/index.php?page=kb&id=".$record['id']."'><i class='fa fa-map-pin fa-sm'></i>&nbsp;".$record['label']."</a>";
+                        } else {
+                            $tmp .= "&nbsp;<a class='round-grey' href='".$_SESSION['settings']['cpassman_url']."/index.php?page=kb&id=".$record['id']."'><i class='fa fa-map-pin fa-sm'></i>&nbsp;".$record['label']."</a>";
+                        }
                     }
                     $arrData['links_to_kbs'] = $tmp;
                 }
@@ -2063,9 +2075,13 @@ 
                     $role,
                     $_POST['id']
                 );
-                if ($access['type'] == "R") array_push($arrTmp, 1);
-                else if ($access['type'] == "W") array_push($arrTmp, 0);
-                else array_push($arrTmp, 3);
+                if ($access['type'] == "R") {
+                    array_push($arrTmp, 1);
+                } else if ($access['type'] == "W") {
+                    array_push($arrTmp, 0);
+                } else {
+                    array_push($arrTmp, 3);
+                }
             }
             $accessLevel = min($arrTmp);
 //echo $_POST['id']." - ".$accessLevel." - ";

sources/main.functions.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
     require_once $_SESSION['settings']['cpassman_dir'] . '/includes/config/settings.php';
 }
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 
 // prepare Encryption class calls

Braces +56 added lines, -42 removed lines

@@ -309,18 +309,18 @@ 
         );
     } else if ($type == "decrypt") {
         // case if IV is empty
-        if (empty($iv))
-            return array(
+        if (empty($iv)) {
+                    return array(
                 'string' => "",
                 'error' => "ERR_ENCRYPTION_NOT_CORRECT"
             );
+        }
 
         // convert
         try {
             $string = testHex2Bin(trim($string));
             $iv = testHex2Bin($iv);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // error - $e->getMessage();
             return array(
                 'string' => "",
@@ -383,20 +383,15 @@ 
         } else if ($type === "decrypt") {
             $text = \Defuse\Crypto\Crypto::decrypt($message, $key);
         }
-    }
-    catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
+    } catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
         $err = "An attack! Either the wrong key was loaded, or the ciphertext has changed since it was created either corrupted in the database or intentionally modified by someone trying to carry out an attack.";
-    }
-    catch (Defuse\Crypto\Exception\BadFormatException $ex) {
+    } catch (Defuse\Crypto\Exception\BadFormatException $ex) {
         $err = $ex;
-    }
-    catch (Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
+    } catch (Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
         $err = $ex;
-    }
-    catch (Defuse\Crypto\Exception\CryptoException $ex) {
+    } catch (Defuse\Crypto\Exception\CryptoException $ex) {
         $err = $ex;
-    }
-    catch (Defuse\Crypto\Exception\IOException $ex) {
+    } catch (Defuse\Crypto\Exception\IOException $ex) {
         $err = $ex;
     }
 
@@ -454,11 +449,9 @@ 
         $protected_key = \Defuse\Crypto\KeyProtectedByPassword::loadFromAsciiSafeString($protected_key_encoded);
         $user_key = $protected_key->unlockKey($psk);
         $user_key_encoded = $user_key->saveToAsciiSafeString();
-    }
-    catch (Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
+    } catch (Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
         return "Error - Major issue as the encryption is broken.";
-    }
-    catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
+    } catch (Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) {
         return "Error - The saltkey is not the correct one.";
     }
 
@@ -1126,7 +1119,9 @@ 
     require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Email/Phpmailer/PHPMailerAutoload.php';
 
     // load PHPMailer
-    if (!isset($mail)) $mail = new PHPMailer();
+    if (!isset($mail)) {
+        $mail = new PHPMailer();
+    }
     // send to user
     $mail->setLanguage("en", "../includes/libraries/Email/Phpmailer/language/");
     $mail->SMTPDebug = 0; //value 1 can be used to debug
@@ -1195,7 +1190,9 @@ 
 
 function isUTF8($string)
 {
-    if (is_array($string) === true) $string = $string['string'];
+    if (is_array($string) === true) {
+        $string = $string['string'];
+    }
     return preg_match(
         '%^(?:
         [\x09\x0A\x0D\x20-\x7E] # ASCII
@@ -1311,12 +1308,24 @@ 
     $pwgen = new Encryption\PwGen\pwgen();
 
     // init
-    if(!empty($size)) $pwgen->setLength($size);
-    if(!empty($secure)) $pwgen->setSecure($secure);
-    if(!empty($numerals)) $pwgen->setNumerals($numerals);
-    if(!empty($capitalize)) $pwgen->setCapitalize($capitalize);
-    if(!empty($ambiguous)) $pwgen->setAmbiguous($ambiguous);
-    if(!empty($symbols)) $pwgen->setSymbols($symbols);
+    if(!empty($size)) {
+        $pwgen->setLength($size);
+    }
+    if(!empty($secure)) {
+        $pwgen->setSecure($secure);
+    }
+    if(!empty($numerals)) {
+        $pwgen->setNumerals($numerals);
+    }
+    if(!empty($capitalize)) {
+        $pwgen->setCapitalize($capitalize);
+    }
+    if(!empty($ambiguous)) {
+        $pwgen->setAmbiguous($ambiguous);
+    }
+    if(!empty($symbols)) {
+        $pwgen->setSymbols($symbols);
+    }
 
     // generate and send back
     return $pwgen->generate();
@@ -1345,7 +1354,9 @@ 
 {
     global $server, $user, $pass, $database, $pre, $port, $encoding;
 
-    if (empty($who)) $who = get_client_ip_server();
+    if (empty($who)) {
+        $who = get_client_ip_server();
+    }
 
     // include librairies & connect to DB
     require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
@@ -1415,20 +1426,21 @@ 
  */
 function get_client_ip_server() {
     $ipaddress = '';
-    if (getenv('HTTP_CLIENT_IP'))
-        $ipaddress = getenv('HTTP_CLIENT_IP');
-    else if(getenv('HTTP_X_FORWARDED_FOR'))
-        $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-    else if(getenv('HTTP_X_FORWARDED'))
-        $ipaddress = getenv('HTTP_X_FORWARDED');
-    else if(getenv('HTTP_FORWARDED_FOR'))
-        $ipaddress = getenv('HTTP_FORWARDED_FOR');
-    else if(getenv('HTTP_FORWARDED'))
-        $ipaddress = getenv('HTTP_FORWARDED');
-    else if(getenv('REMOTE_ADDR'))
-        $ipaddress = getenv('REMOTE_ADDR');
-    else
-        $ipaddress = 'UNKNOWN';
+    if (getenv('HTTP_CLIENT_IP')) {
+            $ipaddress = getenv('HTTP_CLIENT_IP');
+    } else if(getenv('HTTP_X_FORWARDED_FOR')) {
+            $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
+    } else if(getenv('HTTP_X_FORWARDED')) {
+            $ipaddress = getenv('HTTP_X_FORWARDED');
+    } else if(getenv('HTTP_FORWARDED_FOR')) {
+            $ipaddress = getenv('HTTP_FORWARDED_FOR');
+    } else if(getenv('HTTP_FORWARDED')) {
+            $ipaddress = getenv('HTTP_FORWARDED');
+    } else if(getenv('REMOTE_ADDR')) {
+            $ipaddress = getenv('REMOTE_ADDR');
+    } else {
+            $ipaddress = 'UNKNOWN';
+    }
 
     return $ipaddress;
 }
@@ -1495,7 +1507,9 @@ 
         $x = 0;
         $bFound = false;
         foreach($data as $line) {
-            if (stristr($line, ");")) break;
+            if (stristr($line, ");")) {
+                break;
+            }
             if (stristr($line, "'".$field."' => '")) {
                 $data[$x] = "    '".$field."' => '".$value."',\n";
                 $bFound = true;

profile.php

Braces +5 added lines, -2 removed lines

@@ -95,8 +95,10 @@ 
       <li class="menu_150" style="padding:4px; text-align:left;"><i class="fa fa-bars fa-fw"></i>&nbsp;'.$LANG['admin_actions_title'].'
          <ul class="menu_250" style="text-align:left;">
             <li id="but_pickfiles_photo"><i class="fa fa-camera fa-fw"></i> &nbsp;'.$LANG['upload_new_avatar'].'</li>';
-            if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) echo '
+            if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) {
+                echo '
             <li id="but_change_password"><i class="fa fa-key fa-fw"></i> &nbsp;'.$LANG['index_change_pw'].'</li>';
+            }
             echo '
             <li id="but_change_psk"><i class="fa fa-lock fa-fw"></i> &nbsp;'.$LANG['menu_title_new_personal_saltkey'].'</li>
             <li id="but_reset_psk"><i class="fa fa-eraser fa-fw"></i> &nbsp;'.$LANG['personal_saltkey_lost'].'</li>
@@ -157,7 +159,7 @@ 
     <div id="filelist_photo" style="display:none;"></div>';
 
 // if DUOSecurity enabled then changing PWD is not allowed
-if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0)
+if (!isset($_SESSION['settings']['duo']) || $_SESSION['settings']['duo'] == 0) {
    echo '
     <div id="div_change_password" style="display:none; padding:5px;" class="ui-widget ui-state-default">
         <div style="text-align:center;margin:5px;padding:3px;" id="change_pwd_complexPw" class="ui-widget ui-state-active ui-corner-all"></div>
@@ -171,6 +173,7 @@ 
         <span class="button" id="button_change_pw">'.$LANG['index_change_pw_button'].'</span>&nbsp;
         <span id="password_change_wait" style="display:none;"><i class="fa fa-cog fa-spin"></i>&nbsp;'.$LANG['please_wait'].'</span>
     </div>';
+}
 
 //change the saltkey dialogbox
 echo '

install/upgrade_ajax.php

Braces +7 added lines, -4 removed lines

@@ -100,9 +100,12 @@ 
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');
@@ -852,7 +855,7 @@ 
                         }
                         if(($r+1) == $row_count || ($r % 400) == 399){
                             $contents .= ");\n\n";
-                        }else{
+                        } else{
                             $contents .= "),\n";
                         }
                         $r++;

install/js/crypt/aes.class.php

Braces +35 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
     $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $state[$i%4][floor($i/4)] = $input[$i];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $state[$i%4][floor($i/4)] = $input[$i];
+    }
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
@@ -35,14 +37,18 @@ 
     $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
     $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $output[$i] = $state[$i%4][floor($i/4)];
+    }
 
     return $output;
   }
 
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      for ($c=0; $c<$Nb; $c++) {
+          $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      }
     }
 
     return $state;
@@ -50,7 +56,9 @@ 
 
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      for ($c=0; $c<$Nb; $c++) {
+          $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      }
     }
 
     return $s;
@@ -59,8 +67,14 @@ 
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
     for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+      for ($c=0; $c<4; $c++) {
+          $t[$c] = $s[$r][($c+$r)%$Nb];
+      }
+      // shift into temp copy
+      for ($c=0; $c<4; $c++) {
+          $s[$r][$c] = $t[$c];
+      }
+      // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
     return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
@@ -105,28 +119,38 @@ 
 
     for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
       $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+      for ($t=0; $t<4; $t++) {
+          $temp[$t] = $w[$i-1][$t];
+      }
       if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
-        for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        for ($t=0; $t<4; $t++) {
+            $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        }
       } elseif ($Nk > 6 && $i%$Nk == 4) {
         $temp = self::subWord($temp);
       }
-      for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      for ($t=0; $t<4; $t++) {
+          $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      }
     }
 
     return $w;
   }
 
   private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
+    for ($i=0; $i<4; $i++) {
+        $w[$i] = self::$sBox[$w[$i]];
+    }
 
     return $w;
   }
 
   private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
-    for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
+    for ($i=0; $i<3; $i++) {
+        $w[$i] = $w[$i+1];
+    }
     $w[3] = $tmp;
 
     return $w;

install/js/crypt/aesctr.class.php

Braces +41 added lines, -13 removed lines

@@ -21,14 +21,19 @@ 
   public static function encrypt($plaintext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
     // use AES itself to encrypt password to get cipher key (using plain password as source for
     // key expansion) - gives us well encrypted key
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
@@ -39,11 +44,17 @@ 
     $nonceSec = floor($nonce/1000);
     $nonceMs = $nonce%1000;
     // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-    for ($i=0; $i<4; $i++) $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
-    for ($i=0; $i<4; $i++) $counterBlock[$i+4] = $nonceMs & 0xff;
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+    }
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i+4] = $nonceMs & 0xff;
+    }
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) $ctrTxt .= chr($counterBlock[$i]);
+    for ($i=0; $i<8; $i++) {
+        $ctrTxt .= chr($counterBlock[$i]);
+    }
 
     // generate key schedule - an expansion of the key into distinct Key Rounds for each round
     $keySchedule = Aes::keyExpansion($key);
@@ -55,8 +66,12 @@ 
     for ($b=0; $b<$blockCount; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
       // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
 
@@ -89,20 +104,27 @@ 
   public static function decrypt($ciphertext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
     // recover nonce from 1st element of ciphertext
     $counterBlock = array();
     $ctrTxt = substr($ciphertext, 0, 8);
-    for ($i=0; $i<8; $i++) $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    for ($i=0; $i<8; $i++) {
+        $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    }
 
     // generate key schedule
     $keySchedule = Aes::keyExpansion($key);
@@ -110,7 +132,9 @@ 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
     $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
     $ct = array();
-    for ($b=0; $b<$nBlocks; $b++) $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    for ($b=0; $b<$nBlocks; $b++) {
+        $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    }
     $ciphertext = $ct;  // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
@@ -118,8 +142,12 @@ 
 
     for ($b=0; $b<$nBlocks; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block