nilsteampassnet / TeamPass

install/js/crypt/aes.class.php

Spacing +30 added lines, -30 removed lines

@@ -47,8 +47,8 @@ 
      * @param integer $Nb
      */
     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 ($r = 0; $r < 4; $r++) {
+        for ($c = 0; $c < $Nb; $c++) $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
     }
 
     return $state;
@@ -58,8 +58,8 @@ 
      * @param integer $Nb
      */
     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++) {
+    for ($r = 0; $r < 4; $r++) {
+        for ($c = 0; $c < $Nb; $c++) {
             $s[$r][$c] = self::$sBox[$s[$r][$c]];
         }
     }
@@ -72,29 +72,29 @@ 
      */
     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];
+    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++) {
+        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
+    return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
     /**
      * @param integer $Nb
      */
     private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
-    for ($c=0; $c<4; $c++) {
-        $a = array(4);  // 'a' is a copy of the current column from 's'
-        $b = array(4);  // 'b' is aé{02} in GF(2^8)
-        for ($i=0; $i<4; $i++) {
+    for ($c = 0; $c < 4; $c++) {
+        $a = array(4); // 'a' is a copy of the current column from 's'
+        $b = array(4); // 'b' is aé{02} in GF(2^8)
+        for ($i = 0; $i < 4; $i++) {
         $a[$i] = $s[$i][$c];
-        $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+        $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
         }
         // a[n] ^ b[n] is aé{03} in GF(2^8)
         $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -114,33 +114,33 @@ 
      * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
      */
     public static function keyExpansion($key) {  // generate Key Schedule from Cipher Key [é5.2]
-    $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-    $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-    $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+    $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+    $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+    $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $w = array();
     $temp = array();
 
-    for ($i=0; $i<$Nk; $i++) {
-        $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+    for ($i = 0; $i < $Nk; $i++) {
+        $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
         $w[$i] = $r;
     }
 
-    for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+    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) {
+        } 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];
         }
     }
 
@@ -148,7 +148,7 @@ 
     }
 
     private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) {
+    for ($i = 0; $i < 4; $i++) {
         $w[$i] = self::$sBox[$w[$i]];
     }
 
@@ -157,8 +157,8 @@ 
 
     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;
 

Braces +6 added lines, -2 removed lines

@@ -37,7 +37,9 @@ 
     $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;
     }
@@ -48,7 +50,9 @@ 
      */
     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;

install/js/crypt/aesctr.class.php

Spacing +22 added lines, -22 removed lines

@@ -20,8 +20,8 @@ 
      */
     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)) {
+    $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
@@ -99,58 +99,58 @@ 
      */
     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)) {
+    $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
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
-    $nBytes = $nBits/8;  // no bytes in 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
+    $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);
 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
-    $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+    $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
+    $ciphertext = $ct; // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
     $plaintxt = array();
 
-    for ($b=0; $b<$nBlocks; $b++) {
+    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] = 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 - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
         }
 
-        $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+        $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
         $plaintxtByte = array();
-        for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+        for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
         // -- xor plaintext with ciphered counter byte-by-byte --
-        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b],$i,1));
+        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
         $plaintxtByte[$i] = chr($plaintxtByte[$i]);
 
         }

Braces +6 added lines, -2 removed lines

@@ -66,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 --
 

includes/language/polish.php

Braces +4 added lines, -2 removed lines

@@ -880,7 +880,8 @@ 
     'error_ssh_credentials_missing' => 'Poświadczenia SSH są niepoprawne.',
     'error_url_must_be_ssh' => 'URL musi zawierać protokół SSH!',
     'auto_update_server_password_info' => 'Kliknięcie start, automatycznie wykona poniższe kroki: < ul > <li > Połączenie przez SSH do {
-    serwera wykorzystując dane logowania i pole `URL`, < / li > <li > Zmiana hasła użytkownika na serwerze < /il > <li > Zachowanie nowego hasła w Teampass < /il > <li > Zakończenie połączenia SSH < /li > < / ul > <br / > < b > Upewnij się, że użytkownik posiada prawa do zalogowania się i zmiany hasła na serwerze(jeśli nie, określ hasło użytkownika root) przed uruchomieniem.< / b > ',
+    serwera wykorzystując dane logowania i pole `URL`, < / li > <li > Zmiana hasła użytkownika na serwerze < /il > <li > Zachowanie nowego hasła w Teampass < /il > <li > Zakończenie połączenia SSH < /li > < / ul > <br / > < b > Upewnij się, że użytkownik posiada prawa do {
+        zalogowania się i zmiany hasła na serwerze(jeśli nie, określ hasło użytkownika root) przed uruchomieniem.< / b > ',
     'update_server_password' => 'Zaktualizuj hasło serwera',
     'error_personal_sk_expected' => 'Musisz najpierw wprowadzić swój prywatny saltkety!',
     'click_to_generate' => 'Kliknij by wygenerować',
@@ -1048,5 +1049,6 @@ 
     'no_username_needed' => 'No username needed',
     '' => ''
 );
-}
+    }
+    }
 }

includes/libraries/LDAP/adLDAP/classes/adLDAPUsers.php

Braces +2 added lines, -4 removed lines

@@ -215,11 +215,9 @@
         if ($isGUID === true) {
             $username = $this->adldap->utilities()->strGuidToHex($username);
             $filter = "objectguid=".$username;
-        }
-        else if (strpos($username, "@")) {
+        } else if (strpos($username, "@")) {
                 $filter = "userPrincipalName=".$username;
-        }
-        else {
+        } else {
                 $filter = "samaccountname=".$username;
         }
         $filter = "(&(objectCategory=person)({$filter}))";

includes/libraries/Database/Meekrodb/db.class.php

Spacing +2 added lines, -2 removed lines

@@ -321,14 +321,14 @@
     /**
      * @param string $which
      */
-    public function insertOrReplace($which, $table, $datas, $options=array()) {
+    public function insertOrReplace($which, $table, $datas, $options = array()) {
     $datas = unserialize(serialize($datas)); // break references within array
     $keys = $values = array();
 
     if (isset($datas[0]) && is_array($datas[0])) {
         foreach ($datas as $datum) {
         ksort($datum);
-        if (! $keys) {
+        if (!$keys) {
             $keys = array_keys($datum);
         }
         $values[] = array_values($datum);

Braces +114 added lines, -51 removed lines

@@ -161,12 +161,24 @@ 
 
 
     public function __construct($host = null, $user = null, $password = null, $dbName = null, $port = null, $encoding = null) {
-    if ($host === null) $host = DB::$host;
-    if ($user === null) $user = DB::$user;
-    if ($password === null) $password = DB::$password;
-    if ($dbName === null) $dbName = DB::$dbName;
-    if ($port === null) $port = DB::$port;
-    if ($encoding === null) $encoding = DB::$encoding;
+    if ($host === null) {
+        $host = DB::$host;
+    }
+    if ($user === null) {
+        $user = DB::$user;
+    }
+    if ($password === null) {
+        $password = DB::$password;
+    }
+    if ($dbName === null) {
+        $dbName = DB::$dbName;
+    }
+    if ($port === null) {
+        $port = DB::$port;
+    }
+    if ($encoding === null) {
+        $encoding = DB::$encoding;
+    }
 
     $this->host = $host;
     $this->user = $user;
@@ -180,7 +192,9 @@ 
     $mysql = $this->internal_mysql;
 
     if (!($mysql instanceof MySQLi)) {
-        if (!$this->port) $this->port = ini_get('mysqli.default_port');
+        if (!$this->port) {
+            $this->port = ini_get('mysqli.default_port');
+        }
         $this->current_db = $this->dbName;
       
         $mysql = new mysqli($this->host, $this->user, $this->password, $this->dbName, $this->port);
@@ -300,8 +314,11 @@ 
     protected function formatTableName($table) {
     $table = trim($table, '`');
 
-    if (strpos($table, '.')) return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
-    else return '`'.str_replace('`', '``', $table).'`';
+    if (strpos($table, '.')) {
+        return implode('.', array_map(array($this, 'formatTableName'), explode('.', $table)));
+    } else {
+        return '`'.str_replace('`', '``', $table).'`';
+    }
     }
 
     public function update() {
@@ -529,21 +546,31 @@ 
 
     protected function sanitize($value) {
     if (is_object($value)) {
-        if ($value instanceof MeekroDBEval) return $value->text;
-        else if ($value instanceof DateTime) return $this->escape($value->format('Y-m-d H:i:s'));
-        else return '';
+        if ($value instanceof MeekroDBEval) {
+            return $value->text;
+        } else if ($value instanceof DateTime) {
+            return $this->escape($value->format('Y-m-d H:i:s'));
+        } else {
+            return '';
+        }
     }
 
-    if (is_null($value)) return $this->usenull ? 'NULL' : "''";
-    else if (is_bool($value)) return ($value ? 1 : 0);
-    else if (is_int($value)) return $value;
-    else if (is_float($value)) return $value;
-
-    else if (is_array($value)) {
+    if (is_null($value)) {
+        return $this->usenull ? 'NULL' : "''";
+    } else if (is_bool($value)) {
+        return ($value ? 1 : 0);
+    } else if (is_int($value)) {
+        return $value;
+    } else if (is_float($value)) {
+        return $value;
+    } else if (is_array($value)) {
         // non-assoc array?
         if (array_values($value) === $value) {
-        if (is_array($value[0])) return implode(', ', array_map(array($this, 'sanitize'), $value));
-        else return '('.implode(', ', array_map(array($this, 'sanitize'), $value)).')';
+        if (is_array($value[0])) {
+            return implode(', ', array_map(array($this, 'sanitize'), $value));
+        } else {
+            return '('.implode(', ', array_map(array($this, 'sanitize'), $value)).')';
+        }
         }
 
         $pairs = array();
@@ -591,30 +618,48 @@ 
 
         if ($type != '?') {
         $is_array_type = in_array($type, $array_types, true);
-        if ($is_array_type && !is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
-        else if (!$is_array_type && is_array($arg)) $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        if ($is_array_type && !is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected array, got scalar instead!");
+        } else if (!$is_array_type && is_array($arg)) {
+            $this->nonSQLError("Badly formatted SQL query: Expected scalar, got array instead!");
+        }
         }
 
-        if ($type == 's') $result = $this->escape($arg);
-        else if ($type == 'i') $result = $this->intval($arg);
-        else if ($type == 'd') $result = doubleval($arg);
-        else if ($type == 'b') $result = $this->formatTableName($arg);
-        else if ($type == 'l') $result = $arg;
-        else if ($type == 'ss') $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
-        else if ($type == 't') $result = $this->escape($this->parseTS($arg));
-
-        else if ($type == 'ls') $result = array_map(array($this, 'escape'), $arg);
-        else if ($type == 'li') $result = array_map(array($this, 'intval'), $arg);
-        else if ($type == 'ld') $result = array_map('doubleval', $arg);
-        else if ($type == 'lb') $result = array_map(array($this, 'formatTableName'), $arg);
-        else if ($type == 'll') $result = $arg;
-        else if ($type == 'lt') $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
-
-        else if ($type == '?') $result = $this->sanitize($arg);
-
-        else $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+        if ($type == 's') {
+            $result = $this->escape($arg);
+        } else if ($type == 'i') {
+            $result = $this->intval($arg);
+        } else if ($type == 'd') {
+            $result = doubleval($arg);
+        } else if ($type == 'b') {
+            $result = $this->formatTableName($arg);
+        } else if ($type == 'l') {
+            $result = $arg;
+        } else if ($type == 'ss') {
+            $result = $this->escape("%".str_replace(array('%', '_'), array('\%', '\_'), $arg)."%");
+        } else if ($type == 't') {
+            $result = $this->escape($this->parseTS($arg));
+        } else if ($type == 'ls') {
+            $result = array_map(array($this, 'escape'), $arg);
+        } else if ($type == 'li') {
+            $result = array_map(array($this, 'intval'), $arg);
+        } else if ($type == 'ld') {
+            $result = array_map('doubleval', $arg);
+        } else if ($type == 'lb') {
+            $result = array_map(array($this, 'formatTableName'), $arg);
+        } else if ($type == 'll') {
+            $result = $arg;
+        } else if ($type == 'lt') {
+            $result = array_map(array($this, 'escape'), array_map(array($this, 'parseTS'), $arg));
+        } else if ($type == '?') {
+            $result = $this->sanitize($arg);
+        } else {
+            $this->nonSQLError("Badly formatted SQL query: Invalid MeekroDB param $type");
+        }
 
-        if (is_array($result)) $result = '('.implode(',', $result).')';
+        if (is_array($result)) {
+            $result = '('.implode(',', $result).')';
+        }
 
         $query .= $result;
     }
@@ -720,23 +765,33 @@ 
     $this->affected_rows = $db->affected_rows;
 
     // mysqli_result->num_rows won't initially show correct results for unbuffered data
-    if ($is_buffered && ($result instanceof MySQLi_Result)) $this->num_rows = $result->num_rows;
-    else $this->num_rows = null;
+    if ($is_buffered && ($result instanceof MySQLi_Result)) {
+        $this->num_rows = $result->num_rows;
+    } else {
+        $this->num_rows = null;
+    }
 
-    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) return $result;
+    if ($row_type == 'raw' || !($result instanceof MySQLi_Result)) {
+        return $result;
+    }
 
     $return = array();
 
     if ($full_names) {
         $infos = array();
         foreach ($result->fetch_fields() as $info) {
-        if (strlen($info->table)) $infos[] = $info->table.'.'.$info->name;
-        else $infos[] = $info->name;
+        if (strlen($info->table)) {
+            $infos[] = $info->table.'.'.$info->name;
+        } else {
+            $infos[] = $info->name;
+        }
         }
     }
 
     while ($row = ($row_type == 'assoc' ? $result->fetch_assoc() : $result->fetch_row())) {
-        if ($full_names) $row = array_combine($infos, $row);
+        if ($full_names) {
+            $row = array_combine($infos, $row);
+        }
         $return[] = $row;
     }
 
@@ -929,7 +984,9 @@ 
     DB::startTransaction();
     }
     function __destruct() {
-    if (!$this->committed) DB::rollback();
+    if (!$this->committed) {
+        DB::rollback();
+    }
     }
     function commit() {
     DB::commit();
@@ -963,10 +1020,14 @@ 
 
     $R = array();
     foreach ($array as $obj) {
-        if (!array_key_exists($field, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (!array_key_exists($field, $obj)) {
+            die("verticalSlice: array doesn't have requested field\n");
+        }
 
         if ($keyfield) {
-        if (!array_key_exists($keyfield, $obj)) die("verticalSlice: array doesn't have requested field\n");
+        if (!array_key_exists($keyfield, $obj)) {
+            die("verticalSlice: array doesn't have requested field\n");
+        }
         $R[$obj[$keyfield]] = $obj[$field];
         } else {
         $R[] = $obj[$field];
@@ -990,7 +1051,9 @@ 
         $target = & $R;
 
         foreach ($fields as $field) {
-        if (!array_key_exists($field, $obj)) die("reIndex: array doesn't have requested field\n");
+        if (!array_key_exists($field, $obj)) {
+            die("reIndex: array doesn't have requested field\n");
+        }
 
         $nextkey = $obj[$field];
         $target = & $target[$nextkey];

includes/libraries/Authentication/Yubico/Yubico.php

Braces +25 added lines, -9 removed lines

@@ -148,15 +148,21 @@ 
      */
     function getNextURLpart()
     {
-        if ($this->_url_list) $url_list = $this->_url_list;
-        else $url_list = array('api.yubico.com/wsapi/2.0/verify',
+        if ($this->_url_list) {
+            $url_list = $this->_url_list;
+        } else {
+            $url_list = array('api.yubico.com/wsapi/2.0/verify',
                     'api2.yubico.com/wsapi/2.0/verify', 
                     'api3.yubico.com/wsapi/2.0/verify', 
                     'api4.yubico.com/wsapi/2.0/verify',
                     'api5.yubico.com/wsapi/2.0/verify');
+        }
 	  
-        if ($this->_url_index >= count($url_list)) return false;
-        else return $url_list[$this->_url_index++];
+        if ($this->_url_index >= count($url_list)) {
+            return false;
+        } else {
+            return $url_list[$this->_url_index++];
+        }
     }
 
     /**
@@ -291,12 +297,20 @@ 
                 'otp'=>$ret['otp'],
                 'nonce'=>md5(uniqid(rand())));
         /* Take care of protocol version 2 parameters */
-        if ($use_timestamp) $params['timestamp'] = 1;
-        if ($sl) $params['sl'] = $sl;
-        if ($timeout) $params['timeout'] = $timeout;
+        if ($use_timestamp) {
+            $params['timestamp'] = 1;
+        }
+        if ($sl) {
+            $params['sl'] = $sl;
+        }
+        if ($timeout) {
+            $params['timeout'] = $timeout;
+        }
         ksort($params);
         $parameters = '';
-        foreach ($params as $p=>$v) $parameters .= "&".$p."=".$v;
+        foreach ($params as $p=>$v) {
+            $parameters .= "&".$p."=".$v;
+        }
         $parameters = ltrim($parameters, "&");
 	  
         /* Generate signature. */
@@ -401,7 +415,9 @@ 
             $check = Null;
             foreach ($parameters as $param) {
                 if (array_key_exists($param, $response)) {
-            if ($check) $check = $check.'&';
+            if ($check) {
+                $check = $check.'&';
+            }
             $check = $check.$param.'='.$response[$param];
                 }
             }

includes/libraries/Pdf/Tfpdf/font/courieri.php

Braces +2 added lines, -1 removed lines

@@ -3,6 +3,7 @@
 $name = 'Courier-Oblique';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++)
+for ($i = 0; $i <= 255; $i++) {
     $cw[chr($i)] = 600;
+}
 ?>

includes/libraries/Pdf/Tfpdf/font/courierbi.php

Indentation +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
 $up = -100;
 $ut = 50;
 for ($i = 0; $i <= 255; $i++) {
-	$cw[chr($i)] = 600;
+    $cw[chr($i)] = 600;
 }
 ?>

includes/libraries/Pdf/Tfpdf/font/unifont/ttfonts.php

Indentation +175 added lines, -175 removed lines

@@ -115,181 +115,181 @@
                 $record['offset'] = $this->read_ulong();
                 $record['length'] = $this->read_ulong();
                 $this->tables[$record['tag']] = $record;
-		}
-	}
-
-
-	/**
-	 * @param integer[] $x
-	 * @param integer[] $y
-	 */
-	function sub32($x, $y) {
-		$xlo = $x[1];
-		$xhi = $x[0];
-		$ylo = $y[1];
-		$yhi = $y[0];
-		if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
-		$reslo = $xlo - $ylo;
-		if ($yhi > $xhi) { $xhi += 1 << 16; }
-		$reshi = $xhi - $yhi;
-		$reshi = $reshi & 0xFFFF;
-		return array($reshi, $reslo);
-	}
-
-	function calcChecksum($data) {
-		if (strlen($data) % 4) { $data .= str_repeat("\0", (4 - (strlen($data) % 4))); }
-		$hi = 0x0000;
-		$lo = 0x0000;
-		for ($i = 0; $i < strlen($data); $i += 4) {
-			$hi += (ord($data[$i]) << 8) + ord($data[$i + 1]);
-			$lo += (ord($data[$i + 2]) << 8) + ord($data[$i + 3]);
-			$hi += $lo >> 16;
-			$lo = $lo & 0xFFFF;
-			$hi = $hi & 0xFFFF;
-		}
-		return array($hi, $lo);
-	}
-
-	/**
-	 * @param string $tag
-	 */
-	function get_table_pos($tag) {
-		$offset = $this->tables[$tag]['offset'];
-		$length = $this->tables[$tag]['length'];
-		return array($offset, $length);
-	}
-
-	function seek($pos) {
-		$this->_pos = $pos;
-		fseek($this->fh, $this->_pos);
-	}
-
-	/**
-	 * @param integer $delta
-	 */
-	function skip($delta) {
-		$this->_pos = $this->_pos + $delta;
-		fseek($this->fh, $this->_pos);
-	}
-
-	/**
-	 * @param string $tag
-	 */
-	function seek_table($tag, $offset_in_table = 0) {
-		$tpos = $this->get_table_pos($tag);
-		$this->_pos = $tpos[0] + $offset_in_table;
-		fseek($this->fh, $this->_pos);
-		return $this->_pos;
-	}
-
-	function read_tag() {
-		$this->_pos += 4;
-		return fread($this->fh, 4);
-	}
-
-	function read_short() {
-		$this->_pos += 2;
-		$s = fread($this->fh, 2);
-		$a = (ord($s[0]) << 8) + ord($s[1]);
-		if ($a & (1 << 15)) { $a = ($a - (1 << 16)); }
-		return $a;
-	}
-
-	function unpack_short($s) {
-		$a = (ord($s[0]) << 8) + ord($s[1]);
-		if ($a & (1 << 15)) { 
-			$a = ($a - (1 << 16)); 
-		}
-		return $a;
-	}
-
-	function read_ushort() {
-		$this->_pos += 2;
-		$s = fread($this->fh, 2);
-		return (ord($s[0]) << 8) + ord($s[1]);
-	}
-
-	function read_ulong() {
-		$this->_pos += 4;
-		$s = fread($this->fh, 4);
-		// if large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
-	}
-
-	function get_ushort($pos) {
-		fseek($this->fh, $pos);
-		$s = fread($this->fh, 2);
-		return (ord($s[0]) << 8) + ord($s[1]);
-	}
-
-	function get_ulong($pos) {
-		fseek($this->fh, $pos);
-		$s = fread($this->fh, 4);
-		// iF large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
-	}
-
-	function pack_short($val) {
-		if ($val < 0) { 
-			$val = abs($val);
-			$val = ~$val;
-			$val += 1;
-		}
-		return pack("n", $val); 
-	}
-
-	/**
-	 * @param string $value
-	 */
-	function splice($stream, $offset, $value) {
-		return substr($stream, 0, $offset).$value.substr($stream, $offset + strlen($value));
-	}
-
-	/**
-	 * @param string|null $stream
-	 * @param integer $offset
-	 */
-	function _set_ushort($stream, $offset, $value) {
-		$up = pack("n", $value);
-		return $this->splice($stream, $offset, $up);
-	}
-
-	function _set_short($stream, $offset, $val) {
-		if ($val < 0) { 
-			$val = abs($val);
-			$val = ~$val;
-			$val += 1;
-		}
-		$up = pack("n", $val); 
-		return $this->splice($stream, $offset, $up);
-	}
-
-	function get_chunk($pos, $length) {
-		fseek($this->fh, $pos);
-		if ($length < 1) { return ''; }
-		return (fread($this->fh, $length));
-	}
-
-	/**
-	 * @param string $tag
-	 */
-	function get_table($tag) {
-		list($pos, $length) = $this->get_table_pos($tag);
-		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
-		fseek($this->fh, $pos);
-		return (fread($this->fh, $length));
-	}
-
-	/**
-	 * @param string $tag
-	 * @param null|string $data
-	 */
-	function add($tag, $data) {
-		if ($tag == 'head') {
-			$data = $this->splice($data, 8, "\0\0\0\0");
-		}
-		$this->otables[$tag] = $data;
-	}
+        }
+    }
+
+
+    /**
+     * @param integer[] $x
+     * @param integer[] $y
+     */
+    function sub32($x, $y) {
+        $xlo = $x[1];
+        $xhi = $x[0];
+        $ylo = $y[1];
+        $yhi = $y[0];
+        if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
+        $reslo = $xlo - $ylo;
+        if ($yhi > $xhi) { $xhi += 1 << 16; }
+        $reshi = $xhi - $yhi;
+        $reshi = $reshi & 0xFFFF;
+        return array($reshi, $reslo);
+    }
+
+    function calcChecksum($data) {
+        if (strlen($data) % 4) { $data .= str_repeat("\0", (4 - (strlen($data) % 4))); }
+        $hi = 0x0000;
+        $lo = 0x0000;
+        for ($i = 0; $i < strlen($data); $i += 4) {
+            $hi += (ord($data[$i]) << 8) + ord($data[$i + 1]);
+            $lo += (ord($data[$i + 2]) << 8) + ord($data[$i + 3]);
+            $hi += $lo >> 16;
+            $lo = $lo & 0xFFFF;
+            $hi = $hi & 0xFFFF;
+        }
+        return array($hi, $lo);
+    }
+
+    /**
+     * @param string $tag
+     */
+    function get_table_pos($tag) {
+        $offset = $this->tables[$tag]['offset'];
+        $length = $this->tables[$tag]['length'];
+        return array($offset, $length);
+    }
+
+    function seek($pos) {
+        $this->_pos = $pos;
+        fseek($this->fh, $this->_pos);
+    }
+
+    /**
+     * @param integer $delta
+     */
+    function skip($delta) {
+        $this->_pos = $this->_pos + $delta;
+        fseek($this->fh, $this->_pos);
+    }
+
+    /**
+     * @param string $tag
+     */
+    function seek_table($tag, $offset_in_table = 0) {
+        $tpos = $this->get_table_pos($tag);
+        $this->_pos = $tpos[0] + $offset_in_table;
+        fseek($this->fh, $this->_pos);
+        return $this->_pos;
+    }
+
+    function read_tag() {
+        $this->_pos += 4;
+        return fread($this->fh, 4);
+    }
+
+    function read_short() {
+        $this->_pos += 2;
+        $s = fread($this->fh, 2);
+        $a = (ord($s[0]) << 8) + ord($s[1]);
+        if ($a & (1 << 15)) { $a = ($a - (1 << 16)); }
+        return $a;
+    }
+
+    function unpack_short($s) {
+        $a = (ord($s[0]) << 8) + ord($s[1]);
+        if ($a & (1 << 15)) { 
+            $a = ($a - (1 << 16)); 
+        }
+        return $a;
+    }
+
+    function read_ushort() {
+        $this->_pos += 2;
+        $s = fread($this->fh, 2);
+        return (ord($s[0]) << 8) + ord($s[1]);
+    }
+
+    function read_ulong() {
+        $this->_pos += 4;
+        $s = fread($this->fh, 4);
+        // if large uInt32 as an integer, PHP converts it to -ve
+        return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
+    }
+
+    function get_ushort($pos) {
+        fseek($this->fh, $pos);
+        $s = fread($this->fh, 2);
+        return (ord($s[0]) << 8) + ord($s[1]);
+    }
+
+    function get_ulong($pos) {
+        fseek($this->fh, $pos);
+        $s = fread($this->fh, 4);
+        // iF large uInt32 as an integer, PHP converts it to -ve
+        return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
+    }
+
+    function pack_short($val) {
+        if ($val < 0) { 
+            $val = abs($val);
+            $val = ~$val;
+            $val += 1;
+        }
+        return pack("n", $val); 
+    }
+
+    /**
+     * @param string $value
+     */
+    function splice($stream, $offset, $value) {
+        return substr($stream, 0, $offset).$value.substr($stream, $offset + strlen($value));
+    }
+
+    /**
+     * @param string|null $stream
+     * @param integer $offset
+     */
+    function _set_ushort($stream, $offset, $value) {
+        $up = pack("n", $value);
+        return $this->splice($stream, $offset, $up);
+    }
+
+    function _set_short($stream, $offset, $val) {
+        if ($val < 0) { 
+            $val = abs($val);
+            $val = ~$val;
+            $val += 1;
+        }
+        $up = pack("n", $val); 
+        return $this->splice($stream, $offset, $up);
+    }
+
+    function get_chunk($pos, $length) {
+        fseek($this->fh, $pos);
+        if ($length < 1) { return ''; }
+        return (fread($this->fh, $length));
+    }
+
+    /**
+     * @param string $tag
+     */
+    function get_table($tag) {
+        list($pos, $length) = $this->get_table_pos($tag);
+        if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
+        fseek($this->fh, $pos);
+        return (fread($this->fh, $length));
+    }
+
+    /**
+     * @param string $tag
+     * @param null|string $data
+     */
+    function add($tag, $data) {
+        if ($tag == 'head') {
+            $data = $this->splice($data, 8, "\0\0\0\0");
+        }
+        $this->otables[$tag] = $data;
+    }
 
 
 

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 var $maxStrLenRead;
 
     function __construct() {
-        $this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
+        $this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
     }
 
 
@@ -79,7 +79,7 @@ 
      */
     function getMetrics($file) {
         $this->filename = $file;
-        $this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
+        $this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
         $this->_pos = 0;
         $this->charWidths = '';
         $this->glyphPos = array();
@@ -1037,7 +1037,7 @@ 
     /**
      * @param integer $unicode_cmap_offset
      */
-    function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
+    function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph) {
         $this->maxUniChar = 0;
         $this->seek($unicode_cmap_offset + 2);
         $length = $this->read_ushort();

Braces +85 added lines, -65 removed lines

@@ -90,12 +90,15 @@ 
         $this->descent = 0;
         $this->TTCFonts = array();
         $this->version = $version = $this->read_ulong();
-        if ($version == 0x4F54544F) 
-            die("Postscript outlines are not supported");
-        if ($version == 0x74746366) 
-            die("ERROR - TrueType Fonts Collections not supported");
-        if (!in_array($version, array(0x00010000, 0x74727565)))
-            die("Not a TrueType font: version=".$version);
+        if ($version == 0x4F54544F) {
+                    die("Postscript outlines are not supported");
+        }
+        if ($version == 0x74746366) {
+                    die("ERROR - TrueType Fonts Collections not supported");
+        }
+        if (!in_array($version, array(0x00010000, 0x74727565))) {
+                    die("Not a TrueType font: version=".$version);
+        }
         $this->readTableDirectory();
         $this->extractInfo();
         fclose($this->fh);
@@ -322,13 +325,16 @@ 
                 $nameId = $this->read_ushort();
                 $length = $this->read_ushort();
                 $offset = $this->read_ushort();
-                if (!in_array($nameId, $K)) continue;
+                if (!in_array($nameId, $K)) {
+                    continue;
+                }
                 $N = '';
                 if ($platformId == 3 && $encodingId == 1 && $languageId == 0x409) { // Microsoft, Unicode, US English, PS Name
                     $opos = $this->_pos;
                     $this->seek($string_data_offset + $offset);
-                    if ($length % 2 != 0)
-                        die("PostScript name is UTF-16BE string of odd length");
+                    if ($length % 2 != 0) {
+                                            die("PostScript name is UTF-16BE string of odd length");
+                    }
                     $length /= 2;
                     $N = '';
                     while ($length > 0) {
@@ -347,19 +353,23 @@ 
                 if ($N && $names[$nameId] == '') {
                     $names[$nameId] = $N;
                     $nameCount -= 1;
-                    if ($nameCount == 0) break;
+                    if ($nameCount == 0) {
+                        break;
+                    }
                 }
             }
-            if ($names[6])
-                $psName = $names[6];
-            else if ($names[4])
-                $psName = preg_replace('/ /', '-', $names[4]);
-            else if ($names[1])
-                $psName = preg_replace('/ /', '-', $names[1]);
-            else
-                $psName = '';
-            if (!$psName)
-                die("Could not find PostScript font name");
+            if ($names[6]) {
+                            $psName = $names[6];
+            } else if ($names[4]) {
+                            $psName = preg_replace('/ /', '-', $names[4]);
+            } else if ($names[1]) {
+                            $psName = preg_replace('/ /', '-', $names[1]);
+            } else {
+                            $psName = '';
+            }
+            if (!$psName) {
+                            die("Could not find PostScript font name");
+            }
             $this->name = $psName;
             if ($names[1]) { $this->familyName = $names[1]; } else { $this->familyName = $psName; }
             if ($names[2]) { $this->styleName = $names[2]; } else { $this->styleName = 'Regular'; }
@@ -423,21 +433,27 @@ 
             $this->skip(26);
             $sTypoAscender = $this->read_short();
             $sTypoDescender = $this->read_short();
-            if (!$this->ascent) $this->ascent = ($sTypoAscender * $scale);
-            if (!$this->descent) $this->descent = ($sTypoDescender * $scale);
+            if (!$this->ascent) {
+                $this->ascent = ($sTypoAscender * $scale);
+            }
+            if (!$this->descent) {
+                $this->descent = ($sTypoDescender * $scale);
+            }
             if ($version > 1) {
                 $this->skip(16);
                 $sCapHeight = $this->read_short();
                 $this->capHeight = ($sCapHeight * $scale);
-            }
-            else {
+            } else {
                 $this->capHeight = $this->ascent;
             }
-        }
-        else {
+        } else {
             $usWeightClass = 500;
-            if (!$this->ascent) $this->ascent = ($yMax * $scale);
-            if (!$this->descent) $this->descent = ($yMin * $scale);
+            if (!$this->ascent) {
+                $this->ascent = ($yMax * $scale);
+            }
+            if (!$this->descent) {
+                $this->descent = ($yMin * $scale);
+            }
             $this->capHeight = $this->ascent;
         }
         $this->stemV = 50 + intval(pow(($usWeightClass / 65.0), 2));
@@ -454,12 +470,15 @@ 
 
         $this->flags = 4;
 
-        if ($this->italicAngle != 0) 
-            $this->flags = $this->flags | 64;
-        if ($usWeightClass >= 600)
-            $this->flags = $this->flags | 262144;
-        if ($isFixedPitch)
-            $this->flags = $this->flags | 1;
+        if ($this->italicAngle != 0) {
+                    $this->flags = $this->flags | 64;
+        }
+        if ($usWeightClass >= 600) {
+                    $this->flags = $this->flags | 262144;
+        }
+        if ($isFixedPitch) {
+                    $this->flags = $this->flags | 1;
+        }
 
         ///////////////////////////////////
         // hhea - Horizontal header table
@@ -498,14 +517,17 @@ 
             if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
                 $format = $this->get_ushort($cmap_offset + $offset);
                 if ($format == 4) {
-                    if (!$unicode_cmap_offset) $unicode_cmap_offset = $cmap_offset + $offset;
+                    if (!$unicode_cmap_offset) {
+                        $unicode_cmap_offset = $cmap_offset + $offset;
+                    }
                     break;
                 }
             }
             $this->seek($save_pos);
         }
-        if (!$unicode_cmap_offset)
-            die('Font ('.$this->filename.') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
+        if (!$unicode_cmap_offset) {
+                    die('Font ('.$this->filename.') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
+        }
 
 
         $glyphToChar = array();
@@ -589,8 +611,9 @@ 
             $this->seek($save_pos);
         }
 
-        if (!$unicode_cmap_offset)
-            die('Font ('.$this->filename.') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
+        if (!$unicode_cmap_offset) {
+                    die('Font ('.$this->filename.') does not have cmap for Unicode (platform 3, encoding 1, format 4, or platform 0, any encoding, format 4)');
+        }
 
 
         $glyphToChar = array();
@@ -775,10 +798,12 @@ 
             $glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
             if ($glyfLength < $this->maxStrLenRead) {
                 $data = substr($glyphData, $glyphPos, $glyphLen);
-            }
-            else {
-                if ($glyphLen > 0) $data = $this->get_chunk($glyfOffset + $glyphPos, $glyphLen);
-                else $data = '';
+            } else {
+                if ($glyphLen > 0) {
+                    $data = $this->get_chunk($glyfOffset + $glyphPos, $glyphLen);
+                } else {
+                    $data = '';
+                }
             }
 
             if ($glyphLen > 0) {
@@ -824,8 +849,7 @@ 
         if ((($pos + 1) >> 1) > 0xFFFF) {
             $indexToLocFormat = 1; // long format
             foreach ($offsets AS $offset) { $locastr .= pack("N", $offset); }
-        }
-        else {
+        } else {
             $indexToLocFormat = 0; // short format
             foreach ($offsets AS $offset) { $locastr .= pack("n", ($offset / 2)); }
         }
@@ -931,14 +955,12 @@ 
         if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
             $data = $this->get_chunk($start, ($numberOfHMetrics * 4));
             $arr = unpack("n*", $data);
-        }
-        else { $this->seek($start); }
+        } else { $this->seek($start); }
         for ($glyph = 0; $glyph < $numberOfHMetrics; $glyph++) {
 
             if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
                 $aw = $arr[($glyph * 2) + 1];
-            }
-            else {
+            } else {
                 $aw = $this->read_ushort();
                 $lsb = $this->read_ushort();
             }
@@ -996,8 +1018,7 @@ 
         if ($gid < $numberOfHMetrics) {
             $this->seek($start + ($gid * 4));
             $hm = fread($this->fh, 4);
-        }
-        else {
+        } else {
             $this->seek($start + (($numberOfHMetrics - 1) * 4));
             $hm = fread($this->fh, 2);
             $this->seek($start + ($numberOfHMetrics * 2) + ($gid * 2));
@@ -1019,16 +1040,15 @@ 
             for ($n = 0; $n <= $numGlyphs; $n++) {
                 $this->glyphPos[] = ($arr[$n + 1] * 2);
             }
-        }
-        else if ($indexToLocFormat == 1) {
+        } else if ($indexToLocFormat == 1) {
             $data = $this->get_chunk($start, ($numGlyphs * 4) + 4);
             $arr = unpack("N*", $data);
             for ($n = 0; $n <= $numGlyphs; $n++) {
                 $this->glyphPos[] = ($arr[$n + 1]);
             }
+        } else {
+                    die('Unknown location table format '.$indexToLocFormat);
         }
-        else 
-            die('Unknown location table format '.$indexToLocFormat);
     }
 
 
@@ -1060,17 +1080,18 @@ 
         for ($n = 0; $n < $segCount; $n++) {
             $endpoint = ($endCount[$n] + 1);
             for ($unichar = $startCount[$n]; $unichar < $endpoint; $unichar++) {
-                if ($idRangeOffset[$n] == 0)
-                    $glyph = ($unichar + $idDelta[$n]) & 0xFFFF;
-                else {
+                if ($idRangeOffset[$n] == 0) {
+                                    $glyph = ($unichar + $idDelta[$n]) & 0xFFFF;
+                } else {
                     $offset = ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n];
                     $offset = $idRangeOffset_start + 2 * $n + $offset;
-                    if ($offset >= $limit)
-                        $glyph = 0;
-                    else {
+                    if ($offset >= $limit) {
+                                            $glyph = 0;
+                    } else {
                         $glyph = $this->get_ushort($offset);
-                        if ($glyph != 0)
-                            $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
+                        if ($glyph != 0) {
+                                                    $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
+                        }
                     }
                 }
                 $charToGlyph[$unichar] = $glyph;
@@ -1101,8 +1122,7 @@ 
         // Header
         if (_TTF_MAC_HEADER) {
             $stm .= (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entrySelector, $rangeShift)); // Mac
-        }
-        else {
+        } else {
             $stm .= (pack("Nnnnn", 0x00010000, $numTables, $searchRange, $entrySelector, $rangeShift)); // Windows
         }