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

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;
+    }
 
 
 

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

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

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;
+    }
 }
 ?>

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

includes/libraries/LDAP/adLDAP/adLDAP.php

Indentation +14 added lines, -14 removed lines

@@ -755,11 +755,11 @@ 
     }
 
     /**
-    * Returns objectClass in an array
-    *
-    * @param string $distinguishedName The full DN of a contact
-    * @return array
-    */
+     * Returns objectClass in an array
+     *
+     * @param string $distinguishedName The full DN of a contact
+     * @return array
+     */
     public function getObjectClass($distinguishedName) {
         if ($distinguishedName === NULL) { return false; }
         if (!$this->getLdapBind()) { return false; }
@@ -778,21 +778,21 @@ 
     }
 
     /**
-    * Find the Base DN of your domain controller
-    * 
-    * @return string
-    */
+     * Find the Base DN of your domain controller
+     * 
+     * @return string
+     */
     public function findBaseDn() {
         $namingContext = $this->getRootDse(array('defaultnamingcontext'));   
         return $namingContext[0]['defaultnamingcontext'][0];
     }
     
     /**
-    * Get the RootDSE properties from a domain controller
-    * 
-    * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
-    * @return array
-    */
+     * Get the RootDSE properties from a domain controller
+     * 
+     * @param string[] $attributes The attributes you wish to query e.g. defaultnamingcontext
+     * @return array
+     */
     public function getRootDse($attributes = array("*", "+")) {
         if (!$this->ldapBind) { return (false); }