nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/File/X509.php

Doc Comments +2 added lines, -2 removed lines

@@ -1588,7 +1588,7 @@ 
      *
      * @param array ref $root
      * @param string $path
-     * @param object $asn1
+     * @param ASN1 $asn1
      * @access private
      */
     function _mapInExtensions(&$root, $path, $asn1)
@@ -1638,7 +1638,7 @@ 
      *
      * @param array ref $root
      * @param string $path
-     * @param object $asn1
+     * @param ASN1 $asn1
      * @access private
      */
     function _mapOutExtensions(&$root, $path, $asn1)

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Doc Comments +1 added lines

@@ -168,6 +168,7 @@
 
     /**
      * Builds a string to be encoded in a QR code
+     * @param string $label
      */
     public function getQRText($label, $secret)
     {

Braces +34 added lines, -21 removed lines

@@ -26,25 +26,30 @@ 
     {
         $this->issuer = $issuer;
 
-        if (!is_int($digits) || $digits <= 0)
-            throw new TwoFactorAuthException('Digits must be int > 0');
+        if (!is_int($digits) || $digits <= 0) {
+                    throw new TwoFactorAuthException('Digits must be int > 0');
+        }
         $this->digits = $digits;
 
-        if (!is_int($period) || $period <= 0)
-            throw new TwoFactorAuthException('Period must be int > 0');
+        if (!is_int($period) || $period <= 0) {
+                    throw new TwoFactorAuthException('Period must be int > 0');
+        }
         $this->period = $period;
 
         $algorithm = strtolower(trim($algorithm));
-        if (!in_array($algorithm, self::$_supportedalgos))
-            throw new TwoFactorAuthException('Unsupported algorithm: '.$algorithm);
+        if (!in_array($algorithm, self::$_supportedalgos)) {
+                    throw new TwoFactorAuthException('Unsupported algorithm: '.$algorithm);
+        }
         $this->algorithm = $algorithm;
 
         // Set default QR Code provider if none was specified
-        if ($qrcodeprovider == null)
-            $qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
+        if ($qrcodeprovider == null) {
+                    $qrcodeprovider = new Providers\Qr\GoogleQRCodeProvider();
+        }
 
-        if (!($qrcodeprovider instanceof Providers\Qr\IQRCodeProvider))
-            throw new TwoFactorAuthException('QRCodeProvider must implement IQRCodeProvider');
+        if (!($qrcodeprovider instanceof Providers\Qr\IQRCodeProvider)) {
+                    throw new TwoFactorAuthException('QRCodeProvider must implement IQRCodeProvider');
+        }
 
         $this->qrcodeprovider = $qrcodeprovider;
 
@@ -80,11 +85,14 @@ 
     {
         $secret = '';
         $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
-        if ($requirecryptosecure && !$this->rngprovider->isCryptographicallySecure())
-            throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        if ($requirecryptosecure && !$this->rngprovider->isCryptographicallySecure()) {
+                    throw new TwoFactorAuthException('RNG provider is not cryptographically secure');
+        }
         $rnd = $this->rngprovider->getRandomBytes($bytes);
-        for ($i = 0; $i < $bytes; $i++)
-            $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
+        for ($i = 0; $i < $bytes; $i++) {
+                    $secret .= self::$_base32[ord($rnd[$i]) & 31];
+        }
+        //Mask out left 3 bits for 0-31 values
         return $secret;
     }
 
@@ -181,23 +189,28 @@ 
 
     private function base32Decode($value)
     {
-        if (strlen($value) == 0) return '';
+        if (strlen($value) == 0) {
+            return '';
+        }
 
-        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0)
-            throw new TwoFactorAuthException('Invalid base32 string');
+        if (preg_match('/[^'.preg_quote(self::$_base32dict).']/', $value) !== 0) {
+                    throw new TwoFactorAuthException('Invalid base32 string');
+        }
 
         $buffer = '';
         foreach (str_split($value) as $char)
         {
-            if ($char !== '=')
-                $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            if ($char !== '=') {
+                            $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            }
         }
         $length = strlen($buffer);
         $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
 
         $output = '';
-        foreach (explode(' ', $blocks) as $block)
-            $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        foreach (explode(' ', $blocks) as $block) {
+                    $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        }
 
         return $output;
     }

includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php

Doc Comments +1 added lines

@@ -76,6 +76,7 @@
      * @throws Ex\EnvironmentIsBrokenException
      * @throws Ex\WrongKeyOrModifiedCiphertextException
      *
+     * @param string $password
      * @return Key
      */
     public function unlockKey($password)

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

Doc Comments +3 added lines

@@ -150,6 +150,9 @@
 		return array($hi, $lo);
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	function get_table_pos($tag) {
 		$offset = $this->tables[$tag]['offset'];
 		$length = $this->tables[$tag]['length'];

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);
@@ -319,13 +322,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) {
@@ -344,19 +350,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'; }
@@ -420,21 +430,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));
@@ -451,12 +467,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
@@ -495,14 +514,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();
@@ -586,8 +608,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();
@@ -772,10 +795,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) {
@@ -821,8 +846,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)); }
 		}
@@ -928,14 +952,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();
 			}
@@ -993,8 +1015,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));
@@ -1016,16 +1037,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);
 	}
 
 
@@ -1057,17 +1077,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;
@@ -1098,8 +1119,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/fpdf.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 
     /**
     * Get MD5 as binary string
+    * @param string $string
     */
     function _md5_16($string)
     {

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

Doc Comments +3 added lines

@@ -1331,6 +1331,9 @@
     }
 }
 
+/**
+ * @param string $size
+ */
 function _getpagesize($size)
 {
     if (is_string($size))

Braces +491 added lines, -408 removed lines

@@ -108,26 +108,28 @@ 
     if (defined('FPDF_FONTPATH'))
     {
         $this->fontpath = FPDF_FONTPATH;
-        if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\')
-            $this->fontpath .= '/';
+        if (substr($this->fontpath, -1) != '/' && substr($this->fontpath, -1) != '\\') {
+                    $this->fontpath .= '/';
+        }
+    } elseif (is_dir(dirname(__FILE__).'/font')) {
+            $this->fontpath = dirname(__FILE__).'/font/';
+    } else {
+            $this->fontpath = '';
     }
-    elseif (is_dir(dirname(__FILE__).'/font'))
-        $this->fontpath = dirname(__FILE__).'/font/';
-    else
-        $this->fontpath = '';
     // Core fonts
     $this->CoreFonts = array('courier', 'helvetica', 'times', 'symbol', 'zapfdingbats');
     // Scale factor
-    if ($unit == 'pt')
-        $this->k = 1;
-    elseif ($unit == 'mm')
-        $this->k = 72 / 25.4;
-    elseif ($unit == 'cm')
-        $this->k = 72 / 2.54;
-    elseif ($unit == 'in')
-        $this->k = 72;
-    else
-        $this->Error('Incorrect unit: '.$unit);
+    if ($unit == 'pt') {
+            $this->k = 1;
+    } elseif ($unit == 'mm') {
+            $this->k = 72 / 25.4;
+    } elseif ($unit == 'cm') {
+            $this->k = 72 / 2.54;
+    } elseif ($unit == 'in') {
+            $this->k = 72;
+    } else {
+            $this->Error('Incorrect unit: '.$unit);
+    }
     // Page sizes
     $this->StdPageSizes = array('a3'=>array(841.89, 1190.55), 'a4'=>array(595.28, 841.89), 'a5'=>array(420.94, 595.28),
         'letter'=>array(612, 792), 'legal'=>array(612, 1008));
@@ -141,15 +143,14 @@ 
         $this->DefOrientation = 'P';
         $this->w = $size[0];
         $this->h = $size[1];
-    }
-    elseif ($orientation == 'l' || $orientation == 'landscape')
+    } elseif ($orientation == 'l' || $orientation == 'landscape')
     {
         $this->DefOrientation = 'L';
         $this->w = $size[1];
         $this->h = $size[0];
+    } else {
+            $this->Error('Incorrect orientation: '.$orientation);
     }
-    else
-        $this->Error('Incorrect orientation: '.$orientation);
     $this->CurOrientation = $this->DefOrientation;
     $this->wPt = $this->w * $this->k;
     $this->hPt = $this->h * $this->k;
@@ -189,9 +190,10 @@ 
 {
     // Set left margin
     $this->lMargin = $margin;
-    if ($this->page > 0 && $this->x < $margin)
-        $this->x = $margin;
-}
+    if ($this->page > 0 && $this->x < $margin) {
+            $this->x = $margin;
+    }
+    }
 
 function SetTopMargin($margin)
 {
@@ -222,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
@@ -238,49 +242,55 @@ 
 function SetCompression($compress)
 {
     // Set page compression
-    if (function_exists('gzcompress'))
-        $this->compress = $compress;
-    else
-        $this->compress = false;
-}
+    if (function_exists('gzcompress')) {
+            $this->compress = $compress;
+    } else {
+            $this->compress = false;
+    }
+    }
 
 function SetTitle($title, $isUTF8 = false)
 {
     // Title of document
-    if ($isUTF8)
-        $title = $this->_UTF8toUTF16($title);
+    if ($isUTF8) {
+            $title = $this->_UTF8toUTF16($title);
+    }
     $this->title = $title;
 }
 
 function SetSubject($subject, $isUTF8 = false)
 {
     // Subject of document
-    if ($isUTF8)
-        $subject = $this->_UTF8toUTF16($subject);
+    if ($isUTF8) {
+            $subject = $this->_UTF8toUTF16($subject);
+    }
     $this->subject = $subject;
 }
 
 function SetAuthor($author, $isUTF8 = false)
 {
     // Author of document
-    if ($isUTF8)
-        $author = $this->_UTF8toUTF16($author);
+    if ($isUTF8) {
+            $author = $this->_UTF8toUTF16($author);
+    }
     $this->author = $author;
 }
 
 function SetKeywords($keywords, $isUTF8 = false)
 {
     // Keywords of document
-    if ($isUTF8)
-        $keywords = $this->_UTF8toUTF16($keywords);
+    if ($isUTF8) {
+            $keywords = $this->_UTF8toUTF16($keywords);
+    }
     $this->keywords = $keywords;
 }
 
 function SetCreator($creator, $isUTF8 = false)
 {
     // Creator of document
-    if ($isUTF8)
-        $creator = $this->_UTF8toUTF16($creator);
+    if ($isUTF8) {
+            $creator = $this->_UTF8toUTF16($creator);
+    }
     $this->creator = $creator;
 }
 
@@ -305,10 +315,12 @@ 
 function Close()
 {
     // Terminate document
-    if ($this->state == 3)
-        return;
-    if ($this->page == 0)
-        $this->AddPage();
+    if ($this->state == 3) {
+            return;
+    }
+    if ($this->page == 0) {
+            $this->AddPage();
+    }
     // Page footer
     $this->InFooter = true;
     $this->Footer();
@@ -322,8 +334,9 @@ 
 function AddPage($orientation = '', $size = '')
 {
     // Start a new page
-    if ($this->state == 0)
-        $this->Open();
+    if ($this->state == 0) {
+            $this->Open();
+    }
     $family = $this->FontFamily;
     $style = $this->FontStyle.($this->underline ? 'U' : '');
     $fontsize = $this->FontSizePt;
@@ -349,15 +362,18 @@ 
     $this->LineWidth = $lw;
     $this->_out(sprintf('%.2F w', $lw * $this->k));
     // Set font
-    if ($family)
-        $this->SetFont($family, $style, $fontsize);
+    if ($family) {
+            $this->SetFont($family, $style, $fontsize);
+    }
     // Set colors
     $this->DrawColor = $dc;
-    if ($dc != '0 G')
-        $this->_out($dc);
+    if ($dc != '0 G') {
+            $this->_out($dc);
+    }
     $this->FillColor = $fc;
-    if ($fc != '0 g')
-        $this->_out($fc);
+    if ($fc != '0 g') {
+            $this->_out($fc);
+    }
     $this->TextColor = $tc;
     $this->ColorFlag = $cf;
     // Page header
@@ -371,8 +387,9 @@ 
         $this->_out(sprintf('%.2F w', $lw * $this->k));
     }
     // Restore font
-    if ($family)
-        $this->SetFont($family, $style, $fontsize);
+    if ($family) {
+            $this->SetFont($family, $style, $fontsize);
+    }
     // Restore colors
     if ($this->DrawColor != $dc)
     {
@@ -498,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;
@@ -563,22 +580,21 @@ 
                 @unlink($unifilename.'.cw127.php');
             }
             unset($ttf);
-        }
-        else {
+        } else {
             $cw = @file_get_contents($unifilename.'.cw.dat');
         }
         $i = count($this->fonts) + 1;
-        if (!empty($this->AliasNbPages))
-            $sbarr = range(0, 57);
-        else
-            $sbarr = range(0, 32);
+        if (!empty($this->AliasNbPages)) {
+                    $sbarr = range(0, 57);
+        } else {
+                    $sbarr = range(0, 32);
+        }
         $this->fonts[$fontkey] = array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'ttffile'=>$ttffile, 'fontkey'=>$fontkey, 'subset'=>$sbarr, 'unifilename'=>$unifilename);
 
         $this->FontFiles[$fontkey] = array('length1'=>$originalsize, 'type'=>"TTF", 'ttffile'=>$ttffile);
         $this->FontFiles[$file] = array('type'=>"TTF");
         unset($cw);
-    }
-    else {
+    } else {
         $info = $this->_loadfont($file);
         $info['i'] = count($this->fonts) + 1;
         if (!empty($info['diff']))
@@ -595,10 +611,11 @@ 
         if (!empty($info['file']))
         {
             // Embedded font
-            if ($info['type'] == 'TrueType')
-                $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
-            else
-                $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
+            if ($info['type'] == 'TrueType') {
+                            $this->FontFiles[$info['file']] = array('length1'=>$info['originalsize']);
+            } else {
+                            $this->FontFiles[$info['file']] = array('length1'=>$info['size1'], 'length2'=>$info['size2']);
+            }
         }
         $this->fonts[$fontkey] = $info;
     }
@@ -660,22 +677,24 @@ 
     $this->FontSizePt = $size;
     $this->FontSize = $size / $this->k;
     $this->CurrentFont = &$this->fonts[$fontkey];
-    if ($this->fonts[$fontkey]['type'] == 'TTF') { $this->unifontSubset = true; }
-    else { $this->unifontSubset = false; }
-    if ($this->page > 0)
-        $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-}
+    if ($this->fonts[$fontkey]['type'] == 'TTF') { $this->unifontSubset = true; } else { $this->unifontSubset = false; }
+    if ($this->page > 0) {
+            $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
+    }
+    }
 
 function SetFontSize($size)
 {
     // Set font size in points
-    if ($this->FontSizePt == $size)
-        return;
+    if ($this->FontSizePt == $size) {
+            return;
+    }
     $this->FontSizePt = $size;
     $this->FontSize = $size / $this->k;
-    if ($this->page > 0)
-        $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
-}
+    if ($this->page > 0) {
+            $this->_out(sprintf('BT /F%d %.2F Tf ET', $this->CurrentFont['i'], $this->FontSizePt));
+    }
+    }
 
 function AddLink()
 {
@@ -688,10 +707,12 @@ 
 function SetLink($link, $y = 0, $page = -1)
 {
     // Set destination of internal link
-    if ($y == -1)
-        $y = $this->y;
-    if ($page == -1)
-        $page = $this->page;
+    if ($y == -1) {
+            $y = $this->y;
+    }
+    if ($page == -1) {
+            $page = $this->page;
+    }
     $this->links[$link] = array($page, $y);
 }
 
@@ -711,16 +732,19 @@ 
     if ($this->unifontSubset)
     {
         $txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
-        foreach ($this->UTF8StringToArray($txt) as $uni)
-            $this->CurrentFont['subset'][$uni] = $uni;
+        foreach ($this->UTF8StringToArray($txt) as $uni) {
+                    $this->CurrentFont['subset'][$uni] = $uni;
+        }
+    } else {
+            $txt2 = '('.$this->_escape($txt).')';
     }
-    else
-        $txt2 = '('.$this->_escape($txt).')';
     $s = sprintf('BT %.2F %.2F Td %s Tj ET', $x * $this->k, ($this->h - $y) * $this->k, $txt2);
-    if ($this->underline && $txt != '')
-        $s .= ' '.$this->_dounderline($x, $y, $txt);
-    if ($this->ColorFlag)
-        $s = 'q '.$this->TextColor.' '.$s.' Q';
+    if ($this->underline && $txt != '') {
+            $s .= ' '.$this->_dounderline($x, $y, $txt);
+    }
+    if ($this->ColorFlag) {
+            $s = 'q '.$this->TextColor.' '.$s.' Q';
+    }
     $this->_out($s);
 }
 
@@ -752,45 +776,54 @@ 
             $this->_out(sprintf('%.3F Tw', $ws * $k));
         }
     }
-    if ($w == 0)
-        $w = $this->w - $this->rMargin - $this->x;
+    if ($w == 0) {
+            $w = $this->w - $this->rMargin - $this->x;
+    }
     $s = '';
     if ($fill || $border == 1)
     {
-        if ($fill)
-            $op = ($border == 1) ? 'B' : 'f';
-        else
-            $op = 'S';
+        if ($fill) {
+                    $op = ($border == 1) ? 'B' : 'f';
+        } else {
+                    $op = 'S';
+        }
         $s = sprintf('%.2F %.2F %.2F %.2F re %s ', $this->x * $k, ($this->h - $this->y) * $k, $w * $k, -$h * $k, $op);
     }
     if (is_string($border))
     {
         $x = $this->x;
         $y = $this->y;
-        if (strpos($border, 'L') !== false)
-            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);
-        if (strpos($border, 'T') !== false)
-            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);
-        if (strpos($border, 'R') !== false)
-            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
-        if (strpos($border, 'B') !== false)
-            $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
+        if (strpos($border, 'L') !== false) {
+                    $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, $x * $k, ($this->h - ($y + $h)) * $k);
+        }
+        if (strpos($border, 'T') !== false) {
+                    $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - $y) * $k);
+        }
+        if (strpos($border, 'R') !== false) {
+                    $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', ($x + $w) * $k, ($this->h - $y) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
+        }
+        if (strpos($border, 'B') !== false) {
+                    $s .= sprintf('%.2F %.2F m %.2F %.2F l S ', $x * $k, ($this->h - ($y + $h)) * $k, ($x + $w) * $k, ($this->h - ($y + $h)) * $k);
+        }
     }
     if ($txt !== '')
     {
-        if ($align == 'R')
-            $dx = $w - $this->cMargin - $this->GetStringWidth($txt);
-        elseif ($align == 'C')
-            $dx = ($w - $this->GetStringWidth($txt)) / 2;
-        else
-            $dx = $this->cMargin;
-        if ($this->ColorFlag)
-            $s .= 'q '.$this->TextColor.' ';
+        if ($align == 'R') {
+                    $dx = $w - $this->cMargin - $this->GetStringWidth($txt);
+        } elseif ($align == 'C') {
+                    $dx = ($w - $this->GetStringWidth($txt)) / 2;
+        } else {
+                    $dx = $this->cMargin;
+        }
+        if ($this->ColorFlag) {
+                    $s .= 'q '.$this->TextColor.' ';
+        }
 
         // If multibyte, Tw has no effect - do word spacing using an adjustment before each space
         if ($this->ws && $this->unifontSubset) {
-            foreach ($this->UTF8StringToArray($txt) as $uni)
-                $this->CurrentFont['subset'][$uni] = $uni;
+            foreach ($this->UTF8StringToArray($txt) as $uni) {
+                            $this->CurrentFont['subset'][$uni] = $uni;
+            }
             $space = $this->_escape($this->UTF8ToUTF16BE(' ', false));
             $s .= sprintf('BT 0 Tw %.2F %.2F Td [', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k);
             $t = explode(' ', $txt);
@@ -806,55 +839,63 @@ 
             }
             $s .= '] TJ';
             $s .= ' ET';
-        }
-        else {
+        } else {
             if ($this->unifontSubset)
             {
                 $txt2 = '('.$this->_escape($this->UTF8ToUTF16BE($txt, false)).')';
-                foreach ($this->UTF8StringToArray($txt) as $uni)
-                    $this->CurrentFont['subset'][$uni] = $uni;
+                foreach ($this->UTF8StringToArray($txt) as $uni) {
+                                    $this->CurrentFont['subset'][$uni] = $uni;
+                }
+            } else {
+                            $txt2 = '('.str_replace(')', '\\)', str_replace('(', '\\(', str_replace('\\', '\\\\', $txt))).')';
             }
-            else
-                $txt2 = '('.str_replace(')', '\\)', str_replace('(', '\\(', str_replace('\\', '\\\\', $txt))).')';
             $s .= sprintf('BT %.2F %.2F Td %s Tj ET', ($this->x + $dx) * $k, ($this->h - ($this->y + .5 * $h + .3 * $this->FontSize)) * $k, $txt2);
         }
-        if ($this->underline)
-            $s .= ' '.$this->_dounderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);
-        if ($this->ColorFlag)
-            $s .= ' Q';
-        if ($link)
-            $this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);
+        if ($this->underline) {
+                    $s .= ' '.$this->_dounderline($this->x + $dx, $this->y + .5 * $h + .3 * $this->FontSize, $txt);
+        }
+        if ($this->ColorFlag) {
+                    $s .= ' Q';
+        }
+        if ($link) {
+                    $this->Link($this->x + $dx, $this->y + .5 * $h - .5 * $this->FontSize, $this->GetStringWidth($txt), $this->FontSize, $link);
+        }
+    }
+    if ($s) {
+            $this->_out($s);
     }
-    if ($s)
-        $this->_out($s);
     $this->lasth = $h;
     if ($ln > 0)
     {
         // Go to next line
         $this->y += $h;
-        if ($ln == 1)
-            $this->x = $this->lMargin;
+        if ($ln == 1) {
+                    $this->x = $this->lMargin;
+        }
+    } else {
+            $this->x += $w;
+    }
     }
-    else
-        $this->x += $w;
-}
 
 function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false)
 {
     // Output text with automatic or explicit line breaks
     $cw = &$this->CurrentFont['cw'];
-    if ($w == 0)
-        $w = $this->w - $this->rMargin - $this->x;
+    if ($w == 0) {
+            $w = $this->w - $this->rMargin - $this->x;
+    }
     $wmax = ($w - 2 * $this->cMargin);
     $s = str_replace("\r", '', $txt);
     if ($this->unifontSubset) {
         $nb = mb_strlen($s, 'utf-8');
-        while ($nb > 0 && mb_substr($s, $nb - 1, 1, 'utf-8') == "\n") $nb--;
-    }
-    else {
-        $nb = strlen($s);
-        if ($nb > 0 && $s[$nb - 1] == "\n")
+        while ($nb > 0 && mb_substr($s, $nb - 1, 1, 'utf-8') == "\n") {
             $nb--;
+        }
+    } else {
+        $nb = strlen($s);
+        if ($nb > 0 && $s[$nb - 1] == "\n") {
+                    $nb--;
+        }
     }
     $b = 0;
     if ($border)
@@ -864,14 +905,15 @@ 
             $border = 'LTRB';
             $b = 'LRT';
             $b2 = 'LR';
-        }
-        else
+        } else
         {
             $b2 = '';
-            if (strpos($border, 'L') !== false)
-                $b2 .= 'L';
-            if (strpos($border, 'R') !== false)
-                $b2 .= 'R';
+            if (strpos($border, 'L') !== false) {
+                            $b2 .= 'L';
+            }
+            if (strpos($border, 'R') !== false) {
+                            $b2 .= 'R';
+            }
             $b = (strpos($border, 'T') !== false) ? $b2.'T' : $b2;
         }
     }
@@ -886,8 +928,7 @@ 
         // Get next character
         if ($this->unifontSubset) {
             $c = mb_substr($s, $i, 1, 'UTF-8');
-        }
-        else {
+        } else {
             $c = $s[$i];
         }
         if ($c == "\n")
@@ -900,8 +941,7 @@ 
             }
             if ($this->unifontSubset) {
                 $this->Cell($w, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), $b, 2, $align, $fill);
-            }
-            else {
+            } else {
                 $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
             }
             $i++;
@@ -910,8 +950,9 @@ 
             $l = 0;
             $ns = 0;
             $nl++;
-            if ($border && $nl == 2)
-                $b = $b2;
+            if ($border && $nl == 2) {
+                            $b = $b2;
+            }
             continue;
         }
         if ($c == ' ')
@@ -921,16 +962,16 @@ 
             $ns++;
         }
 
-        if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
-        else { $l += $cw[$c] * $this->FontSize / 1000; }
+        if ($this->unifontSubset) { $l += $this->GetStringWidth($c); } else { $l += $cw[$c] * $this->FontSize / 1000; }
 
         if ($l > $wmax)
         {
             // Automatic line break
             if ($sep == -1)
             {
-                if ($i == $j)
-                    $i++;
+                if ($i == $j) {
+                                    $i++;
+                }
                 if ($this->ws > 0)
                 {
                     $this->ws = 0;
@@ -938,12 +979,10 @@ 
                 }
                 if ($this->unifontSubset) {
                     $this->Cell($w, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), $b, 2, $align, $fill);
-                }
-                else {
+                } else {
                     $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
                 }
-            }
-            else
+            } else
             {
                 if ($align == 'J')
                 {
@@ -952,8 +991,7 @@ 
                 }
                 if ($this->unifontSubset) {
                     $this->Cell($w, $h, mb_substr($s, $j, $sep - $j, 'UTF-8'), $b, 2, $align, $fill);
-                }
-                else {
+                } else {
                     $this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
                 }
                 $i = $sep + 1;
@@ -963,11 +1001,12 @@ 
             $l = 0;
             $ns = 0;
             $nl++;
-            if ($border && $nl == 2)
-                $b = $b2;
+            if ($border && $nl == 2) {
+                            $b = $b2;
+            }
+        } else {
+                    $i++;
         }
-        else
-            $i++;
     }
     // Last chunk
     if ($this->ws > 0)
@@ -975,12 +1014,12 @@ 
         $this->ws = 0;
         $this->_out('0 Tw');
     }
-    if ($border && strpos($border, 'B') !== false)
-        $b .= 'B';
+    if ($border && strpos($border, 'B') !== false) {
+            $b .= 'B';
+    }
     if ($this->unifontSubset) {
         $this->Cell($w, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), $b, 2, $align, $fill);
-    }
-    else {
+    } else {
         $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
     }
     $this->x = $this->lMargin;
@@ -1013,8 +1052,7 @@ 
         // Get next character
         if ($this->unifontSubset) {
             $c = mb_substr($s, $i, 1, 'UTF-8');
-        }
-        else {
+        } else {
             $c = $s[$i];
         }
         if ($c == "\n")
@@ -1022,8 +1060,7 @@ 
             // Explicit line break
             if ($this->unifontSubset) {
                 $this->Cell($w, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), 0, 2, '', 0, $link);
-            }
-            else {
+            } else {
                 $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
             }
             $i++;
@@ -1039,11 +1076,11 @@ 
             $nl++;
             continue;
         }
-        if ($c == ' ')
-            $sep = $i;
+        if ($c == ' ') {
+                    $sep = $i;
+        }
 
-        if ($this->unifontSubset) { $l += $this->GetStringWidth($c); }
-        else { $l += $cw[$c] * $this->FontSize / 1000; }
+        if ($this->unifontSubset) { $l += $this->GetStringWidth($c); } else { $l += $cw[$c] * $this->FontSize / 1000; }
 
         if ($l > $wmax)
         {
@@ -1061,21 +1098,19 @@ 
                     $nl++;
                     continue;
                 }
-                if ($i == $j)
-                    $i++;
+                if ($i == $j) {
+                                    $i++;
+                }
                 if ($this->unifontSubset) {
                     $this->Cell($w, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), 0, 2, '', 0, $link);
-                }
-                else {
+                } else {
                     $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
                 }
-            }
-            else
+            } else
             {
                 if ($this->unifontSubset) {
                     $this->Cell($w, $h, mb_substr($s, $j, $sep - $j, 'UTF-8'), 0, 2, '', 0, $link);
-                }
-                else {
+                } else {
                     $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);
                 }
                 $i = $sep + 1;
@@ -1199,11 +1234,12 @@ 
 function SetX($x)
 {
     // Set x position
-    if ($x >= 0)
-        $this->x = $x;
-    else
-        $this->x = $this->w + $x;
-}
+    if ($x >= 0) {
+            $this->x = $x;
+    } else {
+            $this->x = $this->w + $x;
+    }
+    }
 
 function GetY()
 {
@@ -1215,11 +1251,12 @@ 
 {
     // Set y position and reset x
     $this->x = $this->lMargin;
-    if ($y >= 0)
-        $this->y = $y;
-    else
-        $this->y = $this->h + $y;
-}
+    if ($y >= 0) {
+            $this->y = $y;
+    } else {
+            $this->y = $this->h + $y;
+    }
+    }
 
 function SetXY($x, $y)
 {
@@ -1231,8 +1268,9 @@ 
 function Output($name = '', $dest = '')
 {
     // Output PDF to some destination
-    if ($this->state < 3)
-        $this->Close();
+    if ($this->state < 3) {
+            $this->Close();
+    }
     $dest = strtoupper($dest);
     if ($dest == '')
     {
@@ -1271,8 +1309,9 @@ 
         case 'F':
             // Save to local file
             $f = fopen($name, 'wb');
-            if (!$f)
-                $this->Error('Unable to create output file: '.$name);
+            if (!$f) {
+                            $this->Error('Unable to create output file: '.$name);
+            }
             fwrite($f, $this->buffer, strlen($this->buffer));
             fclose($f);
             break;
@@ -1293,18 +1332,22 @@ 
 function _dochecks()
 {
     // Check availability of %F
-    if (sprintf('%.1F', 1.0) != '1.0')
-        $this->Error('This version of PHP is not supported');
+    if (sprintf('%.1F', 1.0) != '1.0') {
+            $this->Error('This version of PHP is not supported');
+    }
     // Check availability of mbstring
-    if (!function_exists('mb_strlen'))
-        $this->Error('mbstring extension is not available');
+    if (!function_exists('mb_strlen')) {
+            $this->Error('mbstring extension is not available');
+    }
     // Check mbstring overloading
-    if (ini_get('mbstring.func_overload') & 2)
-        $this->Error('mbstring overloading must be disabled');
+    if (ini_get('mbstring.func_overload') & 2) {
+            $this->Error('mbstring overloading must be disabled');
+    }
     // Ensure runtime magic quotes are disabled
-    if (get_magic_quotes_runtime())
-        @set_magic_quotes_runtime(0);
-}
+    if (get_magic_quotes_runtime()) {
+            @set_magic_quotes_runtime(0);
+    }
+    }
 
 function _getfontpath()
 {
@@ -1315,8 +1358,9 @@ 
 {
     if (PHP_SAPI != 'cli')
     {
-        if (headers_sent($file, $line))
-            $this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+        if (headers_sent($file, $line)) {
+                    $this->Error("Some data has already been output, can't send PDF file (output started at $file:$line)");
+        }
     }
     if (ob_get_length())
     {
@@ -1336,17 +1380,18 @@ 
     if (is_string($size))
     {
         $size = strtolower($size);
-        if (!isset($this->StdPageSizes[$size]))
-            $this->Error('Unknown page size: '.$size);
+        if (!isset($this->StdPageSizes[$size])) {
+                    $this->Error('Unknown page size: '.$size);
+        }
         $a = $this->StdPageSizes[$size];
         return array($a[0] / $this->k, $a[1] / $this->k);
-    }
-    else
+    } else
     {
-        if ($size[0] > $size[1])
-            return array($size[1], $size[0]);
-        else
-            return $size;
+        if ($size[0] > $size[1]) {
+                    return array($size[1], $size[0]);
+        } else {
+                    return $size;
+        }
     }
 }
 
@@ -1363,14 +1408,16 @@ 
     $this->y = $this->tMargin;
     $this->FontFamily = '';
     // Check page size and orientation
-    if ($orientation == '')
-        $orientation = $this->DefOrientation;
-    else
-        $orientation = strtoupper($orientation[0]);
-    if ($size == '')
-        $size = $this->DefPageSize;
-    else
-        $size = $this->_getpagesize($size);
+    if ($orientation == '') {
+            $orientation = $this->DefOrientation;
+    } else {
+            $orientation = strtoupper($orientation[0]);
+    }
+    if ($size == '') {
+            $size = $this->DefPageSize;
+    } else {
+            $size = $this->_getpagesize($size);
+    }
     if ($orientation != $this->CurOrientation || $size[0] != $this->CurPageSize[0] || $size[1] != $this->CurPageSize[1])
     {
         // New size or orientation
@@ -1389,9 +1436,10 @@ 
         $this->CurOrientation = $orientation;
         $this->CurPageSize = $size;
     }
-    if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1])
-        $this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
-}
+    if ($orientation != $this->DefOrientation || $size[0] != $this->DefPageSize[0] || $size[1] != $this->DefPageSize[1]) {
+            $this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
+    }
+    }
 
 function _endpage()
 {
@@ -1406,8 +1454,9 @@ 
     // Load a font definition file from the font directory
     include($this->fontpath.$font);
     $a = get_defined_vars();
-    if (!isset($a['name']))
-        $this->Error('Could not include font definition file');
+    if (!isset($a['name'])) {
+            $this->Error('Could not include font definition file');
+    }
     return $a;
 }
 
@@ -1443,15 +1492,13 @@ 
             $c3 = ord($s[$i++]);
             $res .= chr((($c1 & 0x0F) << 4) + (($c2 & 0x3C) >> 2));
             $res .= chr((($c2 & 0x03) << 6) + ($c3 & 0x3F));
-        }
-        elseif ($c1 >= 192)
+        } elseif ($c1 >= 192)
         {
             // 2-byte character
             $c2 = ord($s[$i++]);
             $res .= chr(($c1 & 0x1C) >> 2);
             $res .= chr((($c1 & 0x03) << 6) + ($c2 & 0x3F));
-        }
-        else
+        } else
         {
             // Single-byte character
             $res .= "\0".chr($c1);
@@ -1473,16 +1520,19 @@ 
 {
     // Extract info from a JPEG file
     $a = getimagesize($file);
-    if (!$a)
-        $this->Error('Missing or incorrect image file: '.$file);
-    if ($a[2] != 2)
-        $this->Error('Not a JPEG file: '.$file);
-    if (!isset($a['channels']) || $a['channels'] == 3)
-        $colspace = 'DeviceRGB';
-    elseif ($a['channels'] == 4)
-        $colspace = 'DeviceCMYK';
-    else
-        $colspace = 'DeviceGray';
+    if (!$a) {
+            $this->Error('Missing or incorrect image file: '.$file);
+    }
+    if ($a[2] != 2) {
+            $this->Error('Not a JPEG file: '.$file);
+    }
+    if (!isset($a['channels']) || $a['channels'] == 3) {
+            $colspace = 'DeviceRGB';
+    } elseif ($a['channels'] == 4) {
+            $colspace = 'DeviceCMYK';
+    } else {
+            $colspace = 'DeviceGray';
+    }
     $bpc = isset($a['bits']) ? $a['bits'] : 8;
     $data = file_get_contents($file);
     return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
@@ -1495,8 +1545,9 @@ 
 {
     // Extract info from a PNG file
     $f = fopen($file, 'rb');
-    if (!$f)
-        $this->Error('Can\'t open image file: '.$file);
+    if (!$f) {
+            $this->Error('Can\'t open image file: '.$file);
+    }
     $info = $this->_parsepngstream($f, $file);
     fclose($f);
     return $info;
@@ -1505,33 +1556,40 @@ 
 function _parsepngstream($f, $file)
 {
     // Check signature
-    if ($this->_readstream($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-        $this->Error('Not a PNG file: '.$file);
+    if ($this->_readstream($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
+            $this->Error('Not a PNG file: '.$file);
+    }
 
     // Read header chunk
     $this->_readstream($f, 4);
-    if ($this->_readstream($f, 4) != 'IHDR')
-        $this->Error('Incorrect PNG file: '.$file);
+    if ($this->_readstream($f, 4) != 'IHDR') {
+            $this->Error('Incorrect PNG file: '.$file);
+    }
     $w = $this->_readint($f);
     $h = $this->_readint($f);
     $bpc = ord($this->_readstream($f, 1));
-    if ($bpc > 8)
-        $this->Error('16-bit depth not supported: '.$file);
+    if ($bpc > 8) {
+            $this->Error('16-bit depth not supported: '.$file);
+    }
     $ct = ord($this->_readstream($f, 1));
-    if ($ct == 0 || $ct == 4)
-        $colspace = 'DeviceGray';
-    elseif ($ct == 2 || $ct == 6)
-        $colspace = 'DeviceRGB';
-    elseif ($ct == 3)
-        $colspace = 'Indexed';
-    else
-        $this->Error('Unknown color type: '.$file);
-    if (ord($this->_readstream($f, 1)) != 0)
-        $this->Error('Unknown compression method: '.$file);
-    if (ord($this->_readstream($f, 1)) != 0)
-        $this->Error('Unknown filter method: '.$file);
-    if (ord($this->_readstream($f, 1)) != 0)
-        $this->Error('Interlacing not supported: '.$file);
+    if ($ct == 0 || $ct == 4) {
+            $colspace = 'DeviceGray';
+    } elseif ($ct == 2 || $ct == 6) {
+            $colspace = 'DeviceRGB';
+    } elseif ($ct == 3) {
+            $colspace = 'Indexed';
+    } else {
+            $this->Error('Unknown color type: '.$file);
+    }
+    if (ord($this->_readstream($f, 1)) != 0) {
+            $this->Error('Unknown compression method: '.$file);
+    }
+    if (ord($this->_readstream($f, 1)) != 0) {
+            $this->Error('Unknown filter method: '.$file);
+    }
+    if (ord($this->_readstream($f, 1)) != 0) {
+            $this->Error('Interlacing not supported: '.$file);
+    }
     $this->_readstream($f, 4);
     $dp = '/Predictor 15 /Colors '.($colspace == 'DeviceRGB' ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w;
 
@@ -1548,44 +1606,45 @@ 
             // Read palette
             $pal = $this->_readstream($f, $n);
             $this->_readstream($f, 4);
-        }
-        elseif ($type == 'tRNS')
+        } elseif ($type == 'tRNS')
         {
             // Read transparency info
             $t = $this->_readstream($f, $n);
-            if ($ct == 0)
-                $trns = array(ord(substr($t, 1, 1)));
-            elseif ($ct == 2)
-                $trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
-            else
+            if ($ct == 0) {
+                            $trns = array(ord(substr($t, 1, 1)));
+            } elseif ($ct == 2) {
+                            $trns = array(ord(substr($t, 1, 1)), ord(substr($t, 3, 1)), ord(substr($t, 5, 1)));
+            } else
             {
                 $pos = strpos($t, chr(0));
-                if ($pos !== false)
-                    $trns = array($pos);
+                if ($pos !== false) {
+                                    $trns = array($pos);
+                }
             }
             $this->_readstream($f, 4);
-        }
-        elseif ($type == 'IDAT')
+        } elseif ($type == 'IDAT')
         {
             // Read image data block
             $data .= $this->_readstream($f, $n);
             $this->_readstream($f, 4);
+        } elseif ($type == 'IEND') {
+                    break;
+        } else {
+                    $this->_readstream($f, $n + 4);
         }
-        elseif ($type == 'IEND')
-            break;
-        else
-            $this->_readstream($f, $n + 4);
     }
     while ($n);
 
-    if ($colspace == 'Indexed' && empty($pal))
-        $this->Error('Missing palette in '.$file);
+    if ($colspace == 'Indexed' && empty($pal)) {
+            $this->Error('Missing palette in '.$file);
+    }
     $info = array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'dp'=>$dp, 'pal'=>$pal, 'trns'=>$trns);
     if ($ct >= 4)
     {
         // Extract alpha channel
-        if (!function_exists('gzuncompress'))
-            $this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+        if (!function_exists('gzuncompress')) {
+                    $this->Error('Zlib not available, can\'t handle alpha channel: '.$file);
+        }
         $data = gzuncompress($data);
         $color = '';
         $alpha = '';
@@ -1619,8 +1678,9 @@ 
         unset($data);
         $data = gzcompress($color);
         $info['smask'] = gzcompress($alpha);
-        if ($this->PDFVersion < '1.4')
-            $this->PDFVersion = '1.4';
+        if ($this->PDFVersion < '1.4') {
+                    $this->PDFVersion = '1.4';
+        }
     }
     $info['data'] = $data;
     return $info;
@@ -1633,13 +1693,15 @@ 
     while ($n > 0 && !feof($f))
     {
         $s = fread($f, $n);
-        if ($s === false)
-            $this->Error('Error while reading stream');
+        if ($s === false) {
+                    $this->Error('Error while reading stream');
+        }
         $n -= strlen($s);
         $res .= $s;
     }
-    if ($n > 0)
-        $this->Error('Unexpected end of stream');
+    if ($n > 0) {
+            $this->Error('Unexpected end of stream');
+    }
     return $res;
 }
 
@@ -1653,13 +1715,16 @@ 
 function _parsegif($file)
 {
     // Extract info from a GIF file (via PNG conversion)
-    if (!function_exists('imagepng'))
-        $this->Error('GD extension is required for GIF support');
-    if (!function_exists('imagecreatefromgif'))
-        $this->Error('GD has no GIF read support');
+    if (!function_exists('imagepng')) {
+            $this->Error('GD extension is required for GIF support');
+    }
+    if (!function_exists('imagecreatefromgif')) {
+            $this->Error('GD has no GIF read support');
+    }
     $im = imagecreatefromgif($file);
-    if (!$im)
-        $this->Error('Missing or incorrect image file: '.$file);
+    if (!$im) {
+            $this->Error('Missing or incorrect image file: '.$file);
+    }
     imageinterlace($im, 0);
     $f = @fopen('php://temp', 'rb+');
     if ($f)
@@ -1673,15 +1738,16 @@ 
         rewind($f);
         $info = $this->_parsepngstream($f, $file);
         fclose($f);
-    }
-    else
+    } else
     {
         // Use temporary file
         $tmp = tempnam('.', 'gif');
-        if (!$tmp)
-            $this->Error('Unable to create a temporary file');
-        if (!imagepng($im, $tmp))
-            $this->Error('Error while saving to temporary file');
+        if (!$tmp) {
+                    $this->Error('Unable to create a temporary file');
+        }
+        if (!imagepng($im, $tmp)) {
+                    $this->Error('Error while saving to temporary file');
+        }
         imagedestroy($im);
         $info = $this->_parsepng($tmp);
         unlink($tmp);
@@ -1707,11 +1773,12 @@ 
 function _out($s)
 {
     // Add a line to the document
-    if ($this->state == 2)
-        $this->pages[$this->page] .= $s."\n";
-    else
-        $this->buffer .= $s."\n";
-}
+    if ($this->state == 2) {
+            $this->pages[$this->page] .= $s."\n";
+    } else {
+            $this->buffer .= $s."\n";
+    }
+    }
 
 function _putpages()
 {
@@ -1721,18 +1788,19 @@ 
         // Replace number of pages in fonts using subsets
         $alias = $this->UTF8ToUTF16BE($this->AliasNbPages, false);
         $r = $this->UTF8ToUTF16BE("$nb", false);
-        for ($n = 1; $n <= $nb; $n++)
-            $this->pages[$n] = str_replace($alias, $r, $this->pages[$n]);
+        for ($n = 1; $n <= $nb; $n++) {
+                    $this->pages[$n] = str_replace($alias, $r, $this->pages[$n]);
+        }
         // Now repeat for no pages in non-subset fonts
-        for ($n = 1; $n <= $nb; $n++)
-            $this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);
+        for ($n = 1; $n <= $nb; $n++) {
+                    $this->pages[$n] = str_replace($this->AliasNbPages, $nb, $this->pages[$n]);
+        }
     }
     if ($this->DefOrientation == 'P')
     {
         $wPt = $this->DefPageSize[0] * $this->k;
         $hPt = $this->DefPageSize[1] * $this->k;
-    }
-    else
+    } else
     {
         $wPt = $this->DefPageSize[1] * $this->k;
         $hPt = $this->DefPageSize[0] * $this->k;
@@ -1744,8 +1812,9 @@ 
         $this->_newobj();
         $this->_out('<</Type /Page');
         $this->_out('/Parent 1 0 R');
-        if (isset($this->PageSizes[$n]))
-            $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));
+        if (isset($this->PageSizes[$n])) {
+                    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $this->PageSizes[$n][0], $this->PageSizes[$n][1]));
+        }
         $this->_out('/Resources 2 0 R');
         if (isset($this->PageLinks[$n]))
         {
@@ -1755,9 +1824,9 @@ 
             {
                 $rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
                 $annots .= '<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
-                if (is_string($pl[4]))
-                    $annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
-                else
+                if (is_string($pl[4])) {
+                                    $annots .= '/A <</S /URI /URI '.$this->_textstring($pl[4]).'>>>>';
+                } else
                 {
                     $l = $this->links[$pl[4]];
                     $h = isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
@@ -1766,8 +1835,9 @@ 
             }
             $this->_out($annots.']');
         }
-        if ($this->PDFVersion > '1.3')
-            $this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+        if ($this->PDFVersion > '1.3') {
+                    $this->_out('/Group <</Type /Group /S /Transparency /CS /DeviceRGB>>');
+        }
         $this->_out('/Contents '.($this->n + 1).' 0 R>>');
         $this->_out('endobj');
         // Page content
@@ -1889,18 +1959,21 @@ 
             $this->_newobj();
             $cw = &$font['cw'];
             $s = '[';
-            for ($i = 32; $i <= 255; $i++)
-                $s .= $cw[chr($i)].' ';
+            for ($i = 32; $i <= 255; $i++) {
+                            $s .= $cw[chr($i)].' ';
+            }
             $this->_out($s.']');
             $this->_out('endobj');
             // Descriptor
             $this->_newobj();
             $s = '<</Type /FontDescriptor /FontName /'.$name;
-            foreach ($font['desc'] as $k=>$v)
-                $s .= ' /'.$k.' '.$v;
+            foreach ($font['desc'] as $k=>$v) {
+                            $s .= ' /'.$k.' '.$v;
+            }
             $file = $font['file'];
-            if ($file)
-                $s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+            if ($file) {
+                            $s .= ' /FontFile'.($type == 'Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+            }
             $this->_out($s.'>>');
             $this->_out('endobj');
         }
@@ -2019,14 +2092,14 @@ 
             $this->_putstream($fontstream);
             $this->_out('endobj');
             unset($ttf);
-        }
-        else
+        } else
         {
             // Allow for additional types
             $this->fonts[$k]['n'] = $this->n + 1;
             $mtd = '_put'.strtolower($type);
-            if (!method_exists($this, $mtd))
-                $this->Error('Unsupported font type: '.$type);
+            if (!method_exists($this, $mtd)) {
+                            $this->Error('Unsupported font type: '.$type);
+            }
             $this->$mtd($font);
         }
     }
@@ -2058,8 +2131,7 @@ 
                 $cw127 .= '$rangeid='.$rangeid.";\n";
                 $cw127 .= '$prevcid='.$prevcid.";\n";
                 $cw127 .= '$prevwidth='.$prevwidth.";\n";
-                if ($interval) { $cw127 .= '$interval=true'.";\n"; }
-                else { $cw127 .= '$interval=false'.";\n"; }
+                if ($interval) { $cw127 .= '$interval=true'.";\n"; } else { $cw127 .= '$interval=false'.";\n"; }
                 $cw127 .= '$range='.var_export($range, true).";\n";
                 $cw127 .= "?>";
                 fwrite($fh, $cw127, strlen($cw127));
@@ -2113,21 +2185,17 @@ 
             if (isset($range[$k]['interval'])) { unset($range[$k]['interval']); }
             $range[$prevk] = array_merge($range[$prevk], $range[$k]);
             unset($range[$k]);
-        }
-        else { $prevk = $k; }
+        } else { $prevk = $k; }
         $nextk = $k + $cws;
         if (isset($ws['interval'])) {
-            if ($cws > 3) { $prevint = true; }
-            else { $prevint = false; }
+            if ($cws > 3) { $prevint = true; } else { $prevint = false; }
             unset($range[$k]['interval']);
             --$nextk;
-        }
-        else { $prevint = false; }
+        } else { $prevint = false; }
     }
     $w = '';
     foreach ($range as $k => $ws) {
-        if (count(array_count_values($ws)) == 1) { $w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0]; }
-        else { $w .= ' '.$k.' [ '.implode(' ', $ws).' ]'."\n"; }
+        if (count(array_count_values($ws)) == 1) { $w .= ' '.$k.' '.($k + count($ws) - 1).' '.$ws[0]; } else { $w .= ' '.$k.' [ '.implode(' ', $ws).' ]'."\n"; }
     }
     $this->_out('/W ['.$w.' ]');
 }
@@ -2150,28 +2218,33 @@ 
     $this->_out('/Subtype /Image');
     $this->_out('/Width '.$info['w']);
     $this->_out('/Height '.$info['h']);
-    if ($info['cs'] == 'Indexed')
-        $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');
-    else
+    if ($info['cs'] == 'Indexed') {
+            $this->_out('/ColorSpace [/Indexed /DeviceRGB '.(strlen($info['pal']) / 3 - 1).' '.($this->n + 1).' 0 R]');
+    } else
     {
         $this->_out('/ColorSpace /'.$info['cs']);
-        if ($info['cs'] == 'DeviceCMYK')
-            $this->_out('/Decode [1 0 1 0 1 0 1 0]');
+        if ($info['cs'] == 'DeviceCMYK') {
+                    $this->_out('/Decode [1 0 1 0 1 0 1 0]');
+        }
     }
     $this->_out('/BitsPerComponent '.$info['bpc']);
-    if (isset($info['f']))
-        $this->_out('/Filter /'.$info['f']);
-    if (isset($info['dp']))
-        $this->_out('/DecodeParms <<'.$info['dp'].'>>');
+    if (isset($info['f'])) {
+            $this->_out('/Filter /'.$info['f']);
+    }
+    if (isset($info['dp'])) {
+            $this->_out('/DecodeParms <<'.$info['dp'].'>>');
+    }
     if (isset($info['trns']) && is_array($info['trns']))
     {
         $trns = '';
-        for ($i = 0; $i < count($info['trns']); $i++)
-            $trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+        for ($i = 0; $i < count($info['trns']); $i++) {
+                    $trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
+        }
         $this->_out('/Mask ['.$trns.']');
     }
-    if (isset($info['smask']))
-        $this->_out('/SMask '.($this->n + 1).' 0 R');
+    if (isset($info['smask'])) {
+            $this->_out('/SMask '.($this->n + 1).' 0 R');
+    }
     $this->_out('/Length '.strlen($info['data']).'>>');
     $this->_putstream($info['data']);
     $this->_out('endobj');
@@ -2196,9 +2269,10 @@ 
 
 function _putxobjectdict()
 {
-    foreach ($this->images as $image)
-        $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
-}
+    foreach ($this->images as $image) {
+            $this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
+    }
+    }
 
 function _putresourcedict()
 {
@@ -2229,16 +2303,21 @@ 
 function _putinfo()
 {
     $this->_out('/Producer '.$this->_textstring('tFPDF '.tFPDF_VERSION));
-    if (!empty($this->title))
-        $this->_out('/Title '.$this->_textstring($this->title));
-    if (!empty($this->subject))
-        $this->_out('/Subject '.$this->_textstring($this->subject));
-    if (!empty($this->author))
-        $this->_out('/Author '.$this->_textstring($this->author));
-    if (!empty($this->keywords))
-        $this->_out('/Keywords '.$this->_textstring($this->keywords));
-    if (!empty($this->creator))
-        $this->_out('/Creator '.$this->_textstring($this->creator));
+    if (!empty($this->title)) {
+            $this->_out('/Title '.$this->_textstring($this->title));
+    }
+    if (!empty($this->subject)) {
+            $this->_out('/Subject '.$this->_textstring($this->subject));
+    }
+    if (!empty($this->author)) {
+            $this->_out('/Author '.$this->_textstring($this->author));
+    }
+    if (!empty($this->keywords)) {
+            $this->_out('/Keywords '.$this->_textstring($this->keywords));
+    }
+    if (!empty($this->creator)) {
+            $this->_out('/Creator '.$this->_textstring($this->creator));
+    }
     $this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
 }
 
@@ -2246,21 +2325,23 @@ 
 {
     $this->_out('/Type /Catalog');
     $this->_out('/Pages 1 0 R');
-    if ($this->ZoomMode == 'fullpage')
-        $this->_out('/OpenAction [3 0 R /Fit]');
-    elseif ($this->ZoomMode == 'fullwidth')
-        $this->_out('/OpenAction [3 0 R /FitH null]');
-    elseif ($this->ZoomMode == 'real')
-        $this->_out('/OpenAction [3 0 R /XYZ null null 1]');
-    elseif (!is_string($this->ZoomMode))
-        $this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F', $this->ZoomMode / 100).']');
-    if ($this->LayoutMode == 'single')
-        $this->_out('/PageLayout /SinglePage');
-    elseif ($this->LayoutMode == 'continuous')
-        $this->_out('/PageLayout /OneColumn');
-    elseif ($this->LayoutMode == 'two')
-        $this->_out('/PageLayout /TwoColumnLeft');
-}
+    if ($this->ZoomMode == 'fullpage') {
+            $this->_out('/OpenAction [3 0 R /Fit]');
+    } elseif ($this->ZoomMode == 'fullwidth') {
+            $this->_out('/OpenAction [3 0 R /FitH null]');
+    } elseif ($this->ZoomMode == 'real') {
+            $this->_out('/OpenAction [3 0 R /XYZ null null 1]');
+    } elseif (!is_string($this->ZoomMode)) {
+            $this->_out('/OpenAction [3 0 R /XYZ null null '.sprintf('%.2F', $this->ZoomMode / 100).']');
+    }
+    if ($this->LayoutMode == 'single') {
+            $this->_out('/PageLayout /SinglePage');
+    } elseif ($this->LayoutMode == 'continuous') {
+            $this->_out('/PageLayout /OneColumn');
+    } elseif ($this->LayoutMode == 'two') {
+            $this->_out('/PageLayout /TwoColumnLeft');
+    }
+    }
 
 function _putheader()
 {
@@ -2296,8 +2377,9 @@ 
     $this->_out('xref');
     $this->_out('0 '.($this->n + 1));
     $this->_out('0000000000 65535 f ');
-    for ($i = 1; $i <= $this->n; $i++)
-        $this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
+    for ($i = 1; $i <= $this->n; $i++) {
+            $this->_out(sprintf('%010d 00000 n ', $this->offsets[$i]));
+    }
     // Trailer
     $this->_out('trailer');
     $this->_out('<<');
@@ -2327,18 +2409,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/ciphers/DES.php

Doc Comments +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 	 * to the self::$_e[] table.
 	 * This is only used in the F() function
 	 *
-	 * @param array $r 32 bit binary, each bit in an array element
+	 * @param string $r 32 bit binary, each bit in an array element
 	 * @return string 48 bit binary string
 	 */
 	private function e($r)

Braces +23 added lines, -16 removed lines

@@ -201,10 +201,11 @@ 
 		{
 			$l[$n] = $r[$n - 1];
 
-			if ($this->operation() == parent::DECRYPT)
-				$f = $this->F($r[$n - 1], $this->sub_keys[16 - $n]);
-			else
-				$f = $this->F($r[$n - 1], $this->sub_keys[$n - 1]);
+			if ($this->operation() == parent::DECRYPT) {
+							$f = $this->F($r[$n - 1], $this->sub_keys[16 - $n]);
+			} else {
+							$f = $this->F($r[$n - 1], $this->sub_keys[$n - 1]);
+			}
 
 			// XOR F with Ln
 			$r[$n] = $this->xorBin($l[$n - 1], $f);
@@ -240,8 +241,9 @@ 
 		$binkey = parent::str2Bin($this->key());
 
 		// reduce the key down to 56bits based on table $_pc1
-		for ($i = 0; $i < 56; ++$i)
-            $pc1m[$i] = $binkey[self::$_pc1[$i] - 1];
+		for ($i = 0; $i < 56; ++$i) {
+		            $pc1m[$i] = $binkey[self::$_pc1[$i] - 1];
+		}
 
 		// split $pc1m in half (C0 and D0)
 		$c[0] = array_slice($pc1m, 0, 28);
@@ -270,8 +272,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[self::$_pc2[$j] - 1];
+			for ($j = 0; $j < 48; ++$j) {
+							$this->sub_keys[$i - 1] .= $CnDn[self::$_pc2[$j] - 1];
+			}
 		}
 
 		// the sub_keys are created, we are done with the key permutation
@@ -303,8 +306,9 @@ 
 		$ip = "";
 
 		// loop through the 64 bit block, ordering it occording to $_ip
-		for ($i = 0; $i < 64; ++$i)
-			$ip .= $text[self::$_ip[$i] - 1];
+		for ($i = 0; $i < 64; ++$i) {
+					$ip .= $text[self::$_ip[$i] - 1];
+		}
 
 		return $ip;
 	}
@@ -346,8 +350,9 @@ 
 	private function e($r)
 	{
 		$e = "";
-		for ($i = 0; $i < 48; ++$i)
-			$e .= $r[self::$_e[$i] - 1];
+		for ($i = 0; $i < 48; ++$i) {
+					$e .= $r[self::$_e[$i] - 1];
+		}
 
 		return $e;
 	}
@@ -402,8 +407,9 @@ 
 	private function p($s)
 	{
 		$p = "";
-		for ($i = 0; $i < 32; ++$i)
-			$p .= $s[self::$_p[$i] - 1];
+		for ($i = 0; $i < 32; ++$i) {
+					$p .= $s[self::$_p[$i] - 1];
+		}
 
 		return $p;
 	}
@@ -420,8 +426,9 @@ 
 	private function fp($bin)
 	{
 		$fp = "";
-		for ($i = 0; $i < 64; ++$i)
-			$fp .= $bin[self::$_fp[$i] - 1];
+		for ($i = 0; $i < 64; ++$i) {
+					$fp .= $bin[self::$_fp[$i] - 1];
+		}
 
 		return $fp;
 	}

install/libs/aesctr.php

Doc Comments +5 added lines, -5 removed lines

@@ -232,10 +232,10 @@ 
      *
      * Unicode multi-byte character safe
      *
-     * @param plaintext source text to be encrypted
+     * @param plaintext string text to be encrypted
      * @param password  the password to use to generate a key
-     * @param nBits     number of bits to be used in the key (128, 192, or 256)
-     * @return          encrypted text
+     * @param nBits     integer of bits to be used in the key (128, 192, or 256)
+     * @return          string text
      */
     public static function encrypt($plaintext, $password, $nBits)
     {
@@ -315,8 +315,8 @@ 
      *
      * @param ciphertext source text to be decrypted
      * @param password   the password to use to generate a key
-     * @param nBits      number of bits to be used in the key (128, 192, or 256)
-     * @return           decrypted text
+     * @param nBits      integer of bits to be used in the key (128, 192, or 256)
+     * @return           string text
      */
     public static function decrypt($ciphertext, $password, $nBits)
     {

api/functions.php

Braces +23 added lines, -13 removed lines

@@ -352,8 +352,7 @@ 
 
                     $x++;
                 }
-            }
-            else if ($GLOBALS['request'][1] == "userpw") {
+            } else if ($GLOBALS['request'][1] == "userpw") {
                 /*
                 * READ USER ITEMS
                 */
@@ -437,8 +436,7 @@ 
 
                     $x++;
                 }
-            }
-            else if ($GLOBALS['request'][1] == "userfolders") {
+            } else if ($GLOBALS['request'][1] == "userfolders") {
                 /*
                 * READ USER FOLDERS
                 * Sends back a list of folders
@@ -481,8 +479,7 @@ 
                         }
                     }
                 }
-            }
-            elseif ($GLOBALS['request'][1] == "items") {
+            } elseif ($GLOBALS['request'][1] == "items") {
                 /*
                 * READ ITEMS asked
                 */
@@ -829,8 +826,11 @@ 
                                 "SELECT `id` FROM ".prefix_table("roles_title")." WHERE title = %s",
                                 $role
                             );
-                            if (empty($rolesList)) $rolesList = $tmp['id'];
-                            else $rolesList .= ";".$tmp['id'];
+                            if (empty($rolesList)) {
+                                $rolesList = $tmp['id'];
+                            } else {
+                                $rolesList .= ";".$tmp['id'];
+                            }
                         }
 
                         // Add user in DB
@@ -1925,11 +1925,21 @@ 
 
                 // init
                 $pwgen->setLength($params[0]);
-                if ($params[1] === "1") $pwgen->setSecure(true);
-                if ($params[2] === "1") $pwgen->setNumerals(true);
-                if ($params[3] === "1") $pwgen->setCapitalize(true);
-                if ($params[4] === "1") $pwgen->setAmbiguous(true);
-                if ($params[5] === "1" && $params[6] === "1") $pwgen->setSymbols(true);
+                if ($params[1] === "1") {
+                    $pwgen->setSecure(true);
+                }
+                if ($params[2] === "1") {
+                    $pwgen->setNumerals(true);
+                }
+                if ($params[3] === "1") {
+                    $pwgen->setCapitalize(true);
+                }
+                if ($params[4] === "1") {
+                    $pwgen->setAmbiguous(true);
+                }
+                if ($params[5] === "1" && $params[6] === "1") {
+                    $pwgen->setSymbols(true);
+                }
 
                 // generate and send back (generate in base64 if symbols are asked)
                 if ($params[6] === "1") {