nilsteampassnet / TeamPass

install/js/crypt/aes.class.php

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

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/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

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/unifont/ttfonts.php

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
         }
 

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

Braces +2 added lines, -1 removed lines

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

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;