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'];

Indentation +1036 added lines, -1036 removed lines

@@ -69,41 +69,41 @@ 
 var $defaultWidth;
 var $maxStrLenRead;
 
-	function __construct() {
-		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
-	}
-
-
-	/**
-	 * @param string $file
-	 */
-	function getMetrics($file) {
-		$this->filename = $file;
-		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
-		$this->_pos = 0;
-		$this->charWidths = '';
-		$this->glyphPos = array();
-		$this->charToGlyph = array();
-		$this->tables = array();
-		$this->otables = array();
-		$this->ascent = 0;
-		$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);
-		$this->readTableDirectory();
-		$this->extractInfo();
-		fclose($this->fh);
-	}
-
-
-	function readTableDirectory() {
-	    $this->numTables = $this->read_ushort();
+    function __construct() {
+        $this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
+    }
+
+
+    /**
+     * @param string $file
+     */
+    function getMetrics($file) {
+        $this->filename = $file;
+        $this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
+        $this->_pos = 0;
+        $this->charWidths = '';
+        $this->glyphPos = array();
+        $this->charToGlyph = array();
+        $this->tables = array();
+        $this->otables = array();
+        $this->ascent = 0;
+        $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);
+        $this->readTableDirectory();
+        $this->extractInfo();
+        fclose($this->fh);
+    }
+
+
+    function readTableDirectory() {
+        $this->numTables = $this->read_ushort();
             $this->searchRange = $this->read_ushort();
             $this->entrySelector = $this->read_ushort();
             $this->rangeShift = $this->read_ushort();
@@ -115,178 +115,178 @@ 
                 $record['offset'] = $this->read_ulong();
                 $record['length'] = $this->read_ulong();
                 $this->tables[$record['tag']] = $record;
-		}
-	}
-
-
-	/**
-	 * @param integer[] $x
-	 * @param integer[] $y
-	 */
-	function sub32($x, $y) {
-		$xlo = $x[1];
-		$xhi = $x[0];
-		$ylo = $y[1];
-		$yhi = $y[0];
-		if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
-		$reslo = $xlo - $ylo;
-		if ($yhi > $xhi) { $xhi += 1 << 16; }
-		$reshi = $xhi - $yhi;
-		$reshi = $reshi & 0xFFFF;
-		return array($reshi, $reslo);
-	}
-
-	function calcChecksum($data) {
-		if (strlen($data) % 4) { $data .= str_repeat("\0", (4 - (strlen($data) % 4))); }
-		$hi = 0x0000;
-		$lo = 0x0000;
-		for ($i = 0; $i < strlen($data); $i += 4) {
-			$hi += (ord($data[$i]) << 8) + ord($data[$i + 1]);
-			$lo += (ord($data[$i + 2]) << 8) + ord($data[$i + 3]);
-			$hi += $lo >> 16;
-			$lo = $lo & 0xFFFF;
-			$hi = $hi & 0xFFFF;
-		}
-		return array($hi, $lo);
-	}
-
-	function get_table_pos($tag) {
-		$offset = $this->tables[$tag]['offset'];
-		$length = $this->tables[$tag]['length'];
-		return array($offset, $length);
-	}
-
-	function seek($pos) {
-		$this->_pos = $pos;
-		fseek($this->fh,$this->_pos);
-	}
-
-	/**
-	 * @param integer $delta
-	 */
-	function skip($delta) {
-		$this->_pos = $this->_pos + $delta;
-		fseek($this->fh,$this->_pos);
-	}
-
-	/**
-	 * @param string $tag
-	 */
-	function seek_table($tag, $offset_in_table = 0) {
-		$tpos = $this->get_table_pos($tag);
-		$this->_pos = $tpos[0] + $offset_in_table;
-		fseek($this->fh, $this->_pos);
-		return $this->_pos;
-	}
-
-	function read_tag() {
-		$this->_pos += 4;
-		return fread($this->fh, 4);
-	}
-
-	function read_short() {
-		$this->_pos += 2;
-		$s = fread($this->fh, 2);
-		$a = (ord($s[0]) << 8) + ord($s[1]);
-		if ($a & (1 << 15)) { $a = ($a - (1 << 16)); }
-		return $a;
-	}
-
-	function unpack_short($s) {
-		$a = (ord($s[0]) << 8) + ord($s[1]);
-		if ($a & (1 << 15)) { 
-			$a = ($a - (1 << 16)); 
-		}
-		return $a;
-	}
-
-	function read_ushort() {
-		$this->_pos += 2;
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
-	}
-
-	function read_ulong() {
-		$this->_pos += 4;
-		$s = fread($this->fh,4);
-		// if large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
-	}
-
-	function get_ushort($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
-	}
-
-	function get_ulong($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,4);
-		// iF large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
-	}
-
-	function pack_short($val) {
-		if ($val<0) { 
-			$val = abs($val);
-			$val = ~$val;
-			$val += 1;
-		}
-		return pack("n",$val); 
-	}
-
-	/**
-	 * @param string $value
-	 */
-	function splice($stream, $offset, $value) {
-		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
-	}
-
-	/**
-	 * @param string|null $stream
-	 * @param integer $offset
-	 */
-	function _set_ushort($stream, $offset, $value) {
-		$up = pack("n", $value);
-		return $this->splice($stream, $offset, $up);
-	}
-
-	function _set_short($stream, $offset, $val) {
-		if ($val<0) { 
-			$val = abs($val);
-			$val = ~$val;
-			$val += 1;
-		}
-		$up = pack("n",$val); 
-		return $this->splice($stream, $offset, $up);
-	}
-
-	function get_chunk($pos, $length) {
-		fseek($this->fh,$pos);
-		if ($length <1) { return ''; }
-		return (fread($this->fh,$length));
-	}
-
-	/**
-	 * @param string $tag
-	 */
-	function get_table($tag) {
-		list($pos, $length) = $this->get_table_pos($tag);
-		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
-		fseek($this->fh,$pos);
-		return (fread($this->fh,$length));
-	}
-
-	/**
-	 * @param string $tag
-	 * @param null|string $data
-	 */
-	function add($tag, $data) {
-		if ($tag == 'head') {
-			$data = $this->splice($data, 8, "\0\0\0\0");
-		}
-		$this->otables[$tag] = $data;
-	}
+        }
+    }
+
+
+    /**
+     * @param integer[] $x
+     * @param integer[] $y
+     */
+    function sub32($x, $y) {
+        $xlo = $x[1];
+        $xhi = $x[0];
+        $ylo = $y[1];
+        $yhi = $y[0];
+        if ($ylo > $xlo) { $xlo += 1 << 16; $yhi += 1; }
+        $reslo = $xlo - $ylo;
+        if ($yhi > $xhi) { $xhi += 1 << 16; }
+        $reshi = $xhi - $yhi;
+        $reshi = $reshi & 0xFFFF;
+        return array($reshi, $reslo);
+    }
+
+    function calcChecksum($data) {
+        if (strlen($data) % 4) { $data .= str_repeat("\0", (4 - (strlen($data) % 4))); }
+        $hi = 0x0000;
+        $lo = 0x0000;
+        for ($i = 0; $i < strlen($data); $i += 4) {
+            $hi += (ord($data[$i]) << 8) + ord($data[$i + 1]);
+            $lo += (ord($data[$i + 2]) << 8) + ord($data[$i + 3]);
+            $hi += $lo >> 16;
+            $lo = $lo & 0xFFFF;
+            $hi = $hi & 0xFFFF;
+        }
+        return array($hi, $lo);
+    }
+
+    function get_table_pos($tag) {
+        $offset = $this->tables[$tag]['offset'];
+        $length = $this->tables[$tag]['length'];
+        return array($offset, $length);
+    }
+
+    function seek($pos) {
+        $this->_pos = $pos;
+        fseek($this->fh,$this->_pos);
+    }
+
+    /**
+     * @param integer $delta
+     */
+    function skip($delta) {
+        $this->_pos = $this->_pos + $delta;
+        fseek($this->fh,$this->_pos);
+    }
+
+    /**
+     * @param string $tag
+     */
+    function seek_table($tag, $offset_in_table = 0) {
+        $tpos = $this->get_table_pos($tag);
+        $this->_pos = $tpos[0] + $offset_in_table;
+        fseek($this->fh, $this->_pos);
+        return $this->_pos;
+    }
+
+    function read_tag() {
+        $this->_pos += 4;
+        return fread($this->fh, 4);
+    }
+
+    function read_short() {
+        $this->_pos += 2;
+        $s = fread($this->fh, 2);
+        $a = (ord($s[0]) << 8) + ord($s[1]);
+        if ($a & (1 << 15)) { $a = ($a - (1 << 16)); }
+        return $a;
+    }
+
+    function unpack_short($s) {
+        $a = (ord($s[0]) << 8) + ord($s[1]);
+        if ($a & (1 << 15)) { 
+            $a = ($a - (1 << 16)); 
+        }
+        return $a;
+    }
+
+    function read_ushort() {
+        $this->_pos += 2;
+        $s = fread($this->fh,2);
+        return (ord($s[0])<<8) + ord($s[1]);
+    }
+
+    function read_ulong() {
+        $this->_pos += 4;
+        $s = fread($this->fh,4);
+        // if large uInt32 as an integer, PHP converts it to -ve
+        return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+    }
+
+    function get_ushort($pos) {
+        fseek($this->fh,$pos);
+        $s = fread($this->fh,2);
+        return (ord($s[0])<<8) + ord($s[1]);
+    }
+
+    function get_ulong($pos) {
+        fseek($this->fh,$pos);
+        $s = fread($this->fh,4);
+        // iF large uInt32 as an integer, PHP converts it to -ve
+        return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+    }
+
+    function pack_short($val) {
+        if ($val<0) { 
+            $val = abs($val);
+            $val = ~$val;
+            $val += 1;
+        }
+        return pack("n",$val); 
+    }
+
+    /**
+     * @param string $value
+     */
+    function splice($stream, $offset, $value) {
+        return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
+    }
+
+    /**
+     * @param string|null $stream
+     * @param integer $offset
+     */
+    function _set_ushort($stream, $offset, $value) {
+        $up = pack("n", $value);
+        return $this->splice($stream, $offset, $up);
+    }
+
+    function _set_short($stream, $offset, $val) {
+        if ($val<0) { 
+            $val = abs($val);
+            $val = ~$val;
+            $val += 1;
+        }
+        $up = pack("n",$val); 
+        return $this->splice($stream, $offset, $up);
+    }
+
+    function get_chunk($pos, $length) {
+        fseek($this->fh,$pos);
+        if ($length <1) { return ''; }
+        return (fread($this->fh,$length));
+    }
+
+    /**
+     * @param string $tag
+     */
+    function get_table($tag) {
+        list($pos, $length) = $this->get_table_pos($tag);
+        if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
+        fseek($this->fh,$pos);
+        return (fread($this->fh,$length));
+    }
+
+    /**
+     * @param string $tag
+     * @param null|string $data
+     */
+    function add($tag, $data) {
+        if ($tag == 'head') {
+            $data = $this->splice($data, 8, "\0\0\0\0");
+        }
+        $this->otables[$tag] = $data;
+    }
 
 
 
@@ -295,841 +295,841 @@ 
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-	function extractInfo() {
-		///////////////////////////////////
-		// name - Naming table
-		///////////////////////////////////
-			$this->sFamilyClass = 0;
-			$this->sFamilySubClass = 0;
-
-			$name_offset = $this->seek_table("name");
-			$format = $this->read_ushort();
-			if ($format != 0) {
-							die("Unknown name table format ".$format);
-			}
-			$numRecords = $this->read_ushort();
-			$string_data_offset = $name_offset + $this->read_ushort();
-			$names = array(1=>'', 2=>'', 3=>'', 4=>'', 6=>'');
-			$K = array_keys($names);
-			$nameCount = count($names);
-			for ($i = 0; $i < $numRecords; $i++) {
-				$platformId = $this->read_ushort();
-				$encodingId = $this->read_ushort();
-				$languageId = $this->read_ushort();
-				$nameId = $this->read_ushort();
-				$length = $this->read_ushort();
-				$offset = $this->read_ushort();
-				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");
-					$length /= 2;
-					$N = '';
-					while ($length > 0) {
-						$char = $this->read_ushort();
-						$N .= (chr($char));
-						$length -= 1;
-					}
-					$this->_pos = $opos;
-					$this->seek($opos);
-				} else if ($platformId == 1 && $encodingId == 0 && $languageId == 0) { // Macintosh, Roman, English, PS Name
-					$opos = $this->_pos;
-					$N = $this->get_chunk($string_data_offset + $offset, $length);
-					$this->_pos = $opos;
-					$this->seek($opos);
-				}
-				if ($N && $names[$nameId] == '') {
-					$names[$nameId] = $N;
-					$nameCount -= 1;
-					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");
-			$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'; }
-			if ($names[4]) { $this->fullName = $names[4]; } else { $this->fullName = $psName; }
-			if ($names[3]) { $this->uniqueFontID = $names[3]; } else { $this->uniqueFontID = $psName; }
-			if ($names[6]) { $this->fullName = $names[6]; }
-
-		///////////////////////////////////
-		// head - Font header table
-		///////////////////////////////////
-		$this->seek_table("head");
-		$this->skip(18); 
-		$this->unitsPerEm = $unitsPerEm = $this->read_ushort();
-		$scale = 1000 / $unitsPerEm;
-		$this->skip(16);
-		$xMin = $this->read_short();
-		$yMin = $this->read_short();
-		$xMax = $this->read_short();
-		$yMax = $this->read_short();
-		$this->bbox = array(($xMin * $scale), ($yMin * $scale), ($xMax * $scale), ($yMax * $scale));
-		$this->skip(3 * 2);
-		$indexToLocFormat = $this->read_ushort();
-		$glyphDataFormat = $this->read_ushort();
-		if ($glyphDataFormat != 0) {
-					die('Unknown glyph data format '.$glyphDataFormat);
-		}
-
-		///////////////////////////////////
-		// hhea metrics table
-		///////////////////////////////////
-		// ttf2t1 seems to use this value rather than the one in OS/2 - so put in for compatibility
-		if (isset($this->tables["hhea"])) {
-			$this->seek_table("hhea");
-			$this->skip(4);
-			$hheaAscender = $this->read_short();
-			$hheaDescender = $this->read_short();
-			$this->ascent = ($hheaAscender * $scale);
-			$this->descent = ($hheaDescender * $scale);
-		}
-
-		///////////////////////////////////
-		// OS/2 - OS/2 and Windows metrics table
-		///////////////////////////////////
-		if (isset($this->tables["OS/2"])) {
-			$this->seek_table("OS/2");
-			$version = $this->read_ushort();
-			$this->skip(2);
-			$usWeightClass = $this->read_ushort();
-			$this->skip(2);
-			$fsType = $this->read_ushort();
-			if ($fsType == 0x0002 || ($fsType & 0x0300) != 0) {
-				die('ERROR - Font file '.$this->filename.' cannot be embedded due to copyright restrictions.');
-				$this->restrictedUse = true;
-			}
-			$this->skip(20);
-			$sF = $this->read_short();
-			$this->sFamilyClass = ($sF >> 8);
-			$this->sFamilySubClass = ($sF & 0xFF);
-			$this->_pos += 10; //PANOSE = 10 byte length
-			$panose = fread($this->fh, 10);
-			$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 ($version > 1) {
-				$this->skip(16);
-				$sCapHeight = $this->read_short();
-				$this->capHeight = ($sCapHeight * $scale);
-			}
-			else {
-				$this->capHeight = $this->ascent;
-			}
-		}
-		else {
-			$usWeightClass = 500;
-			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));
-
-		///////////////////////////////////
-		// post - PostScript table
-		///////////////////////////////////
-		$this->seek_table("post");
-		$this->skip(4); 
-		$this->italicAngle = $this->read_short() + $this->read_ushort() / 65536.0;
-		$this->underlinePosition = $this->read_short() * $scale;
-		$this->underlineThickness = $this->read_short() * $scale;
-		$isFixedPitch = $this->read_ulong();
-
-		$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;
-
-		///////////////////////////////////
-		// hhea - Horizontal header table
-		///////////////////////////////////
-		$this->seek_table("hhea");
-		$this->skip(32); 
-		$metricDataFormat = $this->read_ushort();
-		if ($metricDataFormat != 0) {
-					die('Unknown horizontal metric data format '.$metricDataFormat);
-		}
-		$numberOfHMetrics = $this->read_ushort();
-		if ($numberOfHMetrics == 0) {
-					die('Number of horizontal metrics is 0');
-		}
-
-		///////////////////////////////////
-		// maxp - Maximum profile table
-		///////////////////////////////////
-		$this->seek_table("maxp");
-		$this->skip(4); 
-		$numGlyphs = $this->read_ushort();
-
-
-		///////////////////////////////////
-		// cmap - Character to glyph index mapping table
-		///////////////////////////////////
-		$cmap_offset = $this->seek_table("cmap");
-		$this->skip(2);
-		$cmapTableCount = $this->read_ushort();
-		$unicode_cmap_offset = 0;
-		for ($i = 0; $i < $cmapTableCount; $i++) {
-			$platformID = $this->read_ushort();
-			$encodingID = $this->read_ushort();
-			$offset = $this->read_ulong();
-			$save_pos = $this->_pos;
-			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;
-					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)');
-
-
-		$glyphToChar = array();
-		$charToGlyph = array();
-		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph);
-
-		///////////////////////////////////
-		// hmtx - Horizontal metrics table
-		///////////////////////////////////
-		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
-
-	}
+    function extractInfo() {
+        ///////////////////////////////////
+        // name - Naming table
+        ///////////////////////////////////
+            $this->sFamilyClass = 0;
+            $this->sFamilySubClass = 0;
+
+            $name_offset = $this->seek_table("name");
+            $format = $this->read_ushort();
+            if ($format != 0) {
+                            die("Unknown name table format ".$format);
+            }
+            $numRecords = $this->read_ushort();
+            $string_data_offset = $name_offset + $this->read_ushort();
+            $names = array(1=>'', 2=>'', 3=>'', 4=>'', 6=>'');
+            $K = array_keys($names);
+            $nameCount = count($names);
+            for ($i = 0; $i < $numRecords; $i++) {
+                $platformId = $this->read_ushort();
+                $encodingId = $this->read_ushort();
+                $languageId = $this->read_ushort();
+                $nameId = $this->read_ushort();
+                $length = $this->read_ushort();
+                $offset = $this->read_ushort();
+                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");
+                    $length /= 2;
+                    $N = '';
+                    while ($length > 0) {
+                        $char = $this->read_ushort();
+                        $N .= (chr($char));
+                        $length -= 1;
+                    }
+                    $this->_pos = $opos;
+                    $this->seek($opos);
+                } else if ($platformId == 1 && $encodingId == 0 && $languageId == 0) { // Macintosh, Roman, English, PS Name
+                    $opos = $this->_pos;
+                    $N = $this->get_chunk($string_data_offset + $offset, $length);
+                    $this->_pos = $opos;
+                    $this->seek($opos);
+                }
+                if ($N && $names[$nameId] == '') {
+                    $names[$nameId] = $N;
+                    $nameCount -= 1;
+                    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");
+            $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'; }
+            if ($names[4]) { $this->fullName = $names[4]; } else { $this->fullName = $psName; }
+            if ($names[3]) { $this->uniqueFontID = $names[3]; } else { $this->uniqueFontID = $psName; }
+            if ($names[6]) { $this->fullName = $names[6]; }
+
+        ///////////////////////////////////
+        // head - Font header table
+        ///////////////////////////////////
+        $this->seek_table("head");
+        $this->skip(18); 
+        $this->unitsPerEm = $unitsPerEm = $this->read_ushort();
+        $scale = 1000 / $unitsPerEm;
+        $this->skip(16);
+        $xMin = $this->read_short();
+        $yMin = $this->read_short();
+        $xMax = $this->read_short();
+        $yMax = $this->read_short();
+        $this->bbox = array(($xMin * $scale), ($yMin * $scale), ($xMax * $scale), ($yMax * $scale));
+        $this->skip(3 * 2);
+        $indexToLocFormat = $this->read_ushort();
+        $glyphDataFormat = $this->read_ushort();
+        if ($glyphDataFormat != 0) {
+                    die('Unknown glyph data format '.$glyphDataFormat);
+        }
+
+        ///////////////////////////////////
+        // hhea metrics table
+        ///////////////////////////////////
+        // ttf2t1 seems to use this value rather than the one in OS/2 - so put in for compatibility
+        if (isset($this->tables["hhea"])) {
+            $this->seek_table("hhea");
+            $this->skip(4);
+            $hheaAscender = $this->read_short();
+            $hheaDescender = $this->read_short();
+            $this->ascent = ($hheaAscender * $scale);
+            $this->descent = ($hheaDescender * $scale);
+        }
+
+        ///////////////////////////////////
+        // OS/2 - OS/2 and Windows metrics table
+        ///////////////////////////////////
+        if (isset($this->tables["OS/2"])) {
+            $this->seek_table("OS/2");
+            $version = $this->read_ushort();
+            $this->skip(2);
+            $usWeightClass = $this->read_ushort();
+            $this->skip(2);
+            $fsType = $this->read_ushort();
+            if ($fsType == 0x0002 || ($fsType & 0x0300) != 0) {
+                die('ERROR - Font file '.$this->filename.' cannot be embedded due to copyright restrictions.');
+                $this->restrictedUse = true;
+            }
+            $this->skip(20);
+            $sF = $this->read_short();
+            $this->sFamilyClass = ($sF >> 8);
+            $this->sFamilySubClass = ($sF & 0xFF);
+            $this->_pos += 10; //PANOSE = 10 byte length
+            $panose = fread($this->fh, 10);
+            $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 ($version > 1) {
+                $this->skip(16);
+                $sCapHeight = $this->read_short();
+                $this->capHeight = ($sCapHeight * $scale);
+            }
+            else {
+                $this->capHeight = $this->ascent;
+            }
+        }
+        else {
+            $usWeightClass = 500;
+            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));
+
+        ///////////////////////////////////
+        // post - PostScript table
+        ///////////////////////////////////
+        $this->seek_table("post");
+        $this->skip(4); 
+        $this->italicAngle = $this->read_short() + $this->read_ushort() / 65536.0;
+        $this->underlinePosition = $this->read_short() * $scale;
+        $this->underlineThickness = $this->read_short() * $scale;
+        $isFixedPitch = $this->read_ulong();
+
+        $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;
+
+        ///////////////////////////////////
+        // hhea - Horizontal header table
+        ///////////////////////////////////
+        $this->seek_table("hhea");
+        $this->skip(32); 
+        $metricDataFormat = $this->read_ushort();
+        if ($metricDataFormat != 0) {
+                    die('Unknown horizontal metric data format '.$metricDataFormat);
+        }
+        $numberOfHMetrics = $this->read_ushort();
+        if ($numberOfHMetrics == 0) {
+                    die('Number of horizontal metrics is 0');
+        }
+
+        ///////////////////////////////////
+        // maxp - Maximum profile table
+        ///////////////////////////////////
+        $this->seek_table("maxp");
+        $this->skip(4); 
+        $numGlyphs = $this->read_ushort();
+
+
+        ///////////////////////////////////
+        // cmap - Character to glyph index mapping table
+        ///////////////////////////////////
+        $cmap_offset = $this->seek_table("cmap");
+        $this->skip(2);
+        $cmapTableCount = $this->read_ushort();
+        $unicode_cmap_offset = 0;
+        for ($i = 0; $i < $cmapTableCount; $i++) {
+            $platformID = $this->read_ushort();
+            $encodingID = $this->read_ushort();
+            $offset = $this->read_ulong();
+            $save_pos = $this->_pos;
+            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;
+                    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)');
+
+
+        $glyphToChar = array();
+        $charToGlyph = array();
+        $this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph);
+
+        ///////////////////////////////////
+        // hmtx - Horizontal metrics table
+        ///////////////////////////////////
+        $this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
+
+    }
 
 
 /////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////
 
 
-	/**
-	 * @return string
-	 */
-	function makeSubset($file, &$subset) {
-		$this->filename = $file;
-		$this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
-		$this->_pos = 0;
-		$this->charWidths = '';
-		$this->glyphPos = array();
-		$this->charToGlyph = array();
-		$this->tables = array();
-		$this->otables = array();
-		$this->ascent = 0;
-		$this->descent = 0;
-		$this->skip(4);
-		$this->maxUni = 0;
-		$this->readTableDirectory();
-
-
-		///////////////////////////////////
-		// head - Font header table
-		///////////////////////////////////
-		$this->seek_table("head");
-		$this->skip(50); 
-		$indexToLocFormat = $this->read_ushort();
-		$glyphDataFormat = $this->read_ushort();
-
-		///////////////////////////////////
-		// hhea - Horizontal header table
-		///////////////////////////////////
-		$this->seek_table("hhea");
-		$this->skip(32); 
-		$metricDataFormat = $this->read_ushort();
-		$orignHmetrics = $numberOfHMetrics = $this->read_ushort();
-
-		///////////////////////////////////
-		// maxp - Maximum profile table
-		///////////////////////////////////
-		$this->seek_table("maxp");
-		$this->skip(4);
-		$numGlyphs = $this->read_ushort();
-
-
-		///////////////////////////////////
-		// cmap - Character to glyph index mapping table
-		///////////////////////////////////
-		$cmap_offset = $this->seek_table("cmap");
-		$this->skip(2);
-		$cmapTableCount = $this->read_ushort();
-		$unicode_cmap_offset = 0;
-		for ($i = 0; $i < $cmapTableCount; $i++) {
-			$platformID = $this->read_ushort();
-			$encodingID = $this->read_ushort();
-			$offset = $this->read_ulong();
-			$save_pos = $this->_pos;
-			if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
-				$format = $this->get_ushort($cmap_offset + $offset);
-				if ($format == 4) {
-					$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)');
-
-
-		$glyphToChar = array();
-		$charToGlyph = array();
-		$this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph);
-
-		$this->charToGlyph = $charToGlyph;
-
-		///////////////////////////////////
-		// hmtx - Horizontal metrics table
-		///////////////////////////////////
-		$scale = 1; // not used
-		$this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
-
-		///////////////////////////////////
-		// loca - Index to location
-		///////////////////////////////////
-		$this->getLOCA($indexToLocFormat, $numGlyphs);
-
-		$subsetglyphs = array(0=>0); 
-		$subsetCharToGlyph = array();
-		foreach ($subset AS $code) {
-			if (isset($this->charToGlyph[$code])) {
-				$subsetglyphs[$this->charToGlyph[$code]] = $code; // Old Glyph ID => Unicode
-				$subsetCharToGlyph[$code] = $this->charToGlyph[$code]; // Unicode to old GlyphID
-
-			}
-			$this->maxUni = max($this->maxUni, $code);
-		}
-
-		list($start, $dummy) = $this->get_table_pos('glyf');
-
-		$glyphSet = array();
-		ksort($subsetglyphs);
-		$n = 0;
-		$fsLastCharIndex = 0; // maximum Unicode index (character code) in this font, according to the cmap subtable for platform ID 3 and platform- specific encoding ID 0 or 1.
-		foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
-			$fsLastCharIndex = max($fsLastCharIndex, $uni);
-			$glyphSet[$originalGlyphIdx] = $n; // old glyphID to new glyphID
-			$n++;
-		}
-
-		ksort($subsetCharToGlyph);
-		foreach ($subsetCharToGlyph AS $uni => $originalGlyphIdx) {
-			$codeToGlyph[$uni] = $glyphSet[$originalGlyphIdx];
-		}
-		$this->codeToGlyph = $codeToGlyph;
-
-		ksort($subsetglyphs);
-		foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
-			$this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs);
-		}
-
-		$numGlyphs = $numberOfHMetrics = count($subsetglyphs);
-
-		//tables copied from the original
-		$tags = array('name');
-		foreach ($tags AS $tag) { $this->add($tag, $this->get_table($tag)); }
-		$tags = array('cvt ', 'fpgm', 'prep', 'gasp');
-		foreach ($tags AS $tag) {
-			if (isset($this->tables[$tag])) { $this->add($tag, $this->get_table($tag)); }
-		}
-
-		// post - PostScript
-		$opost = $this->get_table('post');
-		$post = "\x00\x03\x00\x00".substr($opost, 4, 12)."\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-		$this->add('post', $post);
-
-		// Sort CID2GID map into segments of contiguous codes
-		ksort($codeToGlyph);
-		unset($codeToGlyph[0]);
-		//unset($codeToGlyph[65535]);
-		$rangeid = 0;
-		$range = array();
-		$prevcid = -2;
-		$prevglidx = -1;
-		// for each character
-		foreach ($codeToGlyph as $cid => $glidx) {
-			if ($cid == ($prevcid + 1) && $glidx == ($prevglidx + 1)) {
-				$range[$rangeid][] = $glidx;
-			} else {
-				// new range
-				$rangeid = $cid;
-				$range[$rangeid] = array();
-				$range[$rangeid][] = $glidx;
-			}
-			$prevcid = $cid;
-			$prevglidx = $glidx;
-		}
-
-		// cmap - Character to glyph mapping - Format 4 (MS / )
-		$segCount = count($range) + 1; // + 1 Last segment has missing character 0xFFFF
-		$searchRange = 1;
-		$entrySelector = 0;
-		while ($searchRange * 2 <= $segCount) {
-			$searchRange = $searchRange * 2;
-			$entrySelector = $entrySelector + 1;
-		}
-		$searchRange = $searchRange * 2;
-		$rangeShift = $segCount * 2 - $searchRange;
-		$length = 16 + (8 * $segCount) + ($numGlyphs + 1);
-		$cmap = array(0, 1, // Index : version, number of encoding subtables
-			3, 1, // Encoding Subtable : platform (MS=3), encoding (Unicode)
-			0, 12, // Encoding Subtable : offset (hi,lo)
-			4, $length, 0, // Format 4 Mapping subtable: format, length, language
-			$segCount * 2,
-			$searchRange,
-			$entrySelector,
-			$rangeShift);
-
-		// endCode(s)
-		foreach ($range AS $start=>$subrange) {
-			$endCode = $start + (count($subrange) - 1);
-			$cmap[] = $endCode; // endCode(s)
-		}
-		$cmap[] = 0xFFFF; // endCode of last Segment
-		$cmap[] = 0; // reservedPad
-
-		// startCode(s)
-		foreach ($range AS $start=>$subrange) {
-			$cmap[] = $start; // startCode(s)
-		}
-		$cmap[] = 0xFFFF; // startCode of last Segment
-		// idDelta(s) 
-		foreach ($range AS $start=>$subrange) {
-			$idDelta = -($start - $subrange[0]);
-			$n += count($subrange);
-			$cmap[] = $idDelta; // idDelta(s)
-		}
-		$cmap[] = 1; // idDelta of last Segment
-		// idRangeOffset(s) 
-		foreach ($range AS $subrange) {
-			$cmap[] = 0; // idRangeOffset[segCount]  	Offset in bytes to glyph indexArray, or 0
-
-		}
-		$cmap[] = 0; // idRangeOffset of last Segment
-		foreach ($range AS $subrange) {
-			foreach ($subrange AS $glidx) {
-				$cmap[] = $glidx;
-			}
-		}
-		$cmap[] = 0; // Mapping for last character
-		$cmapstr = '';
-		foreach ($cmap AS $cm) { $cmapstr .= pack("n", $cm); }
-		$this->add('cmap', $cmapstr);
-
-
-		// glyf - Glyph data
-		list($glyfOffset, $glyfLength) = $this->get_table_pos('glyf');
-		if ($glyfLength < $this->maxStrLenRead) {
-			$glyphData = $this->get_table('glyf');
-		}
-
-		$offsets = array();
-		$glyf = '';
-		$pos = 0;
-
-		$hmtxstr = '';
-		$xMinT = 0;
-		$yMinT = 0;
-		$xMaxT = 0;
-		$yMaxT = 0;
-		$advanceWidthMax = 0;
-		$minLeftSideBearing = 0;
-		$minRightSideBearing = 0;
-		$xMaxExtent = 0;
-		$maxPoints = 0; // points in non-compound glyph
-		$maxContours = 0; // contours in non-compound glyph
-		$maxComponentPoints = 0; // points in compound glyph
-		$maxComponentContours = 0; // contours in compound glyph
-		$maxComponentElements = 0; // number of glyphs referenced at top level
-		$maxComponentDepth = 0; // levels of recursion, set to 0 if font has only simple glyphs
-		$this->glyphdata = array();
-
-		foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
-			// hmtx - Horizontal Metrics
-			$hm = $this->getHMetric($orignHmetrics, $originalGlyphIdx);	
-			$hmtxstr .= $hm;
-
-			$offsets[] = $pos;
-			$glyphPos = $this->glyphPos[$originalGlyphIdx];
-			$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 = '';
-			}
-
-			if ($glyphLen > 0) {
-				$up = unpack("n", substr($data, 0, 2));
-			}
-
-			if ($glyphLen > 2 && ($up[1] & (1 << 15))) {	// If number of contours <= -1 i.e. composiste glyph
-				$pos_in_glyph = 10;
-				$flags = GF_MORE;
-				$nComponentElements = 0;
-				while ($flags & GF_MORE) {
-					$nComponentElements += 1; // number of glyphs referenced at top level
-					$up = unpack("n", substr($data, $pos_in_glyph, 2));
-					$flags = $up[1];
-					$up = unpack("n", substr($data, $pos_in_glyph + 2, 2));
-					$glyphIdx = $up[1];
-					$this->glyphdata[$originalGlyphIdx]['compGlyphs'][] = $glyphIdx;
-					$data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]);
-					$pos_in_glyph += 4;
-					if ($flags & GF_WORDS) { $pos_in_glyph += 4; } else { $pos_in_glyph += 2; }
-					if ($flags & GF_SCALE) { $pos_in_glyph += 2; } else if ($flags & GF_XYSCALE) { $pos_in_glyph += 4; } else if ($flags & GF_TWOBYTWO) { $pos_in_glyph += 8; }
-				}
-				$maxComponentElements = max($maxComponentElements, $nComponentElements);
-			}
-
-			$glyf .= $data;
-			$pos += $glyphLen;
-			if ($pos % 4 != 0) {
-				$padding = 4 - ($pos % 4);
-				$glyf .= str_repeat("\0", $padding);
-				$pos += $padding;
-			}
-		}
-
-		$offsets[] = $pos;
-		$this->add('glyf', $glyf);
-
-		// hmtx - Horizontal Metrics
-		$this->add('hmtx', $hmtxstr);
-
-		// loca - Index to location
-		$locastr = '';
-		if ((($pos + 1) >> 1) > 0xFFFF) {
-			$indexToLocFormat = 1; // long format
-			foreach ($offsets AS $offset) { $locastr .= pack("N", $offset); }
-		}
-		else {
-			$indexToLocFormat = 0; // short format
-			foreach ($offsets AS $offset) { $locastr .= pack("n", ($offset / 2)); }
-		}
-		$this->add('loca', $locastr);
-
-		// head - Font header
-		$head = $this->get_table('head');
-		$head = $this->_set_ushort($head, 50, $indexToLocFormat);
-		$this->add('head', $head);
-
-
-		// hhea - Horizontal Header
-		$hhea = $this->get_table('hhea');
-		$hhea = $this->_set_ushort($hhea, 34, $numberOfHMetrics);
-		$this->add('hhea', $hhea);
-
-		// maxp - Maximum Profile
-		$maxp = $this->get_table('maxp');
-		$maxp = $this->_set_ushort($maxp, 4, $numGlyphs);
-		$this->add('maxp', $maxp);
-
-
-		// OS/2 - OS/2
-		$os2 = $this->get_table('OS/2');
-		$this->add('OS/2', $os2);
-
-		fclose($this->fh);
-
-		// Put the TTF file together
-		$stm = '';
-		$this->endTTFile($stm);
-		return $stm;
-	}
-
-	//////////////////////////////////////////////////////////////////////////////////
-	// Recursively get composite glyph data
-	function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) {
-		$depth++;
-		$maxdepth = max($maxdepth, $depth);
-		if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) {
-			foreach ($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) {
-				$this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours);
-			}
-		} else if (($this->glyphdata[$originalGlyphIdx]['nContours'] > 0) && $depth > 0) {	// simple
-			$contours += $this->glyphdata[$originalGlyphIdx]['nContours'];
-			$points += $this->glyphdata[$originalGlyphIdx]['nPoints'];
-		}
-		$depth--;
-	}
-
-
-	//////////////////////////////////////////////////////////////////////////////////
-	// Recursively get composite glyphs
-	function getGlyphs($originalGlyphIdx, &$start, &$glyphSet, &$subsetglyphs) {
-		$glyphPos = $this->glyphPos[$originalGlyphIdx];
-		$glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
-		if (!$glyphLen) { 
-			return;
-		}
-		$this->seek($start + $glyphPos);
-		$numberOfContours = $this->read_short();
-		if ($numberOfContours < 0) {
-			$this->skip(8);
-			$flags = GF_MORE;
-			while ($flags & GF_MORE) {
-				$flags = $this->read_ushort();
-				$glyphIdx = $this->read_ushort();
-				if (!isset($glyphSet[$glyphIdx])) {
-					$glyphSet[$glyphIdx] = count($subsetglyphs); // old glyphID to new glyphID
-					$subsetglyphs[$glyphIdx] = true;
-				}
-				$savepos = ftell($this->fh);
-				$this->getGlyphs($glyphIdx, $start, $glyphSet, $subsetglyphs);
-				$this->seek($savepos);
-				if ($flags & GF_WORDS) {
-									$this->skip(4);
-				} else {
-									$this->skip(2);
-				}
-				if ($flags & GF_SCALE) {
-									$this->skip(2);
-				} else if ($flags & GF_XYSCALE) {
-									$this->skip(4);
-				} else if ($flags & GF_TWOBYTWO) {
-									$this->skip(8);
-				}
-			}
-		}
-	}
-
-	//////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * @param integer $numberOfHMetrics
-	 * @param integer $numGlyphs
-	 * @param integer $scale
-	 */
-	function getHMTX($numberOfHMetrics, $numGlyphs, &$glyphToChar, $scale) {
-		$start = $this->seek_table("hmtx");
-		$aw = 0;
-		$this->charWidths = str_pad('', 256 * 256 * 2, "\x00");
-		$nCharWidths = 0;
-		if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
-			$data = $this->get_chunk($start, ($numberOfHMetrics * 4));
-			$arr = unpack("n*", $data);
-		}
-		else { $this->seek($start); }
-		for ($glyph = 0; $glyph < $numberOfHMetrics; $glyph++) {
-
-			if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
-				$aw = $arr[($glyph * 2) + 1];
-			}
-			else {
-				$aw = $this->read_ushort();
-				$lsb = $this->read_ushort();
-			}
-			if (isset($glyphToChar[$glyph]) || $glyph == 0) {
-
-				if ($aw >= (1 << 15)) { $aw = 0; }	// 1.03 Some (arabic) fonts have -ve values for width
-					// although should be unsigned value - comes out as e.g. 65108 (intended -50)
-				if ($glyph == 0) {
-					$this->defaultWidth = $scale * $aw;
-					continue;
-				}
-				foreach ($glyphToChar[$glyph] AS $char) {
-					if ($char != 0 && $char != 65535) {
- 						$w = intval(round($scale * $aw));
-						if ($w == 0) { $w = 65535; }
-						if ($char < 196608) {
-							$this->charWidths[$char * 2] = chr($w >> 8);
-							$this->charWidths[$char * 2 + 1] = chr($w & 0xFF);
-							$nCharWidths++;
-						}
-					}
-				}
-			}
-		}
-		$data = $this->get_chunk(($start + $numberOfHMetrics * 4), ($numGlyphs * 2));
-		$arr = unpack("n*", $data);
-		$diff = $numGlyphs - $numberOfHMetrics;
-		for ($pos = 0; $pos < $diff; $pos++) {
-			$glyph = $pos + $numberOfHMetrics;
-			if (isset($glyphToChar[$glyph])) {
-				foreach ($glyphToChar[$glyph] AS $char) {
-					if ($char != 0 && $char != 65535) {
-						$w = intval(round($scale * $aw));
-						if ($w == 0) { $w = 65535; }
-						if ($char < 196608) {
-							$this->charWidths[$char * 2] = chr($w >> 8);
-							$this->charWidths[$char * 2 + 1] = chr($w & 0xFF);
-							$nCharWidths++;
-						}
-					}
-				}
-			}
-		}
-		// NB 65535 is a set width of 0
-		// First bytes define number of chars in font
-		$this->charWidths[0] = chr($nCharWidths >> 8);
-		$this->charWidths[1] = chr($nCharWidths & 0xFF);
-	}
-
-	/**
-	 * @param integer $numberOfHMetrics
-	 */
-	function getHMetric($numberOfHMetrics, $gid) {
-		$start = $this->seek_table("hmtx");
-		if ($gid < $numberOfHMetrics) {
-			$this->seek($start + ($gid * 4));
-			$hm = fread($this->fh, 4);
-		}
-		else {
-			$this->seek($start + (($numberOfHMetrics - 1) * 4));
-			$hm = fread($this->fh, 2);
-			$this->seek($start + ($numberOfHMetrics * 2) + ($gid * 2));
-			$hm .= fread($this->fh, 2);
-		}
-		return $hm;
-	}
-
-	/**
-	 * @param integer $indexToLocFormat
-	 * @param integer $numGlyphs
-	 */
-	function getLOCA($indexToLocFormat, $numGlyphs) {
-		$start = $this->seek_table('loca');
-		$this->glyphPos = array();
-		if ($indexToLocFormat == 0) {
-			$data = $this->get_chunk($start, ($numGlyphs * 2) + 2);
-			$arr = unpack("n*", $data);
-			for ($n = 0; $n <= $numGlyphs; $n++) {
-				$this->glyphPos[] = ($arr[$n + 1] * 2);
-			}
-		}
-		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);
-	}
-
-
-	// CMAP Format 4
-
-	/**
-	 * @param integer $unicode_cmap_offset
-	 */
-	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
-		$this->maxUniChar = 0;
-		$this->seek($unicode_cmap_offset + 2);
-		$length = $this->read_ushort();
-		$limit = $unicode_cmap_offset + $length;
-		$this->skip(2);
-
-		$segCount = $this->read_ushort() / 2;
-		$this->skip(6);
-		$endCount = array();
-		for ($i = 0; $i < $segCount; $i++) { $endCount[] = $this->read_ushort(); }
-		$this->skip(2);
-		$startCount = array();
-		for ($i = 0; $i < $segCount; $i++) { $startCount[] = $this->read_ushort(); }
-		$idDelta = array();
-		for ($i = 0; $i < $segCount; $i++) { $idDelta[] = $this->read_short(); }		// ???? was unsigned short
-		$idRangeOffset_start = $this->_pos;
-		$idRangeOffset = array();
-		for ($i = 0; $i < $segCount; $i++) { $idRangeOffset[] = $this->read_ushort(); }
-
-		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 {
-					$offset = ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n];
-					$offset = $idRangeOffset_start + 2 * $n + $offset;
-					if ($offset >= $limit)
-						$glyph = 0;
-					else {
-						$glyph = $this->get_ushort($offset);
-						if ($glyph != 0)
-						   $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
-					}
-				}
-				$charToGlyph[$unichar] = $glyph;
-				if ($unichar < 196608) { $this->maxUniChar = max($unichar, $this->maxUniChar); }
-				$glyphToChar[$glyph][] = $unichar;
-			}
-		}
-	}
-
-
-		// Put the TTF file together
-
-	/**
-	 * @param string $stm
-	 */
-	function endTTFile(&$stm) {
-		$stm = '';
-		$numTables = count($this->otables);
-		$searchRange = 1;
-		$entrySelector = 0;
-		while ($searchRange * 2 <= $numTables) {
-			$searchRange = $searchRange * 2;
-			$entrySelector = $entrySelector + 1;
-		}
-		$searchRange = $searchRange * 16;
-		$rangeShift = $numTables * 16 - $searchRange;
-
-		// Header
-		if (_TTF_MAC_HEADER) {
-			$stm .= (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entrySelector, $rangeShift)); // Mac
-		}
-		else {
-			$stm .= (pack("Nnnnn", 0x00010000, $numTables, $searchRange, $entrySelector, $rangeShift)); // Windows
-		}
-
-		// Table directory
-		$tables = $this->otables;
-
-		ksort($tables); 
-		$offset = 12 + $numTables * 16;
-		foreach ($tables AS $tag=>$data) {
-			if ($tag == 'head') { $head_start = $offset; }
-			$stm .= $tag;
-			$checksum = $this->calcChecksum($data);
-			$stm .= pack("nn", $checksum[0], $checksum[1]);
-			$stm .= pack("NN", $offset, strlen($data));
-			$paddedLength = (strlen($data) + 3) & ~3;
-			$offset = $offset + $paddedLength;
-		}
-
-		// Table data
-		foreach ($tables AS $tag=>$data) {
-			$data .= "\0\0\0";
-			$stm .= substr($data, 0, (strlen($data) & ~3));
-		}
-
-		$checksum = $this->calcChecksum($stm);
-		$checksum = $this->sub32(array(0xB1B0, 0xAFBA), $checksum);
-		$chk = pack("nn", $checksum[0], $checksum[1]);
-		$stm = $this->splice($stm, ($head_start + 8), $chk);
-		return $stm;
-	}
+    /**
+     * @return string
+     */
+    function makeSubset($file, &$subset) {
+        $this->filename = $file;
+        $this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
+        $this->_pos = 0;
+        $this->charWidths = '';
+        $this->glyphPos = array();
+        $this->charToGlyph = array();
+        $this->tables = array();
+        $this->otables = array();
+        $this->ascent = 0;
+        $this->descent = 0;
+        $this->skip(4);
+        $this->maxUni = 0;
+        $this->readTableDirectory();
+
+
+        ///////////////////////////////////
+        // head - Font header table
+        ///////////////////////////////////
+        $this->seek_table("head");
+        $this->skip(50); 
+        $indexToLocFormat = $this->read_ushort();
+        $glyphDataFormat = $this->read_ushort();
+
+        ///////////////////////////////////
+        // hhea - Horizontal header table
+        ///////////////////////////////////
+        $this->seek_table("hhea");
+        $this->skip(32); 
+        $metricDataFormat = $this->read_ushort();
+        $orignHmetrics = $numberOfHMetrics = $this->read_ushort();
+
+        ///////////////////////////////////
+        // maxp - Maximum profile table
+        ///////////////////////////////////
+        $this->seek_table("maxp");
+        $this->skip(4);
+        $numGlyphs = $this->read_ushort();
+
+
+        ///////////////////////////////////
+        // cmap - Character to glyph index mapping table
+        ///////////////////////////////////
+        $cmap_offset = $this->seek_table("cmap");
+        $this->skip(2);
+        $cmapTableCount = $this->read_ushort();
+        $unicode_cmap_offset = 0;
+        for ($i = 0; $i < $cmapTableCount; $i++) {
+            $platformID = $this->read_ushort();
+            $encodingID = $this->read_ushort();
+            $offset = $this->read_ulong();
+            $save_pos = $this->_pos;
+            if (($platformID == 3 && $encodingID == 1) || $platformID == 0) { // Microsoft, Unicode
+                $format = $this->get_ushort($cmap_offset + $offset);
+                if ($format == 4) {
+                    $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)');
+
+
+        $glyphToChar = array();
+        $charToGlyph = array();
+        $this->getCMAP4($unicode_cmap_offset, $glyphToChar, $charToGlyph);
+
+        $this->charToGlyph = $charToGlyph;
+
+        ///////////////////////////////////
+        // hmtx - Horizontal metrics table
+        ///////////////////////////////////
+        $scale = 1; // not used
+        $this->getHMTX($numberOfHMetrics, $numGlyphs, $glyphToChar, $scale);
+
+        ///////////////////////////////////
+        // loca - Index to location
+        ///////////////////////////////////
+        $this->getLOCA($indexToLocFormat, $numGlyphs);
+
+        $subsetglyphs = array(0=>0); 
+        $subsetCharToGlyph = array();
+        foreach ($subset AS $code) {
+            if (isset($this->charToGlyph[$code])) {
+                $subsetglyphs[$this->charToGlyph[$code]] = $code; // Old Glyph ID => Unicode
+                $subsetCharToGlyph[$code] = $this->charToGlyph[$code]; // Unicode to old GlyphID
+
+            }
+            $this->maxUni = max($this->maxUni, $code);
+        }
+
+        list($start, $dummy) = $this->get_table_pos('glyf');
+
+        $glyphSet = array();
+        ksort($subsetglyphs);
+        $n = 0;
+        $fsLastCharIndex = 0; // maximum Unicode index (character code) in this font, according to the cmap subtable for platform ID 3 and platform- specific encoding ID 0 or 1.
+        foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
+            $fsLastCharIndex = max($fsLastCharIndex, $uni);
+            $glyphSet[$originalGlyphIdx] = $n; // old glyphID to new glyphID
+            $n++;
+        }
+
+        ksort($subsetCharToGlyph);
+        foreach ($subsetCharToGlyph AS $uni => $originalGlyphIdx) {
+            $codeToGlyph[$uni] = $glyphSet[$originalGlyphIdx];
+        }
+        $this->codeToGlyph = $codeToGlyph;
+
+        ksort($subsetglyphs);
+        foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
+            $this->getGlyphs($originalGlyphIdx, $start, $glyphSet, $subsetglyphs);
+        }
+
+        $numGlyphs = $numberOfHMetrics = count($subsetglyphs);
+
+        //tables copied from the original
+        $tags = array('name');
+        foreach ($tags AS $tag) { $this->add($tag, $this->get_table($tag)); }
+        $tags = array('cvt ', 'fpgm', 'prep', 'gasp');
+        foreach ($tags AS $tag) {
+            if (isset($this->tables[$tag])) { $this->add($tag, $this->get_table($tag)); }
+        }
+
+        // post - PostScript
+        $opost = $this->get_table('post');
+        $post = "\x00\x03\x00\x00".substr($opost, 4, 12)."\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+        $this->add('post', $post);
+
+        // Sort CID2GID map into segments of contiguous codes
+        ksort($codeToGlyph);
+        unset($codeToGlyph[0]);
+        //unset($codeToGlyph[65535]);
+        $rangeid = 0;
+        $range = array();
+        $prevcid = -2;
+        $prevglidx = -1;
+        // for each character
+        foreach ($codeToGlyph as $cid => $glidx) {
+            if ($cid == ($prevcid + 1) && $glidx == ($prevglidx + 1)) {
+                $range[$rangeid][] = $glidx;
+            } else {
+                // new range
+                $rangeid = $cid;
+                $range[$rangeid] = array();
+                $range[$rangeid][] = $glidx;
+            }
+            $prevcid = $cid;
+            $prevglidx = $glidx;
+        }
+
+        // cmap - Character to glyph mapping - Format 4 (MS / )
+        $segCount = count($range) + 1; // + 1 Last segment has missing character 0xFFFF
+        $searchRange = 1;
+        $entrySelector = 0;
+        while ($searchRange * 2 <= $segCount) {
+            $searchRange = $searchRange * 2;
+            $entrySelector = $entrySelector + 1;
+        }
+        $searchRange = $searchRange * 2;
+        $rangeShift = $segCount * 2 - $searchRange;
+        $length = 16 + (8 * $segCount) + ($numGlyphs + 1);
+        $cmap = array(0, 1, // Index : version, number of encoding subtables
+            3, 1, // Encoding Subtable : platform (MS=3), encoding (Unicode)
+            0, 12, // Encoding Subtable : offset (hi,lo)
+            4, $length, 0, // Format 4 Mapping subtable: format, length, language
+            $segCount * 2,
+            $searchRange,
+            $entrySelector,
+            $rangeShift);
+
+        // endCode(s)
+        foreach ($range AS $start=>$subrange) {
+            $endCode = $start + (count($subrange) - 1);
+            $cmap[] = $endCode; // endCode(s)
+        }
+        $cmap[] = 0xFFFF; // endCode of last Segment
+        $cmap[] = 0; // reservedPad
+
+        // startCode(s)
+        foreach ($range AS $start=>$subrange) {
+            $cmap[] = $start; // startCode(s)
+        }
+        $cmap[] = 0xFFFF; // startCode of last Segment
+        // idDelta(s) 
+        foreach ($range AS $start=>$subrange) {
+            $idDelta = -($start - $subrange[0]);
+            $n += count($subrange);
+            $cmap[] = $idDelta; // idDelta(s)
+        }
+        $cmap[] = 1; // idDelta of last Segment
+        // idRangeOffset(s) 
+        foreach ($range AS $subrange) {
+            $cmap[] = 0; // idRangeOffset[segCount]  	Offset in bytes to glyph indexArray, or 0
+
+        }
+        $cmap[] = 0; // idRangeOffset of last Segment
+        foreach ($range AS $subrange) {
+            foreach ($subrange AS $glidx) {
+                $cmap[] = $glidx;
+            }
+        }
+        $cmap[] = 0; // Mapping for last character
+        $cmapstr = '';
+        foreach ($cmap AS $cm) { $cmapstr .= pack("n", $cm); }
+        $this->add('cmap', $cmapstr);
+
+
+        // glyf - Glyph data
+        list($glyfOffset, $glyfLength) = $this->get_table_pos('glyf');
+        if ($glyfLength < $this->maxStrLenRead) {
+            $glyphData = $this->get_table('glyf');
+        }
+
+        $offsets = array();
+        $glyf = '';
+        $pos = 0;
+
+        $hmtxstr = '';
+        $xMinT = 0;
+        $yMinT = 0;
+        $xMaxT = 0;
+        $yMaxT = 0;
+        $advanceWidthMax = 0;
+        $minLeftSideBearing = 0;
+        $minRightSideBearing = 0;
+        $xMaxExtent = 0;
+        $maxPoints = 0; // points in non-compound glyph
+        $maxContours = 0; // contours in non-compound glyph
+        $maxComponentPoints = 0; // points in compound glyph
+        $maxComponentContours = 0; // contours in compound glyph
+        $maxComponentElements = 0; // number of glyphs referenced at top level
+        $maxComponentDepth = 0; // levels of recursion, set to 0 if font has only simple glyphs
+        $this->glyphdata = array();
+
+        foreach ($subsetglyphs AS $originalGlyphIdx => $uni) {
+            // hmtx - Horizontal Metrics
+            $hm = $this->getHMetric($orignHmetrics, $originalGlyphIdx);	
+            $hmtxstr .= $hm;
+
+            $offsets[] = $pos;
+            $glyphPos = $this->glyphPos[$originalGlyphIdx];
+            $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 = '';
+            }
+
+            if ($glyphLen > 0) {
+                $up = unpack("n", substr($data, 0, 2));
+            }
+
+            if ($glyphLen > 2 && ($up[1] & (1 << 15))) {	// If number of contours <= -1 i.e. composiste glyph
+                $pos_in_glyph = 10;
+                $flags = GF_MORE;
+                $nComponentElements = 0;
+                while ($flags & GF_MORE) {
+                    $nComponentElements += 1; // number of glyphs referenced at top level
+                    $up = unpack("n", substr($data, $pos_in_glyph, 2));
+                    $flags = $up[1];
+                    $up = unpack("n", substr($data, $pos_in_glyph + 2, 2));
+                    $glyphIdx = $up[1];
+                    $this->glyphdata[$originalGlyphIdx]['compGlyphs'][] = $glyphIdx;
+                    $data = $this->_set_ushort($data, $pos_in_glyph + 2, $glyphSet[$glyphIdx]);
+                    $pos_in_glyph += 4;
+                    if ($flags & GF_WORDS) { $pos_in_glyph += 4; } else { $pos_in_glyph += 2; }
+                    if ($flags & GF_SCALE) { $pos_in_glyph += 2; } else if ($flags & GF_XYSCALE) { $pos_in_glyph += 4; } else if ($flags & GF_TWOBYTWO) { $pos_in_glyph += 8; }
+                }
+                $maxComponentElements = max($maxComponentElements, $nComponentElements);
+            }
+
+            $glyf .= $data;
+            $pos += $glyphLen;
+            if ($pos % 4 != 0) {
+                $padding = 4 - ($pos % 4);
+                $glyf .= str_repeat("\0", $padding);
+                $pos += $padding;
+            }
+        }
+
+        $offsets[] = $pos;
+        $this->add('glyf', $glyf);
+
+        // hmtx - Horizontal Metrics
+        $this->add('hmtx', $hmtxstr);
+
+        // loca - Index to location
+        $locastr = '';
+        if ((($pos + 1) >> 1) > 0xFFFF) {
+            $indexToLocFormat = 1; // long format
+            foreach ($offsets AS $offset) { $locastr .= pack("N", $offset); }
+        }
+        else {
+            $indexToLocFormat = 0; // short format
+            foreach ($offsets AS $offset) { $locastr .= pack("n", ($offset / 2)); }
+        }
+        $this->add('loca', $locastr);
+
+        // head - Font header
+        $head = $this->get_table('head');
+        $head = $this->_set_ushort($head, 50, $indexToLocFormat);
+        $this->add('head', $head);
+
+
+        // hhea - Horizontal Header
+        $hhea = $this->get_table('hhea');
+        $hhea = $this->_set_ushort($hhea, 34, $numberOfHMetrics);
+        $this->add('hhea', $hhea);
+
+        // maxp - Maximum Profile
+        $maxp = $this->get_table('maxp');
+        $maxp = $this->_set_ushort($maxp, 4, $numGlyphs);
+        $this->add('maxp', $maxp);
+
+
+        // OS/2 - OS/2
+        $os2 = $this->get_table('OS/2');
+        $this->add('OS/2', $os2);
+
+        fclose($this->fh);
+
+        // Put the TTF file together
+        $stm = '';
+        $this->endTTFile($stm);
+        return $stm;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////
+    // Recursively get composite glyph data
+    function getGlyphData($originalGlyphIdx, &$maxdepth, &$depth, &$points, &$contours) {
+        $depth++;
+        $maxdepth = max($maxdepth, $depth);
+        if (count($this->glyphdata[$originalGlyphIdx]['compGlyphs'])) {
+            foreach ($this->glyphdata[$originalGlyphIdx]['compGlyphs'] AS $glyphIdx) {
+                $this->getGlyphData($glyphIdx, $maxdepth, $depth, $points, $contours);
+            }
+        } else if (($this->glyphdata[$originalGlyphIdx]['nContours'] > 0) && $depth > 0) {	// simple
+            $contours += $this->glyphdata[$originalGlyphIdx]['nContours'];
+            $points += $this->glyphdata[$originalGlyphIdx]['nPoints'];
+        }
+        $depth--;
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////////////
+    // Recursively get composite glyphs
+    function getGlyphs($originalGlyphIdx, &$start, &$glyphSet, &$subsetglyphs) {
+        $glyphPos = $this->glyphPos[$originalGlyphIdx];
+        $glyphLen = $this->glyphPos[$originalGlyphIdx + 1] - $glyphPos;
+        if (!$glyphLen) { 
+            return;
+        }
+        $this->seek($start + $glyphPos);
+        $numberOfContours = $this->read_short();
+        if ($numberOfContours < 0) {
+            $this->skip(8);
+            $flags = GF_MORE;
+            while ($flags & GF_MORE) {
+                $flags = $this->read_ushort();
+                $glyphIdx = $this->read_ushort();
+                if (!isset($glyphSet[$glyphIdx])) {
+                    $glyphSet[$glyphIdx] = count($subsetglyphs); // old glyphID to new glyphID
+                    $subsetglyphs[$glyphIdx] = true;
+                }
+                $savepos = ftell($this->fh);
+                $this->getGlyphs($glyphIdx, $start, $glyphSet, $subsetglyphs);
+                $this->seek($savepos);
+                if ($flags & GF_WORDS) {
+                                    $this->skip(4);
+                } else {
+                                    $this->skip(2);
+                }
+                if ($flags & GF_SCALE) {
+                                    $this->skip(2);
+                } else if ($flags & GF_XYSCALE) {
+                                    $this->skip(4);
+                } else if ($flags & GF_TWOBYTWO) {
+                                    $this->skip(8);
+                }
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * @param integer $numberOfHMetrics
+     * @param integer $numGlyphs
+     * @param integer $scale
+     */
+    function getHMTX($numberOfHMetrics, $numGlyphs, &$glyphToChar, $scale) {
+        $start = $this->seek_table("hmtx");
+        $aw = 0;
+        $this->charWidths = str_pad('', 256 * 256 * 2, "\x00");
+        $nCharWidths = 0;
+        if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
+            $data = $this->get_chunk($start, ($numberOfHMetrics * 4));
+            $arr = unpack("n*", $data);
+        }
+        else { $this->seek($start); }
+        for ($glyph = 0; $glyph < $numberOfHMetrics; $glyph++) {
+
+            if (($numberOfHMetrics * 4) < $this->maxStrLenRead) {
+                $aw = $arr[($glyph * 2) + 1];
+            }
+            else {
+                $aw = $this->read_ushort();
+                $lsb = $this->read_ushort();
+            }
+            if (isset($glyphToChar[$glyph]) || $glyph == 0) {
+
+                if ($aw >= (1 << 15)) { $aw = 0; }	// 1.03 Some (arabic) fonts have -ve values for width
+                    // although should be unsigned value - comes out as e.g. 65108 (intended -50)
+                if ($glyph == 0) {
+                    $this->defaultWidth = $scale * $aw;
+                    continue;
+                }
+                foreach ($glyphToChar[$glyph] AS $char) {
+                    if ($char != 0 && $char != 65535) {
+                            $w = intval(round($scale * $aw));
+                        if ($w == 0) { $w = 65535; }
+                        if ($char < 196608) {
+                            $this->charWidths[$char * 2] = chr($w >> 8);
+                            $this->charWidths[$char * 2 + 1] = chr($w & 0xFF);
+                            $nCharWidths++;
+                        }
+                    }
+                }
+            }
+        }
+        $data = $this->get_chunk(($start + $numberOfHMetrics * 4), ($numGlyphs * 2));
+        $arr = unpack("n*", $data);
+        $diff = $numGlyphs - $numberOfHMetrics;
+        for ($pos = 0; $pos < $diff; $pos++) {
+            $glyph = $pos + $numberOfHMetrics;
+            if (isset($glyphToChar[$glyph])) {
+                foreach ($glyphToChar[$glyph] AS $char) {
+                    if ($char != 0 && $char != 65535) {
+                        $w = intval(round($scale * $aw));
+                        if ($w == 0) { $w = 65535; }
+                        if ($char < 196608) {
+                            $this->charWidths[$char * 2] = chr($w >> 8);
+                            $this->charWidths[$char * 2 + 1] = chr($w & 0xFF);
+                            $nCharWidths++;
+                        }
+                    }
+                }
+            }
+        }
+        // NB 65535 is a set width of 0
+        // First bytes define number of chars in font
+        $this->charWidths[0] = chr($nCharWidths >> 8);
+        $this->charWidths[1] = chr($nCharWidths & 0xFF);
+    }
+
+    /**
+     * @param integer $numberOfHMetrics
+     */
+    function getHMetric($numberOfHMetrics, $gid) {
+        $start = $this->seek_table("hmtx");
+        if ($gid < $numberOfHMetrics) {
+            $this->seek($start + ($gid * 4));
+            $hm = fread($this->fh, 4);
+        }
+        else {
+            $this->seek($start + (($numberOfHMetrics - 1) * 4));
+            $hm = fread($this->fh, 2);
+            $this->seek($start + ($numberOfHMetrics * 2) + ($gid * 2));
+            $hm .= fread($this->fh, 2);
+        }
+        return $hm;
+    }
+
+    /**
+     * @param integer $indexToLocFormat
+     * @param integer $numGlyphs
+     */
+    function getLOCA($indexToLocFormat, $numGlyphs) {
+        $start = $this->seek_table('loca');
+        $this->glyphPos = array();
+        if ($indexToLocFormat == 0) {
+            $data = $this->get_chunk($start, ($numGlyphs * 2) + 2);
+            $arr = unpack("n*", $data);
+            for ($n = 0; $n <= $numGlyphs; $n++) {
+                $this->glyphPos[] = ($arr[$n + 1] * 2);
+            }
+        }
+        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);
+    }
+
+
+    // CMAP Format 4
+
+    /**
+     * @param integer $unicode_cmap_offset
+     */
+    function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
+        $this->maxUniChar = 0;
+        $this->seek($unicode_cmap_offset + 2);
+        $length = $this->read_ushort();
+        $limit = $unicode_cmap_offset + $length;
+        $this->skip(2);
+
+        $segCount = $this->read_ushort() / 2;
+        $this->skip(6);
+        $endCount = array();
+        for ($i = 0; $i < $segCount; $i++) { $endCount[] = $this->read_ushort(); }
+        $this->skip(2);
+        $startCount = array();
+        for ($i = 0; $i < $segCount; $i++) { $startCount[] = $this->read_ushort(); }
+        $idDelta = array();
+        for ($i = 0; $i < $segCount; $i++) { $idDelta[] = $this->read_short(); }		// ???? was unsigned short
+        $idRangeOffset_start = $this->_pos;
+        $idRangeOffset = array();
+        for ($i = 0; $i < $segCount; $i++) { $idRangeOffset[] = $this->read_ushort(); }
+
+        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 {
+                    $offset = ($unichar - $startCount[$n]) * 2 + $idRangeOffset[$n];
+                    $offset = $idRangeOffset_start + 2 * $n + $offset;
+                    if ($offset >= $limit)
+                        $glyph = 0;
+                    else {
+                        $glyph = $this->get_ushort($offset);
+                        if ($glyph != 0)
+                            $glyph = ($glyph + $idDelta[$n]) & 0xFFFF;
+                    }
+                }
+                $charToGlyph[$unichar] = $glyph;
+                if ($unichar < 196608) { $this->maxUniChar = max($unichar, $this->maxUniChar); }
+                $glyphToChar[$glyph][] = $unichar;
+            }
+        }
+    }
+
+
+        // Put the TTF file together
+
+    /**
+     * @param string $stm
+     */
+    function endTTFile(&$stm) {
+        $stm = '';
+        $numTables = count($this->otables);
+        $searchRange = 1;
+        $entrySelector = 0;
+        while ($searchRange * 2 <= $numTables) {
+            $searchRange = $searchRange * 2;
+            $entrySelector = $entrySelector + 1;
+        }
+        $searchRange = $searchRange * 16;
+        $rangeShift = $numTables * 16 - $searchRange;
+
+        // Header
+        if (_TTF_MAC_HEADER) {
+            $stm .= (pack("Nnnnn", 0x74727565, $numTables, $searchRange, $entrySelector, $rangeShift)); // Mac
+        }
+        else {
+            $stm .= (pack("Nnnnn", 0x00010000, $numTables, $searchRange, $entrySelector, $rangeShift)); // Windows
+        }
+
+        // Table directory
+        $tables = $this->otables;
+
+        ksort($tables); 
+        $offset = 12 + $numTables * 16;
+        foreach ($tables AS $tag=>$data) {
+            if ($tag == 'head') { $head_start = $offset; }
+            $stm .= $tag;
+            $checksum = $this->calcChecksum($data);
+            $stm .= pack("nn", $checksum[0], $checksum[1]);
+            $stm .= pack("NN", $offset, strlen($data));
+            $paddedLength = (strlen($data) + 3) & ~3;
+            $offset = $offset + $paddedLength;
+        }
+
+        // Table data
+        foreach ($tables AS $tag=>$data) {
+            $data .= "\0\0\0";
+            $stm .= substr($data, 0, (strlen($data) & ~3));
+        }
+
+        $checksum = $this->calcChecksum($stm);
+        $checksum = $this->sub32(array(0xB1B0, 0xAFBA), $checksum);
+        $chk = pack("nn", $checksum[0], $checksum[1]);
+        $stm = $this->splice($stm, ($head_start + 8), $chk);
+        return $stm;
+    }
 
 
 

Spacing +25 added lines, -25 removed lines

@@ -70,7 +70,7 @@ 
 var $maxStrLenRead;
 
 	function __construct() {
-		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
+		$this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 */
 	function getMetrics($file) {
 		$this->filename = $file;
-		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
+		$this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
 		$this->_pos = 0;
 		$this->charWidths = '';
 		$this->glyphPos = array();
@@ -158,7 +158,7 @@ 
 
 	function seek($pos) {
 		$this->_pos = $pos;
-		fseek($this->fh,$this->_pos);
+		fseek($this->fh, $this->_pos);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	function skip($delta) {
 		$this->_pos = $this->_pos + $delta;
-		fseek($this->fh,$this->_pos);
+		fseek($this->fh, $this->_pos);
 	}
 
 	/**
@@ -202,44 +202,44 @@ 
 
 	function read_ushort() {
 		$this->_pos += 2;
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
+		$s = fread($this->fh, 2);
+		return (ord($s[0]) << 8) + ord($s[1]);
 	}
 
 	function read_ulong() {
 		$this->_pos += 4;
-		$s = fread($this->fh,4);
+		$s = fread($this->fh, 4);
 		// if large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
 	}
 
 	function get_ushort($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
+		fseek($this->fh, $pos);
+		$s = fread($this->fh, 2);
+		return (ord($s[0]) << 8) + ord($s[1]);
 	}
 
 	function get_ulong($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,4);
+		fseek($this->fh, $pos);
+		$s = fread($this->fh, 4);
 		// iF large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
 	}
 
 	function pack_short($val) {
-		if ($val<0) { 
+		if ($val < 0) { 
 			$val = abs($val);
 			$val = ~$val;
 			$val += 1;
 		}
-		return pack("n",$val); 
+		return pack("n", $val); 
 	}
 
 	/**
 	 * @param string $value
 	 */
 	function splice($stream, $offset, $value) {
-		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
+		return substr($stream, 0, $offset).$value.substr($stream, $offset + strlen($value));
 	}
 
 	/**
@@ -252,19 +252,19 @@ 
 	}
 
 	function _set_short($stream, $offset, $val) {
-		if ($val<0) { 
+		if ($val < 0) { 
 			$val = abs($val);
 			$val = ~$val;
 			$val += 1;
 		}
-		$up = pack("n",$val); 
+		$up = pack("n", $val); 
 		return $this->splice($stream, $offset, $up);
 	}
 
 	function get_chunk($pos, $length) {
-		fseek($this->fh,$pos);
-		if ($length <1) { return ''; }
-		return (fread($this->fh,$length));
+		fseek($this->fh, $pos);
+		if ($length < 1) { return ''; }
+		return (fread($this->fh, $length));
 	}
 
 	/**
@@ -273,8 +273,8 @@ 
 	function get_table($tag) {
 		list($pos, $length) = $this->get_table_pos($tag);
 		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
-		fseek($this->fh,$pos);
-		return (fread($this->fh,$length));
+		fseek($this->fh, $pos);
+		return (fread($this->fh, $length));
 	}
 
 	/**
@@ -1034,7 +1034,7 @@ 
 	/**
 	 * @param integer $unicode_cmap_offset
 	 */
-	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
+	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph) {
 		$this->maxUniChar = 0;
 		$this->seek($unicode_cmap_offset + 2);
 		$length = $this->read_ushort();

Braces +85 added lines, -65 removed lines

@@ -90,12 +90,15 @@ 
 		$this->descent = 0;
 		$this->TTCFonts = array();
 		$this->version = $version = $this->read_ulong();
-		if ($version == 0x4F54544F) 
-			die("Postscript outlines are not supported");
-		if ($version == 0x74746366) 
-			die("ERROR - TrueType Fonts Collections not supported");
-		if (!in_array($version, array(0x00010000, 0x74727565)))
-			die("Not a TrueType font: version=".$version);
+		if ($version == 0x4F54544F) {
+					die("Postscript outlines are not supported");
+		}
+		if ($version == 0x74746366) {
+					die("ERROR - TrueType Fonts Collections not supported");
+		}
+		if (!in_array($version, array(0x00010000, 0x74727565))) {
+					die("Not a TrueType font: version=".$version);
+		}
 		$this->readTableDirectory();
 		$this->extractInfo();
 		fclose($this->fh);
@@ -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)
     {

Indentation +15 added lines, -15 removed lines

@@ -122,9 +122,9 @@ 
     }
 
     /**
-    * Compute key depending on object number where the encrypted data is stored
-    * @param integer $n
-    */
+     * Compute key depending on object number where the encrypted data is stored
+     * @param integer $n
+     */
     function _objectkey($n)
     {
         return substr($this->_md5_16($this->encryption_key.pack('VXxx', $n)), 0, 10);
@@ -163,18 +163,18 @@ 
     }
 
     /**
-    * Get MD5 as binary string
-    */
+     * Get MD5 as binary string
+     */
     function _md5_16($string)
     {
         return pack('H*', md5($string));
     }
 
     /**
-    * Compute O value
-    * @param string $user_pass
-    * @param string $owner_pass
-    */
+     * Compute O value
+     * @param string $user_pass
+     * @param string $owner_pass
+     */
     function _Ovalue($user_pass, $owner_pass)
     {
         $tmp = $this->_md5_16($owner_pass);
@@ -183,18 +183,18 @@ 
     }
 
     /**
-    * Compute U value
-    */
+     * Compute U value
+     */
     function _Uvalue()
     {
         return RC4($this->encryption_key, $this->padding);
     }
 
     /**
-    * Compute encryption key
-    * @param string $user_pass
-    * @param integer $protection
-    */
+     * Compute encryption key
+     * @param string $user_pass
+     * @param integer $protection
+     */
     function _generateencryptionkey($user_pass, $owner_pass, $protection)
     {
         // Pad passwords

Spacing +3 added lines, -3 removed lines

@@ -77,11 +77,11 @@
      * - If an owner password is set, document can be opened in privilege mode with no
      *   restriction if that password is entered
      */
-    function SetProtection($permissions=array(), $user_pass='', $owner_pass=null)
+    function SetProtection($permissions = array(), $user_pass = '', $owner_pass = null)
     {
-        $options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32 );
+        $options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32);
         $protection = 192;
-        foreach($permissions as $permission)
+        foreach ($permissions as $permission)
         {
             if (!isset($options[$permission])) {
                             $this->Error('Incorrect permission: '.$permission);

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

Spacing +130 added lines, -130 removed lines

@@ -174,12 +174,12 @@ 
  * @param double $left
  * @param double $top
  */
-function SetMargins($left, $top, $right=null)
+function SetMargins($left, $top, $right = null)
 {
     // Set left, top and right margins
     $this->lMargin = $left;
     $this->tMargin = $top;
-    if($right===null) {
+    if ($right === null) {
             $right = $left;
     }
     $this->rMargin = $right;
@@ -208,25 +208,25 @@ 
 /**
  * @param boolean $auto
  */
-function SetAutoPageBreak($auto, $margin=0)
+function SetAutoPageBreak($auto, $margin = 0)
 {
     // Set auto page break mode and triggering margin
     $this->AutoPageBreak = $auto;
     $this->bMargin = $margin;
-    $this->PageBreakTrigger = $this->h-$margin;
+    $this->PageBreakTrigger = $this->h - $margin;
 }
 
 /**
  * @param string $zoom
  */
-function SetDisplayMode($zoom, $layout='default')
+function SetDisplayMode($zoom, $layout = 'default')
 {
     // Set display mode in viewer
-    if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+    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')
+    if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
         $this->LayoutMode = $layout;
     else
         $this->Error('Incorrect layout display mode: '.$layout);
@@ -404,133 +404,133 @@ 
     return $this->page;
 }
 
-function SetDrawColor($r, $g=null, $b=null)
+function SetDrawColor($r, $g = null, $b = null)
 {
     // Set color for all stroking operations
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->DrawColor = sprintf('%.3F G',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->DrawColor = sprintf('%.3F G', $r / 255);
     } else {
-            $this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+            $this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);
     }
-    if($this->page>0) {
+    if ($this->page > 0) {
             $this->_out($this->DrawColor);
     }
     }
 
-function SetFillColor($r, $g=null, $b=null)
+function SetFillColor($r, $g = null, $b = null)
 {
     // Set color for all filling operations
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->FillColor = sprintf('%.3F g',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->FillColor = sprintf('%.3F g', $r / 255);
     } else {
-            $this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+            $this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
     }
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
-    if($this->page>0) {
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
+    if ($this->page > 0) {
             $this->_out($this->FillColor);
     }
     }
 
-function SetTextColor($r, $g=null, $b=null)
+function SetTextColor($r, $g = null, $b = null)
 {
     // Set color for text
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->TextColor = sprintf('%.3F g',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->TextColor = sprintf('%.3F g', $r / 255);
     } else {
-            $this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+            $this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
     }
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
 }
 
 function GetStringWidth($s)
 {
     // Get width of a string in the current font
-    $s = (string)$s;
+    $s = (string) $s;
     $cw = &$this->CurrentFont['cw'];
-    $w=0;
+    $w = 0;
     if ($this->unifontSubset) {
         $unicode = $this->UTF8StringToArray($s);
-        foreach($unicode as $char) {
-            if (isset($cw[$char])) { $w += (ord($cw[2*$char])<<8) + ord($cw[2*$char+1]); } else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if(isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
+        foreach ($unicode as $char) {
+            if (isset($cw[$char])) { $w += (ord($cw[2 * $char]) << 8) + ord($cw[2 * $char + 1]); } else if ($char > 0 && $char < 128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if (isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if (isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
         }
     } else {
         $l = strlen($s);
-        for($i=0;$i<$l;$i++) {
+        for ($i = 0; $i < $l; $i++) {
                     $w += $cw[$s[$i]];
         }
     }
-    return $w*$this->FontSize/1000;
+    return $w * $this->FontSize / 1000;
 }
 
 function SetLineWidth($width)
 {
     // Set line width
     $this->LineWidth = $width;
-    if($this->page>0) {
-            $this->_out(sprintf('%.2F w',$width*$this->k));
+    if ($this->page > 0) {
+            $this->_out(sprintf('%.2F w', $width * $this->k));
     }
     }
 
 function Line($x1, $y1, $x2, $y2)
 {
     // Draw a line
-    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));
 }
 
-function Rect($x, $y, $w, $h, $style='')
+function Rect($x, $y, $w, $h, $style = '')
 {
     // Draw a rectangle
-    if($style=='F') {
+    if ($style == 'F') {
             $op = 'f';
-    } elseif($style=='FD' || $style=='DF') {
+    } elseif ($style == 'FD' || $style == 'DF') {
             $op = 'B';
     } else {
             $op = 'S';
     }
-    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
 }
 
 /**
  * @param string $family
  */
-function AddFont($family, $style='', $file='', $uni=false)
+function AddFont($family, $style = '', $file = '', $uni = false)
 {
     // Add a TrueType, OpenType or Type1 font
     $family = strtolower($family);
     $style = strtoupper($style);
-    if($style=='IB')
-        $style='BI';
-    if($file=='') {
+    if ($style == 'IB')
+        $style = 'BI';
+    if ($file == '') {
         if ($uni) {
-        $file = str_replace(' ','',$family).strtolower($style).'.ttf';
+        $file = str_replace(' ', '', $family).strtolower($style).'.ttf';
         }
         else {
-        $file = str_replace(' ','',$family).strtolower($style).'.php';
+        $file = str_replace(' ', '', $family).strtolower($style).'.php';
         }
     }
     $fontkey = $family.$style;
-    if(isset($this->fonts[$fontkey]))
+    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 ; }
-        $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file ,0,(strpos($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;
         $ttfstat = stat($ttffilename);
         if (file_exists($unifilename.'.mtx.php')) {
             include($unifilename.'.mtx.php');
         }
-        if (!isset($type) ||  !isset($name) || $originalsize != $ttfstat['size']) {
+        if (!isset($type) || !isset($name) || $originalsize != $ttfstat['size']) {
             $ttffile = $ttffilename;
             require_once($this->_getfontpath().'unifont/ttfonts.php');
             $ttf = new TTFontFile();
             $ttf->getMetrics($ttffile);
             $cw = $ttf->charWidths;
-            $name = preg_replace('/[ ()]/','',$ttf->fullName);
+            $name = preg_replace('/[ ()]/', '', $ttf->fullName);
 
-            $desc= array('Ascent'=>round($ttf->ascent),
+            $desc = array('Ascent'=>round($ttf->ascent),
             'Descent'=>round($ttf->descent),
             'CapHeight'=>round($ttf->capHeight),
             'Flags'=>$ttf->flags,
@@ -607,48 +607,48 @@ 
 /**
  * @param string $family
  */
-function SetFont($family, $style='', $size=0)
+function SetFont($family, $style = '', $size = 0)
 {
     // Select a font; size given in points
-    if($family=='') {
+    if ($family == '') {
             $family = $this->FontFamily;
     } else {
             $family = strtolower($family);
     }
     $style = strtoupper($style);
-    if(strpos($style,'U')!==false)
+    if (strpos($style, 'U') !== false)
     {
         $this->underline = true;
-        $style = str_replace('U','',$style);
+        $style = str_replace('U', '', $style);
     } else {
             $this->underline = false;
     }
-    if($style=='IB') {
+    if ($style == 'IB') {
             $style = 'BI';
     }
-    if($size==0) {
+    if ($size == 0) {
             $size = $this->FontSizePt;
     }
     // Test if font is already selected
-    if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
+    if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size) {
             return;
     }
     // Test if font is already loaded
     $fontkey = $family.$style;
-    if(!isset($this->fonts[$fontkey]))
+    if (!isset($this->fonts[$fontkey]))
     {
         // Test if one of the core fonts
-        if($family=='arial') {
+        if ($family == 'arial') {
                     $family = 'helvetica';
         }
-        if(in_array($family,$this->CoreFonts))
+        if (in_array($family, $this->CoreFonts))
         {
-            if($family=='symbol' || $family=='zapfdingbats') {
+            if ($family == 'symbol' || $family == 'zapfdingbats') {
                             $style = '';
             }
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey])) {
-                            $this->AddFont($family,$style);
+            if (!isset($this->fonts[$fontkey])) {
+                            $this->AddFont($family, $style);
             }
         } else {
                     $this->Error('Undefined font: '.$family.' '.$style);
@@ -1095,11 +1095,11 @@ 
         }
     }
     // Last chunk
-    if($i!=$j) {
+    if ($i != $j) {
         if ($this->unifontSubset) {
-            $this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',0,$link);
+            $this->Cell($l, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), 0, 0, '', 0, $link);
         } else {
-            $this->Cell($l,$h,substr($s,$j),0,0,'',0,$link);
+            $this->Cell($l, $h, substr($s, $j), 0, 0, '', 0, $link);
         }
     }
 }
@@ -1107,86 +1107,86 @@ 
 /**
  * @param integer $h
  */
-function Ln($h=null)
+function Ln($h = null)
 {
     // Line feed; default value is last cell height
     $this->x = $this->lMargin;
-    if($h===null) {
+    if ($h === null) {
             $this->y += $this->lasth;
     } else {
             $this->y += $h;
     }
     }
 
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')
 {
     // Put an image on the page
-    if(!isset($this->images[$file]))
+    if (!isset($this->images[$file]))
     {
         // First use of this image, get info
-        if($type=='')
+        if ($type == '')
         {
-            $pos = strrpos($file,'.');
-            if(!$pos) {
+            $pos = strrpos($file, '.');
+            if (!$pos) {
                             $this->Error('Image file has no extension and no type was specified: '.$file);
             }
-            $type = substr($file,$pos+1);
+            $type = substr($file, $pos + 1);
         }
         $type = strtolower($type);
-        if($type=='jpeg') {
+        if ($type == 'jpeg') {
                     $type = 'jpg';
         }
         $mtd = '_parse'.$type;
-        if(!method_exists($this,$mtd)) {
+        if (!method_exists($this, $mtd)) {
                     $this->Error('Unsupported image type: '.$type);
         }
         $info = $this->$mtd($file);
-        $info['i'] = count($this->images)+1;
+        $info['i'] = count($this->images) + 1;
         $this->images[$file] = $info;
     } else {
             $info = $this->images[$file];
     }
 
     // Automatic width and height calculation if needed
-    if($w==0 && $h==0)
+    if ($w == 0 && $h == 0)
     {
         // Put image at 96 dpi
         $w = -96;
         $h = -96;
     }
-    if($w<0) {
-            $w = -$info['w']*72/$w/$this->k;
+    if ($w < 0) {
+            $w = -$info['w'] * 72 / $w / $this->k;
     }
-    if($h<0) {
-            $h = -$info['h']*72/$h/$this->k;
+    if ($h < 0) {
+            $h = -$info['h'] * 72 / $h / $this->k;
     }
-    if($w==0) {
-            $w = $h*$info['w']/$info['h'];
+    if ($w == 0) {
+            $w = $h * $info['w'] / $info['h'];
     }
-    if($h==0) {
-            $h = $w*$info['h']/$info['w'];
+    if ($h == 0) {
+            $h = $w * $info['h'] / $info['w'];
     }
 
     // Flowing mode
-    if($y===null)
+    if ($y === null)
     {
-        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+        if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
         {
             // Automatic page break
             $x2 = $this->x;
-            $this->AddPage($this->CurOrientation,$this->CurPageSize);
+            $this->AddPage($this->CurOrientation, $this->CurPageSize);
             $this->x = $x2;
         }
         $y = $this->y;
         $this->y += $h;
     }
 
-    if($x===null) {
+    if ($x === null) {
             $x = $this->x;
     }
-    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-    if($link) {
-            $this->Link($x,$y,$w,$h,$link);
+    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));
+    if ($link) {
+            $this->Link($x, $y, $w, $h, $link);
     }
     }
 
@@ -1782,62 +1782,62 @@ 
     $this->_out('1 0 obj');
     $this->_out('<</Type /Pages');
     $kids = '/Kids [';
-    for($i=0;$i<$nb;$i++) {
-            $kids .= (3+2*$i).' 0 R ';
+    for ($i = 0; $i < $nb; $i++) {
+            $kids .= (3 + 2 * $i).' 0 R ';
     }
     $this->_out($kids.']');
     $this->_out('/Count '.$nb);
-    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
+    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));
     $this->_out('>>');
     $this->_out('endobj');
 }
 
 function _putfonts()
 {
-    $nf=$this->n;
-    foreach($this->diffs as $diff)
+    $nf = $this->n;
+    foreach ($this->diffs as $diff)
     {
         // Encodings
         $this->_newobj();
         $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
         $this->_out('endobj');
     }
-    foreach($this->FontFiles as $file=>$info)
+    foreach ($this->FontFiles as $file=>$info)
     {
-        if (!isset($info['type']) || $info['type']!='TTF') {
+        if (!isset($info['type']) || $info['type'] != 'TTF') {
         // Font file embedding
         $this->_newobj();
-        $this->FontFiles[$file]['n']=$this->n;
-        $font='';
-        $f=fopen($this->_getfontpath().$file,'rb',1);
-        if(!$f) {
+        $this->FontFiles[$file]['n'] = $this->n;
+        $font = '';
+        $f = fopen($this->_getfontpath().$file, 'rb', 1);
+        if (!$f) {
                     $this->Error('Font file not found');
         }
-        while(!feof($f)) {
-                    $font.=fread($f,8192);
+        while (!feof($f)) {
+                    $font .= fread($f, 8192);
         }
         fclose($f);
-        $compressed=(substr($file,-2)=='.z');
-        if(!$compressed && isset($info['length2']))
+        $compressed = (substr($file, -2) == '.z');
+        if (!$compressed && isset($info['length2']))
         {
-            $header=(ord($font[0])==128);
-            if($header)
+            $header = (ord($font[0]) == 128);
+            if ($header)
             {
                 // Strip first binary header
-                $font=substr($font,6);
+                $font = substr($font, 6);
             }
-            if($header && ord($font[$info['length1']])==128)
+            if ($header && ord($font[$info['length1']]) == 128)
             {
                 // Strip second binary header
-                $font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+                $font = substr($font, 0, $info['length1']).substr($font, $info['length1'] + 6);
             }
         }
         $this->_out('<</Length '.strlen($font));
-        if($compressed) {
+        if ($compressed) {
                     $this->_out('/Filter /FlateDecode');
         }
         $this->_out('/Length1 '.$info['length1']);
-        if(isset($info['length2'])) {
+        if (isset($info['length2'])) {
                     $this->_out('/Length2 '.$info['length2'].' /Length3 0');
         }
         $this->_out('>>');
@@ -1845,40 +1845,40 @@ 
         $this->_out('endobj');
         }
     }
-    foreach($this->fonts as $k=>$font)
+    foreach ($this->fonts as $k=>$font)
     {
         // Font objects
         //$this->fonts[$k]['n']=$this->n+1;
         $type = $font['type'];
         $name = $font['name'];
-        if($type=='Core')
+        if ($type == 'Core')
         {
             // Standard font
-            $this->fonts[$k]['n']=$this->n+1;
+            $this->fonts[$k]['n'] = $this->n + 1;
             $this->_newobj();
             $this->_out('<</Type /Font');
             $this->_out('/BaseFont /'.$name);
             $this->_out('/Subtype /Type1');
-            if($name!='Symbol' && $name!='ZapfDingbats') {
+            if ($name != 'Symbol' && $name != 'ZapfDingbats') {
                             $this->_out('/Encoding /WinAnsiEncoding');
             }
             $this->_out('>>');
             $this->_out('endobj');
-        } elseif($type=='Type1' || $type=='TrueType')
+        } elseif ($type == 'Type1' || $type == 'TrueType')
         {
             // Additional Type1 or TrueType font
-            $this->fonts[$k]['n']=$this->n+1;
+            $this->fonts[$k]['n'] = $this->n + 1;
             $this->_newobj();
             $this->_out('<</Type /Font');
             $this->_out('/BaseFont /'.$name);
             $this->_out('/Subtype /'.$type);
             $this->_out('/FirstChar 32 /LastChar 255');
-            $this->_out('/Widths '.($this->n+1).' 0 R');
-            $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
-            if($font['enc'])
+            $this->_out('/Widths '.($this->n + 1).' 0 R');
+            $this->_out('/FontDescriptor '.($this->n + 2).' 0 R');
+            if ($font['enc'])
             {
-                if(isset($font['diff'])) {
-                                    $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+                if (isset($font['diff'])) {
+                                    $this->_out('/Encoding '.($nf + $font['diff']).' 0 R');
                 } else {
                                     $this->_out('/Encoding /WinAnsiEncoding');
                 }
@@ -2327,15 +2327,15 @@ 
     for ($i = 0; $i < $len; $i++) {
     $uni = -1;
         $h = ord($str[$i]);
-        if ( $h <= 0x7F )
+        if ($h <= 0x7F)
             $uni = $h;
-        elseif ( $h >= 0xC2 ) {
-            if ( ($h <= 0xDF) && ($i < $len -1) )
+        elseif ($h >= 0xC2) {
+            if (($h <= 0xDF) && ($i < $len - 1))
             $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
-            elseif ( ($h <= 0xEF) && ($i < $len -2) )
+            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) )
+            elseif (($h <= 0xF4) && ($i < $len - 3))
             $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
                                         | (ord($str[++$i]) & 0x3F) << 6
                                         | (ord($str[++$i]) & 0x3F);

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)

Indentation +543 added lines, -543 removed lines

@@ -38,556 +38,556 @@
  */
 class Cipher_DES extends Cipher
 {
-	/** @type integer BYTES_BLOCK The block size, in bytes */
-	const BYTES_BLOCK = 8; // 64 bits
+    /** @type integer BYTES_BLOCK The block size, in bytes */
+    const BYTES_BLOCK = 8; // 64 bits
 
-	/** @type integer BYTES_KEY The key size, in bytes */
-	const BYTES_KEY = 8; // 64 bits
+    /** @type integer BYTES_KEY The key size, in bytes */
+    const BYTES_KEY = 8; // 64 bits
 
-	/** @type array $sub_keys The permutated subkeys */
-	protected $sub_keys = array();
+    /** @type array $sub_keys The permutated subkeys */
+    protected $sub_keys = array();
 
-	/*
+    /*
 	 * Tables initialized in the initTables()
 	 */
 
-	/**
-	 * @type array $_pc1 Permutated choice 1 (PC1),
-	 * This should be considered a constant
-	 */
-	protected static $_pc1 = array();
-
-	/**
-	 * @type array $_pc2 Permutated choice 2 (PC2),
-	 * This should be considered a constant
-	 */
-	protected static $_pc2 = array();
-
-	/**
-	 * @type array $_key_sched The key schedule,
-	 * This should be considered a constant
-	 */
-	protected static $_key_sched = array();
-
-	/**
-	 * @type array $_ip The Initial Permutation (IP),
-	 * This should be considered a constant
-	 */
-	private static $_ip = array();
-
-	/**
-	 * @type array $_e The Expansion table (E),
-	 * This should be considered a constant
-	 */
-	private static $_e = array();
-
-	/**
-	 * @type array $_s The Substitution Box (S),
-	 * This should be considered a constant
-	 */
-	private static $_s = array();
-
-	/**
-	 * @type array $_p The Permutation table (P),
-	 * This should be considered a constant
-	 */
-	private static $_p = array();
-
-	/**
-	 * @type array $_ip The The Final Permutation table (FP),
-	 * This should be considered a constant
-	 */
-	private static $_fp = array();
-
-
-	/**
-	 * Constructor, used only when calling this class directly
-	 * for classes that extend this class, call __construct1()
-	 *
-	 * @param string $key The key used for Encryption/Decryption
-	 * @return void
-	 */
-	public function __construct($key)
-	{
-		// set the DES key
-		parent::__construct(PHP_Crypt::CIPHER_DES, $key, self::BYTES_KEY);
-
-		// initialize variables
-		$this->initTables();
-
-		// DES requires that data is 64 bits
-		$this->blockSize(self::BYTES_BLOCK);
-
-		// create the 16 rounds of 56 bit keys
-		$this->keyPermutation();
-	}
-
-
-	/**
-	 * Second Constructor, used only by child classes that extend this class
-	 *
-	 * @param string $cipher The name of the cipher extending this class
-	 * @param string $key The key used for Encryption/Decryption
-	 * @param integer $key_byte_sz The required byte size of the extending cipher
-	 * @return void
-	 */
-	protected function __construct1($cipher, $key, $key_byte_sz)
-	{
-		// set the key and key size
-		parent::__construct($cipher, $key, $key_byte_sz);
-
-		// initialize variables
-		$this->initTables();
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypt plain text data using DES
-	 *
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$this->operation(parent::ENCRYPT);
-		return $this->des($text);
-	}
-
-
-	/**
-	 * Decrypt a DES encrypted string
-	 *
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$this->operation(parent::DECRYPT);
-		return $this->des($text);
-	}
-
-
-	/**
-	 * This is where the actual encrypt/decryption takes place. Since
-	 * encryption and decryption are the same algorithm in DES, we only
-	 * need one function to do both.
-	 *
-	 * @param string $data The string to be encrypted or decrypted
-	 * @return boolean Returns true
-	 */
-	protected function des(&$data)
-	{
-		$l = array();
-		$r = array();
-
-		// step two: Initial Permutation (IP) of plaintext
-		$data = $this->ip($data);
-
-		// divide the permuted block IP into a left half L0 of 32 bits,
-		// and a right half R0 of 32 bits
-		$l[0] = substr($data, 0, 32);
-		$r[0] = substr($data, 32, 32);
-
-		for ($n = 1; $n <= 16; ++$n)
-		{
-			$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]);
-
-			// XOR F with Ln
-			$r[$n] = $this->xorBin($l[$n - 1], $f);
-		}
-
-		// now we combine L[16] and R[16] back into a 64-bit string, but we reverse
-		// L[16] and R[16] so that it becomes R[16]L[16]
-		$data = $r[16].$l[16];
-
-		// now do the final permutation
-		$data = $this->fp($data);
-		$data = parent::bin2Str($data);
-
-		return true;
-	}
-
-
-	/**
-	 * The Key permutation, based on tables $_pc1 and $_pc2
-	 * Create 16 subkeys, each of which is 48-bits long.
-	 *
-	 * @return void
-	 */
-	private function keyPermutation()
-	{
-		$this->sub_keys = array();
-		$pc1m = array();
-		$pcr = array();
-		$c = array();
-		$d = array();
-
-		// convert the key to binary
-		$binkey = parent::str2Bin($this->key());
-
-		// reduce the key down to 56bits based on table $_pc1
-		for ($i = 0; $i < 56; ++$i)
+    /**
+     * @type array $_pc1 Permutated choice 1 (PC1),
+     * This should be considered a constant
+     */
+    protected static $_pc1 = array();
+
+    /**
+     * @type array $_pc2 Permutated choice 2 (PC2),
+     * This should be considered a constant
+     */
+    protected static $_pc2 = array();
+
+    /**
+     * @type array $_key_sched The key schedule,
+     * This should be considered a constant
+     */
+    protected static $_key_sched = array();
+
+    /**
+     * @type array $_ip The Initial Permutation (IP),
+     * This should be considered a constant
+     */
+    private static $_ip = array();
+
+    /**
+     * @type array $_e The Expansion table (E),
+     * This should be considered a constant
+     */
+    private static $_e = array();
+
+    /**
+     * @type array $_s The Substitution Box (S),
+     * This should be considered a constant
+     */
+    private static $_s = array();
+
+    /**
+     * @type array $_p The Permutation table (P),
+     * This should be considered a constant
+     */
+    private static $_p = array();
+
+    /**
+     * @type array $_ip The The Final Permutation table (FP),
+     * This should be considered a constant
+     */
+    private static $_fp = array();
+
+
+    /**
+     * Constructor, used only when calling this class directly
+     * for classes that extend this class, call __construct1()
+     *
+     * @param string $key The key used for Encryption/Decryption
+     * @return void
+     */
+    public function __construct($key)
+    {
+        // set the DES key
+        parent::__construct(PHP_Crypt::CIPHER_DES, $key, self::BYTES_KEY);
+
+        // initialize variables
+        $this->initTables();
+
+        // DES requires that data is 64 bits
+        $this->blockSize(self::BYTES_BLOCK);
+
+        // create the 16 rounds of 56 bit keys
+        $this->keyPermutation();
+    }
+
+
+    /**
+     * Second Constructor, used only by child classes that extend this class
+     *
+     * @param string $cipher The name of the cipher extending this class
+     * @param string $key The key used for Encryption/Decryption
+     * @param integer $key_byte_sz The required byte size of the extending cipher
+     * @return void
+     */
+    protected function __construct1($cipher, $key, $key_byte_sz)
+    {
+        // set the key and key size
+        parent::__construct($cipher, $key, $key_byte_sz);
+
+        // initialize variables
+        $this->initTables();
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypt plain text data using DES
+     *
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $this->operation(parent::ENCRYPT);
+        return $this->des($text);
+    }
+
+
+    /**
+     * Decrypt a DES encrypted string
+     *
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $this->operation(parent::DECRYPT);
+        return $this->des($text);
+    }
+
+
+    /**
+     * This is where the actual encrypt/decryption takes place. Since
+     * encryption and decryption are the same algorithm in DES, we only
+     * need one function to do both.
+     *
+     * @param string $data The string to be encrypted or decrypted
+     * @return boolean Returns true
+     */
+    protected function des(&$data)
+    {
+        $l = array();
+        $r = array();
+
+        // step two: Initial Permutation (IP) of plaintext
+        $data = $this->ip($data);
+
+        // divide the permuted block IP into a left half L0 of 32 bits,
+        // and a right half R0 of 32 bits
+        $l[0] = substr($data, 0, 32);
+        $r[0] = substr($data, 32, 32);
+
+        for ($n = 1; $n <= 16; ++$n)
+        {
+            $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]);
+
+            // XOR F with Ln
+            $r[$n] = $this->xorBin($l[$n - 1], $f);
+        }
+
+        // now we combine L[16] and R[16] back into a 64-bit string, but we reverse
+        // L[16] and R[16] so that it becomes R[16]L[16]
+        $data = $r[16].$l[16];
+
+        // now do the final permutation
+        $data = $this->fp($data);
+        $data = parent::bin2Str($data);
+
+        return true;
+    }
+
+
+    /**
+     * The Key permutation, based on tables $_pc1 and $_pc2
+     * Create 16 subkeys, each of which is 48-bits long.
+     *
+     * @return void
+     */
+    private function keyPermutation()
+    {
+        $this->sub_keys = array();
+        $pc1m = array();
+        $pcr = array();
+        $c = array();
+        $d = array();
+
+        // convert the key to binary
+        $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];
 
-		// split $pc1m in half (C0 and D0)
-		$c[0] = array_slice($pc1m, 0, 28);
-		$d[0] = array_slice($pc1m, 28, 28);
-
-		// now that $c[0] and $d[0] are defined, create 16 blocks for Cn and Dn
-		// where 1 <= n <= 16
-		for ($i = 1; $i <= 16; ++$i)
-		{
-			// now set the next Cn and Dn as the previous Cn and Dn
-			$c[$i] = $c[$i - 1];
-			$d[$i] = $d[$i - 1];
-
-			for ($j = 0; $j < self::$_key_sched[$i - 1]; ++$j)
-			{
-				// do a left shift, move each bit one place to the left,
-				// except for the first bit, which is cycled to the end
-				// of the block.
-				$c[$i][] = array_shift($c[$i]);
-				$d[$i][] = array_shift($d[$i]);
-			}
-
-			// We now form the sub_keys (Kn), for 1<=n<=16, by applying the
-			// following permutation table to each of the concatenated
-			// pairs CnDn. Each pair has 56 bits, but PC-2 only uses 48
-			// 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];
-		}
-
-		// the sub_keys are created, we are done with the key permutation
-	}
-
-
-	/**
-	 * Initial Permutation (IP)
-	 * Now we encode each 64-bit block of data. There is an initial permutation IP of
-	 * the 64 bits of the message data M. This rearranges the bits according to the
-	 * following table, where the entries in the table show the new arrangement of the
-	 * bits from their initial order. The 58th bit of M becomes the first bit of IP.
-	 * The 50th bit of M becomes the second bit of IP. The 7th bit of M is the last
-	 * bit of IP.
-	 *
-	 * According to the book Applied Cryptography (Bruce Schneier, 2nd edition, pg. 271):
-	 * The initial permution was used to make it easier to load plain text and cipher text
-	 * data into a DES chip in byte-sized pieces when doing DES in hardware. The IP and FP
-	 * are not necessary in software implementations and do not affect the security. However,
-	 * the IP and FP are part of the DES standard and not implementing it would deviate from
-	 * the standard, so we will do it here in phpCrypt.
-	 *
-	 * @param string $text
-	 * @return string the Initial Permutation (IP)
-	 */
-	private function ip($text)
-	{
-		$text = parent::str2Bin($text);
-		$ip = "";
-
-		// loop through the 64 bit block, ordering it occording to $_ip
-		for ($i = 0; $i < 64; ++$i)
-			$ip .= $text[self::$_ip[$i] - 1];
-
-		return $ip;
-	}
-
-
-	/**
-	 * Function F - To calculate f, we first expand each block Rn-1 from 32 bits to 48 bits.
-	 * This is done by using a selection table that repeats some of the bits in Rn-1. We'll
-	 * call the use of this selection table the function E. Thus E(Rn-1) has a 32 bit input
-	 * block, and a 48 bit output block.
-	 *
-	 * @param string $r  32 bit binary, each bit in an array element
-	 * @param string $k 48 bit binary string
-	 * @return string 48 bit binary string
-	 */
-	private function f($r, $k)
-	{
-		$bin = parent::xorBin($k, $this->E($r));
-
-		// create a 32-bit string from $bits by passing it through the S-Boxes
-		$bin = $this->s($bin);
-
-		// now send permute $bin as defined by table self::$_p
-		$bin = $this->p($bin);
-
-		return $bin;
-	}
-
-
-	/**
-	 * Function E - Let E be such that the 48 bits of its output, written as 8 blocks of
-	 * 6 bits each, are obtained by selecting the bits in its inputs in order according
-	 * 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
-	 * @return string 48 bit binary string
-	 */
-	private function e($r)
-	{
-		$e = "";
-		for ($i = 0; $i < 48; ++$i)
-			$e .= $r[self::$_e[$i] - 1];
-
-		return $e;
-	}
-
-
-	/**
-	 * S-Box
-	 * Take a 48-bit string from F() and run it through the S-Boxes, this requires
-	 * us to break up the 48-bit string into 8 groups of 6 bits before sending it
-	 * through the S-Boxes
-	 *
-	 * @param string $bits The 48-bit string from F() to be processed
-	 * @return string A 32-bit string from created from the 48-bit string after passing through S-Boxes
-	 */
-	private function s($bits)
-	{
-		$s = "";
-
-		for ($i = 0; $i <= 42; $i += 6)
-		{
-			$sbits = substr($bits, $i, 6);
-
-			// we need to determine the S-Box column number and row number
-			// from the 6 bit string passed in, this is done using the following method:
-			// The First & Last bits represent a number between 0-3, used to determine which row
-			// The middle 4 bits represent a number between 0-15, used to determine the column
-			$row = bindec("{$sbits[0]}{$sbits[5]}");
-			$col = bindec("{$sbits[1]}{$sbits[2]}{$sbits[3]}{$sbits[4]}");
-
-			// determine the position in the S-BOX, S-Box table is in self::$_s[]
-			$pos = ($row * 16) + $col;
-
-			// get the integer from the S-Box and convert it to binary
-			$bin = decbin(self::$_s[($i / 6)][$pos]);
-			$s .= str_pad($bin, 4, "0", STR_PAD_LEFT);
-		}
-
-		return $s;
-	}
-
-
-	/**
-	 * Permutation P
-	 * The permutation P is defined in self::$_p. P() returns a 32-bit output
-	 * from a 32-bit input from a binary string from the S-BOX by permuting
-	 * the bits of the input block.
-	 * This is only used inside of F() function
-	 *
-	 * @param string $s A 32-bit string originating from being passed through S-Box
-	 * @return string A 32-bit string, which is $s permuted through table self::$_p
-	 */
-	private function p($s)
-	{
-		$p = "";
-		for ($i = 0; $i < 32; ++$i)
-			$p .= $s[self::$_p[$i] - 1];
-
-		return $p;
-	}
-
-
-	/**
-	 * Final Permutation (FP)
-	 * Read the comment about IP and FP being unecessary in software implmented DES (though
-	 * we will do it to follow the DES standard).
-	 *
-	 * @param string $bin A 64-bit binary string
-	 * @return string A 64-bit binary string that has been run through self::$_fp[] table
-	 */
-	private function fp($bin)
-	{
-		$fp = "";
-		for ($i = 0; $i < 64; ++$i)
-			$fp .= $bin[self::$_fp[$i] - 1];
-
-		return $fp;
-	}
-
-
-	/**
-	 * Initialize all the tables, this function is called inside the constructor
-	 *
-	 * @return void
-	 */
-	private function initTables()
-	{
-		// permuted choice 1 (PC1)
-		// these values are chars and should be run through chr() when used
-		self::$_pc1 = array(
-			57, 49, 41, 33, 25, 17, 9,
-			 1, 58, 50, 42, 34, 26, 18,
-			10, 2, 59, 51, 43, 35, 27,
-			19, 11, 3, 60, 52, 44, 36,
-			63, 55, 47, 39, 31, 23, 15,
-			 7, 62, 54, 46, 38, 30, 22,
-			14, 6, 61, 53, 45, 37, 29,
-			21, 13, 5, 28, 20, 12, 4
-		);
-
-		// permuted choice 2 (PC2)
-		// these values are chars and should be run through chr() when used
-		self::$_pc2 = array(
-			14, 17, 11, 24, 1, 5,
-			 3, 28, 15, 6, 21, 10,
-			23, 19, 12, 4, 26, 8,
-			16, 7, 27, 20, 13, 2,
-			41, 52, 31, 37, 47, 55,
-			30, 40, 51, 45, 33, 48,
-			44, 49, 39, 56, 34, 53,
-			46, 42, 50, 36, 29, 32
-		);
-
-		// initial permutation (IP)
-		self::$_ip = array(
-			58, 50, 42, 34, 26, 18, 10, 2,
-			60, 52, 44, 36, 28, 20, 12, 4,
-			62, 54, 46, 38, 30, 22, 14, 6,
-			64, 56, 48, 40, 32, 24, 16, 8,
-			57, 49, 41, 33, 25, 17, 9, 1,
-			59, 51, 43, 35, 27, 19, 11, 3,
-			61, 53, 45, 37, 29, 21, 13, 5,
-			63, 55, 47, 39, 31, 23, 15, 7
-		);
-
-		// expansion (E)
-		self::$_e = array(
-			32, 1, 2, 3, 4, 5,
-			 4, 5, 6, 7, 8, 9,
-			 8, 9, 10, 11, 12, 13,
-			12, 13, 14, 15, 16, 17,
-			16, 17, 18, 19, 20, 21,
-			20, 21, 22, 23, 24, 25,
-			24, 25, 26, 27, 28, 29,
-			28, 29, 30, 31, 32, 1
-		);
-
-		// substition box (S)
-		self::$_s = array(
-			/* S1 */
-			array(
-				14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
-				 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
-				 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
-				15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
-			),
-
-			/* S2 */
-			array(
-				15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
-				 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
-				 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
-				13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
-			),
-
-			/* S3 */
-			array(
-				10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
-				13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
-				13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
-				 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
-			),
-
-			/* S4 */
-			array(
-				 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
-				13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
-				10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
-				 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
-			),
-
-			/* S5 */
-			array(
-				 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
-				14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
-				 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
-				11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
-			),
-
-			/* S6 */
-			array(
-				12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
-				10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
-				 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
-				 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
-			),
-
-			/* S7 */
-			array(
-				 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
-				13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
-				 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
-				 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
-			),
-
-			/* S8 */
-			array(
-				13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
-				 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
-				 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
-				 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
-			)
-		);
-
-		// permutation (P)
-		self::$_p = array(
-			16, 7, 20, 21,
-			29, 12, 28, 17,
-			 1, 15, 23, 26,
-			 5, 18, 31, 10,
-			 2, 8, 24, 14,
-			32, 27, 3, 9,
-			19, 13, 30, 6,
-			22, 11, 4, 25
-		);
-
-		// final permutation (FP)
-		self::$_fp = array(
-			40, 8, 48, 16, 56, 24, 64, 32,
-			39, 7, 47, 15, 55, 23, 63, 31,
-			38, 6, 46, 14, 54, 22, 62, 30,
-			37, 5, 45, 13, 53, 21, 61, 29,
-			36, 4, 44, 12, 52, 20, 60, 28,
-			35, 3, 43, 11, 51, 19, 59, 27,
-			34, 2, 42, 10, 50, 18, 58, 26,
-			33, 1, 41, 9, 49, 17, 57, 25
-		);
-
-		// key schedule used in KeyPermutation()
-		self::$_key_sched = array(1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1);
-	}
-
-
-	/**
-	 * Indicates this is a block cipher
-	 *
-	 * @return integer Returns Cipher::BLOCK
-	 */
-	public function type()
-	{
-		return parent::BLOCK;
-	}
+        // split $pc1m in half (C0 and D0)
+        $c[0] = array_slice($pc1m, 0, 28);
+        $d[0] = array_slice($pc1m, 28, 28);
+
+        // now that $c[0] and $d[0] are defined, create 16 blocks for Cn and Dn
+        // where 1 <= n <= 16
+        for ($i = 1; $i <= 16; ++$i)
+        {
+            // now set the next Cn and Dn as the previous Cn and Dn
+            $c[$i] = $c[$i - 1];
+            $d[$i] = $d[$i - 1];
+
+            for ($j = 0; $j < self::$_key_sched[$i - 1]; ++$j)
+            {
+                // do a left shift, move each bit one place to the left,
+                // except for the first bit, which is cycled to the end
+                // of the block.
+                $c[$i][] = array_shift($c[$i]);
+                $d[$i][] = array_shift($d[$i]);
+            }
+
+            // We now form the sub_keys (Kn), for 1<=n<=16, by applying the
+            // following permutation table to each of the concatenated
+            // pairs CnDn. Each pair has 56 bits, but PC-2 only uses 48
+            // 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];
+        }
+
+        // the sub_keys are created, we are done with the key permutation
+    }
+
+
+    /**
+     * Initial Permutation (IP)
+     * Now we encode each 64-bit block of data. There is an initial permutation IP of
+     * the 64 bits of the message data M. This rearranges the bits according to the
+     * following table, where the entries in the table show the new arrangement of the
+     * bits from their initial order. The 58th bit of M becomes the first bit of IP.
+     * The 50th bit of M becomes the second bit of IP. The 7th bit of M is the last
+     * bit of IP.
+     *
+     * According to the book Applied Cryptography (Bruce Schneier, 2nd edition, pg. 271):
+     * The initial permution was used to make it easier to load plain text and cipher text
+     * data into a DES chip in byte-sized pieces when doing DES in hardware. The IP and FP
+     * are not necessary in software implementations and do not affect the security. However,
+     * the IP and FP are part of the DES standard and not implementing it would deviate from
+     * the standard, so we will do it here in phpCrypt.
+     *
+     * @param string $text
+     * @return string the Initial Permutation (IP)
+     */
+    private function ip($text)
+    {
+        $text = parent::str2Bin($text);
+        $ip = "";
+
+        // loop through the 64 bit block, ordering it occording to $_ip
+        for ($i = 0; $i < 64; ++$i)
+            $ip .= $text[self::$_ip[$i] - 1];
+
+        return $ip;
+    }
+
+
+    /**
+     * Function F - To calculate f, we first expand each block Rn-1 from 32 bits to 48 bits.
+     * This is done by using a selection table that repeats some of the bits in Rn-1. We'll
+     * call the use of this selection table the function E. Thus E(Rn-1) has a 32 bit input
+     * block, and a 48 bit output block.
+     *
+     * @param string $r  32 bit binary, each bit in an array element
+     * @param string $k 48 bit binary string
+     * @return string 48 bit binary string
+     */
+    private function f($r, $k)
+    {
+        $bin = parent::xorBin($k, $this->E($r));
+
+        // create a 32-bit string from $bits by passing it through the S-Boxes
+        $bin = $this->s($bin);
+
+        // now send permute $bin as defined by table self::$_p
+        $bin = $this->p($bin);
+
+        return $bin;
+    }
+
+
+    /**
+     * Function E - Let E be such that the 48 bits of its output, written as 8 blocks of
+     * 6 bits each, are obtained by selecting the bits in its inputs in order according
+     * 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
+     * @return string 48 bit binary string
+     */
+    private function e($r)
+    {
+        $e = "";
+        for ($i = 0; $i < 48; ++$i)
+            $e .= $r[self::$_e[$i] - 1];
+
+        return $e;
+    }
+
+
+    /**
+     * S-Box
+     * Take a 48-bit string from F() and run it through the S-Boxes, this requires
+     * us to break up the 48-bit string into 8 groups of 6 bits before sending it
+     * through the S-Boxes
+     *
+     * @param string $bits The 48-bit string from F() to be processed
+     * @return string A 32-bit string from created from the 48-bit string after passing through S-Boxes
+     */
+    private function s($bits)
+    {
+        $s = "";
+
+        for ($i = 0; $i <= 42; $i += 6)
+        {
+            $sbits = substr($bits, $i, 6);
+
+            // we need to determine the S-Box column number and row number
+            // from the 6 bit string passed in, this is done using the following method:
+            // The First & Last bits represent a number between 0-3, used to determine which row
+            // The middle 4 bits represent a number between 0-15, used to determine the column
+            $row = bindec("{$sbits[0]}{$sbits[5]}");
+            $col = bindec("{$sbits[1]}{$sbits[2]}{$sbits[3]}{$sbits[4]}");
+
+            // determine the position in the S-BOX, S-Box table is in self::$_s[]
+            $pos = ($row * 16) + $col;
+
+            // get the integer from the S-Box and convert it to binary
+            $bin = decbin(self::$_s[($i / 6)][$pos]);
+            $s .= str_pad($bin, 4, "0", STR_PAD_LEFT);
+        }
+
+        return $s;
+    }
+
+
+    /**
+     * Permutation P
+     * The permutation P is defined in self::$_p. P() returns a 32-bit output
+     * from a 32-bit input from a binary string from the S-BOX by permuting
+     * the bits of the input block.
+     * This is only used inside of F() function
+     *
+     * @param string $s A 32-bit string originating from being passed through S-Box
+     * @return string A 32-bit string, which is $s permuted through table self::$_p
+     */
+    private function p($s)
+    {
+        $p = "";
+        for ($i = 0; $i < 32; ++$i)
+            $p .= $s[self::$_p[$i] - 1];
+
+        return $p;
+    }
+
+
+    /**
+     * Final Permutation (FP)
+     * Read the comment about IP and FP being unecessary in software implmented DES (though
+     * we will do it to follow the DES standard).
+     *
+     * @param string $bin A 64-bit binary string
+     * @return string A 64-bit binary string that has been run through self::$_fp[] table
+     */
+    private function fp($bin)
+    {
+        $fp = "";
+        for ($i = 0; $i < 64; ++$i)
+            $fp .= $bin[self::$_fp[$i] - 1];
+
+        return $fp;
+    }
+
+
+    /**
+     * Initialize all the tables, this function is called inside the constructor
+     *
+     * @return void
+     */
+    private function initTables()
+    {
+        // permuted choice 1 (PC1)
+        // these values are chars and should be run through chr() when used
+        self::$_pc1 = array(
+            57, 49, 41, 33, 25, 17, 9,
+                1, 58, 50, 42, 34, 26, 18,
+            10, 2, 59, 51, 43, 35, 27,
+            19, 11, 3, 60, 52, 44, 36,
+            63, 55, 47, 39, 31, 23, 15,
+                7, 62, 54, 46, 38, 30, 22,
+            14, 6, 61, 53, 45, 37, 29,
+            21, 13, 5, 28, 20, 12, 4
+        );
+
+        // permuted choice 2 (PC2)
+        // these values are chars and should be run through chr() when used
+        self::$_pc2 = array(
+            14, 17, 11, 24, 1, 5,
+                3, 28, 15, 6, 21, 10,
+            23, 19, 12, 4, 26, 8,
+            16, 7, 27, 20, 13, 2,
+            41, 52, 31, 37, 47, 55,
+            30, 40, 51, 45, 33, 48,
+            44, 49, 39, 56, 34, 53,
+            46, 42, 50, 36, 29, 32
+        );
+
+        // initial permutation (IP)
+        self::$_ip = array(
+            58, 50, 42, 34, 26, 18, 10, 2,
+            60, 52, 44, 36, 28, 20, 12, 4,
+            62, 54, 46, 38, 30, 22, 14, 6,
+            64, 56, 48, 40, 32, 24, 16, 8,
+            57, 49, 41, 33, 25, 17, 9, 1,
+            59, 51, 43, 35, 27, 19, 11, 3,
+            61, 53, 45, 37, 29, 21, 13, 5,
+            63, 55, 47, 39, 31, 23, 15, 7
+        );
+
+        // expansion (E)
+        self::$_e = array(
+            32, 1, 2, 3, 4, 5,
+                4, 5, 6, 7, 8, 9,
+                8, 9, 10, 11, 12, 13,
+            12, 13, 14, 15, 16, 17,
+            16, 17, 18, 19, 20, 21,
+            20, 21, 22, 23, 24, 25,
+            24, 25, 26, 27, 28, 29,
+            28, 29, 30, 31, 32, 1
+        );
+
+        // substition box (S)
+        self::$_s = array(
+            /* S1 */
+            array(
+                14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
+                    0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
+                    4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
+                15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13
+            ),
+
+            /* S2 */
+            array(
+                15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
+                    3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
+                    0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
+                13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9
+            ),
+
+            /* S3 */
+            array(
+                10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
+                13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
+                13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
+                    1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12
+            ),
+
+            /* S4 */
+            array(
+                    7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
+                13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
+                10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
+                    3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14
+            ),
+
+            /* S5 */
+            array(
+                    2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
+                14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
+                    4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
+                11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3
+            ),
+
+            /* S6 */
+            array(
+                12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
+                10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
+                    9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
+                    4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13
+            ),
+
+            /* S7 */
+            array(
+                    4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
+                13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
+                    1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
+                    6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12
+            ),
+
+            /* S8 */
+            array(
+                13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
+                    1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
+                    7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
+                    2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11
+            )
+        );
+
+        // permutation (P)
+        self::$_p = array(
+            16, 7, 20, 21,
+            29, 12, 28, 17,
+                1, 15, 23, 26,
+                5, 18, 31, 10,
+                2, 8, 24, 14,
+            32, 27, 3, 9,
+            19, 13, 30, 6,
+            22, 11, 4, 25
+        );
+
+        // final permutation (FP)
+        self::$_fp = array(
+            40, 8, 48, 16, 56, 24, 64, 32,
+            39, 7, 47, 15, 55, 23, 63, 31,
+            38, 6, 46, 14, 54, 22, 62, 30,
+            37, 5, 45, 13, 53, 21, 61, 29,
+            36, 4, 44, 12, 52, 20, 60, 28,
+            35, 3, 43, 11, 51, 19, 59, 27,
+            34, 2, 42, 10, 50, 18, 58, 26,
+            33, 1, 41, 9, 49, 17, 57, 25
+        );
+
+        // key schedule used in KeyPermutation()
+        self::$_key_sched = array(1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1);
+    }
+
+
+    /**
+     * Indicates this is a block cipher
+     *
+     * @return integer Returns Cipher::BLOCK
+     */
+    public function type()
+    {
+        return parent::BLOCK;
+    }
 }
 ?>

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

Spacing +10 added lines, -10 removed lines

@@ -1798,7 +1798,7 @@ 
                                             'type' => 'folder_deleted',
                                             'intitule' => "f".$array_category[$i],
                                             'valeur' => $folder->id.', '.$folder->parent_id.', '.
-                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '. $folder->nlevel.', 0, 0, 0, 0'
+                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.$folder->nlevel.', 0, 0, 0, 0'
                                         )
                                     );
                                     //delete folder
@@ -1993,29 +1993,29 @@ 
 
                     echo json_encode($json);
                 } else {
-                    rest_error ('NO_PARAMETERS');
+                    rest_error('NO_PARAMETERS');
                 }
             } else if ($GLOBALS['request'][1] === "version") {
                 echo '{"api-version":"'.$api_version.'"}';
             } else {
-                rest_error ('NO_PARAMETERS');
+                rest_error('NO_PARAMETERS');
             }
         } else {
-            rest_error ('METHOD');
+            rest_error('METHOD');
         }
     }
 }
 
 function rest_put() {
-    if(!@count($GLOBALS['request'])==0){
+    if (!@count($GLOBALS['request']) == 0) {
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
-        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/',$request_uri,$matches);
+        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
         if (count($matches) == 0) {
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
         }
-        $GLOBALS['request'] =  explode('/',$matches[2]);
+        $GLOBALS['request'] = explode('/', $matches[2]);
     }
-    if(apikey_checker($GLOBALS['apikey'])) {
+    if (apikey_checker($GLOBALS['apikey'])) {
         global $server, $user, $pass, $database, $pre, $link;
         teampass_connect();
 
@@ -2025,7 +2025,7 @@ 
 /**
  * @param string $type
  */
-function rest_error ($type,$detail = 'N/A') {
+function rest_error($type, $detail = 'N/A') {
     switch ($type) {
         case 'APIKEY':
             $message = Array('err' => 'This api_key '.$GLOBALS['apikey'].' doesn\'t exist');

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") {