nilsteampassnet / TeamPass

includes/libraries/Pdf/Tfpdf/fpdf.php

Indentation +7 added lines, -7 removed lines

@@ -163,19 +163,19 @@
     }
 
     /**
-    * Get MD5 as binary string
-    * @param string $string
-    */
+     * Get MD5 as binary string
+     * @param string $string
+     */
     function _md5_16($string)
     {
         return pack('H*', md5($string));
     }
 
     /**
-    * Compute O value
-    * @param string $user_pass
-    * @param string $owner_pass
-    */
+     * Compute O value
+     * @param string $user_pass
+     * @param string $owner_pass
+     */
     function _Ovalue($user_pass, $owner_pass)
     {
         $tmp = $this->_md5_16($owner_pass);

includes/libraries/Pdf/Tfpdf/tfpdf.class.php

Braces +29 added lines, -26 removed lines

@@ -224,15 +224,17 @@ 
 function SetDisplayMode($zoom, $layout = 'default')
 {
     // Set display mode in viewer
-    if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))
-        $this->ZoomMode = $zoom;
-    else
-        $this->Error('Incorrect zoom display mode: '.$zoom);
-    if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
-        $this->LayoutMode = $layout;
-    else
-        $this->Error('Incorrect layout display mode: '.$layout);
-}
+    if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom)) {
+            $this->ZoomMode = $zoom;
+    } else {
+            $this->Error('Incorrect zoom display mode: '.$zoom);
+    }
+    if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default') {
+            $this->LayoutMode = $layout;
+    } else {
+            $this->Error('Incorrect layout display mode: '.$layout);
+    }
+    }
 
 /**
  * @param boolean $compress
@@ -513,23 +515,23 @@ 
     // Add a TrueType, OpenType or Type1 font
     $family = strtolower($family);
     $style = strtoupper($style);
-    if ($style == 'IB')
-        $style = 'BI';
+    if ($style == 'IB') {
+            $style = 'BI';
+    }
     if ($file == '') {
         if ($uni) {
         $file = str_replace(' ', '', $family).strtolower($style).'.ttf';
-        }
-        else {
+        } else {
         $file = str_replace(' ', '', $family).strtolower($style).'.php';
         }
     }
     $fontkey = $family.$style;
-    if (isset($this->fonts[$fontkey]))
-        return;
+    if (isset($this->fonts[$fontkey])) {
+            return;
+    }
 
     if ($uni) {
-        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file)) { $ttffilename = _SYSTEM_TTFONTS.$file; }
-        else { $ttffilename = $this->_getfontpath().'unifont/'.$file; }
+        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file)) { $ttffilename = _SYSTEM_TTFONTS.$file; } else { $ttffilename = $this->_getfontpath().'unifont/'.$file; }
         $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file, 0, (strpos($file, '.'))));
         $name = '';
         $originalsize = 0;
@@ -2410,18 +2412,19 @@ 
     for ($i = 0; $i < $len; $i++) {
     $uni = -1;
         $h = ord($str[$i]);
-        if ($h <= 0x7F)
-            $uni = $h;
-        elseif ($h >= 0xC2) {
-            if (($h <= 0xDF) && ($i < $len - 1))
-            $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
-            elseif (($h <= 0xEF) && ($i < $len - 2))
-            $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
+        if ($h <= 0x7F) {
+                    $uni = $h;
+        } elseif ($h >= 0xC2) {
+            if (($h <= 0xDF) && ($i < $len - 1)) {
+                        $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
+            } elseif (($h <= 0xEF) && ($i < $len - 2)) {
+                        $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
                                         | (ord($str[++$i]) & 0x3F);
-            elseif (($h <= 0xF4) && ($i < $len - 3))
-            $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
+            } elseif (($h <= 0xF4) && ($i < $len - 3)) {
+                        $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
                                         | (ord($str[++$i]) & 0x3F) << 6
                                         | (ord($str[++$i]) & 0x3F);
+            }
         }
     if ($uni >= 0) {
         $out[] = $uni;

includes/libraries/phpcrypt/Core.php

Braces +70 added lines, -55 removed lines

@@ -67,8 +67,9 @@ 
     {
         // if we do not have an even number of hex characters
         // append a 0 to the beginning to make it even
-        if (strlen($hex) % 2)
-            $hex = "0$hex";
+        if (strlen($hex) % 2) {
+                    $hex = "0$hex";
+        }
 
         $parts = str_split($hex, 2);
         $parts = array_map(function($v) {
@@ -90,8 +91,9 @@ 
     {
         // php version >= 5.4 have a hex2bin function, use it
         // if it exists
-        if (function_exists("hex2bin"))
-            return hex2bin($hex);
+        if (function_exists("hex2bin")) {
+                    return hex2bin($hex);
+        }
 
         $parts = str_split($hex, 2);
         $parts = array_map(function($v) {
@@ -235,14 +237,16 @@ 
 
         // if we do not have an even number of hex characters
         // append a 0 to the beginning. dechex() drops leading 0's
-        if (strlen($hex) % 2)
-            $hex = "0$hex";
+        if (strlen($hex) % 2) {
+                    $hex = "0$hex";
+        }
 
         // if the number of bytes in the hex is less than
         // what we need it to be, add null bytes to the
         // front of the hex to padd it to the required size
-        if (($req_bytes * 2) > strlen($hex))
-            $hex = str_pad($hex, ($req_bytes * 2), "0", STR_PAD_LEFT);
+        if (($req_bytes * 2) > strlen($hex)) {
+                    $hex = str_pad($hex, ($req_bytes * 2), "0", STR_PAD_LEFT);
+        }
 
         return $hex;
     }
@@ -306,8 +310,7 @@ 
         {
             $width = $len_a;
             $b = str_pad($b, $width, "0", STR_PAD_LEFT);
-        }
-        else if ($len_a < $len_b)
+        } else if ($len_a < $len_b)
         {
             $width = $len_b;
             $a = str_pad($a, $width, "0", STR_PAD_LEFT);
@@ -334,13 +337,15 @@ 
         $count = func_num_args();
 
         // we need a minimum of 2 values
-        if ($count < 2)
-            return false;
+        if ($count < 2) {
+                    return false;
+        }
 
         // first get all hex values to an even number
         array_walk($hex, function(&$val, $i) {
-            if (strlen($val) % 2)
-                $val = "0".$val;
+            if (strlen($val) % 2) {
+                            $val = "0".$val;
+            }
         });
 
         $res = 0;
@@ -348,9 +353,9 @@ 
         {
             // if this is the first loop, set the 'result' to the first
             // hex value
-            if ($i == 0)
-                $res = $hex[0];
-            else
+            if ($i == 0) {
+                            $res = $hex[0];
+            } else
             {
                 // to make the code easier to follow
                 $h1 = $res;
@@ -362,10 +367,11 @@ 
 
                 // now check that both hex values are the same length,
                 // if not pad them with 0's until they are
-                if ($len1 > $len2)
-                    $h2 = str_pad($h2, $len1, "0", STR_PAD_LEFT);
-                else if ($len1 < $len2)
-                    $h1 = str_pad($h1, $len2, "0", STR_PAD_LEFT);
+                if ($len1 > $len2) {
+                                    $h2 = str_pad($h2, $len1, "0", STR_PAD_LEFT);
+                } else if ($len1 < $len2) {
+                                    $h1 = str_pad($h1, $len2, "0", STR_PAD_LEFT);
+                }
 
                 // PHP knows how to XOR each byte in a string, so convert the
                 // hex to a string, XOR, and convert back
@@ -407,8 +413,10 @@ 
         // the same negative number given to it, the work around is
         // to use sprintf().
         // Tested with php 5.3.x on Windows XP & Linux 32bit
-        if ($ret < 0)
-            $ret = sprintf("%u", $ret) + 0; // convert from string to int
+        if ($ret < 0) {
+                    $ret = sprintf("%u", $ret) + 0;
+        }
+        // convert from string to int
 
         return $ret;
     }
@@ -422,9 +430,10 @@ 
      */
     public static function sInt32($int)
     {
-        if (PHP_INT_SIZE === 4) // 32 bit
+        if (PHP_INT_SIZE === 4) {
+            // 32 bit
             return self::sInt($int);
-        else // PHP_INT_SIZE === 8 // 64 bit
+        } else // PHP_INT_SIZE === 8 // 64 bit
         {
             $arr = unpack("l", pack("l", $int));
             return $arr[1];
@@ -440,9 +449,10 @@ 
      */
     public static function uInt32($int)
     {
-        if (PHP_INT_SIZE === 4) // 32 bit
+        if (PHP_INT_SIZE === 4) {
+            // 32 bit
             return self::uInt($int);
-        else // PHP_INT_SIZE === 8  // 64 bit
+        } else // PHP_INT_SIZE === 8  // 64 bit
         {
             $arr = unpack("L", pack("L", $int));
             return $arr[1];
@@ -484,8 +494,9 @@ 
      */
     public static function rotBitsLeft32($i, $shifts)
     {
-        if ($shifts <= 0)
-            return $i;
+        if ($shifts <= 0) {
+                    return $i;
+        }
 
         $shifts &= 0x1f; /* higher rotates would not bring anything */
 
@@ -509,8 +520,9 @@ 
      */
     public static function rotBitsRight32($i, $shifts)
     {
-        if ($shifts <= 0)
-            return $i;
+        if ($shifts <= 0) {
+                    return $i;
+        }
 
         $shifts &= 0x1f; /* higher rotates would not bring anything */
 
@@ -547,19 +559,19 @@ 
 
         if ($src == PHP_Crypt::RAND_DEV_RAND)
         {
-            if (file_exists(PHP_Crypt::RAND_DEV_RAND))
-                $bytes = file_get_contents(PHP_CRYPT::RAND_DEV_RAND, false, null, 0, $byte_len);
-            else
-                $err_msg = PHP_Crypt::RAND_DEV_RAND." not found";
-        }
-        else if ($src == PHP_Crypt::RAND_DEV_URAND)
+            if (file_exists(PHP_Crypt::RAND_DEV_RAND)) {
+                            $bytes = file_get_contents(PHP_CRYPT::RAND_DEV_RAND, false, null, 0, $byte_len);
+            } else {
+                            $err_msg = PHP_Crypt::RAND_DEV_RAND." not found";
+            }
+        } else if ($src == PHP_Crypt::RAND_DEV_URAND)
         {
-            if (file_exists(PHP_Crypt::RAND_DEV_URAND))
-                $bytes = file_get_contents(PHP_CRYPT::RAND_DEV_URAND, false, null, 0, $byte_len);
-            else
-                $err_msg = PHP_Crypt::RAND_DEV_URAND." not found";
-        }
-        else if ($src == PHP_Crypt::RAND_WIN_COM)
+            if (file_exists(PHP_Crypt::RAND_DEV_URAND)) {
+                            $bytes = file_get_contents(PHP_CRYPT::RAND_DEV_URAND, false, null, 0, $byte_len);
+            } else {
+                            $err_msg = PHP_Crypt::RAND_DEV_URAND." not found";
+            }
+        } else if ($src == PHP_Crypt::RAND_WIN_COM)
         {
             if (extension_loaded('com_dotnet'))
             {
@@ -571,22 +583,23 @@ 
                     // binary data on Windows
                     $com = @new \COM("CAPICOM.Utilities.1");
                     $bytes = $com->GetRandom($byte_len, 0);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     $err_msg = "Windows COM exception: ".$e->getMessage();
                 }
 
-                if (!$bytes)
-                    $err_msg = "Windows COM failed to create random string of bytes";
+                if (!$bytes) {
+                                    $err_msg = "Windows COM failed to create random string of bytes";
+                }
+            } else {
+                            $err_msg = "The COM_DOTNET extension is not loaded";
             }
-            else
-                $err_msg = "The COM_DOTNET extension is not loaded";
         }
 
         // trigger a warning if something went wrong
-        if ($err_msg != "")
-            trigger_error("$err_msg. Defaulting to PHP_Crypt::RAND", E_USER_WARNING);
+        if ($err_msg != "") {
+                    trigger_error("$err_msg. Defaulting to PHP_Crypt::RAND", E_USER_WARNING);
+        }
 
         // if the random bytes where not created properly or PHP_Crypt::RAND was
         // passed as the $src param, create the bytes using mt_rand(). It's not
@@ -597,8 +610,9 @@ 
 
             // md5() hash a random number to get a 16 byte string, keep looping
             // until we have a string as long or longer than the ciphers block size
-            for ($i = 0; ($i * self::HASH_LEN) < $byte_len; ++$i)
-                $bytes .= md5(mt_rand(), true);
+            for ($i = 0; ($i * self::HASH_LEN) < $byte_len; ++$i) {
+                            $bytes .= md5(mt_rand(), true);
+            }
         }
 
         // because $bytes may have come from mt_rand() or /dev/urandom which are not
@@ -611,8 +625,9 @@ 
         // some ciphers which have a block size larger than 16 bytes
         $tmp = "";
         $loop = ceil(strlen($bytes) / self::HASH_LEN);
-        for ($i = 0; $i < $loop; ++$i)
-            $tmp .= md5(substr($bytes, ($i * self::HASH_LEN), self::HASH_LEN), true);
+        for ($i = 0; $i < $loop; ++$i) {
+                    $tmp .= md5(substr($bytes, ($i * self::HASH_LEN), self::HASH_LEN), true);
+        }
 
         // grab the number of bytes equal to the requested $byte_len
         return substr($tmp, 0, $byte_len);

includes/libraries/phpcrypt/Padding.php

Braces +20 added lines, -15 removed lines

@@ -67,8 +67,9 @@ 
     {
         // if the size of padding is not greater than 1
         // just return true, no padding will be done
-        if (!($bytes > 0))
-            return true;
+        if (!($bytes > 0)) {
+                    return true;
+        }
 
         switch ($type)
         {
@@ -196,11 +197,11 @@ 
         $pos = strlen($text) - 1;
         $c = ord($text[$pos]);
 
-        if ($c == 0)
-            return true;
-        else if ($c == 1)
-            $text = substr($text, 0, -1);
-        else
+        if ($c == 0) {
+                    return true;
+        } else if ($c == 1) {
+                    $text = substr($text, 0, -1);
+        } else
         {
             // the total null bytes are 1 less than the value of the final byte
             $nc = $c - 1;
@@ -226,8 +227,9 @@ 
         // create the random pad bytes, we do one less than
         // needed because the last byte is reserved for the
         // number of padded bytes
-        for ($i = 0; $i < ($bytes - 1); ++$i)
-            $text .= chr(mt_rand(0, 255));
+        for ($i = 0; $i < ($bytes - 1); ++$i) {
+                    $text .= chr(mt_rand(0, 255));
+        }
 
         // add the byte to indicate the padding length
         $text .= chr($bytes);
@@ -248,8 +250,9 @@ 
 
         // if we got a null byte at the end of the string,
         // just return
-        if ($c == 0)
-            return true;
+        if ($c == 0) {
+                    return true;
+        }
 
         $text = substr($text, 0, $c);
         return true;
@@ -285,8 +288,9 @@ 
         $pos = strlen($text) - 1;
         $c = ord($text[$pos]);
 
-        if ($c == 0)
-            return true;
+        if ($c == 0) {
+                    return true;
+        }
 
         $text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
         return true;
@@ -309,8 +313,9 @@ 
 
         // if we are only padding one byte, then 0x80 is all we need
         // else we follow up with null bytes
-        if ($bytes > 1)
-            $text = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+        if ($bytes > 1) {
+                    $text = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+        }
 
         return true;
     }

includes/libraries/phpcrypt/ciphers/Skipjack.php

Braces +27 added lines, -18 removed lines

@@ -99,17 +99,21 @@ 
             $pos = (4 * $i) - 4;
             $subkey = substr($this->expanded_key, $pos, 4);
 
-            if ($i >= 1 && $i <= 8)
-                $this->ruleA($text, $subkey, $i);
+            if ($i >= 1 && $i <= 8) {
+                            $this->ruleA($text, $subkey, $i);
+            }
 
-            if ($i >= 9 && $i <= 16)
-                $this->ruleB($text, $subkey, $i);
+            if ($i >= 9 && $i <= 16) {
+                            $this->ruleB($text, $subkey, $i);
+            }
 
-            if ($i >= 17 && $i <= 24)
-                $this->ruleA($text, $subkey, $i);
+            if ($i >= 17 && $i <= 24) {
+                            $this->ruleA($text, $subkey, $i);
+            }
 
-            if ($i >= 25 && $i <= 32)
-                $this->ruleB($text, $subkey, $i);
+            if ($i >= 25 && $i <= 32) {
+                            $this->ruleB($text, $subkey, $i);
+            }
         }
 
         return true;
@@ -130,17 +134,21 @@ 
             $pos = ($i - 1) * 4;
             $subkey = substr($this->expanded_key, $pos, 4);
 
-            if ($i <= 32 && $i >= 25)
-                $this->ruleB($text, $subkey, $i);
+            if ($i <= 32 && $i >= 25) {
+                            $this->ruleB($text, $subkey, $i);
+            }
 
-            if ($i <= 24 && $i >= 17)
-                $this->ruleA($text, $subkey, $i);
+            if ($i <= 24 && $i >= 17) {
+                            $this->ruleA($text, $subkey, $i);
+            }
 
-            if ($i <= 16 && $i >= 9)
-                $this->ruleB($text, $subkey, $i);
+            if ($i <= 16 && $i >= 9) {
+                            $this->ruleB($text, $subkey, $i);
+            }
 
-            if ($i <= 8 && $i >= 1)
-                $this->ruleA($text, $subkey, $i);
+            if ($i <= 8 && $i >= 1) {
+                            $this->ruleA($text, $subkey, $i);
+            }
         }
 
         return true;
@@ -334,8 +342,9 @@ 
 
         for ($i = 0; $i < 128; ++$i)
         {
-            if ($pos == $key_bytes)
-                $pos = 0;
+            if ($pos == $key_bytes) {
+                            $pos = 0;
+            }
 
             $this->expanded_key .= $key[$pos];
             ++$pos;

includes/libraries/phpcrypt/ciphers/3DES.php

Braces +22 added lines, -13 removed lines

@@ -61,9 +61,9 @@ 
     {
         $key_len = strlen($key);
 
-        if ($key_len == 8 || $key_len == 16)
-            $key = self::expandKey($key, $key_len);
-        else if ($key_len < self::BYTES_KEY)
+        if ($key_len == 8 || $key_len == 16) {
+                    $key = self::expandKey($key, $key_len);
+        } else if ($key_len < self::BYTES_KEY)
         {
             $msg  = PHP_Crypt::CIPHER_3DES." requires an 8, 16, or 24 byte key. ";
             $msg .= "$key_len bytes received.";
@@ -109,10 +109,13 @@ 
             $key = substr($this->key(), ($i * 8), $blocksz);
             $this->keyPermutation($key);
 
-            if ($i % 2) // round 1
+            if ($i % 2) {
+                // round 1
                 $this->operation(parent::DECRYPT);
-            else // rounds 0 and 2
+            } else {
+                // rounds 0 and 2
                 $this->operation(parent::ENCRYPT);
+            }
 
             $this->des($text);
         }
@@ -138,10 +141,13 @@ 
             $key = substr($this->key(), ($i * 8), $blocksz);
             $this->keyPermutation($key);
 
-            if ($i % 2) // round 1
+            if ($i % 2) {
+                // round 1
                 $this->operation(parent::ENCRYPT);
-            else // round 0 and 2
+            } else {
+                // round 0 and 2
                 $this->operation(parent::DECRYPT);
+            }
 
             $this->des($text);
         }
@@ -210,8 +216,9 @@ 
             // of these.
             $CnDn = array_merge($c[$i], $d[$i]);
             $this->sub_keys[$i - 1] = "";
-            for ($j = 0; $j < 48; ++$j)
-                $this->sub_keys[$i - 1] .= $CnDn[parent::$_pc2[$j] - 1];
+            for ($j = 0; $j < 48; ++$j) {
+                            $this->sub_keys[$i - 1] .= $CnDn[parent::$_pc2[$j] - 1];
+            }
         }
 
         // the sub_keys are created, we are done with the key permutation
@@ -235,13 +242,15 @@ 
     {
         // if we were given an 8 byte key, repeat it
         // 3 times to produce a 24 byte key
-        if ($len == 8)
-            $key = str_repeat($key, 3);
+        if ($len == 8) {
+                    $key = str_repeat($key, 3);
+        }
 
         // if we were given a 16 byte key, add the first
         // 8 bytes to the end of the key to produce 24 bytes
-        if ($len == 16)
-            $key .= substr($key, 0, 8);
+        if ($len == 16) {
+                    $key .= substr($key, 0, 8);
+        }
 
         // return the key
         return $key;

includes/libraries/phpcrypt/ciphers/Blowfish.php

Braces +13 added lines, -16 removed lines

@@ -79,8 +79,7 @@ 
         {
             $key = substr($key, 0, 56);
             $keylen = 56;
-        }
-        else if ($keylen < 1)
+        } else if ($keylen < 1)
         {
             $msg = "No key given. The key must be between 1 - 56 bytes.";
             trigger_error($msg, E_USER_WARNING);
@@ -148,10 +147,11 @@ 
 
         for ($i = 0; $i < 16; ++$i)
         {
-            if ($this->operation() == parent::ENCRYPT)
-                $xl ^= self::$_p[$i];
-            else
-                $xl ^= self::$_p[17 - $i];
+            if ($this->operation() == parent::ENCRYPT) {
+                            $xl ^= self::$_p[$i];
+            } else {
+                            $xl ^= self::$_p[17 - $i];
+            }
 
             // perform F() on the left half, and XOR with the right half
             $xr = $this->F($xl) ^ $xr;
@@ -242,23 +242,19 @@ 
             {
                 self::$_p[$i] = $z0;
                 self::$_p[$i + 1] = $z1;
-            }
-            else if ($i >= 18 && $i < 274)
+            } else if ($i >= 18 && $i < 274)
             {
                 self::$_sbox1[$i - 18] = $z0;
                 self::$_sbox1[$i - 18 + 1] = $z1;
-            }
-            else if ($i >= 274 && $i < 530)
+            } else if ($i >= 274 && $i < 530)
             {
                 self::$_sbox2[$i - 274] = $z0;
                 self::$_sbox2[$i - 274 + 1] = $z1;
-            }
-            else if ($i >= 530 && $i < 786)
+            } else if ($i >= 530 && $i < 786)
             {
                 self::$_sbox3[$i - 530] = $z0;
                 self::$_sbox3[$i - 530 + 1] = $z1;
-            }
-            else if ($i >= 786 && $i < 1042)
+            } else if ($i >= 786 && $i < 1042)
             {
                 self::$_sbox4[$i - 786] = $z0;
                 self::$_sbox4[$i - 786 + 1] = $z1;
@@ -283,8 +279,9 @@ 
      */
     private function keyChunk($size = 1, $reset = false)
     {
-        if ($reset || $this->key_pos >= $this->keySize())
-            $this->key_pos = 0;
+        if ($reset || $this->key_pos >= $this->keySize()) {
+                    $this->key_pos = 0;
+        }
 
         $bytes = substr($this->key(), $this->key_pos, $size);
         $len = strlen($bytes);

includes/libraries/phpcrypt/ciphers/Enigma.php

Braces +15 added lines, -10 removed lines

@@ -158,8 +158,9 @@ 
                 $this->n1 = 0;
                 $this->n2++;
 
-                if ($this->n2 == self::ROTORSZ)
-                    $this->n2 = 0;
+                if ($this->n2 == self::ROTORSZ) {
+                                    $this->n2 = 0;
+                }
 
                 $this->nr2 = $this->n2;
             }
@@ -189,12 +190,14 @@ 
         $klen = $this->keySize();
 
         // get the key to exactly 13 bytes if it's less than 13
-        if ($klen < 13)
-            $this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+        if ($klen < 13) {
+                    $this->xkey = str_pad($this->xkey, 13, chr(0), STR_PAD_RIGHT);
+        }
 
         $seed = 123;
-        for ($i = 0; $i < 13; ++$i)
-            $seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+        for ($i = 0; $i < 13; ++$i) {
+                    $seed = parent::sInt32($seed) * ord($this->xkey[$i]) + $i;
+        }
 
         // sets $t1 and $deck
         for ($i = 0; $i < self::ROTORSZ; ++$i)
@@ -223,12 +226,14 @@ 
             $temp = $this->t1[$k];
             $this->t1[$k] = $this->t1[$ic];
             $this->t1[$ic] = $temp;
-            if ($this->t3[$k] != 0)
-                continue;
+            if ($this->t3[$k] != 0) {
+                            continue;
+            }
 
             $ic = ($random & self::MASK) % $k;
-            while ($this->t3[$ic] != 0)
-                $ic = ($ic + 1) % $k;
+            while ($this->t3[$ic] != 0) {
+                            $ic = ($ic + 1) % $k;
+            }
 
             $this->t3[$k] = $ic;
             $this->t3[$ic] = $k;

includes/libraries/phpcrypt/ciphers/RC2.php

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,7 @@ 
         for ($i = 0; $i < $max; ++$i)
         {
             $pos = $i * 2;
-            $text[$pos]   = chr($w[$i]);
+            $text[$pos] = chr($w[$i]);
             $text[$pos + 1] = chr($w[$i] >> 8);
         }
 
@@ -237,7 +237,7 @@ 
         for ($i = 0; $i < $max; ++$i)
         {
             $pos = $i * 2;
-            $text[$pos]   = chr($w[$i]);
+            $text[$pos] = chr($w[$i]);
             $text[$pos + 1] = chr($w[$i] >> 8);
         }
 

Braces +6 added lines, -4 removed lines

@@ -276,8 +276,9 @@ 
         $len = $this->keySize();
 
         // the max length of the key is 128 bytes
-        if ($len > 128)
-            $this->xkey = substr($this->xkey, 0, 128);
+        if ($len > 128) {
+                    $this->xkey = substr($this->xkey, 0, 128);
+        }
 
         // now expanded the rest of the key to 128 bytes, using the sbox
         for ($i = $len; $i < 128; ++$i)
@@ -288,8 +289,9 @@ 
 
             // the sbox is only 255 bytes, so if we extend past that
             // we need to modulo 256 so we have a valid position
-            if ($pos > 255)
-                $pos -= 256;
+            if ($pos > 255) {
+                            $pos -= 256;
+            }
 
             $this->xkey .= chr(self::$_sbox[$pos]);
         }