thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -932,7 +932,7 @@
         }
         
         if (false === filter_var($address, FILTER_VALIDATE_EMAIL)) {
-          return false;
+            return false;
         }
         
         return true;

Spacing +19 added lines, -19 removed lines

@@ -240,7 +240,7 @@ 
         $this->headers     = [];
         $this->message     = '';
         $this->messageAlt  = '';
-        $this->messageId   = '<'.$_SERVER['REQUEST_TIME'] . '.'. md5(microtime()) . '@' . self::getServerName() . '>';
+        $this->messageId   = '<'.$_SERVER['REQUEST_TIME'].'.'.md5(microtime()).'@'.self::getServerName().'>';
         $this->priority    = 3; // 3 -> Normal
         $this->subject     = '';
 
@@ -249,7 +249,7 @@ 
         $this->_bcc        = [];
         $this->_cc         = [];
         $this->_from       = [];
-        $this->_mailer     = 'phpMyFAQ on PHP/' . PHP_VERSION;
+        $this->_mailer     = 'phpMyFAQ on PHP/'.PHP_VERSION;
         $this->_notifyTo   = [];
         $this->_replyTo    = [];
         $this->_returnPath = [];
@@ -257,7 +257,7 @@ 
         $this->_to         = [];
 
         // Set phpMyFAQ related data
-        $this->_mailer = 'phpMyFAQ/' . $this->_config->get('main.currentVersion');
+        $this->_mailer = 'phpMyFAQ/'.$this->_config->get('main.currentVersion');
         $this->setFrom($this->_config->get('main.administrationMail'));
     }
 
@@ -304,7 +304,7 @@ 
             
             // Wrap the displayed name in quotes (to fix problems with commas etc),
             // and escape any existing quotes
-            $name = '"' . str_replace('"', '\"', $name) . '"';
+            $name = '"'.str_replace('"', '\"', $name).'"';
         }
 
         // Add the e-mail address into the target array
@@ -432,7 +432,7 @@ 
 
         // Disposition-Notification-To, RFC 3798
         $notifyTos = [];
-        foreach($this->_notifyTo as $address => $name) {
+        foreach ($this->_notifyTo as $address => $name) {
             $notifyTos[] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
         $notifyTo = implode(',', $notifyTos);
@@ -442,17 +442,17 @@ 
 
         // From
         foreach ($this->_from as $address => $name) {
-            $this->headers['From'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['From'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // CC
         foreach ($this->_cc as $address => $name) {
-            $this->headers['CC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['CC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // BCC
         foreach ($this->_bcc as $address => $name) {
-            $this->headers['BCC'] = (empty($name) ? '' : $name.' ') . '<' . $address . '>';
+            $this->headers['BCC'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // Message-Id
@@ -463,21 +463,21 @@ 
 
         // Reply-To
         $this->headers['Reply-To'] = $this->headers['From'];
-        foreach($this->_replyTo as $address => $name) {
+        foreach ($this->_replyTo as $address => $name) {
             $this->headers['Reply-To'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
         // Return-Path
-        foreach($this->_from as $address => $name) {
+        foreach ($this->_from as $address => $name) {
             $this->headers['Return-Path'] = '<'.$address.'>';
         }
-        foreach($this->_returnPath as $address => $name) {
+        foreach ($this->_returnPath as $address => $name) {
             $this->headers['Return-Path'] = '<'.$address.'>';
         }
 
         // Sender
         $this->headers['Sender'] = $this->headers['From'];
-        foreach($this->_sender as $address => $name) {
+        foreach ($this->_sender as $address => $name) {
             $this->headers['Sender'] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
 
@@ -621,7 +621,7 @@ 
      */          
     public static function createBoundary()
     {
-        return '-----'  .md5(microtime());
+        return '-----'.md5(microtime());
     }
 
     /**
@@ -637,9 +637,9 @@ 
         // Assure that anything among CRLF, CR will be replaced with just LF
         $text = str_replace(
             array(
-                "\r\n",// CRLF
+                "\r\n", // CRLF
                 "\r", // CR
-                "\n",// LF
+                "\n", // LF
             ),
             "\n", // LF
             $text
@@ -764,7 +764,7 @@ 
 
         // Prepare the recipients
         $to = [];
-        foreach($this->_to as $address => $name) {
+        foreach ($this->_to as $address => $name) {
             $to[] = (empty($name) ? '' : $name.' ').'<'.$address.'>';
         }
         $recipients = implode(',', $to);
@@ -780,7 +780,7 @@ 
         $this->_createBody();
 
         // Send the email adopting to the given MUA
-        $mua  = self::getMUA($this->agent);
+        $mua = self::getMUA($this->agent);
         switch ($this->agent) {
             case 'built-in':
                 $sent = $mua->send($recipients, $this->headers, $this->body);
@@ -926,7 +926,7 @@ 
             return false;
         }
         
-        $unsafe = array ("\r", "\n");
+        $unsafe = array("\r", "\n");
         if ($address !== str_replace($unsafe, '', $address)) {
             return false;
         }
@@ -980,7 +980,7 @@ 
     public function safeEmail($email)
     {
         if ($this->_config->get('spam.enableSafeEmail')) {
-            return str_replace ( array ('@', '.' ), array ('_AT_', '_DOT_' ), $email );
+            return str_replace(array('@', '.'), array('_AT_', '_DOT_'), $email);
         } else {
             return $email;
         }

phpmyfaq/inc/PMF/Mail/IMUA.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
  * @link      http://www.phpmyfaq.de
  * @since     2009-09-11
-  */ 
+ */ 
 interface PMF_Mail_IMUA
 {
     /**

phpmyfaq/inc/PMF/DB/Pgsql.php

Indentation +5 added lines, -5 removed lines

@@ -119,11 +119,11 @@
     }
 
     /**
-    * Escapes a string for use in a query
-    *
-    * @param   string
-    * @return  string
-    */
+     * Escapes a string for use in a query
+     *
+     * @param   string
+     * @return  string
+     */
     public function escape($string)
     {
         return pg_escape_string($this->conn, $string);

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      *
      * @return boolean true, if connected, otherwise false
      */
-    public function connect ($host, $user, $password, $database = '')
+    public function connect($host, $user, $password, $database = '')
     {
         $connectionString = sprintf(
             'host=%s port=5432 dbname=%s user=%s password=%s',
@@ -166,7 +166,7 @@ 
     {
         $ret = [];
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
         
         while ($row = $this->fetchObject($result)) {

Doc Comments +5 added lines, -4 removed lines

@@ -66,7 +66,7 @@ 
      * @param string $password Password
      * @param string $database Database name
      *
-     * @return boolean true, if connected, otherwise false
+     * @return null|boolean true, if connected, otherwise false
      */
     public function connect ($host, $user, $password, $database = '')
     {
@@ -132,7 +132,7 @@ 
     /**
      * Fetch a result row as an object
      *
-     * @param   mixed $result
+     * @param   resource $result
      * @return  mixed
      */
     public function fetchObject($result)
@@ -190,7 +190,7 @@ 
     /**
      * Logs the queries
      *
-     * @return  integer
+     * @return  string
      */
     public function log()
     {
@@ -201,6 +201,7 @@ 
      * Returns just one row
      *
      * @param  string
+     * @param string $query
      * @return string
      */
     private function getOne($query)
@@ -285,7 +286,7 @@ 
      *
      * @param string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

phpmyfaq/inc/PMF/Pagination.php

Indentation +5 added lines, -5 removed lines

@@ -218,23 +218,23 @@
         }
        
         if (isset($options['firstPageLinkTpl'])) {
-           $this->firstPageLinkTpl = $options['firstPageLinkTpl'];
+            $this->firstPageLinkTpl = $options['firstPageLinkTpl'];
         }
         
         if (isset($options['lastPageLinkTpl'])) {
-           $this->lastPageLinkTpl = $options['lastPageLinkTpl'];
+            $this->lastPageLinkTpl = $options['lastPageLinkTpl'];
         }
         
         if (isset($options['layoutTpl'])) {
-           $this->layoutTpl = $options['layoutTpl'];
+            $this->layoutTpl = $options['layoutTpl'];
         }
         
         if (isset($options['pageParamName'])) {
-           $this->pageParamName = $options['pageParamName'];
+            $this->pageParamName = $options['pageParamName'];
         }
 
         if (isset($options['seoName'])) {
-           $this->seoName = $options['seoName'];
+            $this->seoName = $options['seoName'];
         }
 
         if (isset($options['useRewrite']) && isset($options['rewriteUrl'])) {

Spacing +4 added lines, -4 removed lines

@@ -259,7 +259,7 @@ 
         
         if (!empty($url)) {
             $match = [];
-            if (PMF_String::preg_match('$&(amp;|)' . $this->pageParamName . '=(\d+)$', $url, $match)) {
+            if (PMF_String::preg_match('$&(amp;|)'.$this->pageParamName.'=(\d+)$', $url, $match)) {
                 $page = isset($match[2]) ? $match[2] : $page;
             }
         }
@@ -275,8 +275,8 @@ 
     public function render()
     {
         $content   = [];
-        $pages     = ceil($this->total / $this->perPage);
-        $adjacents = floor($this->adjacents / 2) >= 1 ? floor($this->adjacents / 2) : 1;
+        $pages     = ceil($this->total/$this->perPage);
+        $adjacents = floor($this->adjacents/2) >= 1 ? floor($this->adjacents/2) : 1;
         
         for ($page = 1; $page <= $pages; $page++) {
             
@@ -360,7 +360,7 @@ 
 
         } else {
 
-            $cleanedUrl = PMF_String::preg_replace(array('$&(amp;|)' . $this->pageParamName . '=(\d+)$'), '', $url);
+            $cleanedUrl = PMF_String::preg_replace(array('$&(amp;|)'.$this->pageParamName.'=(\d+)$'), '', $url);
             $url        = sprintf('%s&amp;%s=%d', $cleanedUrl, $this->pageParamName, $page);
 
         }

phpmyfaq/inc/libs/tcpdf/tcpdf_filters.php

Doc Comments +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
 	 * ASCIIHexDecode
 	 * Decodes data encoded in an ASCII hexadecimal representation, reproducing the original binary data.
 	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @return string data string.
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */
@@ -185,7 +185,7 @@ 
 	 * ASCII85Decode
 	 * Decodes data encoded in an ASCII base-85 representation, reproducing the original binary data.
 	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @return string data string.
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */
@@ -269,7 +269,7 @@ 
 	 * LZWDecode
 	 * Decompresses data encoded using the LZW (Lempel-Ziv-Welch) adaptive compression method, reproducing the original text or binary data.
 	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @return string data string.
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */
@@ -350,7 +350,7 @@ 
 	 * FlateDecode
 	 * Decompresses data encoded using the zlib/deflate compression method, reproducing the original text or binary data.
 	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @return string data string.
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */
@@ -463,7 +463,7 @@ 
 
 	/**
 	 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
-	 * @param $msg (string) The error message
+	 * @param string $msg (string) The error message
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */

Indentation +401 added lines, -401 removed lines

@@ -52,425 +52,425 @@
  */
 class TCPDF_FILTERS {
 
-	/**
-	 * Define a list of available filter decoders.
-	 * @private
-	 */
-	private $available_filters = array('ASCIIHexDecode', 'ASCII85Decode', 'LZWDecode', 'FlateDecode', 'RunLengthDecode');
+    /**
+     * Define a list of available filter decoders.
+     * @private
+     */
+    private $available_filters = array('ASCIIHexDecode', 'ASCII85Decode', 'LZWDecode', 'FlateDecode', 'RunLengthDecode');
 
 // -----------------------------------------------------------------------------
 
-	/**
-	 * Get a list of available decoding filters.
-	 * @return (array) Array of available filter decoders.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function getAvailableFilters() {
-		return $this->available_filters;
-	}
+    /**
+     * Get a list of available decoding filters.
+     * @return (array) Array of available filter decoders.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function getAvailableFilters() {
+        return $this->available_filters;
+    }
 
-	/**
-	 * Decode data using the specified filter type.
-	 * @param $filter (string) Filter name.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilter($filter, $data) {
-		switch ($filter) {
-			case 'ASCIIHexDecode': {
-				return $this->decodeFilterASCIIHexDecode($data);
-				break;
-			}
-			case 'ASCII85Decode': {
-				return $this->decodeFilterASCII85Decode($data);
-				break;
-			}
-			case 'LZWDecode': {
-				return $this->decodeFilterLZWDecode($data);
-				break;
-			}
-			case 'FlateDecode': {
-				return $this->decodeFilterFlateDecode($data);
-				break;
-			}
-			case 'RunLengthDecode': {
-				return $this->decodeFilterRunLengthDecode($data);
-				break;
-			}
-			case 'CCITTFaxDecode': {
-				return $this->decodeFilterCCITTFaxDecode($data);
-				break;
-			}
-			case 'JBIG2Decode': {
-				return $this->decodeFilterJBIG2Decode($data);
-				break;
-			}
-			case 'DCTDecode': {
-				return $this->decodeFilterDCTDecode($data);
-				break;
-			}
-			case 'JPXDecode': {
-				return $this->decodeFilterJPXDecode($data);
-				break;
-			}
-			case 'Crypt': {
-				return $this->decodeFilterCrypt($data);
-				break;
-			}
-			default: {
-				return decodeFilterStandard($data);
-				break;
-			}
-		}
-	}
+    /**
+     * Decode data using the specified filter type.
+     * @param $filter (string) Filter name.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilter($filter, $data) {
+        switch ($filter) {
+            case 'ASCIIHexDecode': {
+                return $this->decodeFilterASCIIHexDecode($data);
+                break;
+            }
+            case 'ASCII85Decode': {
+                return $this->decodeFilterASCII85Decode($data);
+                break;
+            }
+            case 'LZWDecode': {
+                return $this->decodeFilterLZWDecode($data);
+                break;
+            }
+            case 'FlateDecode': {
+                return $this->decodeFilterFlateDecode($data);
+                break;
+            }
+            case 'RunLengthDecode': {
+                return $this->decodeFilterRunLengthDecode($data);
+                break;
+            }
+            case 'CCITTFaxDecode': {
+                return $this->decodeFilterCCITTFaxDecode($data);
+                break;
+            }
+            case 'JBIG2Decode': {
+                return $this->decodeFilterJBIG2Decode($data);
+                break;
+            }
+            case 'DCTDecode': {
+                return $this->decodeFilterDCTDecode($data);
+                break;
+            }
+            case 'JPXDecode': {
+                return $this->decodeFilterJPXDecode($data);
+                break;
+            }
+            case 'Crypt': {
+                return $this->decodeFilterCrypt($data);
+                break;
+            }
+            default: {
+                return decodeFilterStandard($data);
+                break;
+            }
+        }
+    }
 
-	// --- FILTERS (PDF 32000-2008 - 7.4 Filters) ------------------------------
+    // --- FILTERS (PDF 32000-2008 - 7.4 Filters) ------------------------------
 
-	/**
-	 * Standard
-	 * Default decoding filter (leaves data unchanged).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterStandard($data) {
-		return $data;
-	}
+    /**
+     * Standard
+     * Default decoding filter (leaves data unchanged).
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterStandard($data) {
+        return $data;
+    }
 
-	/**
-	 * ASCIIHexDecode
-	 * Decodes data encoded in an ASCII hexadecimal representation, reproducing the original binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterASCIIHexDecode($data) {
-		// intialize string to return
-		$decoded = '';
-		// all white-space characters shall be ignored
-		$data = preg_replace('/[\s]/', '', $data);
-		// check for EOD character: GREATER-THAN SIGN (3Eh)
-		$eod = strpos($data, '>');
-		if ($eod !== false) {
-			// remove EOD and extra data (if any)
-			$data = substr($data, 0, $eod);
-			$eod = true;
-		}
-		// get data length
-		$data_length = strlen($data);
-		if (($data_length % 2) != 0) {
-			// odd number of hexadecimal digits
-			if ($eod) {
-				// EOD shall behave as if a 0 (zero) followed the last digit
-				$data = substr($data, 0, -1).'0'.substr($data, -1);
-			} else {
-				$this->Error('decodeASCIIHex: invalid code');
-			}
-		}
-		// check for invalid characters
-		if (preg_match('/[^a-fA-F\d]/', $data) > 0) {
-			$this->Error('decodeASCIIHex: invalid code');
-		}
-		// get one byte of binary data for each pair of ASCII hexadecimal digits
-		$decoded = pack('H*', $data);
-		return $decoded;
-	}
+    /**
+     * ASCIIHexDecode
+     * Decodes data encoded in an ASCII hexadecimal representation, reproducing the original binary data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterASCIIHexDecode($data) {
+        // intialize string to return
+        $decoded = '';
+        // all white-space characters shall be ignored
+        $data = preg_replace('/[\s]/', '', $data);
+        // check for EOD character: GREATER-THAN SIGN (3Eh)
+        $eod = strpos($data, '>');
+        if ($eod !== false) {
+            // remove EOD and extra data (if any)
+            $data = substr($data, 0, $eod);
+            $eod = true;
+        }
+        // get data length
+        $data_length = strlen($data);
+        if (($data_length % 2) != 0) {
+            // odd number of hexadecimal digits
+            if ($eod) {
+                // EOD shall behave as if a 0 (zero) followed the last digit
+                $data = substr($data, 0, -1).'0'.substr($data, -1);
+            } else {
+                $this->Error('decodeASCIIHex: invalid code');
+            }
+        }
+        // check for invalid characters
+        if (preg_match('/[^a-fA-F\d]/', $data) > 0) {
+            $this->Error('decodeASCIIHex: invalid code');
+        }
+        // get one byte of binary data for each pair of ASCII hexadecimal digits
+        $decoded = pack('H*', $data);
+        return $decoded;
+    }
 
-	/**
-	 * ASCII85Decode
-	 * Decodes data encoded in an ASCII base-85 representation, reproducing the original binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterASCII85Decode($data) {
-		// intialize string to return
-		$decoded = '';
-		// all white-space characters shall be ignored
-		$data = preg_replace('/[\s]/', '', $data);
-		// remove start sequence 2-character sequence <~ (3Ch)(7Eh)
-		if (strpos($data, '<~') !== false) {
-			// remove EOD and extra data (if any)
-			$data = substr($data, 2);
-		}
-		// check for EOD: 2-character sequence ~> (7Eh)(3Eh)
-		$eod = strpos($data, '~>');
-		if ($eod !== false) {
-			// remove EOD and extra data (if any)
-			$data = substr($data, 0, $eod);
-		}
-		// data length
-		$data_length = strlen($data);
-		// check for invalid characters
-		if (preg_match('/[^\x21-\x75,\x74]/', $data) > 0) {
-			$this->Error('decodeASCII85: invalid code');
-		}
-		// z sequence
-		$zseq = chr(0).chr(0).chr(0).chr(0);
-		// position inside a group of 4 bytes (0-3)
-		$group_pos = 0;
-		$tuple = 0;
-		$pow85 = array((85*85*85*85), (85*85*85), (85*85), 85, 1);
-		$last_pos = ($data_length - 1);
-		// for each byte
-		for ($i = 0; $i < $data_length; ++$i) {
-			// get char value
-			$char = ord($data[$i]);
-			if ($char == 122) { // 'z'
-				if ($group_pos == 0) {
-					$decoded .= $zseq;
-				} else {
-					$this->Error('decodeASCII85: invalid code');
-				}
-			} else {
-				// the value represented by a group of 5 characters should never be greater than 2^32 - 1
-				$tuple += (($char - 33) * $pow85[$group_pos]);
-				if ($group_pos == 4) {
-					$decoded .= chr($tuple >> 24).chr($tuple >> 16).chr($tuple >> 8).chr($tuple);
-					$tuple = 0;
-					$group_pos = 0;
-				} else {
-					++$group_pos;
-				}
-			}
-		}
-		if ($group_pos > 1) {
-			$tuple += $pow85[($group_pos - 1)];
-		}
-		// last tuple (if any)
-		switch ($group_pos) {
-			case 4: {
-				$decoded .= chr($tuple >> 24).chr($tuple >> 16).chr($tuple >> 8);
-				break;
-			}
-			case 3: {
-				$decoded .= chr($tuple >> 24).chr($tuple >> 16);
-				break;
-			}
-			case 2: {
-				$decoded .= chr($tuple >> 24);
-				break;
-			}
-			case 1: {
-				$this->Error('decodeASCII85: invalid code');
-				break;
-			}
-		}
-		return $decoded;
-	}
+    /**
+     * ASCII85Decode
+     * Decodes data encoded in an ASCII base-85 representation, reproducing the original binary data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterASCII85Decode($data) {
+        // intialize string to return
+        $decoded = '';
+        // all white-space characters shall be ignored
+        $data = preg_replace('/[\s]/', '', $data);
+        // remove start sequence 2-character sequence <~ (3Ch)(7Eh)
+        if (strpos($data, '<~') !== false) {
+            // remove EOD and extra data (if any)
+            $data = substr($data, 2);
+        }
+        // check for EOD: 2-character sequence ~> (7Eh)(3Eh)
+        $eod = strpos($data, '~>');
+        if ($eod !== false) {
+            // remove EOD and extra data (if any)
+            $data = substr($data, 0, $eod);
+        }
+        // data length
+        $data_length = strlen($data);
+        // check for invalid characters
+        if (preg_match('/[^\x21-\x75,\x74]/', $data) > 0) {
+            $this->Error('decodeASCII85: invalid code');
+        }
+        // z sequence
+        $zseq = chr(0).chr(0).chr(0).chr(0);
+        // position inside a group of 4 bytes (0-3)
+        $group_pos = 0;
+        $tuple = 0;
+        $pow85 = array((85*85*85*85), (85*85*85), (85*85), 85, 1);
+        $last_pos = ($data_length - 1);
+        // for each byte
+        for ($i = 0; $i < $data_length; ++$i) {
+            // get char value
+            $char = ord($data[$i]);
+            if ($char == 122) { // 'z'
+                if ($group_pos == 0) {
+                    $decoded .= $zseq;
+                } else {
+                    $this->Error('decodeASCII85: invalid code');
+                }
+            } else {
+                // the value represented by a group of 5 characters should never be greater than 2^32 - 1
+                $tuple += (($char - 33) * $pow85[$group_pos]);
+                if ($group_pos == 4) {
+                    $decoded .= chr($tuple >> 24).chr($tuple >> 16).chr($tuple >> 8).chr($tuple);
+                    $tuple = 0;
+                    $group_pos = 0;
+                } else {
+                    ++$group_pos;
+                }
+            }
+        }
+        if ($group_pos > 1) {
+            $tuple += $pow85[($group_pos - 1)];
+        }
+        // last tuple (if any)
+        switch ($group_pos) {
+            case 4: {
+                $decoded .= chr($tuple >> 24).chr($tuple >> 16).chr($tuple >> 8);
+                break;
+            }
+            case 3: {
+                $decoded .= chr($tuple >> 24).chr($tuple >> 16);
+                break;
+            }
+            case 2: {
+                $decoded .= chr($tuple >> 24);
+                break;
+            }
+            case 1: {
+                $this->Error('decodeASCII85: invalid code');
+                break;
+            }
+        }
+        return $decoded;
+    }
 
-	/**
-	 * LZWDecode
-	 * Decompresses data encoded using the LZW (Lempel-Ziv-Welch) adaptive compression method, reproducing the original text or binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterLZWDecode($data) {
-		// intialize string to return
-		$decoded = '';
-		// data length
-		$data_length = strlen($data);
-		// convert string to binary string
-		$bitstring = '';
-		for ($i = 0; $i < $data_length; ++$i) {
-			$bitstring .= sprintf('%08b', ord($data{$i}));
-		}
-		// get the number of bits
-		$data_length = strlen($bitstring);
-		// initialize code length in bits
-		$bitlen = 9;
-		// initialize dictionary index
-		$dix = 258;
-		// initialize the dictionary (with the first 256 entries).
-		$dictionary = array();
-		for ($i = 0; $i < 256; ++$i) {
-			$dictionary[$i] = chr($i);
-		}
-		// previous val
-		$prev_index = 0;
-		// while we encounter EOD marker (257), read code_length bits
-		while (($data_length > 0) AND (($index = bindec(substr($bitstring, 0, $bitlen))) != 257)) {
-			// remove read bits from string
-			$bitstring = substr($bitstring, $bitlen);
-			// update number of bits
-			$data_length -= $bitlen;
-			if ($index == 256) { // clear-table marker
-				// reset code length in bits
-				$bitlen = 9;
-				// reset dictionary index
-				$dix = 258;
-				$prev_index = 256;
-				// reset the dictionary (with the first 256 entries).
-				$dictionary = array();
-				for ($i = 0; $i < 256; ++$i) {
-					$dictionary[$i] = chr($i);
-				}
-			} elseif ($prev_index == 256) {
-				// first entry
-				$decoded .= $dictionary[$index];
-				$prev_index = $index;
-			} else {
-				// check if index exist in the dictionary
-				if ($index < $dix) {
-					// index exist on dictionary
-					$decoded .= $dictionary[$index];
-					$dic_val = $dictionary[$prev_index].$dictionary[$index]{0};
-					// store current index
-					$prev_index = $index;
-				} else {
-					// index do not exist on dictionary
-					$dic_val = $dictionary[$prev_index].$dictionary[$prev_index]{0};
-					$decoded .= $dic_val;
-				}
-				// update dictionary
-				$dictionary[$dix] = $dic_val;
-				++$dix;
-				// change bit length by case
-				if ($dix == 2047) {
-					$bitlen = 12;
-				} elseif ($dix == 1023) {
-					$bitlen = 11;
-				} elseif ($dix == 511) {
-					$bitlen = 10;
-				}
-			}
-		}
-		return $decoded;
-	}
+    /**
+     * LZWDecode
+     * Decompresses data encoded using the LZW (Lempel-Ziv-Welch) adaptive compression method, reproducing the original text or binary data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterLZWDecode($data) {
+        // intialize string to return
+        $decoded = '';
+        // data length
+        $data_length = strlen($data);
+        // convert string to binary string
+        $bitstring = '';
+        for ($i = 0; $i < $data_length; ++$i) {
+            $bitstring .= sprintf('%08b', ord($data{$i}));
+        }
+        // get the number of bits
+        $data_length = strlen($bitstring);
+        // initialize code length in bits
+        $bitlen = 9;
+        // initialize dictionary index
+        $dix = 258;
+        // initialize the dictionary (with the first 256 entries).
+        $dictionary = array();
+        for ($i = 0; $i < 256; ++$i) {
+            $dictionary[$i] = chr($i);
+        }
+        // previous val
+        $prev_index = 0;
+        // while we encounter EOD marker (257), read code_length bits
+        while (($data_length > 0) AND (($index = bindec(substr($bitstring, 0, $bitlen))) != 257)) {
+            // remove read bits from string
+            $bitstring = substr($bitstring, $bitlen);
+            // update number of bits
+            $data_length -= $bitlen;
+            if ($index == 256) { // clear-table marker
+                // reset code length in bits
+                $bitlen = 9;
+                // reset dictionary index
+                $dix = 258;
+                $prev_index = 256;
+                // reset the dictionary (with the first 256 entries).
+                $dictionary = array();
+                for ($i = 0; $i < 256; ++$i) {
+                    $dictionary[$i] = chr($i);
+                }
+            } elseif ($prev_index == 256) {
+                // first entry
+                $decoded .= $dictionary[$index];
+                $prev_index = $index;
+            } else {
+                // check if index exist in the dictionary
+                if ($index < $dix) {
+                    // index exist on dictionary
+                    $decoded .= $dictionary[$index];
+                    $dic_val = $dictionary[$prev_index].$dictionary[$index]{0};
+                    // store current index
+                    $prev_index = $index;
+                } else {
+                    // index do not exist on dictionary
+                    $dic_val = $dictionary[$prev_index].$dictionary[$prev_index]{0};
+                    $decoded .= $dic_val;
+                }
+                // update dictionary
+                $dictionary[$dix] = $dic_val;
+                ++$dix;
+                // change bit length by case
+                if ($dix == 2047) {
+                    $bitlen = 12;
+                } elseif ($dix == 1023) {
+                    $bitlen = 11;
+                } elseif ($dix == 511) {
+                    $bitlen = 10;
+                }
+            }
+        }
+        return $decoded;
+    }
 
-	/**
-	 * FlateDecode
-	 * Decompresses data encoded using the zlib/deflate compression method, reproducing the original text or binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterFlateDecode($data) {
-		// intialize string to return
-		$decoded = gzuncompress($data);
-		if ($decoded === false) {
-			$this->Error('decodeFlate: invalid code');
-		}
-		return $decoded;
-	}
+    /**
+     * FlateDecode
+     * Decompresses data encoded using the zlib/deflate compression method, reproducing the original text or binary data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterFlateDecode($data) {
+        // intialize string to return
+        $decoded = gzuncompress($data);
+        if ($decoded === false) {
+            $this->Error('decodeFlate: invalid code');
+        }
+        return $decoded;
+    }
 
-	/**
-	 * RunLengthDecode
-	 * Decompresses data encoded using a byte-oriented run-length encoding algorithm.
-	 * @param $data (string) Data to decode.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterRunLengthDecode($data) {
-		// intialize string to return
-		$decoded = '';
-		// data length
-		$data_length = strlen($data);
-		$i = 0;
-		while($i < $data_length) {
-			// get current byte value
-			$byte = ord($data{$i});
-			if ($byte == 128) {
-				// a length value of 128 denote EOD
-				break;
-			} elseif ($byte < 128) {
-				// if the length byte is in the range 0 to 127
-				// the following length + 1 (1 to 128) bytes shall be copied literally during decompression
-				$decoded .= substr($data, ($i + 1), ($byte + 1));
-				// move to next block
-				$i += ($byte + 2);
-			} else {
-				// if length is in the range 129 to 255,
-				// the following single byte shall be copied 257 - length (2 to 128) times during decompression
-				$decoded .= str_repeat($data{($i + 1)}, (257 - $byte));
-				// move to next block
-				$i += 2;
-			}
-		}
-		return $decoded;
-	}
+    /**
+     * RunLengthDecode
+     * Decompresses data encoded using a byte-oriented run-length encoding algorithm.
+     * @param $data (string) Data to decode.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterRunLengthDecode($data) {
+        // intialize string to return
+        $decoded = '';
+        // data length
+        $data_length = strlen($data);
+        $i = 0;
+        while($i < $data_length) {
+            // get current byte value
+            $byte = ord($data{$i});
+            if ($byte == 128) {
+                // a length value of 128 denote EOD
+                break;
+            } elseif ($byte < 128) {
+                // if the length byte is in the range 0 to 127
+                // the following length + 1 (1 to 128) bytes shall be copied literally during decompression
+                $decoded .= substr($data, ($i + 1), ($byte + 1));
+                // move to next block
+                $i += ($byte + 2);
+            } else {
+                // if length is in the range 129 to 255,
+                // the following single byte shall be copied 257 - length (2 to 128) times during decompression
+                $decoded .= str_repeat($data{($i + 1)}, (257 - $byte));
+                // move to next block
+                $i += 2;
+            }
+        }
+        return $decoded;
+    }
 
-	/**
-	 * CCITTFaxDecode (NOT IMPLEMETED)
-	 * Decompresses data encoded using the CCITT facsimile standard, reproducing the original data (typically monochrome image data at 1 bit per pixel).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterCCITTFaxDecode($data) {
-		return $data;
-	}
+    /**
+     * CCITTFaxDecode (NOT IMPLEMETED)
+     * Decompresses data encoded using the CCITT facsimile standard, reproducing the original data (typically monochrome image data at 1 bit per pixel).
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterCCITTFaxDecode($data) {
+        return $data;
+    }
 
-	/**
-	 * JBIG2Decode (NOT IMPLEMETED)
-	 * Decompresses data encoded using the JBIG2 standard, reproducing the original monochrome (1 bit per pixel) image data (or an approximation of that data).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterJBIG2Decode($data) {
-		return $data;
-	}
+    /**
+     * JBIG2Decode (NOT IMPLEMETED)
+     * Decompresses data encoded using the JBIG2 standard, reproducing the original monochrome (1 bit per pixel) image data (or an approximation of that data).
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterJBIG2Decode($data) {
+        return $data;
+    }
 
-	/**
-	 * DCTDecode (NOT IMPLEMETED)
-	 * Decompresses data encoded using a DCT (discrete cosine transform) technique based on the JPEG standard, reproducing image sample data that approximates the original data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterDCTDecode($data) {
-		return $data;
-	}
+    /**
+     * DCTDecode (NOT IMPLEMETED)
+     * Decompresses data encoded using a DCT (discrete cosine transform) technique based on the JPEG standard, reproducing image sample data that approximates the original data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterDCTDecode($data) {
+        return $data;
+    }
 
-	/**
-	 * JPXDecode (NOT IMPLEMETED)
-	 * Decompresses data encoded using the wavelet-based JPEG2000 standard, reproducing the original image data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterJPXDecode($data) {
-		return $data;
-	}
+    /**
+     * JPXDecode (NOT IMPLEMETED)
+     * Decompresses data encoded using the wavelet-based JPEG2000 standard, reproducing the original image data.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterJPXDecode($data) {
+        return $data;
+    }
 
-	/**
-	 * Crypt (NOT IMPLEMETED)
-	 * Decrypts data encrypted by a security handler, reproducing the data as it was before encryption.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function decodeFilterCrypt($data) {
-		return $data;
-	}
+    /**
+     * Crypt (NOT IMPLEMETED)
+     * Decrypts data encrypted by a security handler, reproducing the data as it was before encryption.
+     * @param $data (string) Data to decode.
+     * @return Decoded data string.
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function decodeFilterCrypt($data) {
+        return $data;
+    }
 
-	// --- END FILTERS SECTION -------------------------------------------------
+    // --- END FILTERS SECTION -------------------------------------------------
 
-	/**
-	 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
-	 * @param $msg (string) The error message
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function Error($msg) {
-		// exit program and print error
-		die('<strong>TCPDF_FILTERS ERROR: </strong>'.$msg);
-	}
+    /**
+     * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
+     * @param $msg (string) The error message
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function Error($msg) {
+        // exit program and print error
+        die('<strong>TCPDF_FILTERS ERROR: </strong>'.$msg);
+    }
 
 } // END OF TCPDF_FILTERS CLASS
 

Spacing +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
 		}
 		// get data length
 		$data_length = strlen($data);
-		if (($data_length % 2) != 0) {
+		if (($data_length%2) != 0) {
 			// odd number of hexadecimal digits
 			if ($eod) {
 				// EOD shall behave as if a 0 (zero) followed the last digit
@@ -228,7 +228,7 @@ 
 				}
 			} else {
 				// the value represented by a group of 5 characters should never be greater than 2^32 - 1
-				$tuple += (($char - 33) * $pow85[$group_pos]);
+				$tuple += (($char - 33)*$pow85[$group_pos]);
 				if ($group_pos == 4) {
 					$decoded .= chr($tuple >> 24).chr($tuple >> 16).chr($tuple >> 8).chr($tuple);
 					$tuple = 0;
@@ -374,7 +374,7 @@ 
 		// data length
 		$data_length = strlen($data);
 		$i = 0;
-		while($i < $data_length) {
+		while ($i < $data_length) {
 			// get current byte value
 			$byte = ord($data{$i});
 			if ($byte == 128) {

phpmyfaq/inc/libs/tcpdf/tcpdf_parser.php

Doc Comments +1 added lines, -1 removed lines

@@ -487,7 +487,7 @@
 
 	/**
 	 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
-	 * @param $msg (string) The error message
+	 * @param string $msg (string) The error message
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */

Indentation +427 added lines, -427 removed lines

@@ -55,446 +55,446 @@
  */
 class TCPDF_PARSER {
 
-	/**
-	 * Raw content of the PDF document.
-	 * @private
-	 */
-	private $pdfdata = '';
+    /**
+     * Raw content of the PDF document.
+     * @private
+     */
+    private $pdfdata = '';
 
-	/**
-	 * XREF data.
-	 * @protected
-	 */
-	protected $xref = array();
+    /**
+     * XREF data.
+     * @protected
+     */
+    protected $xref = array();
 
-	/**
-	 * Array of PDF objects.
-	 * @protected
-	 */
-	protected $objects = array();
+    /**
+     * Array of PDF objects.
+     * @protected
+     */
+    protected $objects = array();
 
-	/**
-	 * Class object for decoding filters.
-	 * @private
-	 */
-	private $FilterDecoders;
+    /**
+     * Class object for decoding filters.
+     * @private
+     */
+    private $FilterDecoders;
 
 // -----------------------------------------------------------------------------
 
-	/**
-	 * Parse a PDF document an return an array of objects.
-	 * @param $data (string) PDF data to parse.
-	 * @public
-	 * @since 1.0.000 (2011-05-24)
-	 */
-	public function __construct($data) {
-		if (empty($data)) {
-			$this->Error('Empty PDF data.');
-		}
-		$this->pdfdata = $data;
-		// get length
-		$pdflen = strlen($this->pdfdata);
-		// initialize class for decoding filters
-		$this->FilterDecoders = new TCPDF_FILTERS();
-		// get xref and trailer data
-		$this->xref = $this->getXrefData();
-		// parse all document objects
-		$this->objects = array();
-		foreach ($this->xref['xref'] as $obj => $offset) {
-			if (!isset($this->objects[$obj])) {
-				$this->objects[$obj] = $this->getIndirectObject($obj, $offset, true);
-			}
-		}
-		// release some memory
-		unset($this->pdfdata);
-		$this->pdfdata = '';
-	}
+    /**
+     * Parse a PDF document an return an array of objects.
+     * @param $data (string) PDF data to parse.
+     * @public
+     * @since 1.0.000 (2011-05-24)
+     */
+    public function __construct($data) {
+        if (empty($data)) {
+            $this->Error('Empty PDF data.');
+        }
+        $this->pdfdata = $data;
+        // get length
+        $pdflen = strlen($this->pdfdata);
+        // initialize class for decoding filters
+        $this->FilterDecoders = new TCPDF_FILTERS();
+        // get xref and trailer data
+        $this->xref = $this->getXrefData();
+        // parse all document objects
+        $this->objects = array();
+        foreach ($this->xref['xref'] as $obj => $offset) {
+            if (!isset($this->objects[$obj])) {
+                $this->objects[$obj] = $this->getIndirectObject($obj, $offset, true);
+            }
+        }
+        // release some memory
+        unset($this->pdfdata);
+        $this->pdfdata = '';
+    }
 
-	/**
-	 * Return an array of parsed PDF document objects.
-	 * @return (array) Array of parsed PDF document objects.
-	 * @public
-	 * @since 1.0.000 (2011-06-26)
-	 */
-	public function getParsedData() {
-		return array($this->xref, $this->objects);
-	}
+    /**
+     * Return an array of parsed PDF document objects.
+     * @return (array) Array of parsed PDF document objects.
+     * @public
+     * @since 1.0.000 (2011-06-26)
+     */
+    public function getParsedData() {
+        return array($this->xref, $this->objects);
+    }
 
-	/**
-	 * Get xref (cross-reference table) and trailer data from PDF document data.
-	 * @param $offset (int) xref offset (if know).
-	 * @param $xref (array) previous xref array (if any).
-	 * @return Array containing xref and trailer data.
-	 * @protected
-	 * @since 1.0.000 (2011-05-24)
-	 */
-	protected function getXrefData($offset=0, $xref=array()) {
-		// find last startxref
-		if (preg_match_all('/[\r\n]startxref[\s]*[\r\n]+([0-9]+)[\s]*[\r\n]+%%EOF/i', $this->pdfdata, $matches, PREG_SET_ORDER, $offset) == 0) {
-			$this->Error('Unable to find startxref');
-		}
-		$matches = array_pop($matches);
-		$startxref = $matches[1];
-		// check xref position
-		if (strpos($this->pdfdata, 'xref', $startxref) != $startxref) {
-			$this->Error('Unable to find xref');
-		}
-		// extract xref data (object indexes and offsets)
-		$offset = $startxref + 5;
-		// initialize object number
-		$obj_num = 0;
-		while (preg_match('/^([0-9]+)[\s]([0-9]+)[\s]?([nf]?)/im', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
-			$offset = (strlen($matches[0][0]) + $matches[0][1]);
-			if ($matches[3][0] == 'n') {
-				// create unique object index: [object number]_[generation number]
-				$index = $obj_num.'_'.intval($matches[2][0]);
-				// check if object already exist
-				if (!isset($xref['xref'][$index])) {
-					// store object offset position
-					$xref['xref'][$index] = intval($matches[1][0]);
-				}
-				++$obj_num;
-				$offset += 2;
-			} elseif ($matches[3][0] == 'f') {
-				++$obj_num;
-				$offset += 2;
-			} else {
-				// object number (index)
-				$obj_num = intval($matches[1][0]);
-			}
-		}
-		// get trailer data
-		if (preg_match('/trailer[\s]*<<(.*)>>[\s]*[\r\n]+startxref[\s]*[\r\n]+/isU', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
-			$trailer_data = $matches[1][0];
-			if (!isset($xref['trailer'])) {
-				// get only the last updated version
-				$xref['trailer'] = array();
-				// parse trailer_data
-				if (preg_match('/Size[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
-					$xref['trailer']['size'] = intval($matches[1]);
-				}
-				if (preg_match('/Root[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
-					$xref['trailer']['root'] = intval($matches[1]).'_'.intval($matches[2]);
-				}
-				if (preg_match('/Encrypt[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
-					$xref['trailer']['encrypt'] = intval($matches[1]).'_'.intval($matches[2]);
-				}
-				if (preg_match('/Info[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
-					$xref['trailer']['info'] = intval($matches[1]).'_'.intval($matches[2]);
-				}
-				if (preg_match('/ID[\s]*[\[][\s]*[<]([^>]*)[>][\s]*[<]([^>]*)[>]/i', $trailer_data, $matches) > 0) {
-					$xref['trailer']['id'] = array();
-					$xref['trailer']['id'][0] = $matches[1];
-					$xref['trailer']['id'][1] = $matches[2];
-				}
-			}
-			if (preg_match('/Prev[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
-				// get previous xref
-				$xref = getXrefData(substr($this->pdfdata, 0, $startxref), intval($matches[1]), $xref);
-			}
-		} else {
-			$this->Error('Unable to find trailer');
-		}
-		return $xref;
-	}
+    /**
+     * Get xref (cross-reference table) and trailer data from PDF document data.
+     * @param $offset (int) xref offset (if know).
+     * @param $xref (array) previous xref array (if any).
+     * @return Array containing xref and trailer data.
+     * @protected
+     * @since 1.0.000 (2011-05-24)
+     */
+    protected function getXrefData($offset=0, $xref=array()) {
+        // find last startxref
+        if (preg_match_all('/[\r\n]startxref[\s]*[\r\n]+([0-9]+)[\s]*[\r\n]+%%EOF/i', $this->pdfdata, $matches, PREG_SET_ORDER, $offset) == 0) {
+            $this->Error('Unable to find startxref');
+        }
+        $matches = array_pop($matches);
+        $startxref = $matches[1];
+        // check xref position
+        if (strpos($this->pdfdata, 'xref', $startxref) != $startxref) {
+            $this->Error('Unable to find xref');
+        }
+        // extract xref data (object indexes and offsets)
+        $offset = $startxref + 5;
+        // initialize object number
+        $obj_num = 0;
+        while (preg_match('/^([0-9]+)[\s]([0-9]+)[\s]?([nf]?)/im', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+            $offset = (strlen($matches[0][0]) + $matches[0][1]);
+            if ($matches[3][0] == 'n') {
+                // create unique object index: [object number]_[generation number]
+                $index = $obj_num.'_'.intval($matches[2][0]);
+                // check if object already exist
+                if (!isset($xref['xref'][$index])) {
+                    // store object offset position
+                    $xref['xref'][$index] = intval($matches[1][0]);
+                }
+                ++$obj_num;
+                $offset += 2;
+            } elseif ($matches[3][0] == 'f') {
+                ++$obj_num;
+                $offset += 2;
+            } else {
+                // object number (index)
+                $obj_num = intval($matches[1][0]);
+            }
+        }
+        // get trailer data
+        if (preg_match('/trailer[\s]*<<(.*)>>[\s]*[\r\n]+startxref[\s]*[\r\n]+/isU', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+            $trailer_data = $matches[1][0];
+            if (!isset($xref['trailer'])) {
+                // get only the last updated version
+                $xref['trailer'] = array();
+                // parse trailer_data
+                if (preg_match('/Size[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
+                    $xref['trailer']['size'] = intval($matches[1]);
+                }
+                if (preg_match('/Root[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
+                    $xref['trailer']['root'] = intval($matches[1]).'_'.intval($matches[2]);
+                }
+                if (preg_match('/Encrypt[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
+                    $xref['trailer']['encrypt'] = intval($matches[1]).'_'.intval($matches[2]);
+                }
+                if (preg_match('/Info[\s]+([0-9]+)[\s]+([0-9]+)[\s]+R/i', $trailer_data, $matches) > 0) {
+                    $xref['trailer']['info'] = intval($matches[1]).'_'.intval($matches[2]);
+                }
+                if (preg_match('/ID[\s]*[\[][\s]*[<]([^>]*)[>][\s]*[<]([^>]*)[>]/i', $trailer_data, $matches) > 0) {
+                    $xref['trailer']['id'] = array();
+                    $xref['trailer']['id'][0] = $matches[1];
+                    $xref['trailer']['id'][1] = $matches[2];
+                }
+            }
+            if (preg_match('/Prev[\s]+([0-9]+)/i', $trailer_data, $matches) > 0) {
+                // get previous xref
+                $xref = getXrefData(substr($this->pdfdata, 0, $startxref), intval($matches[1]), $xref);
+            }
+        } else {
+            $this->Error('Unable to find trailer');
+        }
+        return $xref;
+    }
 
-	/**
-	 * Get object type, raw value and offset to next object
-	 * @param $offset (int) Object offset.
-	 * @return array containing object type, raw value and offset to next object
-	 * @protected
-	 * @since 1.0.000 (2011-06-20)
-	 */
-	protected function getRawObject($offset=0) {
-		$objtype = ''; // object type to be returned
-		$objval = ''; // object value to be returned
-		// skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
-		$offset += strspn($this->pdfdata, "\x00\x09\x0a\x0c\x0d\x20", $offset);
-		// get first char
-		$char = $this->pdfdata{$offset};
-		// get object type
-		switch ($char) {
-			case '%': { // \x25 PERCENT SIGN
-				// skip comment and search for next token
-				$next = strcspn($this->pdfdata, "\r\n", $offset);
-				if ($next > 0) {
-					$offset += $next;
-					return $this->getRawObject($this->pdfdata, $offset);
-				}
-				break;
-			}
-			case '/': { // \x2F SOLIDUS
-				// name object
-				$objtype = $char;
-				++$offset;
-				if (preg_match('/^([^\x00\x09\x0a\x0c\x0d\x20\s\x28\x29\x3c\x3e\x5b\x5d\x7b\x7d\x2f\x25]+)/', substr($this->pdfdata, $offset, 256), $matches) == 1) {
-					$objval = $matches[1]; // unescaped value
-					$offset += strlen($objval);
-				}
-				break;
-			}
-			case '(':   // \x28 LEFT PARENTHESIS
-			case ')': { // \x29 RIGHT PARENTHESIS
-				// literal string object
-				$objtype = $char;
-				++$offset;
-				$strpos = $offset;
-				if ($char == '(') {
-					$open_bracket = 1;
-					while ($open_bracket > 0) {
-						if (!isset($this->pdfdata{$strpos})) {
-							break;
-						}
-						$ch = $this->pdfdata{$strpos};
-						switch ($ch) {
-							case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
-								// skip next character
-								++$strpos;
-								break;
-							}
-							case '(': { // LEFT PARENHESIS (28h)
-								++$open_bracket;
-								break;
-							}
-							case ')': { // RIGHT PARENTHESIS (29h)
-								--$open_bracket;
-								break;
-							}
-						}
-						++$strpos;
-					}
-					$objval = substr($this->pdfdata, $offset, ($strpos - $offset - 1));
-					$offset = $strpos;
-				}
-				break;
-			}
-			case '[':   // \x5B LEFT SQUARE BRACKET
-			case ']': { // \x5D RIGHT SQUARE BRACKET
-				// array object
-				$objtype = $char;
-				++$offset;
-				if ($char == '[') {
-					// get array content
-					$objval = array();
-					do {
-						// get element
-						$element = $this->getRawObject($offset);
-						$offset = $element[2];
-						$objval[] = $element;
-					} while ($element[0] != ']');
-					// remove closing delimiter
-					array_pop($objval);
-				}
-				break;
-			}
-			case '<':   // \x3C LESS-THAN SIGN
-			case '>': { // \x3E GREATER-THAN SIGN
-				if (isset($this->pdfdata{($offset + 1)}) AND ($this->pdfdata{($offset + 1)} == $char)) {
-					// dictionary object
-					$objtype = $char.$char;
-					$offset += 2;
-					if ($char == '<') {
-						// get array content
-						$objval = array();
-						do {
-							// get element
-							$element = $this->getRawObject($offset);
-							$offset = $element[2];
-							$objval[] = $element;
-						} while ($element[0] != '>>');
-						// remove closing delimiter
-						array_pop($objval);
-					}
-				} else {
-					// hexadecimal string object
-					$objtype = $char;
-					++$offset;
-					if (($char == '<') AND (preg_match('/^([0-9A-Fa-f]+)[>]/iU', substr($this->pdfdata, $offset), $matches) == 1)) {
-						$objval = $matches[1];
-						$offset += strlen($matches[0]);
-					}
-				}
-				break;
-			}
-			default: {
-				if (substr($this->pdfdata, $offset, 6) == 'endobj') {
-					// indirect object
-					$objtype = 'endobj';
-					$offset += 6;
-				} elseif (substr($this->pdfdata, $offset, 4) == 'null') {
-					// null object
-					$objtype = 'null';
-					$offset += 4;
-					$objval = 'null';
-				} elseif (substr($this->pdfdata, $offset, 4) == 'true') {
-					// boolean true object
-					$objtype = 'boolean';
-					$offset += 4;
-					$objval = 'true';
-				} elseif (substr($this->pdfdata, $offset, 5) == 'false') {
-					// boolean false object
-					$objtype = 'boolean';
-					$offset += 5;
-					$objval = 'false';
-				} elseif (substr($this->pdfdata, $offset, 6) == 'stream') {
-					// start stream object
-					$objtype = 'stream';
-					$offset += 6;
-					if (preg_match('/^[\r\n]+(.*)[\r\n]*endstream/isU', substr($this->pdfdata, $offset), $matches) == 1) {
-						$objval = $matches[1];
-						$offset += strlen($matches[0]);
-					}
-				} elseif (substr($this->pdfdata, $offset, 9) == 'endstream') {
-					// end stream object
-					$objtype = 'endstream';
-					$offset += 9;
-				} elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+R/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
-					// indirect object reference
-					$objtype = 'ojbref';
-					$offset += strlen($matches[0]);
-					$objval = intval($matches[1]).'_'.intval($matches[2]);
-				} elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+obj/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
-					// object start
-					$objtype = 'ojb';
-					$objval = intval($matches[1]).'_'.intval($matches[2]);
-					$offset += strlen ($matches[0]);
-				} elseif (($numlen = strspn($this->pdfdata, '+-.0123456789', $offset)) > 0) {
-					// numeric object
-					$objtype = 'numeric';
-					$objval = substr($this->pdfdata, $offset, $numlen);
-					$offset += $numlen;
-				}
-				break;
-			}
-		}
-		return array($objtype, $objval, $offset);
-	}
+    /**
+     * Get object type, raw value and offset to next object
+     * @param $offset (int) Object offset.
+     * @return array containing object type, raw value and offset to next object
+     * @protected
+     * @since 1.0.000 (2011-06-20)
+     */
+    protected function getRawObject($offset=0) {
+        $objtype = ''; // object type to be returned
+        $objval = ''; // object value to be returned
+        // skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
+        $offset += strspn($this->pdfdata, "\x00\x09\x0a\x0c\x0d\x20", $offset);
+        // get first char
+        $char = $this->pdfdata{$offset};
+        // get object type
+        switch ($char) {
+            case '%': { // \x25 PERCENT SIGN
+                // skip comment and search for next token
+                $next = strcspn($this->pdfdata, "\r\n", $offset);
+                if ($next > 0) {
+                    $offset += $next;
+                    return $this->getRawObject($this->pdfdata, $offset);
+                }
+                break;
+            }
+            case '/': { // \x2F SOLIDUS
+                // name object
+                $objtype = $char;
+                ++$offset;
+                if (preg_match('/^([^\x00\x09\x0a\x0c\x0d\x20\s\x28\x29\x3c\x3e\x5b\x5d\x7b\x7d\x2f\x25]+)/', substr($this->pdfdata, $offset, 256), $matches) == 1) {
+                    $objval = $matches[1]; // unescaped value
+                    $offset += strlen($objval);
+                }
+                break;
+            }
+            case '(':   // \x28 LEFT PARENTHESIS
+            case ')': { // \x29 RIGHT PARENTHESIS
+                // literal string object
+                $objtype = $char;
+                ++$offset;
+                $strpos = $offset;
+                if ($char == '(') {
+                    $open_bracket = 1;
+                    while ($open_bracket > 0) {
+                        if (!isset($this->pdfdata{$strpos})) {
+                            break;
+                        }
+                        $ch = $this->pdfdata{$strpos};
+                        switch ($ch) {
+                            case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
+                                // skip next character
+                                ++$strpos;
+                                break;
+                            }
+                            case '(': { // LEFT PARENHESIS (28h)
+                                ++$open_bracket;
+                                break;
+                            }
+                            case ')': { // RIGHT PARENTHESIS (29h)
+                                --$open_bracket;
+                                break;
+                            }
+                        }
+                        ++$strpos;
+                    }
+                    $objval = substr($this->pdfdata, $offset, ($strpos - $offset - 1));
+                    $offset = $strpos;
+                }
+                break;
+            }
+            case '[':   // \x5B LEFT SQUARE BRACKET
+            case ']': { // \x5D RIGHT SQUARE BRACKET
+                // array object
+                $objtype = $char;
+                ++$offset;
+                if ($char == '[') {
+                    // get array content
+                    $objval = array();
+                    do {
+                        // get element
+                        $element = $this->getRawObject($offset);
+                        $offset = $element[2];
+                        $objval[] = $element;
+                    } while ($element[0] != ']');
+                    // remove closing delimiter
+                    array_pop($objval);
+                }
+                break;
+            }
+            case '<':   // \x3C LESS-THAN SIGN
+            case '>': { // \x3E GREATER-THAN SIGN
+                if (isset($this->pdfdata{($offset + 1)}) AND ($this->pdfdata{($offset + 1)} == $char)) {
+                    // dictionary object
+                    $objtype = $char.$char;
+                    $offset += 2;
+                    if ($char == '<') {
+                        // get array content
+                        $objval = array();
+                        do {
+                            // get element
+                            $element = $this->getRawObject($offset);
+                            $offset = $element[2];
+                            $objval[] = $element;
+                        } while ($element[0] != '>>');
+                        // remove closing delimiter
+                        array_pop($objval);
+                    }
+                } else {
+                    // hexadecimal string object
+                    $objtype = $char;
+                    ++$offset;
+                    if (($char == '<') AND (preg_match('/^([0-9A-Fa-f]+)[>]/iU', substr($this->pdfdata, $offset), $matches) == 1)) {
+                        $objval = $matches[1];
+                        $offset += strlen($matches[0]);
+                    }
+                }
+                break;
+            }
+            default: {
+                if (substr($this->pdfdata, $offset, 6) == 'endobj') {
+                    // indirect object
+                    $objtype = 'endobj';
+                    $offset += 6;
+                } elseif (substr($this->pdfdata, $offset, 4) == 'null') {
+                    // null object
+                    $objtype = 'null';
+                    $offset += 4;
+                    $objval = 'null';
+                } elseif (substr($this->pdfdata, $offset, 4) == 'true') {
+                    // boolean true object
+                    $objtype = 'boolean';
+                    $offset += 4;
+                    $objval = 'true';
+                } elseif (substr($this->pdfdata, $offset, 5) == 'false') {
+                    // boolean false object
+                    $objtype = 'boolean';
+                    $offset += 5;
+                    $objval = 'false';
+                } elseif (substr($this->pdfdata, $offset, 6) == 'stream') {
+                    // start stream object
+                    $objtype = 'stream';
+                    $offset += 6;
+                    if (preg_match('/^[\r\n]+(.*)[\r\n]*endstream/isU', substr($this->pdfdata, $offset), $matches) == 1) {
+                        $objval = $matches[1];
+                        $offset += strlen($matches[0]);
+                    }
+                } elseif (substr($this->pdfdata, $offset, 9) == 'endstream') {
+                    // end stream object
+                    $objtype = 'endstream';
+                    $offset += 9;
+                } elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+R/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
+                    // indirect object reference
+                    $objtype = 'ojbref';
+                    $offset += strlen($matches[0]);
+                    $objval = intval($matches[1]).'_'.intval($matches[2]);
+                } elseif (preg_match('/^([0-9]+)[\s]+([0-9]+)[\s]+obj/iU', substr($this->pdfdata, $offset, 33), $matches) == 1) {
+                    // object start
+                    $objtype = 'ojb';
+                    $objval = intval($matches[1]).'_'.intval($matches[2]);
+                    $offset += strlen ($matches[0]);
+                } elseif (($numlen = strspn($this->pdfdata, '+-.0123456789', $offset)) > 0) {
+                    // numeric object
+                    $objtype = 'numeric';
+                    $objval = substr($this->pdfdata, $offset, $numlen);
+                    $offset += $numlen;
+                }
+                break;
+            }
+        }
+        return array($objtype, $objval, $offset);
+    }
 
-	/**
-	 * Get content of indirect object.
-	 * @param $obj_ref (string) Object number and generation number separated by underscore character.
-	 * @param $offset (int) Object offset.
-	 * @param $decoding (boolean) If true decode streams.
-	 * @return array containing object data.
-	 * @protected
-	 * @since 1.0.000 (2011-05-24)
-	 */
-	protected function getIndirectObject($obj_ref, $offset=0, $decoding=true) {
-		$obj = explode('_', $obj_ref);
-		if (($obj === false) OR (count($obj) != 2)) {
-			$this->Error('Invalid object reference: '.$obj);
-			return;
-		}
-		$objref = $obj[0].' '.$obj[1].' obj';
-		if (strpos($this->pdfdata, $objref, $offset) != $offset) {
-			// an indirect reference to an undefined object shall be considered a reference to the null object
-			return array('null', 'null', $offset);
-		}
-		// starting position of object content
-		$offset += strlen($objref);
-		// get array of object content
-		$objdata = array();
-		$i = 0; // object main index
-		do {
-			// get element
-			$element = $this->getRawObject($offset);
-			$offset = $element[2];
-			// decode stream using stream's dictionary information
-			if ($decoding AND ($element[0] == 'stream') AND (isset($objdata[($i - 1)][0])) AND ($objdata[($i - 1)][0] == '<<')) {
-				$element[3] = $this->decodeStream($objdata[($i - 1)][1], $element[1]);
-			}
-			$objdata[$i] = $element;
-			++$i;
-		} while ($element[0] != 'endobj');
-		// remove closing delimiter
-		array_pop($objdata);
-		// return raw object content
-		return $objdata;
-	}
+    /**
+     * Get content of indirect object.
+     * @param $obj_ref (string) Object number and generation number separated by underscore character.
+     * @param $offset (int) Object offset.
+     * @param $decoding (boolean) If true decode streams.
+     * @return array containing object data.
+     * @protected
+     * @since 1.0.000 (2011-05-24)
+     */
+    protected function getIndirectObject($obj_ref, $offset=0, $decoding=true) {
+        $obj = explode('_', $obj_ref);
+        if (($obj === false) OR (count($obj) != 2)) {
+            $this->Error('Invalid object reference: '.$obj);
+            return;
+        }
+        $objref = $obj[0].' '.$obj[1].' obj';
+        if (strpos($this->pdfdata, $objref, $offset) != $offset) {
+            // an indirect reference to an undefined object shall be considered a reference to the null object
+            return array('null', 'null', $offset);
+        }
+        // starting position of object content
+        $offset += strlen($objref);
+        // get array of object content
+        $objdata = array();
+        $i = 0; // object main index
+        do {
+            // get element
+            $element = $this->getRawObject($offset);
+            $offset = $element[2];
+            // decode stream using stream's dictionary information
+            if ($decoding AND ($element[0] == 'stream') AND (isset($objdata[($i - 1)][0])) AND ($objdata[($i - 1)][0] == '<<')) {
+                $element[3] = $this->decodeStream($objdata[($i - 1)][1], $element[1]);
+            }
+            $objdata[$i] = $element;
+            ++$i;
+        } while ($element[0] != 'endobj');
+        // remove closing delimiter
+        array_pop($objdata);
+        // return raw object content
+        return $objdata;
+    }
 
-	/**
-	 * Get the content of object, resolving indect object reference if necessary.
-	 * @param $obj (string) Object value.
-	 * @return array containing object data.
-	 * @protected
-	 * @since 1.0.000 (2011-06-26)
-	 */
-	protected function getObjectVal($obj) {
-		if ($obj[0] == 'objref') {
-			// reference to indirect object
-			if (isset($this->objects[$obj[1]])) {
-				// this object has been already parsed
-				return $this->objects[$obj[1]];
-			} elseif (isset($this->xref[$obj[1]])) {
-				// parse new object
-				$this->objects[$obj[1]] = $this->getIndirectObject($obj[1], $this->xref[$obj[1]], false);
-				return $this->objects[$obj[1]];
-			}
-		}
-		return $obj;
-	}
+    /**
+     * Get the content of object, resolving indect object reference if necessary.
+     * @param $obj (string) Object value.
+     * @return array containing object data.
+     * @protected
+     * @since 1.0.000 (2011-06-26)
+     */
+    protected function getObjectVal($obj) {
+        if ($obj[0] == 'objref') {
+            // reference to indirect object
+            if (isset($this->objects[$obj[1]])) {
+                // this object has been already parsed
+                return $this->objects[$obj[1]];
+            } elseif (isset($this->xref[$obj[1]])) {
+                // parse new object
+                $this->objects[$obj[1]] = $this->getIndirectObject($obj[1], $this->xref[$obj[1]], false);
+                return $this->objects[$obj[1]];
+            }
+        }
+        return $obj;
+    }
 
-	/**
-	 * Decode the specified stream.
-	 * @param $sdic (array) Stream's dictionary array.
-	 * @param $stream (string) Stream to decode.
-	 * @return array containing decoded stream data and remaining filters.
-	 * @protected
-	 * @since 1.0.000 (2011-06-22)
-	 */
-	protected function decodeStream($sdic, $stream) {
-		// get stream lenght and filters
-		$slength = strlen($stream);
-		$filters = array();
-		foreach ($sdic as $k => $v) {
-			if ($v[0] == '/') {
-				if (($v[1] == 'Length') AND (isset($sdic[($k + 1)])) AND ($sdic[($k + 1)][0] == 'numeric')) {
-					// get declared stream lenght
-					$declength = intval($sdic[($k + 1)][1]);
-					if ($declength < $slength) {
-						$stream = substr($stream, 0, $declength);
-						$slength = $declength;
-					}
-				} elseif (($v[1] == 'Filter') AND (isset($sdic[($k + 1)]))) {
-					// resolve indirect object
-					$objval = $this->getObjectVal($sdic[($k + 1)]);
-					if ($objval[0] == '/') {
-						// single filter
-						$filters[] = $objval[1];
-					} elseif ($objval[0] == '[') {
-						// array of filters
-						foreach ($objval[1] as $flt) {
-							if ($flt[0] == '/') {
-								$filters[] = $flt[1];
-							}
-						}
-					}
-				}
-			}
-		}
-		// decode the stream
-		$remaining_filters = array();
-		foreach ($filters as $filter) {
-			if (in_array($filter, $this->FilterDecoders->getAvailableFilters())) {
-				$stream = $this->FilterDecoders->decodeFilter($filter, $stream);
-			} else {
-				// add missing filter to array
-				$remaining_filters[] = $filter;
-			}
-		}
-		return array($stream, $remaining_filters);
-	}
+    /**
+     * Decode the specified stream.
+     * @param $sdic (array) Stream's dictionary array.
+     * @param $stream (string) Stream to decode.
+     * @return array containing decoded stream data and remaining filters.
+     * @protected
+     * @since 1.0.000 (2011-06-22)
+     */
+    protected function decodeStream($sdic, $stream) {
+        // get stream lenght and filters
+        $slength = strlen($stream);
+        $filters = array();
+        foreach ($sdic as $k => $v) {
+            if ($v[0] == '/') {
+                if (($v[1] == 'Length') AND (isset($sdic[($k + 1)])) AND ($sdic[($k + 1)][0] == 'numeric')) {
+                    // get declared stream lenght
+                    $declength = intval($sdic[($k + 1)][1]);
+                    if ($declength < $slength) {
+                        $stream = substr($stream, 0, $declength);
+                        $slength = $declength;
+                    }
+                } elseif (($v[1] == 'Filter') AND (isset($sdic[($k + 1)]))) {
+                    // resolve indirect object
+                    $objval = $this->getObjectVal($sdic[($k + 1)]);
+                    if ($objval[0] == '/') {
+                        // single filter
+                        $filters[] = $objval[1];
+                    } elseif ($objval[0] == '[') {
+                        // array of filters
+                        foreach ($objval[1] as $flt) {
+                            if ($flt[0] == '/') {
+                                $filters[] = $flt[1];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        // decode the stream
+        $remaining_filters = array();
+        foreach ($filters as $filter) {
+            if (in_array($filter, $this->FilterDecoders->getAvailableFilters())) {
+                $stream = $this->FilterDecoders->decodeFilter($filter, $stream);
+            } else {
+                // add missing filter to array
+                $remaining_filters[] = $filter;
+            }
+        }
+        return array($stream, $remaining_filters);
+    }
 
-	/**
-	 * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
-	 * @param $msg (string) The error message
-	 * @public
-	 * @since 1.0.000 (2011-05-23)
-	 */
-	public function Error($msg) {
-		// exit program and print error
-		die('<strong>TCPDF_PARSER ERROR: </strong>'.$msg);
-	}
+    /**
+     * This method is automatically called in case of fatal error; it simply outputs the message and halts the execution.
+     * @param $msg (string) The error message
+     * @public
+     * @since 1.0.000 (2011-05-23)
+     */
+    public function Error($msg) {
+        // exit program and print error
+        die('<strong>TCPDF_PARSER ERROR: </strong>'.$msg);
+    }
 
 } // END OF TCPDF_PARSER CLASS
 

Spacing +4 added lines, -4 removed lines

@@ -128,7 +128,7 @@ 
 	 * @protected
 	 * @since 1.0.000 (2011-05-24)
 	 */
-	protected function getXrefData($offset=0, $xref=array()) {
+	protected function getXrefData($offset = 0, $xref = array()) {
 		// find last startxref
 		if (preg_match_all('/[\r\n]startxref[\s]*[\r\n]+([0-9]+)[\s]*[\r\n]+%%EOF/i', $this->pdfdata, $matches, PREG_SET_ORDER, $offset) == 0) {
 			$this->Error('Unable to find startxref');
@@ -205,7 +205,7 @@ 
 	 * @protected
 	 * @since 1.0.000 (2011-06-20)
 	 */
-	protected function getRawObject($offset=0) {
+	protected function getRawObject($offset = 0) {
 		$objtype = ''; // object type to be returned
 		$objval = ''; // object value to be returned
 		// skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
@@ -357,7 +357,7 @@ 
 					// object start
 					$objtype = 'ojb';
 					$objval = intval($matches[1]).'_'.intval($matches[2]);
-					$offset += strlen ($matches[0]);
+					$offset += strlen($matches[0]);
 				} elseif (($numlen = strspn($this->pdfdata, '+-.0123456789', $offset)) > 0) {
 					// numeric object
 					$objtype = 'numeric';
@@ -379,7 +379,7 @@ 
 	 * @protected
 	 * @since 1.0.000 (2011-05-24)
 	 */
-	protected function getIndirectObject($obj_ref, $offset=0, $decoding=true) {
+	protected function getIndirectObject($obj_ref, $offset = 0, $decoding = true) {
 		$obj = explode('_', $obj_ref);
 		if (($obj === false) OR (count($obj) != 2)) {
 			$this->Error('Invalid object reference: '.$obj);

phpmyfaq/inc/PMF/Category.php

Doc Comments +2 added lines, -2 removed lines

@@ -906,7 +906,7 @@ 
      * of associative arrays with the keys 'name', 'id', 'lang',
      * 'parent_id' and 'description'.
      *
-     * @param integer $article_id Record id
+     * @param integer $articleId Record id
      *
      * @return  array
      */
@@ -1095,7 +1095,7 @@ 
      *
      * @param  integer $category_id   Category id
      * @param  string  $category_lang Category language
-     * @return boolean
+     * @return integer
      */
     public function checkLanguage($category_id, $category_lang)
     {

Spacing +14 added lines, -14 removed lines

@@ -227,8 +227,8 @@ 
 
         while ($row = $this->_config->getDb()->fetchArray($result)) {
             $this->categoryName[$row['id']] = $row;
-            $this->categories[] =& $this->categoryName[$row['id']];
-            $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
+            $this->categories[] = & $this->categoryName[$row['id']];
+            $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
         }
 
         return $this->categories;
@@ -394,8 +394,8 @@ 
             $symbol = 'minus';
         } else {
             $temp = isset($this->children[$thisParent_id]) ? array_keys($this->children[$thisParent_id]) : [];
-            if (isset($temp[count($temp)-1])) {
-                $symbol = ($id == $temp[count($temp)-1]) ? 'angle' : 'medium';
+            if (isset($temp[count($temp) - 1])) {
+                $symbol = ($id == $temp[count($temp) - 1]) ? 'angle' : 'medium';
             }
         }
 
@@ -468,7 +468,7 @@ 
         $childs = [];
 
         if (isset($this->children[$id])) {
-            foreach(array_keys($this->children[$id]) as $childId) {
+            foreach (array_keys($this->children[$id]) as $childId) {
                 $childs = array_merge($childs, array($childId));
                 $childs = array_merge($childs, $this->getChildNodes($childId));
             }
@@ -625,7 +625,7 @@ 
         $open   = 0;
         $this->expandAll();
 
-        for ($y = 0 ;$y < $this->height(); $y = $this->getNextLineTree($y)) {
+        for ($y = 0; $y < $this->height(); $y = $this->getNextLineTree($y)) {
 
             list($hasChild, $categoryName, $parent, $description) = $this->getLineDisplay($y);
             $level     = $this->treeTab[$y]['level'];
@@ -671,7 +671,7 @@ 
                 $numFaqs = '';
             } else {
                 $totFaqRecords += $number[$parent];
-                $numFaqs = '<span class="rssCategoryLink"> (' . $plr->GetMsg('plmsgEntries', $number[$parent]);
+                $numFaqs = '<span class="rssCategoryLink"> ('.$plr->GetMsg('plmsgEntries', $number[$parent]);
                 if ($this->_config->get('main.enableRssFeeds')) {
                     $numFaqs .= sprintf(
                         ' <a href="feed/category/rss.php?category_id=%d&category_lang=%s" target="_blank"><i class="fa fa-rss"></i></a>',
@@ -694,7 +694,7 @@ 
             $oLink->text      = $categoryName;
             $oLink->tooltip   = $description;
 
-            $output .= $oLink->toHtmlAnchor() . $numFaqs;
+            $output .= $oLink->toHtmlAnchor().$numFaqs;
             $open    = $level;
         }
 
@@ -738,7 +738,7 @@ 
             return $l + 1;
         } else {
             for ($i = $l + 1; $i < $this->height(); $i++) {
-                if ($this->treeTab[$i]["level"]<=$this->treeTab[$l]["level"]) {
+                if ($this->treeTab[$i]["level"] <= $this->treeTab[$l]["level"]) {
                     return $i;
                 }
             }
@@ -778,7 +778,7 @@ 
         );
 
         $oLink            = new PMF_Link($url, $this->_config);
-        $oLink->id        = 'category_' . $categoryId;
+        $oLink->id        = 'category_'.$categoryId;
         $oLink->itemTitle = $categoryName;
         $oLink->text      = $categoryName;
 
@@ -1321,7 +1321,7 @@ 
                 if ($lang == $selected_lang) {
                     $output .= " selected=\"selected\"";
                 }
-                $output .=  ">".$langname."</option>\n";
+                $output .= ">".$langname."</option>\n";
             }
         }
 
@@ -1348,10 +1348,10 @@ 
         $query .= ' ORDER BY id';
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchArray($result)) {
-            if (!array_key_exists($row['id'],$this->categoryName)) {
+            if (!array_key_exists($row['id'], $this->categoryName)) {
                $this->categoryName[$row['id']] = $row;
-               $this->categories[] =& $this->categoryName[$row['id']];
-               $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
+               $this->categories[] = & $this->categoryName[$row['id']];
+               $this->children[$row['parent_id']][$row['id']] = & $this->categoryName[$row['id']];
             }
         }
     }

Indentation +19 added lines, -19 removed lines

@@ -576,10 +576,10 @@ 
     }
 
     /**
-    * print the static tree with the number of records
-    *
-    * @return string
-    */
+     * print the static tree with the number of records
+     *
+     * @return string
+     */
     public function viewTree()
     {
         global $sids, $plr;
@@ -1232,7 +1232,7 @@ 
             PMF_Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-           $query .= " AND lang = '".$category_lang."'";
+            $query .= " AND lang = '".$category_lang."'";
         }
         $this->_config->getDb()->query($query);
 
@@ -1256,7 +1256,7 @@ 
             PMF_Db::getTablePrefix(),
             $category_id);
         if (!$delete_all) {
-           $query .= " AND category_lang = '".$category_lang."'";
+            $query .= " AND category_lang = '".$category_lang."'";
         }
         $this->_config->getDb()->query($query);
 
@@ -1280,7 +1280,7 @@ 
         $translated   = [];
 
         foreach ($existcatlang as $language) {
-           $query = sprintf("
+            $query = sprintf("
                SELECT
                   name, description
                FROM
@@ -1289,13 +1289,13 @@ 
                    id = %d
                AND
                    lang = '%s'",
-               PMF_Db::getTablePrefix(),
-               $category_id,
-               $language);
-           $result = $this->_config->getDb()->query($query);
-           if ($row = $this->_config->getDb()->fetchArray($result)) {
-              $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
-           }
+                PMF_Db::getTablePrefix(),
+                $category_id,
+                $language);
+            $result = $this->_config->getDb()->query($query);
+            if ($row = $this->_config->getDb()->fetchArray($result)) {
+                $translated[$languageCodes[strtoupper($language)]] = $row['name'].('' == $row['description'] ? '' : '  ('.$row['description'].')');
+            }
         }
         ksort($translated);
 
@@ -1349,9 +1349,9 @@ 
         $result = $this->_config->getDb()->query($query);
         while ($row = $this->_config->getDb()->fetchArray($result)) {
             if (!array_key_exists($row['id'],$this->categoryName)) {
-               $this->categoryName[$row['id']] = $row;
-               $this->categories[] =& $this->categoryName[$row['id']];
-               $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
+                $this->categoryName[$row['id']] = $row;
+                $this->categories[] =& $this->categoryName[$row['id']];
+                $this->children[$row['parent_id']][$row['id']] =& $this->categoryName[$row['id']];
             }
         }
     }
@@ -1548,8 +1548,8 @@ 
                 fd.lang = fcr.category_lang
             ORDER BY
                 fcr.category_id, fd.id',
-             PMF_Db::getTablePrefix(),
-             PMF_Db::getTablePrefix());
+                PMF_Db::getTablePrefix(),
+                PMF_Db::getTablePrefix());
         $result = $this->_config->getDb()->query($query);
 
         if ($this->_config->getDb()->numRows($result) > 0) {

phpmyfaq/inc/PMF/DB/Mssql.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      * @param   string $password
      * @param   string $database
      *
-     * @return  boolean TRUE, if connected, otherwise FALSE
+     * @return  null|boolean TRUE, if connected, otherwise FALSE
      */
     public function connect($host, $user, $password, $database = '')
     {
@@ -282,7 +282,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     public function getTableNames($prefix = '')
     {

Indentation +6 added lines, -6 removed lines

@@ -115,11 +115,11 @@ 
     }
 
     /**
-    * Escapes a string for use in a query
-    *
-    * @param   string
-    * @return  string
-    */
+     * Escapes a string for use in a query
+     *
+     * @param   string
+     * @return  string
+     */
     public function escape($string)
     {
         return str_replace("'", "''", $string);
@@ -258,7 +258,7 @@ 
      */
     public function clientVersion()
     {
-         return '';
+            return '';
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
     {
         $ret = [];
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
         
         while ($row = $this->fetchObject($result)) {

phpmyfaq/inc/PMF/DB/Mysqli.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
      *
      * @throws PMF_Exception
      *
-     * @return  boolean true, if connected, otherwise false
+     * @return  null|boolean true, if connected, otherwise false
      */
     public function connect($host, $user, $password, $database = '')
     {
@@ -284,7 +284,7 @@ 
      *
      * @param  string $prefix Table prefix
      *
-     * @return array
+     * @return string[]
      */
     function getTableNames($prefix = '')
     {

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function connect($host, $user, $password, $database = '')
     {
-        if (substr($host, 0, 1)=='/') {
+        if (substr($host, 0, 1) == '/') {
                 // Connect to MySQL via socket
                 $this->conn = new mysqli(null, $user, $password, null, null, $host);
         } else {
@@ -80,7 +80,7 @@ 
                 $this->conn = new mysqli($host, $user, $password);
         }
         if ($this->conn->connect_error) {
-            PMF_Db::errorPage($this->conn->connect_errno . ': ' . $this->conn->connect_error);
+            PMF_Db::errorPage($this->conn->connect_errno.': '.$this->conn->connect_error);
             die();
         }
         
@@ -90,8 +90,8 @@ 
         }
 
         if ('' !== $database) {
-            if (! $this->conn->select_db($database)) {
-                throw new PMF_Exception('Cannot connect to database ' . $database);
+            if (!$this->conn->select_db($database)) {
+                throw new PMF_Exception('Cannot connect to database '.$database);
             }
         }
 
@@ -176,7 +176,7 @@ 
     {
         $ret = [];
         if (false === $result) {
-            throw new Exception('Error while fetching result: ' . $this->error());
+            throw new Exception('Error while fetching result: '.$this->error());
         }
         
         while ($row = $this->fetchObject($result)) {

Indentation +17 added lines, -17 removed lines

@@ -127,11 +127,11 @@ 
     }
 
     /**
-    * Escapes a string for use in a query
-    *
-    * @param   string
-    * @return  string
-    */
+     * Escapes a string for use in a query
+     *
+     * @param   string
+     * @return  string
+     */
     public function escape($string)
     {
         return $this->conn->real_escape_string($string);
@@ -211,11 +211,11 @@ 
         return $this->sqllog;
     }
 
-     /**
-      * This function returns the table status.
-      *
-      * @return array
-      */
+        /**
+         * This function returns the table status.
+         *
+         * @return array
+         */
     public function getTableStatus()
     {
         $arr = [];
@@ -241,19 +241,19 @@ 
                MAX(%s) AS current_id
            FROM
                %s",
-           $id,
-           $table);
+            $id,
+            $table);
            
         $result  = $this->query($select);
         $current = $result->fetch_row();
         return $current[0] + 1;
     }
 
-     /**
-      * Returns the error string.
-      *
-      * @return string
-      */
+        /**
+         * Returns the error string.
+         *
+         * @return string
+         */
     public function error()
     {
         return $this->conn->error;