chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/include/table_frame_decorator.cls.php

Doc Comments -1 removed lines

@@ -129,7 +129,6 @@
    * added to the clone.  This method is overidden in order to remove
    * frames from the cellmap properly.
    *
-   * @param Frame $row
    */
   function split($child = null) {
 

Spacing +18 added lines, -18 removed lines

@@ -133,15 +133,15 @@ 
    */
   function split($child = null) {
 
-    if ( is_null($child) ) {
+    if (is_null($child)) {
       parent::split();
       return;
     }
 
     // If $child is a header or if it is the first non-header row, do
     // not duplicate headers, simply move the table to the next page.
-    if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
-         !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
+    if (count($this->_headers) && !in_array($child, $this->_headers, true) &&
+         !in_array($child->get_prev_sibling(), $this->_headers, true)) {
 
       $first_header = null;
 
@@ -150,7 +150,7 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
+        if (is_null($first_header))
           $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
@@ -158,7 +158,7 @@ 
 
       parent::split($first_header);
 
-    } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
+    } else if (in_array($child->get_style()->display, self::$ROW_GROUPS)) {
 
       // Individual rows should have already been handled
       parent::split($child);
@@ -184,8 +184,8 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ($frame = $frame->get_parent())
+      if (in_array($frame->get_style()->display, Style::$TABLE_TYPES))
         break;
 
     return $frame;
@@ -237,15 +237,15 @@ 
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
-    while ( $iter ) {
+    while ($iter) {
       $child = $iter;
       $iter = $iter->get_next_sibling();
 
       $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+      if ($anon_row) {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           // Add the previous anonymous row
           $this->insert_child_before($table_row, $child);
 
@@ -261,12 +261,12 @@ 
 
       } else {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           $child->normalise();
           continue;
         }
 
-        if ( $display === "table-cell") {
+        if ($display === "table-cell") {
           // Create an anonymous table row
           $tr = $this->get_node()->ownerDocument->createElement("tr");
 
@@ -279,7 +279,7 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+          if ($tr_style = $css->lookup("tr"))
             $style->merge($tr_style);
 
           // Okay, I have absolutely no idea why I need this clone here, but
@@ -295,27 +295,27 @@ 
           continue;
         }
 
-        if ( !in_array($display, self::$VALID_CHILDREN) ) {
+        if (!in_array($display, self::$VALID_CHILDREN)) {
           $erroneous_frames[] = $child;
           continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+          if ($grandchild->get_style()->display === "table-row")
             $grandchild->normalise();
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
+        if ($display === "table-header-group")
           $this->_headers[] = $child;
 
-        else if ( $display === "table-footer-group" )
+        else if ($display === "table-footer-group")
           $this->_footers[] = $child;
       }
     }
 
-    if ( $anon_row ) {
+    if ($anon_row) {
       // Add the row to the table
       $this->_frame->append_child($table_row);
       $table_row->normalise();

Braces +20 added lines, -15 removed lines

@@ -150,8 +150,9 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
-          $first_header = $new_header;
+        if ( is_null($first_header) ) {
+                  $first_header = $new_header;
+        }
 
         $this->insert_child_before($new_header, $child);
       }
@@ -184,9 +185,10 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ( $frame = $frame->get_parent() ) {
+          if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
+    }
 
     return $frame;
   }
@@ -279,8 +281,9 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
-            $style->merge($tr_style);
+          if ( $tr_style = $css->lookup("tr") ) {
+                      $style->merge($tr_style);
+          }
 
           // Okay, I have absolutely no idea why I need this clone here, but
           // if it's omitted, php (as of 2004-07-28) segfaults.
@@ -302,16 +305,17 @@ 
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
-            $grandchild->normalise();
+          if ( $grandchild->get_style()->display === "table-row" ) {
+                      $grandchild->normalise();
+          }
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
-
-        else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
+        if ( $display === "table-header-group" ) {
+                  $this->_headers[] = $child;
+        } else if ( $display === "table-footer-group" ) {
+                  $this->_footers[] = $child;
+        }
       }
     }
 
@@ -322,8 +326,9 @@ 
       $this->_cellmap->add_row();
     }
 
-    foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+    foreach ($erroneous_frames as $frame) {
+          $this->move_after($frame);
+    }
 
   }
 

Indentation +223 added lines, -224 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: table_frame_decorator.cls.php,v $
- * Created on: 2004-06-04
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: table_frame_decorator.cls.php,v $
+     * Created on: 2004-06-04
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: table_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -46,73 +45,73 @@ 
  * @package dompdf
  */
 class Table_Frame_Decorator extends Frame_Decorator {
-  static $VALID_CHILDREN = array("table-row-group",
-                                 "table-row",
-                                 "table-header-group",
-                                 "table-footer-group",
-                                 "table-column",
-                                 "table-column-group",
-                                 "table-caption",
-                                 "table-cell");
-
-  static $ROW_GROUPS = array('table-row-group',
-                             'table-header-group',
-                             'table-footer-group');
-
-  /**
-   * The Cellmap object for this table.  The cellmap maps table cells
-   * to rows and columns, and aids in calculating column widths.
-   *
-   * @var Cellmap
-   */
-  protected $_cellmap;
-
-  /**
-   * The minimum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_min_width;
-
-  /**
-   * The maximum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_max_width;
-
-  /**
-   * Table header rows.  Each table header is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_headers;
-
-  /**
-   * Table footer rows.  Each table footer is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_footers;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    static $VALID_CHILDREN = array("table-row-group",
+                                    "table-row",
+                                    "table-header-group",
+                                    "table-footer-group",
+                                    "table-column",
+                                    "table-column-group",
+                                    "table-caption",
+                                    "table-cell");
+
+    static $ROW_GROUPS = array('table-row-group',
+                                'table-header-group',
+                                'table-footer-group');
+
+    /**
+     * The Cellmap object for this table.  The cellmap maps table cells
+     * to rows and columns, and aids in calculating column widths.
+     *
+     * @var Cellmap
+     */
+    protected $_cellmap;
+
+    /**
+     * The minimum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_min_width;
+
+    /**
+     * The maximum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_max_width;
+
+    /**
+     * Table header rows.  Each table header is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_headers;
+
+    /**
+     * Table footer rows.  Each table footer is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_footers;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_cellmap = new Cellmap($this);
     $this->_min_width = null;
     $this->_max_width = null;
     $this->_headers = array();
     $this->_footers = array();
-  }
+    }
 
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_cellmap->reset();
     $this->_min_width = null;
@@ -120,22 +119,22 @@ 
     $this->_headers = array();
     $this->_footers = array();
     $this->_reflower->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split the table at $row.  $row and all subsequent rows will be
-   * added to the clone.  This method is overidden in order to remove
-   * frames from the cellmap properly.
-   *
-   * @param Frame $row
-   */
-  function split($child = null) {
+    /**
+     * split the table at $row.  $row and all subsequent rows will be
+     * added to the clone.  This method is overidden in order to remove
+     * frames from the cellmap properly.
+     *
+     * @param Frame $row
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
     // If $child is a header or if it is the first non-header row, do
@@ -143,200 +142,200 @@ 
     if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
          !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
 
-      $first_header = null;
+        $first_header = null;
 
-      // Insert copies of the table headers before $child
-      foreach ($this->_headers as $header) {
+        // Insert copies of the table headers before $child
+        foreach ($this->_headers as $header) {
 
         $new_header = $header->deep_copy();
 
         if ( is_null($first_header) )
-          $first_header = $new_header;
+            $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
-      }
+        }
 
-      parent::split($first_header);
+        parent::split($first_header);
 
     } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
 
-      // Individual rows should have already been handled
-      parent::split($child);
+        // Individual rows should have already been handled
+        parent::split($child);
 
     } else {
 
-      $iter = $child;
+        $iter = $child;
 
-      while ($iter) {
+        while ($iter) {
         $this->_cellmap->remove_row($iter);
         $iter = $iter->get_next_sibling();
-      }
+        }
 
-      parent::split($child);
+        parent::split($child);
+    }
     }
-  }
 
-  /**
-   * Static function to locate the parent table of a frame
-   *
-   * @param Frame $frame
-   * @return Frame the table that is an ancestor of $frame
-   */
-  static function find_parent_table(Frame $frame) {
+    /**
+     * Static function to locate the parent table of a frame
+     *
+     * @param Frame $frame
+     * @return Frame the table that is an ancestor of $frame
+     */
+    static function find_parent_table(Frame $frame) {
 
     while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+        if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
 
     return $frame;
-  }
-
-  /**
-   * Return this table's Cellmap
-   *
-   * @return Cellmap
-   */
-  function get_cellmap() { return $this->_cellmap; }
-
-  /**
-   * Return the minimum width of this table
-   *
-   * @return float
-   */
-  function get_min_width() { return $this->_min_width; }
-
-  /**
-   * Return the maximum width of this table
-   *
-   * @return float
-   */
-  function get_max_width() { return $this->_max_width; }
-
-  /**
-   * Set the minimum width of the table
-   *
-   * @param float $width the new minimum width
-   */
-  function set_min_width($width) { $this->_min_width = $width; }
-
-  /**
-   * Set the maximum width of the table
-   *
-   * @param float $width the new maximum width
-   */
-  function set_max_width($width) { $this->_max_width = $width; }
-
-  /**
-   * Restructure tree so that the table has the correct structure.
-   * Invalid children (i.e. all non-table-rows) are moved below the
-   * table.
-   */
-  function normalise() {
+    }
+
+    /**
+     * Return this table's Cellmap
+     *
+     * @return Cellmap
+     */
+    function get_cellmap() { return $this->_cellmap; }
+
+    /**
+     * Return the minimum width of this table
+     *
+     * @return float
+     */
+    function get_min_width() { return $this->_min_width; }
+
+    /**
+     * Return the maximum width of this table
+     *
+     * @return float
+     */
+    function get_max_width() { return $this->_max_width; }
+
+    /**
+     * Set the minimum width of the table
+     *
+     * @param float $width the new minimum width
+     */
+    function set_min_width($width) { $this->_min_width = $width; }
+
+    /**
+     * Set the maximum width of the table
+     *
+     * @param float $width the new maximum width
+     */
+    function set_max_width($width) { $this->_max_width = $width; }
+
+    /**
+     * Restructure tree so that the table has the correct structure.
+     * Invalid children (i.e. all non-table-rows) are moved below the
+     * table.
+     */
+    function normalise() {
 
     // Store frames generated by invalid tags and move them outside the table
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
     while ( $iter ) {
-      $child = $iter;
-      $iter = $iter->get_next_sibling();
+        $child = $iter;
+        $iter = $iter->get_next_sibling();
 
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+        if ( $anon_row ) {
 
         if ( $display === "table-row" ) {
-          // Add the previous anonymous row
-          $this->insert_child_before($table_row, $child);
+            // Add the previous anonymous row
+            $this->insert_child_before($table_row, $child);
 
-          $table_row->normalise();
-          $child->normalise();
-          $anon_row = false;
-          continue;
+            $table_row->normalise();
+            $child->normalise();
+            $anon_row = false;
+            continue;
         }
 
         // add the child to the anonymous row
         $table_row->append_child($child);
         continue;
 
-      } else {
+        } else {
 
         if ( $display === "table-row" ) {
-          $child->normalise();
-          continue;
+            $child->normalise();
+            continue;
         }
 
         if ( $display === "table-cell") {
-          // Create an anonymous table row
-          $tr = $this->get_node()->ownerDocument->createElement("tr");
+            // Create an anonymous table row
+            $tr = $this->get_node()->ownerDocument->createElement("tr");
 
-          $frame = new Frame($tr);
+            $frame = new Frame($tr);
 
-          $css = $this->get_style()->get_stylesheet();
-          $style = $css->create_style();
-          $style->inherit($this->get_style());
+            $css = $this->get_style()->get_stylesheet();
+            $style = $css->create_style();
+            $style->inherit($this->get_style());
 
-          // Lookup styles for tr tags.  If the user wants styles to work
-          // better, they should make the tr explicit... I'm not going to
-          // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+            // Lookup styles for tr tags.  If the user wants styles to work
+            // better, they should make the tr explicit... I'm not going to
+            // try to guess what they intended.
+            if ( $tr_style = $css->lookup("tr") )
             $style->merge($tr_style);
 
-          // Okay, I have absolutely no idea why I need this clone here, but
-          // if it's omitted, php (as of 2004-07-28) segfaults.
-          $frame->set_style(clone $style);
-          $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
-          $table_row->set_root($this->_root);
+            // Okay, I have absolutely no idea why I need this clone here, but
+            // if it's omitted, php (as of 2004-07-28) segfaults.
+            $frame->set_style(clone $style);
+            $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
+            $table_row->set_root($this->_root);
 
-          // Add the cell to the row
-          $table_row->append_child($child);
+            // Add the cell to the row
+            $table_row->append_child($child);
 
-          $anon_row = true;
-          continue;
+            $anon_row = true;
+            continue;
         }
 
         if ( !in_array($display, self::$VALID_CHILDREN) ) {
-          $erroneous_frames[] = $child;
-          continue;
+            $erroneous_frames[] = $child;
+            continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+            if ( $grandchild->get_style()->display === "table-row" )
             $grandchild->normalise();
         }
 
         // Add headers and footers
         if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
+            $this->_headers[] = $child;
 
         else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
-      }
+            $this->_footers[] = $child;
+        }
     }
 
     if ( $anon_row ) {
-      // Add the row to the table
-      $this->_frame->append_child($table_row);
-      $table_row->normalise();
-      $this->_cellmap->add_row();
+        // Add the row to the table
+        $this->_frame->append_child($table_row);
+        $table_row->normalise();
+        $this->_cellmap->add_row();
     }
 
     foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+        $this->move_after($frame);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Moves the specified frame and it's corresponding node outside of
-   * the table.
-   *
-   * @param Frame $frame the frame to move
-   */
-  function move_after(Frame $frame) {
+    /**
+     * Moves the specified frame and it's corresponding node outside of
+     * the table.
+     *
+     * @param Frame $frame the frame to move
+     */
+    function move_after(Frame $frame) {
     $this->get_parent()->insert_child_after($frame, $this);
-  }
+    }
 
 }

main/inc/lib/phpdocx/pdf/include/tcpdf_adapter.cls.php

Doc Comments +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
   /**
    * Sets the stroke colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -196,7 +196,7 @@ 
   /**
    * Sets the fill colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -391,7 +391,7 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
+   * @param integer $adjust word spacing adjustment
    */
   function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
 
@@ -421,7 +421,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   function get_text_width($text, $font, $size, $spacing = 0){}

Indentation +328 added lines, -329 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -57,98 +56,98 @@ 
  */
 class TCPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
 
-  /**
-   * Instance of the TCPDF class
-   *
-   * @var TCPDF
-   */
-  private $_pdf;
-
-  /**
-   * PDF width in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height in points
-   *
-   * @var float
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Last line width used
-   *
-   * @var float
-   */
-  private $_last_line_width;
+    /**
+     * Instance of the TCPDF class
+     *
+     * @var TCPDF
+     */
+    private $_pdf;
+
+    /**
+     * PDF width in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height in points
+     *
+     * @var float
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Last line width used
+     *
+     * @var float
+     */
+    private $_last_line_width;
   
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accessing after initial rendering is complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accessing after initial rendering is complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
    
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZE[$paper];
+        $size = self::$PAPER_SIZE[$paper];
     else
-      $size = self::$PAPER_SIZE["letter"];
+        $size = self::$PAPER_SIZE["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
 
     $this->_width = $size[2] - $size[0];
@@ -163,135 +162,135 @@ 
     $this->_page_text = array();
 
     $this->_last_fill_color     =
-      $this->_last_stroke_color =
-      $this->_last_line_width   = null;
+        $this->_last_stroke_color =
+        $this->_last_line_width   = null;
 
-  }  
+    }  
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
-
-  /**
-   * Sets the stroke colour
-   *
-   * @param array $color
-   */
-  protected function _set_stroke_colour($colour) {
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
+
+    /**
+     * Sets the stroke colour
+     *
+     * @param array $color
+     */
+    protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_stroke_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_stroke_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Sets the fill colour
-   *
-   * @param array $color
-   */
-  protected function _set_fill_colour($colour) {
+    /**
+     * Sets the fill colour
+     *
+     * @param array $color
+     */
+    protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_fill_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_fill_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Return the TCPDF instance
-   *
-   * @return TCPDF
-   */
-  function get_tcpdf() { return $this->_pdf; }
+    /**
+     * Return the TCPDF instance
+     *
+     * @return TCPDF
+     */
+    function get_tcpdf() { return $this->_pdf; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     return $this->_page_number;
-  }
-
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    }
+
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     return $this->_page_count;
-  }
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     $this->_page_count = (int)$count;
-  }
-
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
 
     // FIXME: ugh, need to handle different styles here
     $this->_pdf->line($x1, $y1, $x2, $y2);
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
@@ -299,165 +298,165 @@ 
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     $this->_set_fill_colour($color);
     
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h, "F");
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
     // FIXME: FPDF sucks
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
-
-  function javascript($code){}
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h){}
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+
+    function javascript($code){}
   
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname){}
-
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height){}
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname){}
+
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height){}
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0){}
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size){}
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0){}
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size){}
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page(){}
-
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null){}
-
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($options = null){}
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page(){}
+
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null){}
+
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null){}
   
 }
     

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,7 @@ 
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . '/tcpdf/tcpdf.php');
+require_once(DOMPDF_LIB_DIR.'/tcpdf/tcpdf.php');
 
 /**
  * TCPDF PDF Rendering interface
@@ -138,14 +138,14 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
    
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZE[$paper];
     else
       $size = self::$PAPER_SIZE["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -186,8 +186,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_stroke_color = $color;
     }
 
@@ -203,8 +203,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_fill_color) || $color != $this->_last_fill_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_fill_color = $color;
     }
 
@@ -241,7 +241,7 @@ 
    * @param int $count
    */
   function set_page_count($count) {
-    $this->_page_count = (int)$count;
+    $this->_page_count = (int) $count;
   }
 
   /**
@@ -261,7 +261,7 @@ 
    */
   function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -289,7 +289,7 @@ 
    */   
   function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -363,7 +363,7 @@ 
    * @param array $style
    * @param bool $fill Fills the circle if true   
    */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {}
 
   /**
    * Add an image to the pdf.
@@ -378,7 +378,7 @@ 
    * @param int $w width (in pixels)
    * @param int $h height (in pixels)
    */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
+  function image($img_url, $img_type, $x, $y, $w, $h) {}
 
   /**
    * Writes text at the specified x and y coordinates
@@ -393,16 +393,16 @@ 
    * @param array $color
    * @param float $adjust word spacing adjustment
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0) {}
 
-  function javascript($code){}
+  function javascript($code) {}
   
   /**
    * Add a named destination (similar to <a name="foo">...</a> in html)
    *
    * @param string $anchorname The name of the named destination
    */
-  function add_named_dest($anchorname){}
+  function add_named_dest($anchorname) {}
 
   /**
    * Add a link to the pdf
@@ -413,7 +413,7 @@ 
    * @param float  $width   The width of the link
    * @param float  $height   The height of the link
    */
-  function add_link($url, $x, $y, $width, $height){}
+  function add_link($url, $x, $y, $width, $height) {}
   
   /**
    * Calculates text size, in points
@@ -424,7 +424,7 @@ 
    * @param float  $spacing word spacing, if any
    * @return float
    */
-  function get_text_width($text, $font, $size, $spacing = 0){}
+  function get_text_width($text, $font, $size, $spacing = 0) {}
 
   /**
    * Calculates font height, in points
@@ -433,7 +433,7 @@ 
    * @param float $size
    * @return float
    */
-  function get_font_height($font, $size){}
+  function get_font_height($font, $size) {}
 
   
   /**
@@ -441,7 +441,7 @@ 
    *
    * Subsequent drawing operations will appear on the new page.
    */
-  function new_page(){}
+  function new_page() {}
 
   /**
    * Streams the PDF directly to the browser
@@ -449,7 +449,7 @@ 
    * @param string $filename the name of the PDF file
    * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
    */
-  function stream($filename, $options = null){}
+  function stream($filename, $options = null) {}
 
   /**
    * Returns the PDF as a string
@@ -457,7 +457,7 @@ 
    * @param array  $options associative array: 'compress' => 1 or 0
    * @return string
    */
-  function output($options = null){}
+  function output($options = null) {}
   
 }
     

Braces +7 added lines, -6 removed lines

@@ -138,12 +138,13 @@
    */
   function __construct($paper = "letter", $orientation = "portrait") {
    
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZE[$paper];
-    else
-      $size = self::$PAPER_SIZE["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZE[$paper];
+    } else {
+          $size = self::$PAPER_SIZE["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];

main/inc/lib/phpdocx/pdf/lib/class.pdf.php

Doc Comments +90 added lines

@@ -347,6 +347,8 @@ 
 
   /**
    *destination object, used to specify the location for the user to jump to, presently on opening
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_destination($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -384,6 +386,7 @@ 
 
   /**
    * set the viewer preferences
+   * @param string $action
    */
   protected function  o_viewerPreferences($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -424,6 +427,7 @@ 
 
   /**
    * define the document catalog, the overall controller for the document
+   * @param string $action
    */
   protected function  o_catalog($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -490,6 +494,8 @@ 
 
   /**
    * object which is a parent to the pages in the document
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_pages($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -623,6 +629,8 @@ 
 
   /**
    * define the outlines in the doc, empty for now
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_outlines($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -658,6 +666,8 @@ 
 
   /**
    * an object to hold the font description
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_font($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -827,6 +837,8 @@ 
 
   /**
    * a font descriptor, needed for including additional fonts
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_fontDescriptor($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -885,6 +897,8 @@ 
 
   /**
    * the font encoding
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_fontEncoding($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -930,6 +944,7 @@ 
 
   /**
    * a descendent cid font,  needed for unicode fonts
+   * @param string $action
    */
   protected function  o_fontDescendentCID($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1019,6 +1034,7 @@ 
 
   /**
    * a font glyph to character map,  needed for unicode fonts
+   * @param string $action
    */
   protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1061,6 +1077,7 @@ 
 
   /**
    * the document procset, solves some problems with printing to old PS printers
+   * @param string $action
    */
   protected function  o_procset($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1099,6 +1116,7 @@ 
 
   /**
    * define the document information
+   * @param integer $id
    */
   protected function  o_info($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1151,6 +1169,8 @@ 
 
   /**
    * an action object, used to link to URLS initially
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_action($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1200,6 +1220,8 @@ 
   /**
    * an annotation object, this will add an annotation to the current page.
    * initially will support just link annotations
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_annotation($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1258,6 +1280,7 @@ 
 
   /**
    * a page object, it also creates a contents object to hold its contents
+   * @param string $action
    */
   protected function  o_page($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1342,6 +1365,8 @@ 
 
   /**
    * the contents objects hold all of the content which appears on pages
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_contents($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1397,6 +1422,10 @@ 
     }
   }
 
+  /**
+   * @param integer $id
+   * @param string $action
+   */
   protected function  o_embedjs($id, $action, $code = '') {
     if  ($action !== 'new') {
       $o = & $this->objects[$id];
@@ -1419,6 +1448,10 @@ 
     }
   }
   
+  /**
+   * @param integer $id
+   * @param string $action
+   */
   protected function  o_javascript($id, $action, $code = '') {
     if  ($action !== 'new') {
       $o = & $this->objects[$id];
@@ -1444,6 +1477,8 @@ 
 
   /**
    * an image object, will be an XObject in the document, includes description and data
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_image($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1561,6 +1596,8 @@ 
 
   /**
    * graphics state object
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_extGState($id,  $action,  $options = "") {
     static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
@@ -1604,6 +1641,8 @@ 
 
   /**
    * encryption object.
+   * @param integer $id
+   * @param string $action
    */
   protected function  o_encryption($id, $action, $options = '') {
     if  ($action !== 'new') {
@@ -1679,6 +1718,7 @@ 
 
   /**
    * calculate the 16 byte version of the 128 bit md5 digest of the string
+   * @param string $string
    */
   function  md5_16($string) {
     $tmp =  md5($string);
@@ -1765,6 +1805,11 @@ 
 
   /**
    * add a link in the document to an external URL
+   * @param string $url
+   * @param double $x0
+   * @param double $y0
+   * @param double $x1
+   * @param double $y1
    */
   function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
@@ -1775,6 +1820,11 @@ 
 
   /**
    * add a link in the document to an internal destination (ie. within the document)
+   * @param string $label
+   * @param double $x0
+   * @param double $y0
+   * @param double $x1
+   * @param double $y1
    */
   function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
@@ -2561,6 +2611,10 @@ 
 
   /**
    * draw a line from one set of coordinates to another
+   * @param double $x1
+   * @param double $y1
+   * @param double $x2
+   * @param double $y2
    */
   function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
@@ -2735,6 +2789,7 @@ 
 
   /**
    * draw a polygon, the syntax for this is similar to the GD polygon command
+   * @param integer $np
    */
   function  polygon($p, $np, $f =  0) {
     $this->objects[$this->currentContents]['c'].=  "\n";
@@ -2755,6 +2810,10 @@ 
   /**
    * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
    * the coordinates of the upper-right corner
+   * @param double $x1
+   * @param double $y1
+   * @param double $width
+   * @param double $height
    */
   function  filledRectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
@@ -2764,6 +2823,10 @@ 
   /**
    * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
    * the coordinates of the upper-right corner
+   * @param double $x1
+   * @param double $y1
+   * @param double $width
+   * @param double $height
    */
   function  rectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
@@ -2875,6 +2938,7 @@ 
 
   /**
    * return the height in units of the current font in the given size
+   * @param double $size
    */
   function  getFontHeight($size) {
     if  (!$this->numFonts) {
@@ -3064,6 +3128,8 @@ 
    * on the page the text will end
    *
    * @access private
+   * @param integer $angle
+   * @param integer $wa
    */
   function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
@@ -3468,6 +3534,8 @@ 
    * do a part of the calculation for sorting out the justification of the text
    *
    * @access private
+   * @param integer $adjust
+   * @param string $justification
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
@@ -3717,6 +3785,7 @@ 
 
   /**
    * open an existing object for editing
+   * @param integer $id
    */
   function  reopenObject($id) {
     $this->nStack++;
@@ -3748,6 +3817,7 @@ 
 
   /**
    * stop an object from appearing on pages from this point on
+   * @param integer $id
    */
   function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
@@ -3760,6 +3830,7 @@ 
 
   /**
    * after an object has been created, it wil only show if it has been added, using this function.
+   * @param integer $id
    */
   function  addObject($id, $options =  'add') {
     // add the specified object to the page
@@ -3835,6 +3906,7 @@ 
 
   /**
    * add content to the documents info object
+   * @param string $label
    */
   function  addInfo($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
@@ -3870,6 +3942,8 @@ 
    * extract an integer from a position in a byte stream
    *
    * @access private
+   * @param integer $pos
+   * @param integer $num
    */
   function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
@@ -3936,6 +4010,9 @@ 
   /**
    * add a PNG image into the document, from a file
    * this should work with remote files
+   * @param string $file
+   * @param double $x
+   * @param double $y
    */
   function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
     //if already cached, need not to read again
@@ -3978,6 +4055,7 @@ 
 
   /**
    * add a PNG image into the document, from a memory buffer of the file
+   * @param null|string $data
    */
   function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
 	if ( isset($this->imagelist[$file]) ) {
@@ -4231,6 +4309,9 @@ 
 
   /**
    * add a JPEG image into the document, from a file
+   * @param string $img
+   * @param double $x
+   * @param double $y
    */
   function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
@@ -4336,6 +4417,10 @@ 
   /* Check if image already added to pdf image directory.
    * If yes, need not to create again (pass empty data)
    */
+
+  /**
+   * @param string $imgname
+   */
   function  image_iscached($imgname) {
     return isset($this->imagelist[$imgname]);
   }
@@ -4345,6 +4430,7 @@ 
    * common code used by the two JPEG adding functions
    *
    * @access private
+   * @param null|string $data
    */
   function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
     if ( isset($this->imagelist[$imgname]) ) {
@@ -4377,6 +4463,7 @@ 
 
   /**
    * specify where the document should open when it first starts
+   * @param string $style
    */
   function  openHere($style, $a =  0, $b =  0, $c =  0) {
     // this function will open the document at a specified page, in a specified style
@@ -4402,6 +4489,8 @@ 
 
   /**
    * create a labelled destination within the document
+   * @param string $label
+   * @param string $style
    */
   function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
@@ -4420,6 +4509,7 @@ 
    * define font families, this is used to initialize the font families for the default fonts
    * and for the user to add new ones for their fonts. The default bahavious can be overridden should
    * that be desired.
+   * @param string $family
    */
   function  setFontFamily($family, $options =  '') {
     if  (!is_array($options)) {

Indentation +2039 added lines, -2039 removed lines

@@ -1,324 +1,324 @@ 
 <?php
-  /**
-   * Cpdf
-   *
-   * http://www.ros.co.nz/pdf
-   *
-   * A PHP class to provide the basic functionality to create a pdf document without
-   * any requirement for additional modules.
-   *
-   * Note that the companion class CezPdf can be used to extend this class and dramatically
-   * simplify the creation of documents.
-   *
-   * Extended by Orion Richardson to support Unicode / UTF-8 characters using
-   * TCPDF and others as a guide.
-   *
-   * IMPORTANT NOTE
-   * there is no warranty, implied or otherwise with this software.
-   *
-   * LICENCE
-   * This code has been placed in the Public Domain for all to enjoy.
-   *
-   * @author       Wayne Munro <pdf@ros.co.nz>
-   * @contributor  Orion Richardson <orionr@yahoo.com>
-   * @contributor  Helmut Tischer <htischer@weihenstephan.org>
-   * @contributor  Ryan H. Masten <ryan.masten@gmail.com>
-   * @version  009
-   * @package  Cpdf
-   *
-   * Changes
-   * @contributor Helmut Tischer <htischer@weihenstephan.org>
-   * @version 0.5.1.htischer.20090507
-   * - On multiple identical png and jpg images, put only one copy into the pdf file and refer to it.
-   *   This reduces file size and rendering time.
-   * - Allow font metrics cache to be a different folder as the font metrics. This allows a read only installation.
-   * - Allow adding images directly from a gd object. This increases performance by avoiding temporary files.
-   * - On png image files remove alpa channel to allow display of typical png files in pdf.
-   * - On addImage avoid temporary file. Todo: Duplicate Image (currently not used)
-   * - Add a check function, whether image is already cached, This avoids double creation by caller which saves
-   *   CPU time and memory.
-   * @contributor Helmut Tischer <htischer@weihenstephan.org>
-   * @version dompdf_trunk_with_helmut_mods.20090524
-   * - Allow temp and fontcache folders to be passed in by class creator
-   * @version dompdf_trunk_with_helmut_mods.20090528
-   * - typo 'decent' instead of 'descent' at various locations made getFontDescender worthless
-   */
+    /**
+     * Cpdf
+     *
+     * http://www.ros.co.nz/pdf
+     *
+     * A PHP class to provide the basic functionality to create a pdf document without
+     * any requirement for additional modules.
+     *
+     * Note that the companion class CezPdf can be used to extend this class and dramatically
+     * simplify the creation of documents.
+     *
+     * Extended by Orion Richardson to support Unicode / UTF-8 characters using
+     * TCPDF and others as a guide.
+     *
+     * IMPORTANT NOTE
+     * there is no warranty, implied or otherwise with this software.
+     *
+     * LICENCE
+     * This code has been placed in the Public Domain for all to enjoy.
+     *
+     * @author       Wayne Munro <pdf@ros.co.nz>
+     * @contributor  Orion Richardson <orionr@yahoo.com>
+     * @contributor  Helmut Tischer <htischer@weihenstephan.org>
+     * @contributor  Ryan H. Masten <ryan.masten@gmail.com>
+     * @version  009
+     * @package  Cpdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - On multiple identical png and jpg images, put only one copy into the pdf file and refer to it.
+     *   This reduces file size and rendering time.
+     * - Allow font metrics cache to be a different folder as the font metrics. This allows a read only installation.
+     * - Allow adding images directly from a gd object. This increases performance by avoiding temporary files.
+     * - On png image files remove alpa channel to allow display of typical png files in pdf.
+     * - On addImage avoid temporary file. Todo: Duplicate Image (currently not used)
+     * - Add a check function, whether image is already cached, This avoids double creation by caller which saves
+     *   CPU time and memory.
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Allow temp and fontcache folders to be passed in by class creator
+     * @version dompdf_trunk_with_helmut_mods.20090528
+     * - typo 'decent' instead of 'descent' at various locations made getFontDescender worthless
+     */
 
 /* $Id: class.pdf.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
 class  Cpdf {
 
 
-  /**
-   * the current number of pdf objects in the document
-   */
-  public  $numObj = 0;
+    /**
+     * the current number of pdf objects in the document
+     */
+    public  $numObj = 0;
 
-  /**
-   * this array contains all of the pdf objects, ready for final assembly
-   */
-  public  $objects =  array();
+    /**
+     * this array contains all of the pdf objects, ready for final assembly
+     */
+    public  $objects =  array();
 
-  /**
-   * the objectId (number within the objects array) of the document catalog
-   */
-  public  $catalogId;
+    /**
+     * the objectId (number within the objects array) of the document catalog
+     */
+    public  $catalogId;
 
-  /**
-   * array carrying information about the fonts that the system currently knows about
-   * used to ensure that a font is not loaded twice, among other things
-   */
-  public  $fonts = array();
+    /**
+     * array carrying information about the fonts that the system currently knows about
+     * used to ensure that a font is not loaded twice, among other things
+     */
+    public  $fonts = array();
   
-  /**
-   * the default font metrics file to use if no other font has been loaded
-   * the path to the directory containing the font metrics should be included
-   */
-  public  $defaultFont = './fonts/Helvetica.afm';
+    /**
+     * the default font metrics file to use if no other font has been loaded
+     * the path to the directory containing the font metrics should be included
+     */
+    public  $defaultFont = './fonts/Helvetica.afm';
   
-  /**
-   * a record of the current font
-   */
-  public  $currentFont = '';
+    /**
+     * a record of the current font
+     */
+    public  $currentFont = '';
 
-  /**
-   * the current base font
-   */
-  public  $currentBaseFont = '';
+    /**
+     * the current base font
+     */
+    public  $currentBaseFont = '';
 
-  /**
-   * the number of the current font within the font array
-   */
-  public  $currentFontNum = 0;
+    /**
+     * the number of the current font within the font array
+     */
+    public  $currentFontNum = 0;
 
-  /**
-   *
-   */
-  public  $currentNode;
+    /**
+     *
+     */
+    public  $currentNode;
 
-  /**
-   * object number of the current page
-   */
-  public  $currentPage;
+    /**
+     * object number of the current page
+     */
+    public  $currentPage;
 
-  /**
-   * object number of the currently active contents block
-   */
-  public  $currentContents;
+    /**
+     * object number of the currently active contents block
+     */
+    public  $currentContents;
 
-  /**
-   * number of fonts within the system
-   */
-  public  $numFonts = 0;
+    /**
+     * number of fonts within the system
+     */
+    public  $numFonts = 0;
 
-  /**
-   * Number of graphic state resources used
-   */
-  private  $numStates =  0;
+    /**
+     * Number of graphic state resources used
+     */
+    private  $numStates =  0;
 
 
-  /**
-   * current colour for fill operations, defaults to inactive value, all three components should be between 0 and 1 inclusive when active
-   */
-  public  $currentColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
+    /**
+     * current colour for fill operations, defaults to inactive value, all three components should be between 0 and 1 inclusive when active
+     */
+    public  $currentColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
 
-  /**
-   * current colour for stroke operations (lines etc.)
-   */
-  public  $currentStrokeColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
+    /**
+     * current colour for stroke operations (lines etc.)
+     */
+    public  $currentStrokeColour = array('r'=>-1, 'g'=>-1, 'b'=>-1);
 
-  /**
-   * current style that lines are drawn in
-   */
-  public  $currentLineStyle = '';
+    /**
+     * current style that lines are drawn in
+     */
+    public  $currentLineStyle = '';
 
-  /**
-   * current line transparency (partial graphics state)
-   */
-  public $currentLineTransparency = array("mode" => "Normal", "opacity" => 1.0);
+    /**
+     * current line transparency (partial graphics state)
+     */
+    public $currentLineTransparency = array("mode" => "Normal", "opacity" => 1.0);
   
-  /**
-   * current fill transparency (partial graphics state)
-   */
-  public $currentFillTransparency = array("mode" => "Normal", "opacity" => 1.0);
+    /**
+     * current fill transparency (partial graphics state)
+     */
+    public $currentFillTransparency = array("mode" => "Normal", "opacity" => 1.0);
   
-  /**
-   * an array which is used to save the state of the document, mainly the colours and styles
-   * it is used to temporarily change to another state, the change back to what it was before
-   */
-  public  $stateStack =  array();
+    /**
+     * an array which is used to save the state of the document, mainly the colours and styles
+     * it is used to temporarily change to another state, the change back to what it was before
+     */
+    public  $stateStack =  array();
 
-  /**
-   * number of elements within the state stack
-   */
-  public  $nStateStack =  0;
+    /**
+     * number of elements within the state stack
+     */
+    public  $nStateStack =  0;
 
-  /**
-   * number of page objects within the document
-   */
-  public  $numPages = 0;
+    /**
+     * number of page objects within the document
+     */
+    public  $numPages = 0;
 
-  /**
-   * object Id storage stack
-   */
-  public  $stack = array();
+    /**
+     * object Id storage stack
+     */
+    public  $stack = array();
 
-  /**
-   * number of elements within the object Id storage stack
-   */
-  public  $nStack = 0;
+    /**
+     * number of elements within the object Id storage stack
+     */
+    public  $nStack = 0;
 
-  /**
-   * an array which contains information about the objects which are not firmly attached to pages
-   * these have been added with the addObject function
-   */
-  public  $looseObjects = array();
+    /**
+     * an array which contains information about the objects which are not firmly attached to pages
+     * these have been added with the addObject function
+     */
+    public  $looseObjects = array();
 
-  /**
-   * array contains infomation about how the loose objects are to be added to the document
-   */
-  public  $addLooseObjects = array();
+    /**
+     * array contains infomation about how the loose objects are to be added to the document
+     */
+    public  $addLooseObjects = array();
 
-  /**
-   * the objectId of the information object for the document
-   * this contains authorship, title etc.
-   */
-  public  $infoObject = 0;
+    /**
+     * the objectId of the information object for the document
+     * this contains authorship, title etc.
+     */
+    public  $infoObject = 0;
 
-  /**
-   * number of images being tracked within the document
-   */
-  public  $numImages = 0;
+    /**
+     * number of images being tracked within the document
+     */
+    public  $numImages = 0;
 
-  /**
-   * an array containing options about the document
-   * it defaults to turning on the compression of the objects
-   */
-  public  $options = array('compression'=>1);
+    /**
+     * an array containing options about the document
+     * it defaults to turning on the compression of the objects
+     */
+    public  $options = array('compression'=>1);
 
-  /**
-   * the objectId of the first page of the document
-   */
-  public  $firstPageId;
+    /**
+     * the objectId of the first page of the document
+     */
+    public  $firstPageId;
 
-  /**
-   * used to track the last used value of the inter-word spacing, this is so that it is known
-   * when the spacing is changed.
-   */
-  public  $wordSpaceAdjust = 0;
+    /**
+     * used to track the last used value of the inter-word spacing, this is so that it is known
+     * when the spacing is changed.
+     */
+    public  $wordSpaceAdjust = 0;
 
-  /**
-   * the object Id of the procset object
-   */
-  public  $procsetObjectId;
+    /**
+     * the object Id of the procset object
+     */
+    public  $procsetObjectId;
 
-  /**
-   * store the information about the relationship between font families
-   * this used so that the code knows which font is the bold version of another font, etc.
-   * the value of this array is initialised in the constuctor function.
-   */
-  public  $fontFamilies =  array();
+    /**
+     * store the information about the relationship between font families
+     * this used so that the code knows which font is the bold version of another font, etc.
+     * the value of this array is initialised in the constuctor function.
+     */
+    public  $fontFamilies =  array();
  
-  /**
-   * folder for php serialized formats of font metrics files.
-   * If empty string, use same folder as original metrics files.
-   * This can be passed in from class creator.
-   * If this folder does not exist or is not writable, Cpdf will be **much** slower.
-   * Because of potential trouble with php safe mode, folder cannot be created at runtime.
-   */
-  public  $fontcache = '';
+    /**
+     * folder for php serialized formats of font metrics files.
+     * If empty string, use same folder as original metrics files.
+     * This can be passed in from class creator.
+     * If this folder does not exist or is not writable, Cpdf will be **much** slower.
+     * Because of potential trouble with php safe mode, folder cannot be created at runtime.
+     */
+    public  $fontcache = '';
   
-  /**
-   * The version of the font metrics cache file.
-   * This value must be manually incremented whenever the internal font data structure is modified.
-   */
-  public  $fontcacheVersion = 2;
+    /**
+     * The version of the font metrics cache file.
+     * This value must be manually incremented whenever the internal font data structure is modified.
+     */
+    public  $fontcacheVersion = 2;
 
-  /**
-   * temporary folder.
-   * If empty string, will attempty system tmp folder.
-   * This can be passed in from class creator.
-   * Only used for conversion of gd images to jpeg images.
-   */
-  public  $tmp = '';
+    /**
+     * temporary folder.
+     * If empty string, will attempty system tmp folder.
+     * This can be passed in from class creator.
+     * Only used for conversion of gd images to jpeg images.
+     */
+    public  $tmp = '';
 
-  /**
-   * track if the current font is bolded or italicised
-   */
-  public  $currentTextState =  '';
+    /**
+     * track if the current font is bolded or italicised
+     */
+    public  $currentTextState =  '';
 
-  /**
-   * messages are stored here during processing, these can be selected afterwards to give some useful debug information
-   */
-  public  $messages = '';
+    /**
+     * messages are stored here during processing, these can be selected afterwards to give some useful debug information
+     */
+    public  $messages = '';
 
-  /**
-   * the ancryption array for the document encryption is stored here
-   */
-  public  $arc4 = '';
+    /**
+     * the ancryption array for the document encryption is stored here
+     */
+    public  $arc4 = '';
 
-  /**
-   * the object Id of the encryption information
-   */
-  public  $arc4_objnum = 0;
+    /**
+     * the object Id of the encryption information
+     */
+    public  $arc4_objnum = 0;
 
-  /**
-   * the file identifier, used to uniquely identify a pdf document
-   */
-  public  $fileIdentifier = '';
+    /**
+     * the file identifier, used to uniquely identify a pdf document
+     */
+    public  $fileIdentifier = '';
 
-  /**
-   * a flag to say if a document is to be encrypted or not
-   */
-  public  $encrypted = 0;
+    /**
+     * a flag to say if a document is to be encrypted or not
+     */
+    public  $encrypted = 0;
 
-  /**
-   * the ancryption key for the encryption of all the document content (structure is not encrypted)
-   */
-  public  $encryptionKey = '';
+    /**
+     * the ancryption key for the encryption of all the document content (structure is not encrypted)
+     */
+    public  $encryptionKey = '';
 
-  /**
-   * array which forms a stack to keep track of nested callback functions
-   */
-  public  $callback =  array();
+    /**
+     * array which forms a stack to keep track of nested callback functions
+     */
+    public  $callback =  array();
 
-  /**
-   * the number of callback functions in the callback array
-   */
-  public  $nCallback =  0;
+    /**
+     * the number of callback functions in the callback array
+     */
+    public  $nCallback =  0;
 
-  /**
-   * store label->id pairs for named destinations, these will be used to replace internal links
-   * done this way so that destinations can be defined after the location that links to them
-   */
-  public  $destinations =  array();
+    /**
+     * store label->id pairs for named destinations, these will be used to replace internal links
+     * done this way so that destinations can be defined after the location that links to them
+     */
+    public  $destinations =  array();
 
-  /**
-   * store the stack for the transaction commands, each item in here is a record of the values of all the
-   * publiciables within the class, so that the user can rollback at will (from each 'start' command)
-   * note that this includes the objects array, so these can be large.
-   */
-  public  $checkpoint =  '';
+    /**
+     * store the stack for the transaction commands, each item in here is a record of the values of all the
+     * publiciables within the class, so that the user can rollback at will (from each 'start' command)
+     * note that this includes the objects array, so these can be large.
+     */
+    public  $checkpoint =  '';
 
-  /* Table of Image origin filenames and image labels which were already added with o_image().
+    /* Table of Image origin filenames and image labels which were already added with o_image().
    * Allows to merge identical images
    */
-  public  $imagelist = array();
+    public  $imagelist = array();
 
-  /**
-   * whether the text passed in should be treated as Unicode or just local character set.
-   */
-  public  $isUnicode = false;
+    /**
+     * whether the text passed in should be treated as Unicode or just local character set.
+     */
+    public  $isUnicode = false;
   
-  public  $javascript = '';
+    public  $javascript = '';
 
-  /**
-   * class constructor
-   * this will start a new document
-   * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
-   * @var boolean whether text will be treated as Unicode or not.
-   */
-  function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
+    /**
+     * class constructor
+     * this will start a new document
+     * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
+     * @var boolean whether text will be treated as Unicode or not.
+     */
+    function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
     $this->isUnicode = $isUnicode;
     $this->fontcache = $fontcache;
     $this->tmp = $tmp;
@@ -327,73 +327,73 @@ 
     // also initialize the font families that are known about already
     $this->setFontFamily('init');
     //  $this->fileIdentifier = md5('xxxxxxxx'.time());
-  }
-
-
-  /**
-   * Document object methods (internal use only)
-   *
-   * There is about one object method for each type of object in the pdf document
-   * Each function has the same call list ($id,$action,$options).
-   * $id = the object ID of the object, or what it is to be if it is being created
-   * $action = a string specifying the action to be performed, though ALL must support:
-   *           'new' - create the object with the id $id
-   *           'out' - produce the output for the pdf object
-   * $options = optional, a string or array containing the various parameters for the object
-   *
-   * These, in conjunction with the output function are the ONLY way for output to be produced
-   * within the pdf 'file'.
-   */
+    }
 
-  /**
-   *destination object, used to specify the location for the user to jump to, presently on opening
-   */
-  protected function  o_destination($id, $action, $options = '') {
+
+    /**
+     * Document object methods (internal use only)
+     *
+     * There is about one object method for each type of object in the pdf document
+     * Each function has the same call list ($id,$action,$options).
+     * $id = the object ID of the object, or what it is to be if it is being created
+     * $action = a string specifying the action to be performed, though ALL must support:
+     *           'new' - create the object with the id $id
+     *           'out' - produce the output for the pdf object
+     * $options = optional, a string or array containing the various parameters for the object
+     *
+     * These, in conjunction with the output function are the ONLY way for output to be produced
+     * within the pdf 'file'.
+     */
+
+    /**
+     *destination object, used to specify the location for the user to jump to, presently on opening
+     */
+    protected function  o_destination($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
-      case  'XYZ':
+        $tmp =  '';
+        switch  ($options['type']) {
+        case  'XYZ':
       case  'FitR':
         $tmp =   ' '.$options['p3'].$tmp;
-      case  'FitH':
+        case  'FitH':
       case  'FitV':
       case  'FitBH':
       case  'FitBV':
         $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
-      case  'Fit':
+        case  'Fit':
       case  'FitB':
         $tmp =   $options['type'].$tmp;
         $this->objects[$id]['info']['string'] = $tmp;
         $this->objects[$id]['info']['page'] = $options['page'];
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $tmp =  $o['info'];
-      $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
-      return  $res;
+        $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * set the viewer preferences
-   */
-  protected function  o_viewerPreferences($id, $action, $options = '') {
+    /**
+     * set the viewer preferences
+     */
+    protected function  o_viewerPreferences($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
-      break;
+        break;
 
     case  'add':
       foreach($options as  $k=>$v) {
@@ -406,167 +406,167 @@ 
         case  'NonFullScreenPageMode':
         case  'Direction':
           $o['info'][$k] = $v;
-          break;
+            break;
+        }
         }
-      }
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.= "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\n";
-      return  $res;
+        }
+        $res.= "\n>>\n";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the document catalog, the overall controller for the document
-   */
-  protected function  o_catalog($id, $action, $options = '') {
+    /**
+     * define the document catalog, the overall controller for the document
+     */
+    protected function  o_catalog($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
-      $this->catalogId = $id;
-      break;
+        $this->catalogId = $id;
+        break;
 
     case  'outlines':
     case  'pages':
     case  'openHere':
     case  'javascript':
       $o['info'][$action] = $options;
-      break;
+        break;
 
     case  'viewerPreferences':
       if  (!isset($o['info']['viewerPreferences'])) {
         $this->numObj++;
         $this->o_viewerPreferences($this->numObj, 'new');
         $o['info']['viewerPreferences'] = $this->numObj;
-      }
+        }
 
-      $vp =  $o['info']['viewerPreferences'];
-      $this->o_viewerPreferences($vp, 'add', $options);
+        $vp =  $o['info']['viewerPreferences'];
+        $this->o_viewerPreferences($vp, 'add', $options);
 
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         switch ($k) {
         case  'outlines':
           $res.= "\n".'/Outlines '.$v.' 0 R';
-          break;
+            break;
           
         case  'pages':
           $res.= "\n".'/Pages '.$v.' 0 R';
-          break;
+            break;
 
         case  'viewerPreferences':
           $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
-          break;
+            break;
 
         case  'openHere':
           $res.= "\n".'/OpenAction '.$v.' 0 R';
-          break;
+            break;
 
         case  'javascript':
           $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
-          break;
+            break;
+        }
         }
-      }
 
-      $res.= " >>\nendobj";
-      return  $res;
+        $res.= " >>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * object which is a parent to the pages in the document
-   */
-  protected function  o_pages($id, $action, $options = '') {
+    /**
+     * object which is a parent to the pages in the document
+     */
+    protected function  o_pages($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'pages', 'info'=>array());
-      $this->o_catalog($this->catalogId, 'pages', $id);
-      break;
+        $this->o_catalog($this->catalogId, 'pages', $id);
+        break;
 
     case  'page':
       if  (!is_array($options)) {
         // then it will just be the id of the new page
         $o['info']['pages'][] = $options;
-      } else {
+        } else {
         // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
         // and pos is either 'before' or 'after', saying where this page will fit.
         if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+            $i =  array_search($options['rid'], $o['info']['pages']);
+            if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
 
             // then there is a match
             // make a space
             switch  ($options['pos']) {
             case  'before':
               $k =  $i;
-              break;
+                break;
 
             case  'after':
               $k = $i+1;
-              break;
+                break;
 
             default:
               $k = -1;
-              break;
+                break;
             }
 
             if  ($k >= 0) {
-              for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
+                for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
                 $o['info']['pages'][$j+1] = $o['info']['pages'][$j];
-              }
+                }
 
-              $o['info']['pages'][$k] = $options['id'];
+                $o['info']['pages'][$k] = $options['id'];
+            }
             }
-          }
         }
-      }
-      break;
+        }
+        break;
 
     case  'procset':
       $o['info']['procset'] = $options;
-      break;
+        break;
 
     case  'mediaBox':
       $o['info']['mediaBox'] = $options;
-      // which should be an array of 4 numbers
-      break;
+        // which should be an array of 4 numbers
+        break;
 
     case  'font':
       $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
-      break;
+        break;
 
     case  'extGState':
       $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
-      break;
+        break;
 
     case  'xObject':
       $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
-      break;
+        break;
 
     case  'out':
       if  (count($o['info']['pages'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
         foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
+            $res.= $v." 0 R\n";
         }
 
         $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
@@ -574,129 +574,129 @@ 
         if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
               isset($o['info']['procset']) ||
               (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+            $res.= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
+            if  (isset($o['info']['procset'])) {
             $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
-          }
+            }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
+            if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
             $res.= "\n/Font << ";
             foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
             }
             $res.= "\n>>";
-          }
+            }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
+            if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
             $res.= "\n/XObject << ";
             foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+                $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
             }
             $res.= "\n>>";
-          }
+            }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
+            if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
             $res.=  "\n/ExtGState << ";
             foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+                $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
             }
             $res.=  "\n>>";
-          }
+            }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
+            $res.= "\n>>";
+            if  (isset($o['info']['mediaBox'])) {
             $tmp = $o['info']['mediaBox'];
             $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
-          }
+            }
         }
 
         $res.= "\n >>\nendobj";
-      } else {
+        } else {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the outlines in the doc, empty for now
-   */
-  protected function  o_outlines($id, $action, $options = '') {
+    /**
+     * define the outlines in the doc, empty for now
+     */
+    protected function  o_outlines($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
-      $this->o_catalog($this->catalogId, 'outlines', $id);
-      break;
+        $this->o_catalog($this->catalogId, 'outlines', $id);
+        break;
 
     case  'outline':
       $o['info']['outlines'][] = $options;
-      break;
+        break;
 
     case  'out':
       if  (count($o['info']['outlines'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
         foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
+            $res.= $v." 0 R ";
         }
 
         $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
-      } else {
+        } else {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an object to hold the font description
-   */
-  protected function  o_font($id, $action, $options = '') {
+    /**
+     * an object to hold the font description
+     */
+    protected function  o_font($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
+        $fontNum =  $this->numFonts;
+        $this->objects[$id]['info']['fontNum'] =  $fontNum;
 
-      // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
+        // deal with the encoding and the differences
+        if  (isset($options['differences'])) {
         // then we'll need an encoding dictionary
         $this->numObj++;
         $this->o_fontEncoding($this->numObj, 'new', $options);
         $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
+        } else  if  (isset($options['encoding'])) {
         // we can specify encoding here
         switch ($options['encoding']) {
         case  'WinAnsiEncoding':
         case  'MacRomanEncoding':
         case  'MacExpertEncoding':
           $this->objects[$id]['info']['encoding'] =  $options['encoding'];
-          break;
+            break;
 
         case  'none':
           break;
 
         default:
           $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-          break;
+            break;
         }
-      } else {
+        } else {
         $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-      }
+        }
 
-      if ($this->fonts[$options['fontFileName']]['isUnicode']) {
+        if ($this->fonts[$options['fontFileName']]['isUnicode']) {
         // For Unicode fonts, we need to incorporate font data into
         // sub-sections that are linked from the primary font section.
         // Look at o_fontGIDtoCID and o_fontDescendentCID functions
@@ -738,34 +738,34 @@ 
         $cidFontId = ++$this->numObj;
         $this->o_fontDescendentCID($cidFontId, 'new', $options);
         $this->objects[$id]['info']['cidFont'] = $cidFontId;
-      }
+        }
       
-      // also tell the pages node about the new font
-      $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
-      break;
+        // also tell the pages node about the new font
+        $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
+        break;
 
     case  'add':
       foreach ($options as  $k => $v) {
         switch  ($k) {
         case  'BaseFont':
           $o['info']['name'] =  $v;
-          break;
+            break;
         case  'FirstChar':
         case  'LastChar':
         case  'Widths':
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
+            $o['info'][$k] =  $v;
+            break;
+        }
         }
-      }
 
-      // pass values down to descendent font
-      if (isset($o['info']['cidFont'])) {
+        // pass values down to descendent font
+        if (isset($o['info']['cidFont'])) {
         $this->o_fontDescendentCID($o['info']['cidFont'], 'add', $options);
-      }
-      break;
+        }
+        break;
 
     case  'out':
       if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
@@ -787,60 +787,60 @@ 
         $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
         $res.=  ">>\n";
         $res.=  "endobj";
-      } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
+        } else {
+        $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+        $res.=  "/Name /F".$o['info']['fontNum']."\n";
+        $res.=  "/BaseFont /".$o['info']['name']."\n";
 
-      if  (isset($o['info']['encodingDictionary'])) {
+        if  (isset($o['info']['encodingDictionary'])) {
         // then place a reference to the dictionary
         $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
+        } else  if  (isset($o['info']['encoding'])) {
         // use the specified encoding
         $res.=  "/Encoding /".$o['info']['encoding']."\n";
-      }
+        }
 
-      if  (isset($o['info']['FirstChar'])) {
+        if  (isset($o['info']['FirstChar'])) {
         $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-      }
+        }
 
-      if  (isset($o['info']['LastChar'])) {
+        if  (isset($o['info']['LastChar'])) {
         $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-      }
+        }
 
-      if  (isset($o['info']['Widths'])) {
+        if  (isset($o['info']['Widths'])) {
         $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
-      }
+        }
 
-      if  (isset($o['info']['FontDescriptor'])) {
+        if  (isset($o['info']['FontDescriptor'])) {
         $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        }
 
         $res.=  ">>\n";
         $res.=  "endobj";
-      }
+        }
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a font descriptor, needed for including additional fonts
-   */
-  protected function  o_fontDescriptor($id, $action, $options = '') {
+    /**
+     * a font descriptor, needed for including additional fonts
+     */
+    protected function  o_fontDescriptor($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
-      foreach ($o['info'] as  $label => $value) {
+        foreach ($o['info'] as  $label => $value) {
         switch  ($label) {
         case  'Ascent':
         case  'CapHeight':
@@ -857,111 +857,111 @@ 
         case  'CharSet':
           if  (mb_strlen($value, '8bit')) {
             $res.= '/'.$label.' '.$value."\n";
-          }
+            }
 
-          break;
+            break;
         case  'FontFile':
         case  'FontFile2':
         case  'FontFile3':
           $res.= '/'.$label.' '.$value." 0 R\n";
-          break;
+            break;
 
         case  'FontBBox':
           $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
-          break;
+            break;
 
         case  'FontName':
           $res.= '/'.$label.' /'.$value."\n";
-          break;
+            break;
+        }
         }
-      }
 
-      $res.= ">>\nendobj";
+        $res.= ">>\nendobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * the font encoding
-   */
-  protected function  o_fontEncoding($id, $action, $options = '') {
+    /**
+     * the font encoding
+     */
+    protected function  o_fontEncoding($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       // the options array should contain 'differences' and maybe 'encoding'
       $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
+        if  (!isset($o['info']['encoding'])) {
         $o['info']['encoding'] = 'WinAnsiEncoding';
-      }
+        }
 
-      if  ($o['info']['encoding'] !== 'none') {
+        if  ($o['info']['encoding'] !== 'none') {
         $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
-      }
+        }
 
-      $res.= "/Differences \n[";
+        $res.= "/Differences \n[";
 
-      $onum = -100;
+        $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
+        foreach($o['info']['differences'] as  $num=>$label) {
         if  ($num != $onum+1) {
-          // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
+            // we cannot make use of consecutive numbering
+            $res.=  "\n".$num." /".$label;
         } else {
-          $res.=  " /".$label;
+            $res.=  " /".$label;
         }
 
         $onum = $num;
-      }
+        }
 
-      $res.= "\n]\n>>\nendobj";
-      return  $res;
+        $res.= "\n]\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a descendent cid font,  needed for unicode fonts
-   */
-  protected function  o_fontDescendentCID($id, $action, $options = '') {
+    /**
+     * a descendent cid font,  needed for unicode fonts
+     */
+    protected function  o_fontDescendentCID($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
 
-      // we need a CID system info section
-      $cidSystemInfoId = ++$this->numObj;
-      $this->o_contents($cidSystemInfoId, 'new', 'raw');
-      $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
-      $this->objects[$cidSystemInfoId]['c'] = $res;
-
-      // and a CID to GID map
-      $cidToGidMapId = ++$this->numObj;
-      $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
-      $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
-      break;
+        // we need a CID system info section
+        $cidSystemInfoId = ++$this->numObj;
+        $this->o_contents($cidSystemInfoId, 'new', 'raw');
+        $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
+        $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+        $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+        $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
+        $res.=  ">>";
+        $this->objects[$cidSystemInfoId]['c'] = $res;
+
+        // and a CID to GID map
+        $cidToGidMapId = ++$this->numObj;
+        $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
+        $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
+        break;
 
     case  'add':
       foreach ($options as  $k => $v) {
         switch  ($k) {
         case  'BaseFont':
           $o['info']['name'] =  $v;
-          break;
+            break;
 
         case  'FirstChar':
         case  'LastChar':
@@ -969,21 +969,21 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
+            $o['info'][$k] =  $v;
+            break;
+        }
         }
-      }
 
-      // pass values down to cid to gid map
-      $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
-      break;
+        // pass values down to cid to gid map
+        $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
+        break;
 
     case  'out':
       $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+        $res.=  "<</Type /Font\n";
+        $res.=  "/Subtype /CIDFontType2\n";
+        $res.=  "/BaseFont /".$o['info']['name']."\n";
+        $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
 //      if  (isset($o['info']['FirstChar'])) {
 //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
 //      }
@@ -991,126 +991,126 @@ 
 //      if  (isset($o['info']['LastChar'])) {
 //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
 //      }
-      if  (isset($o['info']['FontDescriptor'])) {
+        if  (isset($o['info']['FontDescriptor'])) {
         $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        }
 
-      if  (isset($o['info']['MissingWidth'])) {
+        if  (isset($o['info']['MissingWidth'])) {
         $res.=  "/DW ".$o['info']['MissingWidth']."\n";
-      }
+        }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+        if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
         $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
         $w = '';
         foreach ($cid_widths as $cid => $width) {
-          $w .= $cid.' ['.$width.'] ';
+            $w .= $cid.' ['.$width.'] ';
         }
         $res.=  "/W [".$w."]\n";
-      }
+        }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+        $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+        $res.=  ">>\n";
+        $res.=  "endobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
   
 
-  /**
-   * a font glyph to character map,  needed for unicode fonts
-   */
-  protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
+    /**
+     * a font glyph to character map,  needed for unicode fonts
+     */
+    protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
-      break;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n";
-      $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
-      $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
+        $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
+        $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
                     $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
+        if  (!$compressed && isset($o['raw'])) {
         $res.= $tmp;
-      } else {
+        } else {
         $res.=  "<<";
 
         if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
+            // then implement ZLIB based compression on this content stream
+            $compressed = true;
+            $tmp =  gzcompress($tmp,  6);
         }
         if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
+            $res.= "\n/Filter /FlateDecode";
         }
 
         $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
-      }
+        }
 
-      $res.= "\nendobj";
-      return  $res;
+        $res.= "\nendobj";
+        return  $res;
+    }
     }
-  }
   
 
-  /**
-   * the document procset, solves some problems with printing to old PS printers
-   */
-  protected function  o_procset($id, $action, $options = '') {
+    /**
+     * the document procset, solves some problems with printing to old PS printers
+     */
+    protected function  o_procset($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
-      $this->o_pages($this->currentNode, 'procset', $id);
-      $this->procsetObjectId = $id;
-      break;
+        $this->o_pages($this->currentNode, 'procset', $id);
+        $this->procsetObjectId = $id;
+        break;
 
     case  'add':
       // this is to add new items to the procset list, despite the fact that this is considered
       // obselete, the items are required for printing to some postscript printers
       switch  ($options) {
-      case  'ImageB':
+        case  'ImageB':
       case  'ImageC':
       case  'ImageI':
         $o['info'][$options] = 1;
         break;
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n[";
-      foreach ($o['info'] as  $label=>$val) {
+        foreach ($o['info'] as  $label=>$val) {
         $res.= '/'.$label.' ';
-      }
-      $res.= "]\nendobj";
-      return  $res;
+        }
+        $res.= "]\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * define the document information
-   */
-  protected function  o_info($id, $action, $options = '') {
+    /**
+     * define the document information
+     */
+    protected function  o_info($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->infoObject = $id;
-      $date = 'D:'.@date('Ymd');
-      $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
-      break;
+        $date = 'D:'.@date('Ymd');
+        $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
+        break;
     case  'Title':
     case  'Author':
     case  'Subject':
@@ -1121,107 +1121,107 @@ 
     case  'ModDate':
     case  'Trapped':
       $o['info'][$action] = $options;
-      break;
+        break;
 
     case  'out':
       if  ($this->encrypted) {
         $this->encryptInit($id);
-      }
+        }
 
-      $res = "\n".$id." 0 obj\n<<\n";
-      foreach ($o['info'] as  $k=>$v) {
+        $res = "\n".$id." 0 obj\n<<\n";
+        foreach ($o['info'] as  $k=>$v) {
         $res.= '/'.$k.' (';
         // dates must be outputted as-is, without Unicode transformations
         $raw = ($k === 'CreationDate' || $k === 'ModDate');
         $c = $v;
 
         if  ($this->encrypted) {
-          $c = $this->ARC4($c);
+            $c = $this->ARC4($c);
         }
 
         $res.= ($raw) ? $c : $this->filterText($c);
         $res.= ")\n";
-      }
+        }
 
-      $res.= ">>\nendobj";
-      return  $res;
+        $res.= ">>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an action object, used to link to URLS initially
-   */
-  protected function  o_action($id, $action, $options = '') {
+    /**
+     * an action object, used to link to URLS initially
+     */
+    protected function  o_action($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       if  (is_array($options)) {
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
-      } else {
+        } else {
         // then assume a URI action
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
-      }
-      break;
+        }
+        break;
 
     case  'out':
       if  ($this->encrypted) {
         $this->encryptInit($id);
-      }
+        }
 
-      $res = "\n".$id." 0 obj\n<< /Type /Action";
-      switch ($o['type']) {
-      case  'ilink':
+        $res = "\n".$id." 0 obj\n<< /Type /Action";
+        switch ($o['type']) {
+        case  'ilink':
         // there will be an 'label' setting, this is the name of the destination
         $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
         break;
 
-      case  'URI':
+        case  'URI':
         $res.= "\n/S /URI\n/URI (";
         if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
+            $res.= $this->filterText($this->ARC4($o['info']));
         } else {
-          $res.= $this->filterText($o['info']);
+            $res.= $this->filterText($o['info']);
         }
 
         $res.= ")";
         break;
-      }
+        }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * an annotation object, this will add an annotation to the current page.
-   * initially will support just link annotations
-   */
-  protected function  o_annotation($id, $action, $options = '') {
+    /**
+     * an annotation object, this will add an annotation to the current page.
+     * initially will support just link annotations
+     */
+    protected function  o_annotation($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       // add the annotation to the current page
       $pageId =  $this->currentPage;
-      $this->o_page($pageId, 'annot', $id);
+        $this->o_page($pageId, 'annot', $id);
 
-      // and add the action object which is going to be required
-      switch ($options['type']) {
-      case  'link':
+        // and add the action object which is going to be required
+        switch ($options['type']) {
+        case  'link':
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
         $this->numObj++;
         $this->o_action($this->numObj, 'new', $options['url']);
         $this->objects[$id]['info']['actionId'] = $this->numObj;
         break;
 
-      case  'ilink':
+        case  'ilink':
         // this is to a named internal link
         $label =  $options['label'];
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
@@ -1229,199 +1229,199 @@ 
         $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
         $this->objects[$id]['info']['actionId'] = $this->numObj;
         break;
-      }
-      break;
+        }
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Annot";
-      switch ($o['info']['type']) {
-      case  'link':
+        switch ($o['info']['type']) {
+        case  'link':
       case  'ilink':
         $res.=  "\n/Subtype /Link";
         break;
-      }
-      $res.= "\n/A ".$o['info']['actionId']." 0 R";
-      $res.= "\n/Border [0 0 0]";
-      $res.= "\n/H /I";
-      $res.= "\n/Rect [ ";
+        }
+        $res.= "\n/A ".$o['info']['actionId']." 0 R";
+        $res.= "\n/Border [0 0 0]";
+        $res.= "\n/H /I";
+        $res.= "\n/Rect [ ";
 
-      foreach($o['info']['rect'] as  $v) {
+        foreach($o['info']['rect'] as  $v) {
         $res.=  sprintf("%.4F ", $v);
-      }
+        }
 
-      $res.= "]";
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "]";
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * a page object, it also creates a contents object to hold its contents
-   */
-  protected function  o_page($id, $action, $options = '') {
+    /**
+     * a page object, it also creates a contents object to hold its contents
+     */
+    protected function  o_page($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->numPages++;
-      $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
+        $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
 
-      if  (is_array($options)) {
+        if  (is_array($options)) {
         // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
         $options['id'] = $id;
         $this->o_pages($this->currentNode, 'page', $options);
-      } else {
+        } else {
         $this->o_pages($this->currentNode, 'page', $id);
-      }
-
-      $this->currentPage = $id;
-      //make a contents object to go with this page
-      $this->numObj++;
-      $this->o_contents($this->numObj, 'new', $id);
-      $this->currentContents = $this->numObj;
-      $this->objects[$id]['info']['contents'] = array();
-      $this->objects[$id]['info']['contents'][] = $this->numObj;
-
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
+        }
+
+        $this->currentPage = $id;
+        //make a contents object to go with this page
+        $this->numObj++;
+        $this->o_contents($this->numObj, 'new', $id);
+        $this->currentContents = $this->numObj;
+        $this->objects[$id]['info']['contents'] = array();
+        $this->objects[$id]['info']['contents'][] = $this->numObj;
+
+        $match =  ($this->numPages%2 ?  'odd' :  'even');
+        foreach($this->addLooseObjects as  $oId=>$target) {
         if  ($target === 'all' || $match === $target) {
-          $this->objects[$id]['info']['contents'][] = $oId;
+            $this->objects[$id]['info']['contents'][] = $oId;
         }
-      }
-      break;
+        }
+        break;
 
     case  'content':
       $o['info']['contents'][] = $options;
-      break;
+        break;
 
     case  'annot':
       // add an annotation to this page
       if  (!isset($o['info']['annot'])) {
         $o['info']['annot'] = array();
-      }
+        }
 
-      // $options should contain the id of the annotation dictionary
-      $o['info']['annot'][] = $options;
-      break;
+        // $options should contain the id of the annotation dictionary
+        $o['info']['annot'][] = $options;
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+        $res.= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
+        if  (isset($o['info']['annot'])) {
         $res.= "\n/Annots [";
         foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
+            $res.= " ".$aId." 0 R";
         }
         $res.= " ]";
-      }
+        }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
+        $count =  count($o['info']['contents']);
+        if  ($count == 1) {
         $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
+        } else  if  ($count>1) {
         $res.= "\n/Contents [\n";
 
         // reverse the page contents so added objects are below normal content
         //foreach (array_reverse($o['info']['contents']) as  $cId) {
         // Back to normal now that I've got transparency working --Benj
         foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
+            $res.= $cId." 0 R\n";
         }
         $res.= "]";
-      }
+        }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * the contents objects hold all of the content which appears on pages
-   */
-  protected function  o_contents($id, $action, $options = '') {
+    /**
+     * the contents objects hold all of the content which appears on pages
+     */
+    protected function  o_contents($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
+        if  (mb_strlen($options, '8bit') &&  intval($options)) {
         // then this contents is the primary for a page
         $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
+        } else  if  ($options === 'raw') {
         // then this page contains some other type of system object
         $this->objects[$id]['raw'] = 1;
-      }
-      break;
+        }
+        break;
 
     case  'add':
       // add more options to the decleration
       foreach ($options as  $k=>$v) {
         $o['info'][$k] = $v;
-      }
+        }
 
     case  'out':
       $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+        $res =  "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
+        if  (isset($this->objects[$id]['raw'])) {
         $res.= $tmp;
-      } else {
+        } else {
         $res.=  "<<";
         if  (function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
+            // then implement ZLIB based compression on this content stream
+            $res.= " /Filter /FlateDecode";
+            $tmp =  gzcompress($tmp,  6);
         }
 
         if  ($this->encrypted) {
-          $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
+            $this->encryptInit($id);
+            $tmp =  $this->ARC4($tmp);
         }
 
         foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
+            $res.=  "\n/".$k.' '.$v;
         }
 
         $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
-      }
+        }
 
-      $res.= "\nendobj";
-      return  $res;
+        $res.= "\nendobj";
+        return  $res;
+    }
     }
-  }
 
-  protected function  o_embedjs($id, $action, $code = '') {
+    protected function  o_embedjs($id, $action, $code = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
         'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
-      ));
-      break;
+        ));
+        break;
 
     case  'out':
       $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        }
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
   
-  protected function  o_javascript($id, $action, $code = '') {
+    protected function  o_javascript($id, $action, $code = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
@@ -1429,71 +1429,71 @@ 
       $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
         'S' => '/JavaScript',
         'JS' => '('.$this->filterText($code).')',
-      ));
-      break;
+        ));
+        break;
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        }
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
     }
-  }
 
-  /**
-   * an image object, will be an XObject in the document, includes description and data
-   */
-  protected function  o_image($id, $action, $options = '') {
+    /**
+     * an image object, will be an XObject in the document, includes description and data
+     */
+    protected function  o_image($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       // make the new object
       $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
-      $this->objects[$id]['info']['Type'] = '/XObject';
-      $this->objects[$id]['info']['Subtype'] = '/Image';
-      $this->objects[$id]['info']['Width'] = $options['iw'];
-      $this->objects[$id]['info']['Height'] = $options['ih'];
+        $this->objects[$id]['info']['Type'] = '/XObject';
+        $this->objects[$id]['info']['Subtype'] = '/Image';
+        $this->objects[$id]['info']['Width'] = $options['iw'];
+        $this->objects[$id]['info']['Height'] = $options['ih'];
 
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
+        if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
         if  (!isset($options['channels'])) {
-          $options['channels'] = 3;
+            $options['channels'] = 3;
         }
 
         switch ($options['channels']) {
         case  1:
           $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
-          break;
+            break;
 
         default:
           $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
-          break;
+            break;
         }
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
-      } else  if  ($options['type'] === 'png') {
+        } else  if  ($options['type'] === 'png') {
         $this->objects[$id]['info']['Filter'] = '/FlateDecode';
         $this->objects[$id]['info']['DecodeParms'] = '<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
 
         if  (mb_strlen($options['pdata'], '8bit')) {
-          $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
-          $this->numObj++;
-          $this->o_contents($this->numObj, 'new');
-          $this->objects[$this->numObj]['c'] = $options['pdata'];
-          $tmp.= $this->numObj.' 0 R';
-          $tmp.= ' ]';
-          $this->objects[$id]['info']['ColorSpace'] =  $tmp;
-          if  (isset($options['transparency'])) {
+            $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
+            $this->numObj++;
+            $this->o_contents($this->numObj, 'new');
+            $this->objects[$this->numObj]['c'] = $options['pdata'];
+            $tmp.= $this->numObj.' 0 R';
+            $tmp.= ' ]';
+            $this->objects[$id]['info']['ColorSpace'] =  $tmp;
+            if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
+                $this->objects[$id]['info']['Mask'] =  $tmp;
+                break;
 
             case 'color-key':
               $tmp = ' [ '.
@@ -1501,19 +1501,19 @@ 
                 $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
                 $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
                 ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              pre_r($tmp);
-              break;
+                $this->objects[$id]['info']['Mask'] = $tmp;
+                pre_r($tmp);
+                break;
               
             }
-          }
+            }
         } else {
-          if  (isset($options['transparency'])) {
+            if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
+                $this->objects[$id]['info']['Mask'] =  $tmp;
+                break;
 
             case 'color-key':
               $tmp = ' [ '.
@@ -1521,329 +1521,329 @@ 
                 $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
                 $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
                 ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              break;              
+                $this->objects[$id]['info']['Mask'] = $tmp;
+                break;              
+            }
             }
-          }
-          $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
+            $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
         }
 
         $this->objects[$id]['info']['BitsPerComponent'] = $options['bitsPerComponent'];
-      }
+        }
 
-      // assign it a place in the named resource dictionary as an external object, according to
-      // the label passed in with it.
-      $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
+        // assign it a place in the named resource dictionary as an external object, according to
+        // the label passed in with it.
+        $this->o_pages($this->currentNode, 'xObject', array('label'=>$options['label'], 'objNum'=>$id));
 
-      // also make sure that we have the right procset object for it.
-      $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
-      break;
+        // also make sure that we have the right procset object for it.
+        $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
+        break;
 
     case  'out':
       $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+        $res =  "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
+        foreach($o['info'] as  $k=>$v) {
         $res.= "\n/".$k.' '.$v;
-      }
+        }
 
-      if  ($this->encrypted) {
+        if  ($this->encrypted) {
         $this->encryptInit($id);
         $tmp =  $this->ARC4($tmp);
-      }
+        }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
 
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * graphics state object
-   */
-  protected function  o_extGState($id,  $action,  $options = "") {
+    /**
+     * graphics state object
+     */
+    protected function  o_extGState($id,  $action,  $options = "") {
     static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
-                                   "D",  "RI",  "OP",  "op",  "OPM",
-                                   "Font",  "BG",  "BG2",  "UCR",
-                                   "TR",  "TR2",  "HT",  "FL",
-                                   "SM",  "SA",  "BM",  "SMask",
-                                   "CA",  "ca",  "AIS",  "TK");
+                                    "D",  "RI",  "OP",  "op",  "OPM",
+                                    "Font",  "BG",  "BG2",  "UCR",
+                                    "TR",  "TR2",  "HT",  "FL",
+                                    "SM",  "SA",  "BM",  "SMask",
+                                    "CA",  "ca",  "AIS",  "TK");
 
     if  ($action !==  "new") {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch  ($action) {
     case  "new":
       $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
 
-      // Tell the pages about the new resource
-      $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
-      break;
+        // Tell the pages about the new resource
+        $this->numStates++;
+        $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+        break;
 
     case  "out":
       $res =
         "\n" . $id . " 0 obj\n".
         "<< /Type /ExtGState\n";
 
-      foreach ($o["info"] as  $parameter => $value) {
+        foreach ($o["info"] as  $parameter => $value) {
         if  ( !in_array($parameter,  $valid_params))
-          continue;
+            continue;
         $res.=  "/$parameter $value\n";
-      }
+        }
 
-      $res.=
+        $res.=
         ">>\n".
         "endobj";
-      return  $res;
+        return  $res;
+    }
     }
-  }
 
 
-  /**
-   * encryption object.
-   */
-  protected function  o_encryption($id, $action, $options = '') {
+    /**
+     * encryption object.
+     */
+    protected function  o_encryption($id, $action, $options = '') {
     if  ($action !== 'new') {
-      $o = & $this->objects[$id];
+        $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       // make the new object
       $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
-      $this->arc4_objnum = $id;
+        $this->arc4_objnum = $id;
 
-      // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
+        // figure out the additional paramaters required
+        $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
+        $len =  mb_strlen($options['owner'], '8bit');
 
-      if  ($len>32) {
+        if  ($len>32) {
         $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
+        } else  if  ($len<32) {
         $owner =  $options['owner'].substr($pad, 0, 32-$len);
-      } else {
+        } else {
         $owner =  $options['owner'];
-      }
+        }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
+        $len =  mb_strlen($options['user'], '8bit');
+        if  ($len>32) {
         $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
+        } else  if  ($len<32) {
         $user =  $options['user'].substr($pad, 0, 32-$len);
-      } else {
+        } else {
         $user =  $options['user'];
-      }
-
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
-      $this->ARC4_init($okey);
-      $ovalue = $this->ARC4($user);
-      $this->objects[$id]['info']['O'] = $ovalue;
-
-      // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
-
-      $ukey =  substr($tmp, 0, 5);
-      $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
-      $this->encrypted = 1;
-      $uvalue = $this->ARC4($pad);
-      $this->objects[$id]['info']['U'] = $uvalue;
-      $this->encryptionKey = $ukey;
-      // initialize the arc4 array
-      break;
+        }
+
+        $tmp =  $this->md5_16($owner);
+        $okey =  substr($tmp, 0, 5);
+        $this->ARC4_init($okey);
+        $ovalue = $this->ARC4($user);
+        $this->objects[$id]['info']['O'] = $ovalue;
+
+        // now make the u value, phew.
+        $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+
+        $ukey =  substr($tmp, 0, 5);
+        $this->ARC4_init($ukey);
+        $this->encryptionKey =  $ukey;
+        $this->encrypted = 1;
+        $uvalue = $this->ARC4($pad);
+        $this->objects[$id]['info']['U'] = $uvalue;
+        $this->encryptionKey = $ukey;
+        // initialize the arc4 array
+        break;
 
     case  'out':
       $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
-      // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
-      return  $res;
-    }
-  }
-
-
-  /**
-   * ARC4 functions
-   * A series of function to implement ARC4 encoding in PHP
-   */
+        $res.= "\n/Filter /Standard";
+        $res.= "\n/V 1";
+        $res.= "\n/R 2";
+        $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
+        $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+        // and the p-value needs to be converted to account for the twos-complement approach
+        $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
+        $res.= "\n/P ".($o['info']['p']);
+        $res.= "\n>>\nendobj";
+        return  $res;
+    }
+    }
 
-  /**
-   * calculate the 16 byte version of the 128 bit md5 digest of the string
-   */
-  function  md5_16($string) {
+
+    /**
+     * ARC4 functions
+     * A series of function to implement ARC4 encoding in PHP
+     */
+
+    /**
+     * calculate the 16 byte version of the 128 bit md5 digest of the string
+     */
+    function  md5_16($string) {
     $tmp =  md5($string);
     $out = '';
     for  ($i = 0;$i <= 30;$i = $i+2) {
-      $out.= chr(hexdec(substr($tmp, $i, 2)));
+        $out.= chr(hexdec(substr($tmp, $i, 2)));
     }
     return  $out;
-  }
+    }
 
 
-  /**
-   * initialize the encryption for processing a particular object
-   */
-  function  encryptInit($id) {
+    /**
+     * initialize the encryption for processing a particular object
+     */
+    function  encryptInit($id) {
     $tmp =  $this->encryptionKey;
     $hex =  dechex($id);
     if  (mb_strlen($hex, '8bit') <6) {
-      $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
+        $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
     }
     $tmp.=  chr(hexdec(substr($hex, 4, 2))) .chr(hexdec(substr($hex, 2, 2))) .chr(hexdec(substr($hex, 0, 2))) .chr(0) .chr(0);
     $key =  $this->md5_16($tmp);
     $this->ARC4_init(substr($key, 0, 10));
-  }
+    }
 
 
-  /**
-   * initialize the ARC4 encryption
-   */
-  function  ARC4_init($key = '') {
+    /**
+     * initialize the ARC4 encryption
+     */
+    function  ARC4_init($key = '') {
     $this->arc4 =  '';
 
     // setup the control array
     if  (mb_strlen($key, '8bit') == 0) {
-      return;
+        return;
     }
 
     $k =  '';
     while (mb_strlen($k, '8bit') <256) {
-      $k.= $key;
+        $k.= $key;
     }
 
     $k = substr($k, 0, 256);
     for  ($i = 0;$i<256;$i++) {
-      $this->arc4.=  chr($i);
+        $this->arc4.=  chr($i);
     }
 
     $j = 0;
 
     for  ($i = 0;$i<256;$i++) {
-      $t =  $this->arc4[$i];
-      $j =  ($j + ord($t)  + ord($k[$i])) %256;
-      $this->arc4[$i] = $this->arc4[$j];
-      $this->arc4[$j] = $t;
+        $t =  $this->arc4[$i];
+        $j =  ($j + ord($t)  + ord($k[$i])) %256;
+        $this->arc4[$i] = $this->arc4[$j];
+        $this->arc4[$j] = $t;
+    }
     }
-  }
 
 
-  /**
-   * ARC4 encrypt a text string
-   */
-  function  ARC4($text) {
+    /**
+     * ARC4 encrypt a text string
+     */
+    function  ARC4($text) {
     $len = mb_strlen($text, '8bit');
     $a = 0;
     $b = 0;
     $c =  $this->arc4;
     $out = '';
     for  ($i = 0;$i<$len;$i++) {
-      $a =  ($a+1) %256;
-      $t =  $c[$a];
-      $b =  ($b+ord($t)) %256;
-      $c[$a] = $c[$b];
-      $c[$b] = $t;
-      $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
-      $out.= chr(ord($text[$i])  ^ $k);
+        $a =  ($a+1) %256;
+        $t =  $c[$a];
+        $b =  ($b+ord($t)) %256;
+        $c[$a] = $c[$b];
+        $c[$b] = $t;
+        $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
+        $out.= chr(ord($text[$i])  ^ $k);
     }
     return  $out;
-  }
+    }
 
 
-  /**
-   * functions which can be called to adjust or add to the document
-   */
+    /**
+     * functions which can be called to adjust or add to the document
+     */
 
-  /**
-   * add a link in the document to an external URL
-   */
-  function  addLink($url, $x0, $y0, $x1, $y1) {
+    /**
+     * add a link in the document to an external URL
+     */
+    function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
     $info =  array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
-  }
+    }
 
 
-  /**
-   * add a link in the document to an internal destination (ie. within the document)
-   */
-  function  addInternalLink($label, $x0, $y0, $x1, $y1) {
+    /**
+     * add a link in the document to an internal destination (ie. within the document)
+     */
+    function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
     $info =  array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
-  }
+    }
 
 
-  /**
-   * set the encryption of the document
-   * can be used to turn it on and/or set the passwords which it will have.
-   * also the functions that the user will have are set here, such as print, modify, add
-   */
-  function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
+    /**
+     * set the encryption of the document
+     * can be used to turn it on and/or set the passwords which it will have.
+     * also the functions that the user will have are set here, such as print, modify, add
+     */
+    function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
     $p = bindec(11000000);
 
     $options =  array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
 
     foreach($pc as  $k=>$v) {
-      if  ($v &&  isset($options[$k])) {
+        if  ($v &&  isset($options[$k])) {
         $p+= $options[$k];
-      } else  if  (isset($options[$v])) {
+        } else  if  (isset($options[$v])) {
         $p+= $options[$v];
-      }
+        }
     }
 
     // implement encryption on the document
     if  ($this->arc4_objnum ==  0) {
-      // then the block does not exist already, add it.
-      $this->numObj++;
-      if  (mb_strlen($ownerPass) == 0) {
+        // then the block does not exist already, add it.
+        $this->numObj++;
+        if  (mb_strlen($ownerPass) == 0) {
         $ownerPass = $userPass;
-      }
+        }
 
-      $this->o_encryption($this->numObj, 'new', array('user'=>$userPass, 'owner'=>$ownerPass, 'p'=>$p));
+        $this->o_encryption($this->numObj, 'new', array('user'=>$userPass, 'owner'=>$ownerPass, 'p'=>$p));
+    }
     }
-  }
 
 
-  /**
-   * should be used for internal checks, not implemented as yet
-   */
-  function  checkAllHere() {
-  }
+    /**
+     * should be used for internal checks, not implemented as yet
+     */
+    function  checkAllHere() {
+    }
 
 
-  /**
-   * return the pdf stream as a string returned from the function
-   */
-  function  output($debug = false) {
+    /**
+     * return the pdf stream as a string returned from the function
+     */
+    function  output($debug = false) {
     if  ($debug) {
-      // turn compression off
-      $this->options['compression'] = 0;
+        // turn compression off
+        $this->options['compression'] = 0;
     }
     
     if ($this->javascript) {
-      $this->numObj++;
+        $this->numObj++;
       
-      $js_id = $this->numObj;
-      $this->o_embedjs($js_id, 'new');
-      $this->o_javascript(++$this->numObj, 'new', $this->javascript);
+        $js_id = $this->numObj;
+        $this->o_embedjs($js_id, 'new');
+        $this->o_javascript(++$this->numObj, 'new', $this->javascript);
       
-      $id =  $this->catalogId;
+        $id =  $this->catalogId;
       
-      $this->o_catalog($id, 'javascript', $js_id);
+        $this->o_catalog($id, 'javascript', $js_id);
     }
 
     if  ($this->arc4_objnum) {
-      $this->ARC4_init($this->encryptionKey);
+        $this->ARC4_init($this->encryptionKey);
     }
 
     $this->checkAllHere();
@@ -1854,43 +1854,43 @@ 
     $pos = mb_strlen($content, '8bit');
 
     foreach($this->objects as  $k=>$v) {
-      $tmp = 'o_'.$v['t'];
-      $cont = $this->$tmp($k, 'out');
-      $content.= $cont;
-      $xref[] = $pos;
-      $pos+= mb_strlen($cont, '8bit');
+        $tmp = 'o_'.$v['t'];
+        $cont = $this->$tmp($k, 'out');
+        $content.= $cont;
+        $xref[] = $pos;
+        $pos+= mb_strlen($cont, '8bit');
     }
 
     $content.= "\nxref\n0 ".(count($xref) +1) ."\n0000000000 65535 f \n";
 
     foreach($xref as  $p) {
-      $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
+        $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
     }
 
     $content.= "trailer\n<<\n/Size ".(count($xref) +1) ."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
 
     // if encryption has been applied to this document then add the marker for this dictionary
     if  ($this->arc4_objnum > 0) {
-      $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
+        $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
     }
 
     if  (mb_strlen($this->fileIdentifier, '8bit')) {
-      $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
+        $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
     }
 
     $content.=  ">>\nstartxref\n".$pos."\n%%EOF\n";
 
     return  $content;
-  }
-
-  /**
-   * intialize a new document
-   * if this is called on an existing document results may be unpredictable, but the existing document would be lost at minimum
-   * this function is called automatically by the constructor function
-   *
-   * @access private
-   */
-  function  newDocument($pageSize = array(0, 0, 612, 792)) {
+    }
+
+    /**
+     * intialize a new document
+     * if this is called on an existing document results may be unpredictable, but the existing document would be lost at minimum
+     * this function is called automatically by the constructor function
+     *
+     * @access private
+     */
+    function  newDocument($pageSize = array(0, 0, 612, 792)) {
     $this->numObj = 0;
     $this->objects =  array();
 
@@ -1918,32 +1918,32 @@ 
     // need to store the first page id as there is no way to get it to the user during
     // startup
     $this->firstPageId =  $this->currentContents;
-  }
-
-  /**
-   * open the font file and return a php structure containing it.
-   * first check if this one has been done before and saved in a form more suited to php
-   * note that if a php serialized version does not exist it will try and make one, but will
-   * require write access to the directory to do it... it is MUCH faster to have these serialized
-   * files.
-   *
-   * @access private
-   */
-  function  openFont($font) {
+    }
+
+    /**
+     * open the font file and return a php structure containing it.
+     * first check if this one has been done before and saved in a form more suited to php
+     * note that if a php serialized version does not exist it will try and make one, but will
+     * require write access to the directory to do it... it is MUCH faster to have these serialized
+     * files.
+     *
+     * @access private
+     */
+    function  openFont($font) {
     // assume that $font contains the path and file but not the extension
     $pos = strrpos($font, '/');
 
     if  ($pos === false) {
-      $dir =  './';
-      $name =  $font;
+        $dir =  './';
+        $name =  $font;
     } else {
-      $dir = substr($font, 0, $pos+1);
-      $name = substr($font, $pos+1);
+        $dir = substr($font, 0, $pos+1);
+        $name = substr($font, $pos+1);
     }
     
     $fontcache = $this->fontcache;
     if ($fontcache == '') {
-    	$fontcache = $dir;
+        $fontcache = $dir;
     }
     
     //$name       filename without folder and extension of font metrics
@@ -1964,42 +1964,42 @@ 
     $cache_name = 'php_' . $metrics_name;
     $this->addMessage('metrics: '.$metrics_name.', cache: '.$cache_name);
     if  (file_exists($fontcache . $cache_name)) {
-      $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
-      $tmp =  file_get_contents($fontcache . $cache_name);
-      eval($tmp);
+        $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
+        $tmp =  file_get_contents($fontcache . $cache_name);
+        eval($tmp);
 
-      if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
+        if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
         // if the font file is old, then clear it out and prepare for re-creation
         $this->addMessage('openFont: clear out, make way for new version.');
         unset($this->fonts[$font]);
-      }
+        }
     }
 
     if  (!isset($this->fonts[$font]) &&  file_exists($dir . $metrics_name)) {
-      // then rebuild the php_<font>.afm file from the <font>.afm file
-      $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
-      $data =  array();
+        // then rebuild the php_<font>.afm file from the <font>.afm file
+        $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
+        $data =  array();
       
-      // Since we're not going to enable Unicode for the core fonts we need to use a font-based
-      // setting for Unicode support rather than a global setting.
-      $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm');
+        // Since we're not going to enable Unicode for the core fonts we need to use a font-based
+        // setting for Unicode support rather than a global setting.
+        $data['isUnicode'] = (strtolower(substr($metrics_name, -3)) !== 'afm');
       
-      $cidtogid = '';
-      if ($data['isUnicode']) {
+        $cidtogid = '';
+        if ($data['isUnicode']) {
         $cidtogid = str_pad('', 256*256*2, "\x00");
-      }
+        }
 
-      $file =  file($dir . $metrics_name);
+        $file =  file($dir . $metrics_name);
 
-      foreach ($file as  $rowA) {
+        foreach ($file as  $rowA) {
         $row = trim($rowA);
         $pos = strpos($row, ' ');
 
         if  ($pos) {
-          // then there must be some keyword
-          $key =  substr($row, 0, $pos);
-          switch  ($key) {
-          case  'FontName':
+            // then there must be some keyword
+            $key =  substr($row, 0, $pos);
+            switch  ($key) {
+            case  'FontName':
           case  'FullName':
           case  'FamilyName':
           case  'Weight':
@@ -2021,140 +2021,140 @@ 
             $data[$key] = trim(substr($row, $pos));
             break;
 
-          case  'FontBBox':
+            case  'FontBBox':
             $data[$key] = explode(' ', trim(substr($row, $pos)));
             break;
 
-          case  'C': // Found in AFM files
+            case  'C': // Found in AFM files
             //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
             $bits = explode(';', trim($row));
             $dtmp = array();
 
             foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
+                $bits2 =  explode(' ', trim($bit));
+                if  (mb_strlen($bits2[0], '8bit')) {
                 if  (count($bits2) >2) {
-                  $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
+                    $dtmp[$bits2[0]] = array();
+                    for  ($i = 1;$i<count($bits2);$i++) {
                     $dtmp[$bits2[0]][] = $bits2[$i];
-                  }
+                    }
                 } else  if  (count($bits2) == 2) {
-                  $dtmp[$bits2[0]] = $bits2[1];
+                    $dtmp[$bits2[0]] = $bits2[1];
+                }
                 }
-              }
             }
 
             $cc = (int)$dtmp['C'];
             if  ($cc >= 0) {
-              $data['C'][$dtmp['C']] = $dtmp;
-              $data['C'][$dtmp['N']] = $dtmp;
+                $data['C'][$dtmp['C']] = $dtmp;
+                $data['C'][$dtmp['N']] = $dtmp;
             } else {
-              $data['C'][$dtmp['N']] = $dtmp;
+                $data['C'][$dtmp['N']] = $dtmp;
             }
 
             if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-              $data['MissingWidth'] = $width;
+                $data['MissingWidth'] = $width;
             }
             
             break;
 
-          case  'U': // Found in UFM files
+            case  'U': // Found in UFM files
             if ($data['isUnicode']) {
-              // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-              $bits = explode(';', trim($row));
-              $dtmp = array();
+                // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+                $bits = explode(';', trim($row));
+                $dtmp = array();
 
-              foreach($bits as  $bit) {
+                foreach($bits as  $bit) {
                 $bits2 =  explode(' ', trim($bit));
                 if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
+                    if  (count($bits2) >2) {
                     $dtmp[$bits2[0]] = array();
                     for  ($i = 1;$i<count($bits2);$i++) {
-                      $dtmp[$bits2[0]][] = $bits2[$i];
+                        $dtmp[$bits2[0]][] = $bits2[$i];
                     }
-                  } else  if  (count($bits2) == 2) {
+                    } else  if  (count($bits2) == 2) {
                     $dtmp[$bits2[0]] = $bits2[1];
-                  }
+                    }
+                }
                 }
-              }
 
-              $cc = (int)$dtmp['U'];
-              $glyph = $dtmp['G'];
-              $width = $dtmp['WX'];
-              if  ($cc >= 0) {
+                $cc = (int)$dtmp['U'];
+                $glyph = $dtmp['G'];
+                $width = $dtmp['WX'];
+                if  ($cc >= 0) {
                 // Set values in CID to GID map
                 if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                    $cidtogid[$cc*2] = chr($glyph >> 8);
+                    $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
                 }
 
                 $data['C'][$dtmp['U']] = $dtmp;
                 $data['C'][$dtmp['N']] = $dtmp;
-              } else {
+                } else {
                 $data['C'][$dtmp['N']] = $dtmp;
-              }
+                }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
                 $data['MissingWidth'] = $width;
-              }
+                }
             }
             break;
 
-          case  'KPX':
+            case  'KPX':
             //KPX Adieresis yacute -40
             $bits = explode(' ', trim($row));
             $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
             break;
-          }
+            }
+        }
         }
-      }
 
-      //    echo $cidtogid; die("CIDtoGID Displayed!");
-      if  (function_exists('gzcompress') &&  $this->options['compression']) {
+        //    echo $cidtogid; die("CIDtoGID Displayed!");
+        if  (function_exists('gzcompress') &&  $this->options['compression']) {
         // then implement ZLIB based compression on CIDtoGID string
         $data['CIDtoGID_Compressed'] = true;
         $cidtogid =  gzcompress($cidtogid,  6);
-      }
-      $data['CIDtoGID'] = base64_encode($cidtogid);
-      $data['_version_'] = $this->fontcacheVersion;
-      $this->fonts[$font] = $data;
-
-      //Because of potential trouble with php safe mode, expect that the folder already exists.
-      //If not existing, this will hit performance because of missing cached results.
-      if ( is_dir(substr($fontcache,0,-1)) ) {
+        }
+        $data['CIDtoGID'] = base64_encode($cidtogid);
+        $data['_version_'] = $this->fontcacheVersion;
+        $this->fonts[$font] = $data;
+
+        //Because of potential trouble with php safe mode, expect that the folder already exists.
+        //If not existing, this will hit performance because of missing cached results.
+        if ( is_dir(substr($fontcache,0,-1)) ) {
         file_put_contents($fontcache . $cache_name,  '$this->fonts[$font]=' . var_export($data,  true)  . ';');
-      }
+        }
     }
     
     if  (!isset($this->fonts[$font])) {
-      $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
-      //echo 'Font not Found '.$font;
+        $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
+        //echo 'Font not Found '.$font;
     }
 
     //pre_r($this->messages);
-  }
-
-  /**
-   * if the font is not loaded then load it and make the required object
-   * else just make it the current font
-   * the encoding array can contain 'encoding'=> 'none','WinAnsiEncoding','MacRomanEncoding' or 'MacExpertEncoding'
-   * note that encoding='none' will need to be used for symbolic fonts
-   * and 'differences' => an array of mappings between numbers 0->255 and character names.
-   *
-   */
-  function  selectFont($fontName, $encoding =  '', $set =  true) {
+    }
+
+    /**
+     * if the font is not loaded then load it and make the required object
+     * else just make it the current font
+     * the encoding array can contain 'encoding'=> 'none','WinAnsiEncoding','MacRomanEncoding' or 'MacExpertEncoding'
+     * note that encoding='none' will need to be used for symbolic fonts
+     * and 'differences' => an array of mappings between numbers 0->255 and character names.
+     *
+     */
+    function  selectFont($fontName, $encoding =  '', $set =  true) {
     $ext = substr($fontName, -4);
     if  ($ext === '.afm' || $ext === '.ufm') {
-      $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
+        $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
     }
 
     if  (!isset($this->fonts[$fontName])) {
-      $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
+        $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
 
-      // load the file
-      $this->openFont($fontName);
+        // load the file
+        $this->openFont($fontName);
 
-      if  (isset($this->fonts[$fontName])) {
+        if  (isset($this->fonts[$fontName])) {
         $this->numObj++;
         $this->numFonts++;
 
@@ -2165,17 +2165,17 @@ 
         $options =  array('name' => $name, 'fontFileName' => $fontName);
 
         if  (is_array($encoding)) {
-          // then encoding and differences might be set
-          if  (isset($encoding['encoding'])) {
+            // then encoding and differences might be set
+            if  (isset($encoding['encoding'])) {
             $options['encoding'] =  $encoding['encoding'];
-          }
+            }
 
-          if  (isset($encoding['differences'])) {
+            if  (isset($encoding['differences'])) {
             $options['differences'] =  $encoding['differences'];
-          }
+            }
         } else  if  (mb_strlen($encoding, '8bit')) {
-          // then perhaps only the encoding has been set
-          $options['encoding'] =  $encoding;
+            // then perhaps only the encoding has been set
+            $options['encoding'] =  $encoding;
         }
 
         $fontObj =  $this->numObj;
@@ -2187,11 +2187,11 @@ 
         // references into the font object
         $basefile =  $fontName;
         if  (file_exists($basefile.'.pfb')) {
-          $fbtype =  'pfb';
+            $fbtype =  'pfb';
         } else  if  (file_exists($basefile.'.ttf')) {
-          $fbtype =  'ttf';
+            $fbtype =  'ttf';
         } else {
-          $fbtype =  '';
+            $fbtype =  '';
         }
 
         $fbfile =  $basefile.'.'.$fbtype;
@@ -2203,74 +2203,74 @@ 
         // OAR - I don't understand this old check
         // if  (substr($fontName, -4) ===  '.afm' &&  strlen($fbtype)) {
         if  (mb_strlen($fbtype, '8bit')) {
-          $adobeFontName =  $this->fonts[$fontName]['FontName'];
-          //        $fontObj = $this->numObj;
-          $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
+            $adobeFontName =  $this->fonts[$fontName]['FontName'];
+            //        $fontObj = $this->numObj;
+            $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
 
-          // find the array of font widths, and put that into an object.
-          $firstChar =  -1;
-          $lastChar =  0;
-          $widths =  array();
-          $cid_widths = array();
+            // find the array of font widths, and put that into an object.
+            $firstChar =  -1;
+            $lastChar =  0;
+            $widths =  array();
+            $cid_widths = array();
 
-          foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
+            foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
             if  (intval($num) >0 ||  $num ==  '0') {
-              if (!$this->fonts[$fontName]['isUnicode']) {
+                if (!$this->fonts[$fontName]['isUnicode']) {
                 // With Unicode, widths array isn't used
                 if  ($lastChar>0 &&  $num>$lastChar+1) {
-                  for ($i =  $lastChar+1;$i<$num;$i++) {
+                    for ($i =  $lastChar+1;$i<$num;$i++) {
                     $widths[] =  0;
-                  }
+                    }
+                }
                 }
-              }
 
-              $widths[] =  $d['WX'];
+                $widths[] =  $d['WX'];
 
-              if ($this->fonts[$fontName]['isUnicode']) {
+                if ($this->fonts[$fontName]['isUnicode']) {
                 $cid_widths[$num] =  $d['WX'];
-              }
+                }
 
-              if  ($firstChar ==  -1) {
+                if  ($firstChar ==  -1) {
                 $firstChar =  $num;
-              }
+                }
 
-              $lastChar =  $num;
+                $lastChar =  $num;
+            }
             }
-          }
 
-          // also need to adjust the widths for the differences array
-          if  (isset($options['differences'])) {
+            // also need to adjust the widths for the differences array
+            if  (isset($options['differences'])) {
             foreach($options['differences'] as  $charNum => $charName) {
-              if  ($charNum > $lastChar) {
+                if  ($charNum > $lastChar) {
                 if (!$this->fonts[$fontName]['isUnicode']) {
-                  // With Unicode, widths array isn't used
-                  for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
+                    // With Unicode, widths array isn't used
+                    for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
                     $widths[] =  0;
-                  }
+                    }
                 }
 
                 $lastChar =  $charNum;
-              }
+                }
 
-              if  (isset($this->fonts[$fontName]['C'][$charName])) {
+                if  (isset($this->fonts[$fontName]['C'][$charName])) {
                 $widths[$charNum-$firstChar] =  $this->fonts[$fontName]['C'][$charName]['WX'];
                 if ($this->fonts[$fontName]['isUnicode']) {
-                  $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+                    $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
                 }
-              }
+                }
+            }
             }
-          }
 
-          if ($this->fonts[$fontName]['isUnicode']) {
+            if ($this->fonts[$fontName]['isUnicode']) {
             $this->fonts[$fontName]['CIDWidths'] = $cid_widths;
-          }
+            }
 
-          $this->addMessage('selectFont: FirstChar = '.$firstChar);
-          $this->addMessage('selectFont: LastChar = '.$lastChar);
+            $this->addMessage('selectFont: FirstChar = '.$firstChar);
+            $this->addMessage('selectFont: LastChar = '.$lastChar);
 
-          $widthid = -1;
+            $widthid = -1;
 
-          if (!$this->fonts[$fontName]['isUnicode']) {
+            if (!$this->fonts[$fontName]['isUnicode']) {
             // With Unicode, widths array isn't used
 
             $this->numObj++;
@@ -2278,147 +2278,147 @@ 
             $this->objects[$this->numObj]['c'].=  '[';
 
             foreach($widths as  $width) {
-              $this->objects[$this->numObj]['c'].=  ' '.$width;
+                $this->objects[$this->numObj]['c'].=  ' '.$width;
             }
 
             $this->objects[$this->numObj]['c'].=  ' ]';
             $widthid =  $this->numObj;
-          }
+            }
 
-          $missing_width = 500;
-          $stemV = 70;
+            $missing_width = 500;
+            $stemV = 70;
 
-          if (isset($this->fonts[$fontName]['MissingWidth'])) {
+            if (isset($this->fonts[$fontName]['MissingWidth'])) {
             $missing_width =  $this->fonts[$fontName]['MissingWidth'];
-          }
-          if (isset($this->fonts[$fontName]['StdVW'])) {
+            }
+            if (isset($this->fonts[$fontName]['StdVW'])) {
             $stemV = $this->fonts[$fontName]['StdVW'];
-          } elseif (isset($this->fonts[$fontName]['Weight']) && preg_match('!(bold|black)!i', $this->fonts[$fontName]['Weight'])) {
+            } elseif (isset($this->fonts[$fontName]['Weight']) && preg_match('!(bold|black)!i', $this->fonts[$fontName]['Weight'])) {
             $stemV = 120;
-          }
+            }
 
-          // load the pfb file, and put that into an object too.
-          // note that pdf supports only binary format type 1 font files, though there is a
-          // simple utility to convert them from pfa to pfb.
-          $data =  file_get_contents($fbfile);
+            // load the pfb file, and put that into an object too.
+            // note that pdf supports only binary format type 1 font files, though there is a
+            // simple utility to convert them from pfa to pfb.
+            $data =  file_get_contents($fbfile);
 
-          // create the font descriptor
-          $this->numObj++;
-          $fontDescriptorId =  $this->numObj;
+            // create the font descriptor
+            $this->numObj++;
+            $fontDescriptorId =  $this->numObj;
 
-          $this->numObj++;
-          $pfbid =  $this->numObj;
+            $this->numObj++;
+            $pfbid =  $this->numObj;
 
-          // determine flags (more than a little flakey, hopefully will not matter much)
-          $flags =  0;
+            // determine flags (more than a little flakey, hopefully will not matter much)
+            $flags =  0;
 
-          if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
+            if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
             $flags+=  pow(2, 6);
-          }
+            }
 
-          if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
+            if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
             $flags+=  1;
-          }
+            }
 
-          $flags+=  pow(2, 5); // assume non-sybolic
-          $list =  array(
+            $flags+=  pow(2, 5); // assume non-sybolic
+            $list =  array(
             'Ascent' => 'Ascender', 
             'CapHeight' => 'CapHeight', 
             'MissingWidth' => 'MissingWidth', 
             'Descent' => 'Descender', 
             'FontBBox' => 'FontBBox', 
             'ItalicAngle' => 'ItalicAngle'
-          );
-          $fdopt =  array(
+            );
+            $fdopt =  array(
             'Flags' => $flags, 
             'FontName' => $adobeFontName, 
             'StemV' => $stemV
-          );
+            );
 
-          foreach($list as  $k => $v) {
+            foreach($list as  $k => $v) {
             if  (isset($this->fonts[$fontName][$v])) {
-              $fdopt[$k] =  $this->fonts[$fontName][$v];
+                $fdopt[$k] =  $this->fonts[$fontName][$v];
+            }
             }
-          }
 
-          if  ($fbtype === 'pfb') {
+            if  ($fbtype === 'pfb') {
             $fdopt['FontFile'] =  $pfbid;
-          } else  if  ($fbtype === 'ttf') {
+            } else  if  ($fbtype === 'ttf') {
             $fdopt['FontFile2'] =  $pfbid;
-          }
+            }
 
-          $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
+            $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
 
-          // embed the font program
-          $this->o_contents($this->numObj, 'new');
-          $this->objects[$pfbid]['c'].=  $data;
+            // embed the font program
+            $this->o_contents($this->numObj, 'new');
+            $this->objects[$pfbid]['c'].=  $data;
 
-          // determine the cruicial lengths within this file
-          if  ($fbtype === 'pfb') {
+            // determine the cruicial lengths within this file
+            if  ($fbtype === 'pfb') {
             $l1 =  strpos($data, 'eexec') +6;
             $l2 =  strpos($data, '00000000') -$l1;
             $l3 =  mb_strlen($data, '8bit') -$l2-$l1;
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1, 'Length2' => $l2, 'Length3' => $l3));
-          } else  if  ($fbtype == 'ttf') {
+            } else  if  ($fbtype == 'ttf') {
             $l1 =  mb_strlen($data, '8bit');
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1));
-          }
+            }
 
-          // tell the font object about all this new stuff
-          $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
+            // tell the font object about all this new stuff
+            $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
 
-          if  ($fbtype === 'ttf') {
+            if  ($fbtype === 'ttf') {
             $tmp['SubType'] =  'TrueType';
-          }
+            }
 
-          $this->addMessage('adding extra info to font.('.$fontObj.')');
+            $this->addMessage('adding extra info to font.('.$fontObj.')');
 
-          foreach($tmp as  $fk => $fv) {
+            foreach($tmp as  $fk => $fv) {
             $this->addMessage($fk." : ".$fv);
-          }
+            }
 
-          $this->o_font($fontObj, 'add', $tmp);
+            $this->o_font($fontObj, 'add', $tmp);
         } else {
-          $this->addMessage('selectFont: pfb or ttf file not found, ok if this is one of the 14 standard fonts');
+            $this->addMessage('selectFont: pfb or ttf file not found, ok if this is one of the 14 standard fonts');
         }
 
         // also set the differences here, note that this means that these will take effect only the
         //first time that a font is selected, else they are ignored
         if  (isset($options['differences'])) {
-          $this->fonts[$fontName]['differences'] =  $options['differences'];
+            $this->fonts[$fontName]['differences'] =  $options['differences'];
+        }
         }
-      }
     }
 
     if  ($set &&  isset($this->fonts[$fontName])) {
-      // so if for some reason the font was not set in the last one then it will not be selected
-      $this->currentBaseFont =  $fontName;
+        // so if for some reason the font was not set in the last one then it will not be selected
+        $this->currentBaseFont =  $fontName;
 
-      // the next lines mean that if a new font is selected, then the current text state will be
-      // applied to it as well.
-      $this->currentFont =  $this->currentBaseFont;
-      $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+        // the next lines mean that if a new font is selected, then the current text state will be
+        // applied to it as well.
+        $this->currentFont =  $this->currentBaseFont;
+        $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
 
-      //$this->setCurrentFont();
+        //$this->setCurrentFont();
     }
 
     return  $this->currentFontNum;
     //return $this->numObj;
-  }
-
-  /**
-   * sets up the current font, based on the font families, and the current text state
-   * note that this system is quite flexible, a bold-italic font can be completely different to a
-   * italic-bold font, and even bold-bold will have to be defined within the family to have meaning
-   * This function is to be called whenever the currentTextState is changed, it will update
-   * the currentFont setting to whatever the appropriatte family one is.
-   * If the user calls selectFont themselves then that will reset the currentBaseFont, and the currentFont
-   * This function will change the currentFont to whatever it should be, but will not change the
-   * currentBaseFont.
-   *
-   * @access private
-   */
-  function  setCurrentFont() {
+    }
+
+    /**
+     * sets up the current font, based on the font families, and the current text state
+     * note that this system is quite flexible, a bold-italic font can be completely different to a
+     * italic-bold font, and even bold-bold will have to be defined within the family to have meaning
+     * This function is to be called whenever the currentTextState is changed, it will update
+     * the currentFont setting to whatever the appropriatte family one is.
+     * If the user calls selectFont themselves then that will reset the currentBaseFont, and the currentFont
+     * This function will change the currentFont to whatever it should be, but will not change the
+     * currentBaseFont.
+     *
+     * @access private
+     */
+    function  setCurrentFont() {
     //   if (strlen($this->currentBaseFont) == 0){
     //     // then assume an initial font
     //     $this->selectFont($this->defaultFont);
@@ -2440,185 +2440,185 @@ 
     $this->currentFont =  $this->currentBaseFont;
     $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
     //  }
-  }
+    }
 
 
-  /**
-   * function for the user to find out what the ID is of the first page that was created during
-   * startup - useful if they wish to add something to it later.
-   */
-  function  getFirstPageId() {
+    /**
+     * function for the user to find out what the ID is of the first page that was created during
+     * startup - useful if they wish to add something to it later.
+     */
+    function  getFirstPageId() {
     return  $this->firstPageId;
-  }
+    }
 
 
-  /**
-   * add content to the currently active object
-   *
-   * @access private
-   */
-  function  addContent($content) {
+    /**
+     * add content to the currently active object
+     *
+     * @access private
+     */
+    function  addContent($content) {
     $this->objects[$this->currentContents]['c'].=  $content;
-  }
+    }
 
 
-  /**
-   * sets the colour for fill operations
-   */
-  function  setColor($r, $g, $b, $force =  0) {
+    /**
+     * sets the colour for fill operations
+     */
+    function  setColor($r, $g, $b, $force =  0) {
     if  ($r >=  0 &&  ($force ||  $r !=  $this->currentColour['r'] ||  $g !=  $this->currentColour['g'] ||  $b !=  $this->currentColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
-      $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+        $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
+        $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+    }
     }
-  }
 
 
-  /**
-   * sets the colour for stroke operations
-   */
-  function  setStrokeColor($r, $g, $b, $force =  0) {
+    /**
+     * sets the colour for stroke operations
+     */
+    function  setStrokeColor($r, $g, $b, $force =  0) {
     if  ($r >=  0 &&  ($force ||  $r !=  $this->currentStrokeColour['r'] ||  $g !=  $this->currentStrokeColour['g'] ||  $b !=  $this->currentStrokeColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
-      $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+        $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
+        $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+    }
     }
-  }
 
 
-  /**
-   * Set the graphics state for compositions
-   */
-  function  setGraphicsState($parameters) {
+    /**
+     * Set the graphics state for compositions
+     */
+    function  setGraphicsState($parameters) {
     // Create a new graphics state object
     // FIXME: should actually keep track of states that have already been created...
     $this->numObj++;
     $this->o_extGState($this->numObj,  'new',  $parameters);
     $this->objects[ $this->currentContents ]['c'].=  "\n/GS" . $this->numStates . " gs";
-  }
-
-
-  /**
-   * Set current blend mode & opacity for lines.
-   *
-   * Valid blend modes are:
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blend mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  function setLineTransparency($mode, $opacity) {
+    }
+
+
+    /**
+     * Set current blend mode & opacity for lines.
+     *
+     * Valid blend modes are:
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blend mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    function setLineTransparency($mode, $opacity) {
     static $blend_modes = array("Normal", "Multiply", "Screen",
                                 "Overlay", "Darken", "Lighten",
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
     if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+        $mode = "Normal";
     
     // Only create a new graphics state if required
     if ( $mode == $this->currentLineTransparency["mode"]  &&
          $opacity == $this->currentLineTransparency["opacity"] )
-      return;
+        return;
 
     $options = array("BM" => "/$mode",
-                     "CA" => (float)$opacity);
+                        "CA" => (float)$opacity);
 
     $this->setGraphicsState($options);
-  }
+    }
   
-  /**
-   * Set current blend mode & opacity for filled objects.
-   *
-   * Valid blend modes are:
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blend mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  function setFillTransparency($mode, $opacity) {
+    /**
+     * Set current blend mode & opacity for filled objects.
+     *
+     * Valid blend modes are:
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blend mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    function setFillTransparency($mode, $opacity) {
     static $blend_modes = array("Normal", "Multiply", "Screen",
                                 "Overlay", "Darken", "Lighten",
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
     if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+        $mode = "Normal";
 
     if ( $mode == $this->currentFillTransparency["mode"]  &&
          $opacity == $this->currentFillTransparency["opacity"] )
-      return;
+        return;
 
     $options = array("BM" => "/$mode",
-                     "ca" => (float)$opacity);
+                        "ca" => (float)$opacity);
     
     $this->setGraphicsState($options);
-  }
+    }
 
-  /**
-   * draw a line from one set of coordinates to another
-   */
-  function  line($x1, $y1, $x2, $y2) {
+    /**
+     * draw a line from one set of coordinates to another
+     */
+    function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
-  }
+        "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
+    }
 
 
-  /**
-   * draw a bezier curve based on 4 control points
-   */
-  function  curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3) {
+    /**
+     * draw a bezier curve based on 4 control points
+     */
+    function  curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3) {
     // in the current line style, draw a bezier curve from (x0,y0) to (x3,y3) using the other two points
     // as the control points for the curve.
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
+        "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
 
     $this->objects[$this->currentContents]['c'] .=
-      ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
-  }
+        ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
+    }
 
 
-  /**
-   * draw a part of an ellipse
-   */
-  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
+    /**
+     * draw a part of an ellipse
+     */
+    function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
     $this->ellipse($x0, $y0, $r1, $r2, $angle, $nSeg, $astart, $afinish, 0);
-  }
+    }
 
 
-  /**
-   * draw a filled ellipse
-   */
-  function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
+    /**
+     * draw a filled ellipse
+     */
+    function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
     return  $this->ellipse($x0, $y0, $r1, $r2 =  0, $angle, $nSeg, $astart, $afinish, 1, 1);
-  }
-
-
-  /**
-   * draw an ellipse
-   * note that the part and filled ellipse are just special cases of this function
-   *
-   * draws an ellipse in the current line style
-   * centered at $x0,$y0, radii $r1,$r2
-   * if $r2 is not set, then a circle is drawn
-   * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
-   * pretty crappy shape at 2, as we are approximating with bezier curves.
-   */
-  function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
+    }
+
+
+    /**
+     * draw an ellipse
+     * note that the part and filled ellipse are just special cases of this function
+     *
+     * draws an ellipse in the current line style
+     * centered at $x0,$y0, radii $r1,$r2
+     * if $r2 is not set, then a circle is drawn
+     * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
+     * pretty crappy shape at 2, as we are approximating with bezier curves.
+     */
+    function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
     if  ($r1 ==  0) {
-      return;
+        return;
     }
 
     if  ($r2 ==  0) {
-      $r2 =  $r1;
+        $r2 =  $r1;
     }
 
     if  ($nSeg < 2) {
-      $nSeg =  2;
+        $nSeg =  2;
     }
 
     $astart =  deg2rad((float)$astart);
@@ -2629,16 +2629,16 @@ 
     $dtm =  $dt/3;
 
     if  ($angle !=  0) {
-      $a =  -1*deg2rad((float)$angle);
+        $a =  -1*deg2rad((float)$angle);
 
-      $tmp  =  "\n q ";
-      $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
+        $tmp  =  "\n q ";
+        $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
+        $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
 
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+        $this->objects[$this->currentContents]['c'].=  $tmp;
 
-      $x0 =  0;
-      $y0 =  0;
+        $x0 =  0;
+        $y0 =  0;
     }
 
     $t1 =  $astart;
@@ -2650,183 +2650,183 @@ 
     $this->objects[$this->currentContents]['c'] .=  "\n".sprintf('%.3F', $a0) .' '.sprintf('%.3F', $b0) .' m ';
 
     for  ($i = 1; $i <=  $nSeg; $i++) {
-      // draw this bit of the total curve
-      $t1 =  $i * $dt + $astart;
-      $a1 =  $x0 + $r1 * cos($t1);
-      $b1 =  $y0 + $r2 * sin($t1);
-      $c1 = -$r1 * sin($t1);
-      $d1 =  $r2 * cos($t1);
-
-      $this->objects[$this->currentContents]['c']
+        // draw this bit of the total curve
+        $t1 =  $i * $dt + $astart;
+        $a1 =  $x0 + $r1 * cos($t1);
+        $b1 =  $y0 + $r2 * sin($t1);
+        $c1 = -$r1 * sin($t1);
+        $d1 =  $r2 * cos($t1);
+
+        $this->objects[$this->currentContents]['c']
         .=  "\n".sprintf('%.3F', ($a0+$c0*$dtm)) .' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
 
-      $this->objects[$this->currentContents]['c'] .=
+        $this->objects[$this->currentContents]['c'] .=
         ' '.sprintf('%.3F', ($a1-$c1*$dtm)) .' '.sprintf('%.3F', ($b1-$d1*$dtm)) .' '.sprintf('%.3F', $a1) .' '.sprintf('%.3F', $b1) .' c';
 
-      $a0 =  $a1;
-      $b0 =  $b1;
-      $c0 =  $c1;
-      $d0 =  $d1;
+        $a0 =  $a1;
+        $b0 =  $b1;
+        $c0 =  $c1;
+        $d0 =  $d1;
     }
 
     if  ($fill) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+        $this->objects[$this->currentContents]['c'].=  ' f';
     } else if ($close) {
         $this->objects[$this->currentContents]['c'].=  ' s';
         // small 's' signifies closing the path as well
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+        $this->objects[$this->currentContents]['c'].=  ' S';
     }
 
     if  ($angle !=  0) {
-      $this->objects[$this->currentContents]['c'].=  ' Q';
-    }
-  }
-
-
-  /**
-   * this sets the line drawing style.
-   * width, is the thickness of the line in user units
-   * cap is the type of cap to put on the line, values can be 'butt','round','square'
-   *    where the diffference between 'square' and 'butt' is that 'square' projects a flat end past the
-   *    end of the line.
-   * join can be 'miter', 'round', 'bevel'
-   * dash is an array which sets the dash pattern, is a series of length values, which are the lengths of the
-   *   on and off dashes.
-   *   (2) represents 2 on, 2 off, 2 on , 2 off ...
-   *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
-   * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
-   */
-  function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
+        $this->objects[$this->currentContents]['c'].=  ' Q';
+    }
+    }
+
+
+    /**
+     * this sets the line drawing style.
+     * width, is the thickness of the line in user units
+     * cap is the type of cap to put on the line, values can be 'butt','round','square'
+     *    where the diffference between 'square' and 'butt' is that 'square' projects a flat end past the
+     *    end of the line.
+     * join can be 'miter', 'round', 'bevel'
+     * dash is an array which sets the dash pattern, is a series of length values, which are the lengths of the
+     *   on and off dashes.
+     *   (2) represents 2 on, 2 off, 2 on , 2 off ...
+     *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
+     * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
+     */
+    function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
     // this is quite inefficient in that it sets all the parameters whenever 1 is changed, but will fix another day
     $string =  '';
 
     if  ($width>0) {
-      $string.=  $width.' w';
+        $string.=  $width.' w';
     }
 
     $ca =  array('butt' => 0, 'round' => 1, 'square' => 2);
 
     if  (isset($ca[$cap])) {
-      $string.=  ' '.$ca[$cap].' J';
+        $string.=  ' '.$ca[$cap].' J';
     }
 
     $ja =  array('miter' => 0, 'round' => 1, 'bevel' => 2);
 
     if  (isset($ja[$join])) {
-      $string.=  ' '.$ja[$join].' j';
+        $string.=  ' '.$ja[$join].' j';
     }
 
     if  (is_array($dash)) {
-      $string.=  ' [';
+        $string.=  ' [';
 
-      foreach ($dash as  $len) {
+        foreach ($dash as  $len) {
         $string.=  ' '.$len;
-      }
+        }
 
-      $string.=  ' ] '.$phase.' d';
+        $string.=  ' ] '.$phase.' d';
     }
 
     $this->currentLineStyle =  $string;
     $this->objects[$this->currentContents]['c'].=  "\n".$string;
-  }
+    }
 
 
 
-  /**
-   * draw a polygon, the syntax for this is similar to the GD polygon command
-   */
-  function  polygon($p, $np, $f =  0) {
+    /**
+     * draw a polygon, the syntax for this is similar to the GD polygon command
+     */
+    function  polygon($p, $np, $f =  0) {
     $this->objects[$this->currentContents]['c'].=  "\n";
     $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[0]) .' '.sprintf('%.3F', $p[1]) .' m ';
 
     for  ($i =  2; $i < $np * 2; $i =  $i + 2) {
-      $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
+        $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
     }
 
     if  ($f ==  1) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+        $this->objects[$this->currentContents]['c'].=  ' f';
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+        $this->objects[$this->currentContents]['c'].=  ' S';
+    }
     }
-  }
 
 
-  /**
-   * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
-   * the coordinates of the upper-right corner
-   */
-  function  filledRectangle($x1, $y1, $width, $height) {
+    /**
+     * a filled rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
+     * the coordinates of the upper-right corner
+     */
+    function  filledRectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
-  }
+    }
 
 
-  /**
-   * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
-   * the coordinates of the upper-right corner
-   */
-  function  rectangle($x1, $y1, $width, $height) {
+    /**
+     * draw a rectangle, note that it is the width and height of the rectangle which are the secondary paramaters, not
+     * the coordinates of the upper-right corner
+     */
+    function  rectangle($x1, $y1, $width, $height) {
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
-  }
+    }
 
 
-  /**
-   * add a new page to the document
-   * this also makes the new page the current active object
-   */
-  function  newPage($insert =  0, $id =  0, $pos =  'after') {
+    /**
+     * add a new page to the document
+     * this also makes the new page the current active object
+     */
+    function  newPage($insert =  0, $id =  0, $pos =  'after') {
     // if there is a state saved, then go up the stack closing them
     // then on the new page, re-open them with the right setings
 
     if  ($this->nStateStack) {
-      for  ($i =  $this->nStateStack;$i >=  1;$i--) {
+        for  ($i =  $this->nStateStack;$i >=  1;$i--) {
         $this->restoreState($i);
-      }
+        }
     }
 
     $this->numObj++;
 
     if  ($insert) {
-      // the id from the ezPdf class is the id of the contents of the page, not the page object itself
-      // query that object to find the parent
-      $rid =  $this->objects[$id]['onPage'];
-      $opt =  array('rid' => $rid, 'pos' => $pos);
-      $this->o_page($this->numObj, 'new', $opt);
+        // the id from the ezPdf class is the id of the contents of the page, not the page object itself
+        // query that object to find the parent
+        $rid =  $this->objects[$id]['onPage'];
+        $opt =  array('rid' => $rid, 'pos' => $pos);
+        $this->o_page($this->numObj, 'new', $opt);
     } else {
-      $this->o_page($this->numObj, 'new');
+        $this->o_page($this->numObj, 'new');
     }
 
     // if there is a stack saved, then put that onto the page
     if  ($this->nStateStack) {
-      for  ($i =  1;$i <=  $this->nStateStack;$i++) {
+        for  ($i =  1;$i <=  $this->nStateStack;$i++) {
         $this->saveState($i);
-      }
+        }
     }
 
     // and if there has been a stroke or fill colour set, then transfer them
     if  ($this->currentColour['r'] >=  0) {
-      $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
+        $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
     }
 
     if  ($this->currentStrokeColour['r'] >=  0) {
-      $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
+        $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
     }
 
     // if there is a line style set, then put this in too
     if  (mb_strlen($this->currentLineStyle, '8bit')) {
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
+        $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
     }
 
     // the call to the o_page object set currentContents to the present page, so this can be returned as the page id
     return  $this->currentContents;
-  }
+    }
 
 
-  /**
-   * output the pdf code, streaming it to the browser
-   * the relevant headers are set so that hopefully the browser will recognise it
-   */
-  function  stream($options =  '') {
+    /**
+     * output the pdf code, streaming it to the browser
+     * the relevant headers are set so that hopefully the browser will recognise it
+     */
+    function  stream($options =  '') {
     // setting the options allows the adjustment of the headers
     // values at the moment are:
     // 'Content-Disposition' => 'filename'  - sets the filename, though not too sure how well this will
@@ -2837,16 +2837,16 @@ 
     // 'compress' = > 1 or 0 - apply content stream compression, this is on (1) by default
     // 'Attachment' => 1 or 0 - if 1, force the browser to open a download dialog
     if  (!is_array($options)) {
-      $options =  array();
+        $options =  array();
     }
 
     if  ( headers_sent())
-      die("Unable to stream pdf: headers already sent");
+        die("Unable to stream pdf: headers already sent");
 
     if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
-      $tmp =  ltrim($this->output(1));
+        $tmp =  ltrim($this->output(1));
     } else {
-      $tmp =  ltrim($this->output());
+        $tmp =  ltrim($this->output());
     }
 
     header("Cache-Control: private");
@@ -2857,28 +2857,28 @@ 
     $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
 
     if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+        $options["Attachment"] =  true;
 
     $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
 
     header("Content-Disposition: $attachment; filename=\"$fileName\"");
 
     if  (isset($options['Accept-Ranges']) &&  $options['Accept-Ranges'] ==  1) {
-      //FIXME: Is this the correct value ... spec says 1#range-unit
-      header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
+        //FIXME: Is this the correct value ... spec says 1#range-unit
+        header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
     }
 
     echo  $tmp;
     flush();
-  }
+    }
 
 
-  /**
-   * return the height in units of the current font in the given size
-   */
-  function  getFontHeight($size) {
+    /**
+     * return the height in units of the current font in the given size
+     */
+    function  getFontHeight($size) {
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
     
     // for the current font, and the given size, what is the height of the font in user units
@@ -2887,165 +2887,165 @@ 
     // have to adjust by a font offset for Windows fonts.  unfortunately it looks like
     // the bounding box calculations are wrong and I don't know why.
     if (isset($this->fonts[$this->currentFont]['FontHeightOffset'])) {
-      // For CourierNew from Windows this needs to be -646 to match the
-      // Adobe native Courier font.
-      //
-      // For FreeMono from GNU this needs to be -337 to match the
-      // Courier font.
-      //
-      // Both have been added manually to the .afm and .ufm files.
-      $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
+        // For CourierNew from Windows this needs to be -646 to match the
+        // Adobe native Courier font.
+        //
+        // For FreeMono from GNU this needs to be -337 to match the
+        // Courier font.
+        //
+        // Both have been added manually to the .afm and .ufm files.
+        $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
     }
 
     return  $size*$h/1000;
-  }
+    }
 
 
-  /**
-   * return the font descender, this will normally return a negative number
-   * if you add this number to the baseline, you get the level of the bottom of the font
-   * it is in the pdf user units
-   */
-  function  getFontDescender($size) {
+    /**
+     * return the font descender, this will normally return a negative number
+     * if you add this number to the baseline, you get the level of the bottom of the font
+     * it is in the pdf user units
+     */
+    function  getFontDescender($size) {
     // note that this will most likely return a negative value
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     //$h = $this->fonts[$this->currentFont]['FontBBox'][1];
     $h = $this->fonts[$this->currentFont]['Descender'];
 
     return  $size*$h/1000;
-  }
+    }
 
 
-  /**
-   * filter the text, this is applied to all text just before being inserted into the pdf document
-   * it escapes the various things that need to be escaped, and so on
-   *
-   * @access private
-   */
-  function  filterText($text, $bom = true) {
+    /**
+     * filter the text, this is applied to all text just before being inserted into the pdf document
+     * it escapes the various things that need to be escaped, and so on
+     *
+     * @access private
+     */
+    function  filterText($text, $bom = true) {
     if (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
     
-  	$cf = $this->currentFont;
+        $cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
-      $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-      $text =  $this->utf8toUtf16BE($text, $bom);
+        $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
+        $text =  $this->utf8toUtf16BE($text, $bom);
     } else {
-      if (in_array('Windows-1252', mb_list_encodings())) {
+        if (in_array('Windows-1252', mb_list_encodings())) {
         $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
-      } else {
+        } else {
         $text = mb_convert_encoding($text, 'iso-8859-1', 'UTF-8');
-      }
-      $text = html_entity_decode($text, ENT_QUOTES);
+        }
+        $text = html_entity_decode($text, ENT_QUOTES);
     }
 
     // the chr(13) substitution fixes a bug seen in TCPDF (bug #1421290)
     $text = strtr($text, array(')' => '\\)', '(' => '\\(', '\\' => '\\\\', chr(13) => '\r'));
     return  $text;
-  }
-
-  /**
-   * return array containing codepoints (UTF-8 character values) for the
-   * string passed in.
-   *
-   * based on the excellent TCPDF code by Nicola Asuni and the
-   * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-   *
-   * @access private
-   * @author Orion Richardson
-   * @since January 5, 2008
-   * @param string $text UTF-8 string to process
-   * @return array UTF-8 codepoints array for the string
-   */
-  function  utf8toCodePointsArray(&$text) {
+    }
+
+    /**
+     * return array containing codepoints (UTF-8 character values) for the
+     * string passed in.
+     *
+     * based on the excellent TCPDF code by Nicola Asuni and the
+     * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+     *
+     * @access private
+     * @author Orion Richardson
+     * @since January 5, 2008
+     * @param string $text UTF-8 string to process
+     * @return array UTF-8 codepoints array for the string
+     */
+    function  utf8toCodePointsArray(&$text) {
     $length = mb_strlen($text, '8bit'); // http://www.php.net/manual/en/function.mb-strlen.php#77040
     $unicode = array(); // array containing unicode values
     $bytes = array(); // array containing single character byte sequences
     $numbytes = 1; // number of octetc needed to represent the UTF-8 character
     
     for ($i = 0; $i < $length; $i++) {
-      $c = ord($text[$i]); // get one string character at time
-      if (count($bytes) == 0) { // get starting octect
+        $c = ord($text[$i]); // get one string character at time
+        if (count($bytes) == 0) { // get starting octect
         if ($c <= 0x7F) {
-          $unicode[] = $c; // use the character "as is" because is ASCII
-          $numbytes = 1;
+            $unicode[] = $c; // use the character "as is" because is ASCII
+            $numbytes = 1;
         } elseif (($c >> 0x05) == 0x06) { // 2 bytes character (0x06 = 110 BIN)
-          $bytes[] = ($c - 0xC0) << 0x06;
-          $numbytes = 2;
+            $bytes[] = ($c - 0xC0) << 0x06;
+            $numbytes = 2;
         } elseif (($c >> 0x04) == 0x0E) { // 3 bytes character (0x0E = 1110 BIN)
-          $bytes[] = ($c - 0xE0) << 0x0C;
-          $numbytes = 3;
+            $bytes[] = ($c - 0xE0) << 0x0C;
+            $numbytes = 3;
         } elseif (($c >> 0x03) == 0x1E) { // 4 bytes character (0x1E = 11110 BIN)
-          $bytes[] = ($c - 0xF0) << 0x12;
-          $numbytes = 4;
+            $bytes[] = ($c - 0xF0) << 0x12;
+            $numbytes = 4;
         } else {
-          // use replacement character for other invalid sequences
-          $unicode[] = 0xFFFD;
-          $bytes = array();
-          $numbytes = 1;
+            // use replacement character for other invalid sequences
+            $unicode[] = 0xFFFD;
+            $bytes = array();
+            $numbytes = 1;
         }
-      } elseif (($c >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
+        } elseif (($c >> 0x06) == 0x02) { // bytes 2, 3 and 4 must start with 0x02 = 10 BIN
         $bytes[] = $c - 0x80;
         if (count($bytes) == $numbytes) {
-          // compose UTF-8 bytes to a single unicode value
-          $c = $bytes[0];
-          for ($j = 1; $j < $numbytes; $j++) {
+            // compose UTF-8 bytes to a single unicode value
+            $c = $bytes[0];
+            for ($j = 1; $j < $numbytes; $j++) {
             $c += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
-          }
-          if ((($c >= 0xD800) AND ($c <= 0xDFFF)) OR ($c >= 0x10FFFF)) {
+            }
+            if ((($c >= 0xD800) AND ($c <= 0xDFFF)) OR ($c >= 0x10FFFF)) {
             // The definition of UTF-8 prohibits encoding character numbers between
             // U+D800 and U+DFFF, which are reserved for use with the UTF-16
             // encoding form (as surrogate pairs) and do not directly represent
             // characters.
             $unicode[] = 0xFFFD; // use replacement character
-          } else {
+            } else {
             $unicode[] = $c; // add char to array
-          }
-          // reset data for next char
-          $bytes = array();
-          $numbytes = 1;
+            }
+            // reset data for next char
+            $bytes = array();
+            $numbytes = 1;
         }
-      } else {
+        } else {
         // use replacement character for other invalid sequences
         $unicode[] = 0xFFFD;
         $bytes = array();
         $numbytes = 1;
-      }
+        }
     }
     return $unicode;
-  }
-
-  /**
-   * convert UTF-8 to UTF-16 with an additional byte order marker
-   * at the front if required.
-   *
-   * based on the excellent TCPDF code by Nicola Asuni and the
-   * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
-   *
-   * @access private
-   * @author Orion Richardson
-   * @since January 5, 2008
-   * @param string $text UTF-8 string to process
-   * @param boolean $bom whether to add the byte order marker
-   * @return string UTF-16 result string
-   */
-  function  utf8toUtf16BE(&$text, $bom = true) {
+    }
+
+    /**
+     * convert UTF-8 to UTF-16 with an additional byte order marker
+     * at the front if required.
+     *
+     * based on the excellent TCPDF code by Nicola Asuni and the
+     * RFC for UTF-8 at http://www.faqs.org/rfcs/rfc3629.html
+     *
+     * @access private
+     * @author Orion Richardson
+     * @since January 5, 2008
+     * @param string $text UTF-8 string to process
+     * @param boolean $bom whether to add the byte order marker
+     * @return string UTF-16 result string
+     */
+    function  utf8toUtf16BE(&$text, $bom = true) {
     $cf =  $this->currentFont;
     if (!$this->fonts[$cf]['isUnicode']) return $text;
     $out = $bom ? "\xFE\xFF" : '';
     
     $unicode = $this->utf8toCodePointsArray($text);
     foreach ($unicode as $c) {
-      if ($c == 0xFFFD) {
+        if ($c == 0xFFFD) {
         $out .= "\xFF\xFD"; // replacement character
-      } elseif ($c < 0x10000) {
+        } elseif ($c < 0x10000) {
         $out .= chr($c >> 0x08);
         $out .= chr($c & 0xFF);
-       } else {
+        } else {
         $c -= 0x10000;
         $w1 = 0xD800 | ($c >> 0x10);
         $w2 = 0xDC00 | ($c & 0x3FF);
@@ -3053,19 +3053,19 @@ 
         $out .= chr($w1 & 0xFF);
         $out .= chr($w2 >> 0x08);
         $out .= chr($w2 & 0xFF);
-      }
+        }
     }
     return $out;
-  }
+    }
 
 
-  /**
-   * given a start position and information about how text is to be laid out, calculate where
-   * on the page the text will end
-   *
-   * @access private
-   */
-  function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
+    /**
+     * given a start position and information about how text is to be laid out, calculate where
+     * on the page the text will end
+     *
+     * @access private
+     */
+    function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
     $w =  $this->getTextWidth($size, $text);
 
@@ -3076,66 +3076,66 @@ 
     $a =  deg2rad((float)$angle);
 
     return  array(cos($a) *$w+$x, -sin($a) *$w+$y);
-  }
+    }
 
 
-  /**
-   * wrapper function for PRVTcheckTextDirective1
-   *
-   * @access private
-   */
-  function  PRVTcheckTextDirective(&$text, $i, &$f) {
+    /**
+     * wrapper function for PRVTcheckTextDirective1
+     *
+     * @access private
+     */
+    function  PRVTcheckTextDirective(&$text, $i, &$f) {
     return  0;
     $x =  0;
     $y =  0;
     return  $this->PRVTcheckTextDirective1($text, $i, $f, 0, $x, $y);
-  }
+    }
 
 
-  /**
-   * checks if the text stream contains a control directive
-   * if so then makes some changes and returns the number of characters involved in the directive
-   * this has been re-worked to include everything neccesary to find the current writing point, so that
-   * the location can be sent to the callback function if required
-   * if the directive does not require a font change, then $f should be set to 0
-   *
-   * @access private
-   */
-  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
+    /**
+     * checks if the text stream contains a control directive
+     * if so then makes some changes and returns the number of characters involved in the directive
+     * this has been re-worked to include everything neccesary to find the current writing point, so that
+     * the location can be sent to the callback function if required
+     * if the directive does not require a font change, then $f should be set to 0
+     *
+     * @access private
+     */
+    function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
     return  0;
     $directive =  0;
     $j =  $i;
     if  ($text[$j] === '<') {
-      $j++;
-      switch ($text[$j]) {
-      case  '/':
+        $j++;
+        switch ($text[$j]) {
+        case  '/':
         $j++;
         if  (mb_strlen($text) <=  $j) {
-          return  $directive;
+            return  $directive;
         }
 
         switch ($text[$j]) {
         case  'b':
         case  'i':
           $j++;
-          if  ($text[$j] === '>') {
+            if  ($text[$j] === '>') {
             $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
 
             if  ($p !==  false) {
-              // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+                // then there is one to remove
+                $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
             }
 
             $directive =  $j-$i+1;
-          }
-          break;
+            }
+            break;
 
         case  'c':
           // this this might be a callback function
           $j++;
-          $k =  mb_strpos($text, '>', $j);
+            $k =  mb_strpos($text, '>', $j);
 
-          if  ($k !==  false &&  $text[$j] === ':') {
+            if  ($k !==  false &&  $text[$j] === ':') {
             // then this will be treated as a callback directive
             $directive =  $k-$i+1;
             $f =  0;
@@ -3144,18 +3144,18 @@ 
             $b1 =  mb_strpos($tmp, ':');
 
             if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
+                $func =  mb_substr($tmp, 0, $b1);
+                $parm =  mb_substr($tmp, $b1+1);
             } else {
-              $func =  $tmp;
-              $parm =  '';
+                $func =  $tmp;
+                $parm =  '';
             }
 
             if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
+                $directive =  0;
             } else {
-              // only call the function if this is the final call
-              if  ($final) {
+                // only call the function if this is the final call
+                if  ($final) {
                 // need to assess the text position, calculate the text width to this point
                 // can use getTextWidth to find the text width I think
                 $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
@@ -3166,76 +3166,76 @@ 
                 $ret =  $this->$func($info);
 
                 if  (is_array($ret)) {
-                  // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
+                    // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                    foreach($ret as  $rk => $rv) {
                     switch ($rk) {
                     case  'x':
                     case  'y':
                       $$rk =  $rv;
-                      break;
+                        break;
+                    }
                     }
-                  }
                 }
 
                 // also remove from to the stack
                 // for simplicity, just take from the end, fix this another day
                 $this->nCallback--;
                 if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
+                    $this->nCallBack =  0;
+                }
                 }
-              }
             }
-          }
-          break;
+            }
+            break;
         }
         break;
 
-      case  'b':
+        case  'b':
       case  'i':
         $j++;
         if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
+            $this->currentTextState.=  $text[$j-1];
+            $directive =  $j-$i+1;
         }
         break;
 
-      case  'C':
+        case  'C':
         $noClose =  1;
-      case  'c':
+        case  'c':
         // this this might be a callback function
         $j++;
         $k =  mb_strpos($text, '>', $j);
 
         if  ($k !==  false &&  $text[$j] ===  ':') {
-          // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+            // then this will be treated as a callback directive
+            $directive =  $k-$i+1;
 
-          $f =  0;
+            $f =  0;
 
-          // split the remainder on colons to get the function name and the paramater
-          //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+            // split the remainder on colons to get the function name and the paramater
+            //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
+            $tmp =  mb_substr($text, $j+1, $k-$j-1);
+            $b1 =  mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
+            if  ($b1 !==  false) {
             $func =  mb_substr($tmp, 0, $b1);
             $parm =  mb_substr($tmp, $b1+1);
-          } else {
+            } else {
             $func =  $tmp;
             $parm =  '';
-          }
+            }
 
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
             $directive =  0;
-          } else {
+            } else {
             // only call the function if this is the final call, ie, the one actually doing printing, not measurement
             if  ($final) {
-              // need to assess the text position, calculate the text width to this point
-              // can use getTextWidth to find the text width I think
-              // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+                // need to assess the text position, calculate the text width to this point
+                // can use getTextWidth to find the text width I think
+                // also add the text height and descender
+                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-              $info =  array(
+                $info =  array(
                 'x' => $tmp[0], 
                 'y' => $tmp[1], 
                 'angle' => $angle, 
@@ -3244,79 +3244,79 @@ 
                 'f' => $func, 
                 'height' => $this->getFontHeight($size), 
                 'descender' => $this->getFontDescender($size)
-              );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
+                );
+                $x =  $tmp[0];
+                $y =  $tmp[1];
 
-              if  (!isset($noClose) ||  !$noClose) {
+                if  (!isset($noClose) ||  !$noClose) {
                 // only add to the stack if this is a small 'c', therefore is a start-stop pair
                 $this->nCallback++;
                 $info['nCallback'] =  $this->nCallback;
                 $this->callback[$this->nCallback] =  $info;
-              }
+                }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
+                $ret =  $this->$func($info);
+                if  (is_array($ret)) {
                 // then the return from the callback function could set the position, to start with, later will do font colour, and font
                 foreach($ret as  $rk => $rv) {
-                  switch ($rk) {
-                  case  'x':
+                    switch ($rk) {
+                    case  'x':
                   case  'y':
                     $$rk =  $rv;
                     break;
-                  }
+                    }
+                }
                 }
-              }
             }
-          }
+            }
         }
         break;
-      }
+        }
     }
 
     return  $directive;
-  }
+    }
 
 
-  /**
-   * add text to the document, at a specified location, size and angle on the page
-   */
-  function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
+    /**
+     * add text to the document, at a specified location, size and angle on the page
+     */
+    function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     // if there are any open callbacks, then they should be called, to show the start of the line
     if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+        for  ($i =  $this->nCallback;$i>0;$i--) {
         // call each function
         $info =  array('x' => $x,
-                       'y' => $y,
-                       'angle' => $angle,
-                       'status' => 'sol',
-                       'p' => $this->callback[$i]['p'],
-                       'nCallback' => $this->callback[$i]['nCallback'],
-                       'height' => $this->callback[$i]['height'],
-                       'descender' => $this->callback[$i]['descender']);
+                        'y' => $y,
+                        'angle' => $angle,
+                        'status' => 'sol',
+                        'p' => $this->callback[$i]['p'],
+                        'nCallback' => $this->callback[$i]['nCallback'],
+                        'height' => $this->callback[$i]['height'],
+                        'descender' => $this->callback[$i]['descender']);
 
         $func =  $this->callback[$i]['f'];
         $this->$func($info);
-      }
+        }
     }
 
     if  ($angle ==  0) {
-      $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
+        $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
     } else {
-      $a =  deg2rad((float)$angle);
-      $tmp =  "\n".'BT ';
-      $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+        $a =  deg2rad((float)$angle);
+        $tmp =  "\n".'BT ';
+        $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
+        $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
+        $this->objects[$this->currentContents]['c'].=  $tmp;
     }
 
     if  ($wordSpaceAdjust !=  0 ||  $wordSpaceAdjust !=  $this->wordSpaceAdjust) {
-      $this->wordSpaceAdjust =  $wordSpaceAdjust;
-      $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
+        $this->wordSpaceAdjust =  $wordSpaceAdjust;
+        $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
     }
 
     $len =  mb_strlen($text);
@@ -3366,47 +3366,47 @@ 
      }
     */
     if  ($start < $len) {
-      $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
-      $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
-      $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
+        $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
+        $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
+        $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
     }
 
     $this->objects[$this->currentContents]['c'].=  ' ET';
 
     // if there are any open callbacks, then they should be called, to show the end of the line
     if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+        for  ($i =  $this->nCallback;$i>0;$i--) {
         // call each function
         $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
         $info =  array(
-          'x' => $tmp[0], 
-          'y' => $tmp[1], 
-          'angle' => $angle,
-          'status' => 'eol', 
-          'p' => $this->callback[$i]['p'], 
-          'nCallback' => $this->callback[$i]['nCallback'], 
-          'height' => $this->callback[$i]['height'], 
-          'descender' => $this->callback[$i]['descender']
+            'x' => $tmp[0], 
+            'y' => $tmp[1], 
+            'angle' => $angle,
+            'status' => 'eol', 
+            'p' => $this->callback[$i]['p'], 
+            'nCallback' => $this->callback[$i]['nCallback'], 
+            'height' => $this->callback[$i]['height'], 
+            'descender' => $this->callback[$i]['descender']
         );
         $func =  $this->callback[$i]['f'];
         $this->$func($info);
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * calculate how wide a given text string will be on a page, at a given size.
-   * this can be called externally, but is alse used by the other class functions
-   */
-  function  getTextWidth($size, $text, $spacing =  0) {
+    /**
+     * calculate how wide a given text string will be on a page, at a given size.
+     * this can be called externally, but is alse used by the other class functions
+     */
+    function  getTextWidth($size, $text, $spacing =  0) {
     // this function should not change any of the settings, though it will need to
     // track any directives which change during calculation, so copy them at the start
     // and put them back at the end.
     $store_currentTextState =  $this->currentTextState;
 
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     // converts a number or a float to a string so it can get the width
@@ -3418,33 +3418,33 @@ 
     $cf =  $this->currentFont;
     $space_scale =  1000 / $size;
     if ( $this->fonts[$cf]['isUnicode']) {
-      // for Unicode, use the code points array to calculate width rather
-      // than just the string itself
-      $unicode =  $this->utf8toCodePointsArray($text);
+        // for Unicode, use the code points array to calculate width rather
+        // than just the string itself
+        $unicode =  $this->utf8toCodePointsArray($text);
 
-      foreach ($unicode as $char) {
+        foreach ($unicode as $char) {
         // check if we have to replace character
-      if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+        if  ( isset($this->fonts[$cf]['differences'][$char])) {
+            $char =  $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
         if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+            $w+=  $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
         if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+            $w+=  $spacing * $space_scale;
+        }
         }
-      }
 
     } else {
-      $len =  mb_strlen($text, 'Windows-1252');
+        $len =  mb_strlen($text, 'Windows-1252');
 
-      for  ($i =  0; $i < $len; $i++) {
+        for  ($i =  0; $i < $len; $i++) {
         $char =  ord($text[$i]);
         // check if we have to replace character
         if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+            $char =  $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
         if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
@@ -3452,60 +3452,60 @@ 
         }
         // add additional padding for space
         if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+            $w+=  $spacing * $space_scale;
+        }
         }
-      }
     }
 
     $this->currentTextState =  $store_currentTextState;
     $this->setCurrentFont();
 
     return  $w*$size/1000;
-  }
+    }
 
 
-  /**
-   * do a part of the calculation for sorting out the justification of the text
-   *
-   * @access private
-   */
-  function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
+    /**
+     * do a part of the calculation for sorting out the justification of the text
+     *
+     * @access private
+     */
+    function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
     case  'left':
       return;
 
     case  'right':
       $x+=  $width-$actual;
-      break;
+        break;
 
     case  'center':
     case  'centre':
       $x+=  ($width-$actual) /2;
-      break;
+        break;
 
     case  'full':
       // count the number of words
       $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+        $nspaces =  count($words) -1;
 
-      if  ($nspaces>0) {
+        if  ($nspaces>0) {
         $adjust =  ($width-$actual) /$nspaces;
-      } else {
+        } else {
         $adjust =  0;
-      }
-      break;
+        }
+        break;
+    }
     }
-  }
 
 
-  /**
-   * add text to the page, but ensure that it fits within a certain width
-   * if it does not fit then put in as much as possible, splitting at word boundaries
-   * and return the remainder.
-   * justification and angle can also be specified for the text
-   */
-  function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
-  	// TODO - need to support Unicode
+    /**
+     * add text to the page, but ensure that it fits within a certain width
+     * if it does not fit then put in as much as possible, splitting at word boundaries
+     * and return the remainder.
+     * justification and angle can also be specified for the text
+     */
+    function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
+        // TODO - need to support Unicode
     $cf =  $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
         die("addTextWrap does not support Unicode yet!");
@@ -3521,12 +3521,12 @@ 
     $store_currentTextState =  $this->currentTextState;
 
     if  (!$this->numFonts) {
-      $this->selectFont($this->defaultFont);
+        $this->selectFont($this->defaultFont);
     }
 
     if  ($width <=  0) {
-      // error, pretend it printed ok, otherwise risking a loop
-      return  '';
+        // error, pretend it printed ok, otherwise risking a loop
+        return  '';
     }
 
     $w =  0;
@@ -3537,38 +3537,38 @@ 
     $tw =  $width/$size*1000;
 
     for  ($i =  0;$i<$len;$i++) {
-      $f =  1;
-      $directive =  0;
-      //$this->PRVTcheckTextDirective($text,$i,$f);
-      if  ($directive) {
+        $f =  1;
+        $directive =  0;
+        //$this->PRVTcheckTextDirective($text,$i,$f);
+        if  ($directive) {
         if  ($f) {
-          $this->setCurrentFont();
-          $cf =  $this->currentFont;
+            $this->setCurrentFont();
+            $cf =  $this->currentFont;
         }
 
         $i =  $i+$directive-1;
-      } else {
+        } else {
         $cOrd =  ord($text[$i]);
 
         if  (isset($this->fonts[$cf]['differences'][$cOrd])) {
-          // then this character is being replaced by another
-          $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
+            // then this character is being replaced by another
+            $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
         } else {
-          $cOrd2 =  $cOrd;
+            $cOrd2 =  $cOrd;
         }
 
         if  (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
+            $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
         }
 
         if  ($w>$tw) {
-          // then we need to truncate this line
-          if  ($break>0) {
+            // then we need to truncate this line
+            if  ($break>0) {
             // then we have somewhere that we can split :)
             if  ($text[$break] ===  ' ') {
-              $tmp =  mb_substr($text, 0, $break);
+                $tmp =  mb_substr($text, 0, $break);
             } else {
-              $tmp =  mb_substr($text, 0, $break+1);
+                $tmp =  mb_substr($text, 0, $break+1);
             }
 
             $adjust =  0;
@@ -3579,18 +3579,18 @@ 
             $this->setCurrentFont();
 
             if  (!$test) {
-              $this->addText($x, $y, $size, $tmp, $angle, $adjust);
+                $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
             return  mb_substr($text, $break+1);
-          } else {
+            } else {
             // just split before the current character
             $tmp =  mb_substr($text, 0, $i);
             $adjust =  0;
             $ctmp =  ord($text[$i]);
 
             if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-              $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+                $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
             }
 
             $tmpw =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
@@ -3601,34 +3601,34 @@ 
             $this->setCurrentFont();
 
             if  (!$test) {
-              $this->addText($x, $y, $size, $tmp, $angle, $adjust);
+                $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
             return  mb_substr($text, $i);
-          }
+            }
         }
 
         if  ($text[$i] ===  '-') {
-          $break =  $i;
-          $breakWidth =  $w*$size/1000;
+            $break =  $i;
+            $breakWidth =  $w*$size/1000;
         }
 
         if  ($text[$i] ===  ' ') {
-          $break =  $i;
-          $ctmp =  ord($text[$i]);
+            $break =  $i;
+            $ctmp =  ord($text[$i]);
 
-          if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
+            if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
             $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
-          }
+            }
 
-          $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+            $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+        }
         }
-      }
     }
 
     // then there was no need to break this line
     if  ($justification ===  'full') {
-      $justification =  'left';
+        $justification =  'left';
     }
 
     $adjust =  0;
@@ -3641,68 +3641,68 @@ 
     $this->setCurrentFont();
 
     if  (!$test) {
-      $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
+        $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
     }
 
     return  '';
-  }
+    }
 
 
-  /**
-   * this will be called at a new page to return the state to what it was on the
-   * end of the previous page, before the stack was closed down
-   * This is to get around not being able to have open 'q' across pages
-   *
-   */
-  function  saveState($pageEnd =  0) {
+    /**
+     * this will be called at a new page to return the state to what it was on the
+     * end of the previous page, before the stack was closed down
+     * This is to get around not being able to have open 'q' across pages
+     *
+     */
+    function  saveState($pageEnd =  0) {
     if  ($pageEnd) {
-      // this will be called at a new page to return the state to what it was on the
-      // end of the previous page, before the stack was closed down
-      // This is to get around not being able to have open 'q' across pages
-      $opt =  $this->stateStack[$pageEnd];
-      // ok to use this as stack starts numbering at 1
-      $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
-      $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
-      $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
-      //    $this->currentLineStyle = $opt['lin'];
+        // this will be called at a new page to return the state to what it was on the
+        // end of the previous page, before the stack was closed down
+        // This is to get around not being able to have open 'q' across pages
+        $opt =  $this->stateStack[$pageEnd];
+        // ok to use this as stack starts numbering at 1
+        $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
+        $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
+        $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
+        //    $this->currentLineStyle = $opt['lin'];
     } else {
-      $this->nStateStack++;
-      $this->stateStack[$this->nStateStack] =  array(
+        $this->nStateStack++;
+        $this->stateStack[$this->nStateStack] =  array(
         'col' => $this->currentColour, 
         'str' => $this->currentStrokeColour, 
         'lin' => $this->currentLineStyle
-      );
+        );
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
-  }
+    }
 
 
-  /**
-   * restore a previously saved state
-   */
-  function  restoreState($pageEnd =  0) {
+    /**
+     * restore a previously saved state
+     */
+    function  restoreState($pageEnd =  0) {
     if  (!$pageEnd) {
-      $n =  $this->nStateStack;
-      $this->currentColour =  $this->stateStack[$n]['col'];
-      $this->currentStrokeColour =  $this->stateStack[$n]['str'];
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
-      $this->currentLineStyle =  $this->stateStack[$n]['lin'];
-      unset($this->stateStack[$n]);
-      $this->nStateStack--;
+        $n =  $this->nStateStack;
+        $this->currentColour =  $this->stateStack[$n]['col'];
+        $this->currentStrokeColour =  $this->stateStack[$n]['str'];
+        $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
+        $this->currentLineStyle =  $this->stateStack[$n]['lin'];
+        unset($this->stateStack[$n]);
+        $this->nStateStack--;
     }
     
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * make a loose object, the output will go into this object, until it is closed, then will revert to
-   * the current one.
-   * this object will not appear until it is included within a page.
-   * the function will return the object number
-   */
-  function  openObject() {
+    /**
+     * make a loose object, the output will go into this object, until it is closed, then will revert to
+     * the current one.
+     * this object will not appear until it is included within a page.
+     * the function will return the object number
+     */
+    function  openObject() {
     $this->nStack++;
     $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
     // add a new object of the content type, to hold the data flow
@@ -3712,315 +3712,315 @@ 
     $this->looseObjects[$this->numObj] =  1;
 
     return  $this->numObj;
-  }
+    }
 
 
-  /**
-   * open an existing object for editing
-   */
-  function  reopenObject($id) {
+    /**
+     * open an existing object for editing
+     */
+    function  reopenObject($id) {
     $this->nStack++;
     $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
     $this->currentContents =  $id;
 
     // also if this object is the primary contents for a page, then set the current page to its parent
     if  (isset($this->objects[$id]['onPage'])) {
-      $this->currentPage =  $this->objects[$id]['onPage'];
+        $this->currentPage =  $this->objects[$id]['onPage'];
+    }
     }
-  }
 
 
-  /**
-   * close an object
-   */
-  function  closeObject() {
+    /**
+     * close an object
+     */
+    function  closeObject() {
     // close the object, as long as there was one open in the first place, which will be indicated by
     // an objectId on the stack.
     if  ($this->nStack>0) {
-      $this->currentContents =  $this->stack[$this->nStack]['c'];
-      $this->currentPage =  $this->stack[$this->nStack]['p'];
-      $this->nStack--;
-      // easier to probably not worry about removing the old entries, they will be overwritten
-      // if there are new ones.
+        $this->currentContents =  $this->stack[$this->nStack]['c'];
+        $this->currentPage =  $this->stack[$this->nStack]['p'];
+        $this->nStack--;
+        // easier to probably not worry about removing the old entries, they will be overwritten
+        // if there are new ones.
+    }
     }
-  }
 
 
-  /**
-   * stop an object from appearing on pages from this point on
-   */
-  function  stopObject($id) {
+    /**
+     * stop an object from appearing on pages from this point on
+     */
+    function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
     // be the last one that could contian it.
     if  (isset($this->addLooseObjects[$id])) {
-      $this->addLooseObjects[$id] =  '';
+        $this->addLooseObjects[$id] =  '';
+    }
     }
-  }
 
 
-  /**
-   * after an object has been created, it wil only show if it has been added, using this function.
-   */
-  function  addObject($id, $options =  'add') {
+    /**
+     * after an object has been created, it wil only show if it has been added, using this function.
+     */
+    function  addObject($id, $options =  'add') {
     // add the specified object to the page
     if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
-      // then it is a valid object, and it is not being added to itself
-      switch ($options) {
-      case  'all':
+        // then it is a valid object, and it is not being added to itself
+        switch ($options) {
+        case  'all':
         // then this object is to be added to this page (done in the next block) and
         // all future new pages.
         $this->addLooseObjects[$id] =  'all';
 
-      case  'add':
+        case  'add':
         if  (isset($this->objects[$this->currentContents]['onPage'])) {
-          // then the destination contents is the primary for the page
-          // (though this object is actually added to that page)
-          $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
+            // then the destination contents is the primary for the page
+            // (though this object is actually added to that page)
+            $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
         }
         break;
 
-      case  'even':
+        case  'even':
         $this->addLooseObjects[$id] =  'even';
         $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
         if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
-          $this->addObject($id);
-          // hacky huh :)
+            $this->addObject($id);
+            // hacky huh :)
         }
         break;
 
-      case  'odd':
+        case  'odd':
         $this->addLooseObjects[$id] =  'odd';
         $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
         if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
-          $this->addObject($id);
-          // hacky huh :)
+            $this->addObject($id);
+            // hacky huh :)
         }
         break;
 
-      case  'next':
+        case  'next':
         $this->addLooseObjects[$id] =  'all';
         break;
 
-      case  'nexteven':
+        case  'nexteven':
         $this->addLooseObjects[$id] =  'even';
         break;
 
-      case  'nextodd':
+        case  'nextodd':
         $this->addLooseObjects[$id] =  'odd';
         break;
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * return a storable representation of a specific object
-   */
-  function  serializeObject($id) {
+    /**
+     * return a storable representation of a specific object
+     */
+    function  serializeObject($id) {
     if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
-  }
+        return  var_export($this->objects[$id],  true);
+    }
 
 
-  /**
-   * restore an object from its stored representation.  returns its new object id.
-   */
-  function  restoreSerializedObject($obj) {
+    /**
+     * restore an object from its stored representation.  returns its new object id.
+     */
+    function  restoreSerializedObject($obj) {
     $obj_id =  $this->openObject();
     eval('$this->objects[$obj_id] = ' . $obj . ';');
     $this->closeObject();
     return  $obj_id;
-  }
+    }
 
 
-  /**
-   * add content to the documents info object
-   */
-  function  addInfo($label, $value =  0) {
+    /**
+     * add content to the documents info object
+     */
+    function  addInfo($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
     // modify this so that arrays can be passed as well.
     // if $label is an array then assume that it is key => value pairs
     // else assume that they are both scalar, anything else will probably error
     if  (is_array($label)) {
-      foreach ($label as  $l => $v) {
+        foreach ($label as  $l => $v) {
         $this->o_info($this->infoObject, $l, $v);
-      }
+        }
     } else {
-      $this->o_info($this->infoObject, $label, $value);
+        $this->o_info($this->infoObject, $label, $value);
+    }
     }
-  }
 
 
-  /**
-   * set the viewer preferences of the document, it is up to the browser to obey these.
-   */
-  function  setPreferences($label, $value =  0) {
+    /**
+     * set the viewer preferences of the document, it is up to the browser to obey these.
+     */
+    function  setPreferences($label, $value =  0) {
     // this will only work if the label is one of the valid ones.
     if  (is_array($label)) {
-      foreach ($label as  $l => $v) {
+        foreach ($label as  $l => $v) {
         $this->o_catalog($this->catalogId, 'viewerPreferences', array($l => $v));
-      }
+        }
     } else {
-      $this->o_catalog($this->catalogId, 'viewerPreferences', array($label => $value));
+        $this->o_catalog($this->catalogId, 'viewerPreferences', array($label => $value));
+    }
     }
-  }
 
 
-  /**
-   * extract an integer from a position in a byte stream
-   *
-   * @access private
-   */
-  function  PRVT_getBytes(&$data, $pos, $num) {
+    /**
+     * extract an integer from a position in a byte stream
+     *
+     * @access private
+     */
+    function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
     $ret =  0;
     for  ($i =  0;$i<$num;$i++) {
-      $ret =  $ret*256;
-      $ret+=  ord($data[$pos+$i]);
+        $ret =  $ret*256;
+        $ret+=  ord($data[$pos+$i]);
     }
 
     return  $ret;
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a GD object
-   * this should work with remote files
-   */
-  function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
+    /**
+     * add a PNG image into the document, from a GD object
+     * this should work with remote files
+     */
+    function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
-	  $data = null;
-	} else {
-  	  // Example for transparency handling on new image. Retain for current image
-      // $tIndex = imagecolortransparent($img);
-      // if ($tIndex > 0) {
-      //   $tColor    = imagecolorsforindex($img, $tIndex);
-      //   $new_tIndex    = imagecolorallocate($new_img, $tColor['red'], $tColor['green'], $tColor['blue']);
-      //   imagefill($new_img, 0, 0, $new_tIndex);
-      //   imagecolortransparent($new_img, $new_tIndex);
-      // }
-	  // blending mode (literal/blending) on drawing into current image. not relevant when not saved or not drawn
-	  //imagealphablending($img, true);
-	  //default, but explicitely set to ensure pdf compatibility
-      imagesavealpha($img, false);
+    if ( isset($this->imagelist[$file]) ) {
+        $data = null;
+    } else {
+        // Example for transparency handling on new image. Retain for current image
+        // $tIndex = imagecolortransparent($img);
+        // if ($tIndex > 0) {
+        //   $tColor    = imagecolorsforindex($img, $tIndex);
+        //   $new_tIndex    = imagecolorallocate($new_img, $tColor['red'], $tColor['green'], $tColor['blue']);
+        //   imagefill($new_img, 0, 0, $new_tIndex);
+        //   imagecolortransparent($new_img, $new_tIndex);
+        // }
+        // blending mode (literal/blending) on drawing into current image. not relevant when not saved or not drawn
+        //imagealphablending($img, true);
+        //default, but explicitely set to ensure pdf compatibility
+        imagesavealpha($img, false);
       
-      $error =  0;
-      //DEBUG_IMG_TEMP
-      //debugpng
-      if (DEBUGPNG) print '[addImagePng '.$file.']';
+        $error =  0;
+        //DEBUG_IMG_TEMP
+        //debugpng
+        if (DEBUGPNG) print '[addImagePng '.$file.']';
 
-      ob_start();
-      @imagepng($img);
-      //$data = ob_get_contents(); ob_end_clean();
-      $data = ob_get_clean();
+        ob_start();
+        @imagepng($img);
+        //$data = ob_get_contents(); ob_end_clean();
+        $data = ob_get_clean();
 
-      if ($data == '') {
+        if ($data == '') {
         $error = 1;
         $errormsg = 'trouble writing file from GD';
         //DEBUG_IMG_TEMP
         //debugpng
         if (DEBUGPNG) print 'trouble writing file from GD';
-	  }
+        }
 
-      if  ($error) {
+        if  ($error) {
         $this->addMessage('PNG error - ('.$file.') '.$errormsg);
         return;
-      }
+        }
     }  //End isset($this->imagelist[$file]) (png Duplicate removal)
 
     $this->addPngFromBuf($file, $x, $y, $w, $h, $data);
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a file
-   * this should work with remote files
-   */
-  function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
+    /**
+     * add a PNG image into the document, from a file
+     * this should work with remote files
+     */
+    function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
-	  $img = null;
-	} else {
-      //png files typically contain an alpha channel.
-      //pdf file format or class.pdf does not support alpha blending.
-      //on alpha blended images, more transparent areas have a color near black.
-      //This appears in the result on not storing the alpha channel.
-      //Correct would be the box background image or its parent when transparent.
-      //But this would make the image dependent on the background.
-      //Therefore create an image with white background and copy in
-      //A more natural background than black is white.
-      //Therefore create an empty image with white background and merge the
-      //image in with alpha blending.
-      $imgtmp = @imagecreatefrompng($file);
-      if (!$imgtmp) {
+    if ( isset($this->imagelist[$file]) ) {
+        $img = null;
+    } else {
+        //png files typically contain an alpha channel.
+        //pdf file format or class.pdf does not support alpha blending.
+        //on alpha blended images, more transparent areas have a color near black.
+        //This appears in the result on not storing the alpha channel.
+        //Correct would be the box background image or its parent when transparent.
+        //But this would make the image dependent on the background.
+        //Therefore create an image with white background and copy in
+        //A more natural background than black is white.
+        //Therefore create an empty image with white background and merge the
+        //image in with alpha blending.
+        $imgtmp = @imagecreatefrompng($file);
+        if (!$imgtmp) {
         return;
-      }
-      $sx = imagesx($imgtmp);
-      $sy = imagesy($imgtmp);
-      $img = imagecreatetruecolor($sx,$sy);
-      imagealphablending($img, true);
-  	  $ti = imagecolortransparent($imgtmp);
-	  if ($ti >= 0) {
-	    $tc = imagecolorsforindex($imgtmp,$ti);
+        }
+        $sx = imagesx($imgtmp);
+        $sy = imagesy($imgtmp);
+        $img = imagecreatetruecolor($sx,$sy);
+        imagealphablending($img, true);
+        $ti = imagecolortransparent($imgtmp);
+        if ($ti >= 0) {
+        $tc = imagecolorsforindex($imgtmp,$ti);
         $ti = imagecolorallocate($img,$tc['red'],$tc['green'],$tc['blue']);
         imagefill($img,0,0,$ti);
         imagecolortransparent($img, $ti);
-      } else {
+        } else {
         imagefill($img,1,1,imagecolorallocate($img,255,255,255));
-      }
-      imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
-      imagedestroy($imgtmp);
+        }
+        imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
+        imagedestroy($imgtmp);
     }
     $this->addImagePng($file, $x, $y, $w, $h, $img);
-  }
+    }
 
 
-  /**
-   * add a PNG image into the document, from a memory buffer of the file
-   */
-  function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
-	if ( isset($this->imagelist[$file]) ) {
-      //debugpng
-      //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
-	  $data = null;
-      $info['width'] = $this->imagelist[$file]['w'];
-      $info['height'] = $this->imagelist[$file]['h'];
-      $label = $this->imagelist[$file]['label'];
-
-	} else {
-      if ($data == null) {
-      	$this->addMessage('addPngFromBuf error - ('.$imgname.') data not present!');
+    /**
+     * add a PNG image into the document, from a memory buffer of the file
+     */
+    function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
+    if ( isset($this->imagelist[$file]) ) {
+        //debugpng
+        //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
+        $data = null;
+        $info['width'] = $this->imagelist[$file]['w'];
+        $info['height'] = $this->imagelist[$file]['h'];
+        $label = $this->imagelist[$file]['label'];
+
+    } else {
+        if ($data == null) {
+            $this->addMessage('addPngFromBuf error - ('.$imgname.') data not present!');
         return;
-      }
-      //debugpng
-      //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
+        }
+        //debugpng
+        //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
     $error =  0;
 
     if  (!$error) {
-      $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
-      if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
+        $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
+        if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
         $error =  1;
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
 
         $errormsg =  'this file does not have a valid header';
-      }
+        }
     }
 
 
     if  (!$error) {
-      // set pointer
-      $p =  8;
-      $len =  mb_strlen($data, '8bit');
+        // set pointer
+        $p =  8;
+        $len =  mb_strlen($data, '8bit');
 
-      // cycle through the file, identifying chunks
-      $haveHeader =  0;
-      $info =  array();
-      $idata =  '';
-      $pdata =  '';
+        // cycle through the file, identifying chunks
+        $haveHeader =  0;
+        $info =  array();
+        $idata =  '';
+        $pdata =  '';
 
-      while  ($p < $len) {
+        while  ($p < $len) {
         $chunkLen =  $this->PRVT_getBytes($data, $p, 4);
         $chunkType =  mb_substr($data, $p+4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
@@ -4028,48 +4028,48 @@ 
         case  'IHDR':
           // this is where all the file information comes from
           $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
-
-          //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
+            $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
+            $info['bitDepth'] =  ord($data[$p+16]);
+            $info['colorType'] =  ord($data[$p+17]);
+            $info['compressionMethod'] =  ord($data[$p+18]);
+            $info['filterMethod'] =  ord($data[$p+19]);
+            $info['interlaceMethod'] =  ord($data[$p+20]);
+
+            //print_r($info);
+            $haveHeader =  1;
+            if  ($info['compressionMethod'] !=  0) {
             $error =  1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
 
             $errormsg =  'unsupported compression method';
-          }
+            }
 
-          if  ($info['filterMethod'] !=  0) {
+            if  ($info['filterMethod'] !=  0) {
             $error =  1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
             $errormsg =  'unsupported filter method';
-          }
-          break;
+            }
+            break;
 
         case  'PLTE':
           $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            break;
 
         case  'IDAT':
           $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            break;
 
         case  'tRNS':
           //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
           //print "tRNS found, color type = ".$info['colorType']."\n";
           $transparency =  array();
 
-          if  ($info['colorType'] ==  3) {
+            if  ($info['colorType'] ==  3) {
             // indexed color, rbg
             /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
@@ -4083,13 +4083,13 @@ 
             $trans =  0;
 
             for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
+                if  (ord($data[$p+8+$i]) ==  0) {
                 $trans =  $i;
-              }
+                }
             }
 
             $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
+            } elseif ($info['colorType'] ==  0) {
             // grayscale
             /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
@@ -4098,7 +4098,7 @@ 
             $transparency['type'] =  'indexed';
 
             $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
+            } elseif ($info['colorType'] ==  2) {
             // truecolor
             /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
@@ -4114,176 +4114,176 @@ 
 
             $transparency['type'] = 'color-key';
             
-          } else {
+            } else {
             //unsupported transparency type
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
-          }
-          // KS End new code
-          break;
+            }
+            // KS End new code
+            break;
 
         default:
           break;
         }
 
         $p+=  $chunkLen+12;
-      }
+        }
 
 
-      if (!$haveHeader) {
+        if (!$haveHeader) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
 
         $errormsg =  'information header is missing';
-      }
+        }
 
-      if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
+        if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
 
         $errormsg =  'There appears to be no support for interlaced images in pdf.';
-      }
+        }
     }
 
     if  (!$error &&  $info['bitDepth'] > 8) {
-      $error =  1;
+        $error =  1;
 
-      //debugpng
-      if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+        //debugpng
+        if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
 
-      $errormsg =  'only bit depth of 8 or less is supported';
+        $errormsg =  'only bit depth of 8 or less is supported';
     }
 
     if  (!$error) {
-      if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
+        if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
         $error =  1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
-      } else {
+        } else {
         switch  ($info['colorType']) {
         case  3:
           $color =  'DeviceRGB';
-          $ncolor =  1;
-          break;
+            $ncolor =  1;
+            break;
 
         case  2:
           $color =  'DeviceRGB';
-          $ncolor =  3;
-          break;
+            $ncolor =  3;
+            break;
 
         case  0:
           $color =  'DeviceGray';
-          $ncolor =  1;
-          break;
+            $ncolor =  1;
+            break;
+        }
         }
-      }
     }
 
     if  ($error) {
-      $this->addMessage('PNG error - ('.$file.') '.$errormsg);
-      return;
+        $this->addMessage('PNG error - ('.$file.') '.$errormsg);
+        return;
     }
 
-      //print_r($info);
-      // so this image is ok... add it in.
-      $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
-      $this->numObj++;
+        //print_r($info);
+        // so this image is ok... add it in.
+        $this->numImages++;
+        $im =  $this->numImages;
+        $label =  'I'.$im;
+        $this->numObj++;
 
-      //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
-      $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
+        //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
+        $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
 
-      if  (isset($transparency)) {
+        if  (isset($transparency)) {
         $options['transparency'] =  $transparency;
-      }
+        }
 
-      $this->o_image($this->numObj, 'new', $options);
-      $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
+        $this->o_image($this->numObj, 'new', $options);
+        $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
     }
 
     if  ($w <=  0 && $h <=  0) {
-      $w =  $info['width'];
-      $h =  $info['height'];
+        $w =  $info['width'];
+        $h =  $info['height'];
     }
 
     if  ($w <=  0) {
-      $w =  $h/$info['height']*$info['width'];
+        $w =  $h/$info['height']*$info['width'];
     }
 
     if  ($h <=  0) {
-      $h =  $w*$info['height']/$info['width'];
+        $h =  $w*$info['height']/$info['width'];
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
     $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * add a JPEG image into the document, from a file
-   */
-  function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
+    /**
+     * add a JPEG image into the document, from a file
+     */
+    function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
     // note that this function is unable to operate on a remote file.
 
     if  (!file_exists($img)) {
-      return;
+        return;
     }
 
-	if ( isset($this->imagelist[$img]) ) {
-	  $data = null;
-      $imageWidth = $this->imagelist[$img]['w'];
-      $imageHeight = $this->imagelist[$img]['h'];
-      $channels =  $this->imagelist[$img]['c'];
-	} else {
-      $tmp =  getimagesize($img);
-      $imageWidth =  $tmp[0];
-      $imageHeight =  $tmp[1];
+    if ( isset($this->imagelist[$img]) ) {
+        $data = null;
+        $imageWidth = $this->imagelist[$img]['w'];
+        $imageHeight = $this->imagelist[$img]['h'];
+        $channels =  $this->imagelist[$img]['c'];
+    } else {
+        $tmp =  getimagesize($img);
+        $imageWidth =  $tmp[0];
+        $imageHeight =  $tmp[1];
 
-      if  (isset($tmp['channels'])) {
+        if  (isset($tmp['channels'])) {
         $channels =  $tmp['channels'];
-      } else {
+        } else {
         $channels =  3;
-      }
+        }
 
-      //$fp = fopen($img,'rb');
-      $data =  file_get_contents($img);
-      //fread($fp,filesize($img));
-      //fclose($fp);
+        //$fp = fopen($img,'rb');
+        $data =  file_get_contents($img);
+        //fread($fp,filesize($img));
+        //fclose($fp);
     }
 
     if  ($w <=  0 &&  $h <=  0) {
-      $w =  $imageWidth;
+        $w =  $imageWidth;
     }
 
     if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+        $w =  $h/$imageHeight*$imageWidth;
     }
 
     if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+        $h =  $w*$imageHeight/$imageWidth;
     }
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $channels, $img);
-  }
+    }
 
 
-  /**
-   * add an image into the document, from a GD object
-   * this function is not all that reliable, and I would probably encourage people to use
-   * the file based functions
-   */
-  function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
+    /**
+     * add an image into the document, from a GD object
+     * this function is not all that reliable, and I would probably encourage people to use
+     * the file based functions
+     */
+    function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
     /* Todo:
      * Pass in original filename as $imgname
      * If already cached like image_iscached(), allow empty $img
@@ -4303,7 +4303,7 @@ 
     // there seems to be some problem here in that images that have quality set above 75 do not appear
     // not too sure why this is, but in the meantime I have restricted this to 75.
     if  ($quality>75) {
-      $quality =  75;
+        $quality =  75;
     }
 
     // if the width or height are set to zero, then set the other one based on keeping the image
@@ -4312,15 +4312,15 @@ 
     $imageHeight =  imagesy($img);
 
     if  ($w <=  0 &&  $h <=  0) {
-      return;
+        return;
     }
 
     if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+        $w =  $h/$imageHeight*$imageWidth;
     }
 
     if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+        $h =  $w*$imageHeight/$imageWidth;
     }
 
     // gotta get the data out of the img..
@@ -4330,55 +4330,55 @@ 
     $data = ob_get_clean();
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $imgname);
-  }
+    }
 
 
-  /* Check if image already added to pdf image directory.
+    /* Check if image already added to pdf image directory.
    * If yes, need not to create again (pass empty data)
    */
-  function  image_iscached($imgname) {
+    function  image_iscached($imgname) {
     return isset($this->imagelist[$imgname]);
-  }
+    }
 
 
-  /**
-   * common code used by the two JPEG adding functions
-   *
-   * @access private
-   */
-  function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
+    /**
+     * common code used by the two JPEG adding functions
+     *
+     * @access private
+     */
+    function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
     if ( isset($this->imagelist[$imgname]) ) {
-      $label = $this->imagelist[$imgname]['label'];
-      //debugpng
-      //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
+        $label = $this->imagelist[$imgname]['label'];
+        //debugpng
+        //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
 
     } else {
-      if ($data == null) {
-      	$this->addMessage('addJpegImage_common error - ('.$imgname.') data not present!');
+        if ($data == null) {
+            $this->addMessage('addJpegImage_common error - ('.$imgname.') data not present!');
         return;
-      }
+        }
 
-      // note that this function is not to be called externally
-      // it is just the common code between the GD and the file options
-      $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
-      $this->numObj++;
-      $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
-      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
+        // note that this function is not to be called externally
+        // it is just the common code between the GD and the file options
+        $this->numImages++;
+        $im =  $this->numImages;
+        $label =  'I'.$im;
+        $this->numObj++;
+        $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
+        $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
     }
 
     $this->objects[$this->currentContents]['c'].=  "\nq";
     $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
     $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
     $this->objects[$this->currentContents]['c'].=  "\nQ";
-  }
+    }
 
 
-  /**
-   * specify where the document should open when it first starts
-   */
-  function  openHere($style, $a =  0, $b =  0, $c =  0) {
+    /**
+     * specify where the document should open when it first starts
+     */
+    function  openHere($style, $a =  0, $b =  0, $c =  0) {
     // this function will open the document at a specified page, in a specified style
     // the values for style, and the required paramters are:
     // 'XYZ'  left, top, zoom
@@ -4393,17 +4393,17 @@ 
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
     $id =  $this->catalogId;
     $this->o_catalog($id, 'openHere', $this->numObj);
-  }
+    }
   
-  function addJavascript($code) {
+    function addJavascript($code) {
     $this->javascript .= $code;
-  }
+    }
 
 
-  /**
-   * create a labelled destination within the document
-   */
-  function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
+    /**
+     * create a labelled destination within the document
+     */
+    function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
     // it has been linked to
     // styles are the same as the 'openHere' function
@@ -4413,78 +4413,78 @@ 
 
     // store the label->idf relationship, note that this means that labels can be used only once
     $this->destinations["$label"] =  $id;
-  }
+    }
 
 
-  /**
-   * define font families, this is used to initialize the font families for the default fonts
-   * and for the user to add new ones for their fonts. The default bahavious can be overridden should
-   * that be desired.
-   */
-  function  setFontFamily($family, $options =  '') {
+    /**
+     * define font families, this is used to initialize the font families for the default fonts
+     * and for the user to add new ones for their fonts. The default bahavious can be overridden should
+     * that be desired.
+     */
+    function  setFontFamily($family, $options =  '') {
     if  (!is_array($options)) {
-      if  ($family ===  'init') {
+        if  ($family ===  'init') {
         // set the known family groups
         // these font families will be used to enable bold and italic markers to be included
         // within text streams. html forms will be used... <b></b> <i></i>
         $this->fontFamilies['Helvetica.afm'] =
-          array('b' => 'Helvetica-Bold.afm',
+            array('b' => 'Helvetica-Bold.afm',
                 'i' => 'Helvetica-Oblique.afm',
                 'bi' => 'Helvetica-BoldOblique.afm',
                 'ib' => 'Helvetica-BoldOblique.afm');
 
         $this->fontFamilies['Courier.afm'] =
-          array('b' => 'Courier-Bold.afm',
+            array('b' => 'Courier-Bold.afm',
                 'i' => 'Courier-Oblique.afm',
                 'bi' => 'Courier-BoldOblique.afm',
                 'ib' => 'Courier-BoldOblique.afm');
 
         $this->fontFamilies['Times-Roman.afm'] =
-          array('b' => 'Times-Bold.afm',
+            array('b' => 'Times-Bold.afm',
                 'i' => 'Times-Italic.afm',
                 'bi' => 'Times-BoldItalic.afm',
                 'ib' => 'Times-BoldItalic.afm');
-      }
+        }
     } else {
 
-      // the user is trying to set a font family
-      // note that this can also be used to set the base ones to something else
-      if  (mb_strlen($family)) {
+        // the user is trying to set a font family
+        // note that this can also be used to set the base ones to something else
+        if  (mb_strlen($family)) {
         $this->fontFamilies[$family] =  $options;
-      }
+        }
+    }
     }
-  }
 
 
-  /**
-   * used to add messages for use in debugging
-   */
-  function  addMessage($message) {
+    /**
+     * used to add messages for use in debugging
+     */
+    function  addMessage($message) {
     $this->messages.=  $message."\n";
-  }
+    }
 
 
-  /**
-   * a few functions which should allow the document to be treated transactionally.
-   */
-  function  transaction($action) {
+    /**
+     * a few functions which should allow the document to be treated transactionally.
+     */
+    function  transaction($action) {
     switch  ($action) {
     case  'start':
       // store all the data away into the checkpoint variable
       $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
-      unset($data);
-      break;
+        $this->checkpoint =  $data;
+        unset($data);
+        break;
 
     case  'commit':
       if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
         $tmp =  $this->checkpoint['checkpoint'];
         $this->checkpoint =  $tmp;
         unset($tmp);
-      } else {
+        } else {
         $this->checkpoint =  '';
-      }
-      break;
+        }
+        break;
 
     case  'rewind':
       // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
@@ -4493,25 +4493,25 @@ 
         $tmp =  $this->checkpoint;
 
         foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
+            if  ($k !==  'checkpoint') {
             $this->$k =  $v;
-          }
+            }
         }
         unset($tmp);
-      }
-      break;
+        }
+        break;
 
     case  'abort':
       if  (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
         $tmp =  $this->checkpoint;
         foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
+            $this->$k =  $v;
         }
         unset($tmp);
-      }
-      break;
+        }
+        break;
+    }
     }
-  }
 }
 // end of class

Switch Indentation +1218 added lines, -1218 removed lines

@@ -354,30 +354,30 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
-      case  'XYZ':
-      case  'FitR':
-        $tmp =   ' '.$options['p3'].$tmp;
-      case  'FitH':
-      case  'FitV':
-      case  'FitBH':
-      case  'FitBV':
-        $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
-      case  'Fit':
-      case  'FitB':
-        $tmp =   $options['type'].$tmp;
-        $this->objects[$id]['info']['string'] = $tmp;
-        $this->objects[$id]['info']['page'] = $options['page'];
-      }
+        case  'new':
+          $this->objects[$id] = array('t'=>'destination', 'info'=>array());
+          $tmp =  '';
+          switch  ($options['type']) {
+              case  'XYZ':
+              case  'FitR':
+                $tmp =   ' '.$options['p3'].$tmp;
+              case  'FitH':
+              case  'FitV':
+              case  'FitBH':
+              case  'FitBV':
+                $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
+              case  'Fit':
+              case  'FitB':
+                $tmp =   $options['type'].$tmp;
+                $this->objects[$id]['info']['string'] = $tmp;
+                $this->objects[$id]['info']['page'] = $options['page'];
+          }
       break;
 
-    case  'out':
-      $tmp =  $o['info'];
-      $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
-      return  $res;
+        case  'out':
+          $tmp =  $o['info'];
+          $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+          return  $res;
     }
   }
 
@@ -391,33 +391,33 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
-      break;
-
-    case  'add':
-      foreach($options as  $k=>$v) {
-        switch  ($k) {
-        case  'HideToolbar':
-        case  'HideMenubar':
-        case  'HideWindowUI':
-        case  'FitWindow':
-        case  'CenterWindow':
-        case  'NonFullScreenPageMode':
-        case  'Direction':
-          $o['info'][$k] = $v;
+        case  'new':
+          $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
           break;
-        }
+
+        case  'add':
+          foreach($options as  $k=>$v) {
+            switch  ($k) {
+                case  'HideToolbar':
+                case  'HideMenubar':
+                case  'HideWindowUI':
+                case  'FitWindow':
+                case  'CenterWindow':
+                case  'NonFullScreenPageMode':
+                case  'Direction':
+                  $o['info'][$k] = $v;
+                  break;
+            }
       }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\n";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\n";
+          return  $res;
     }
   }
 
@@ -431,55 +431,55 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
-      $this->catalogId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
+          $this->catalogId = $id;
+          break;
 
-    case  'outlines':
-    case  'pages':
-    case  'openHere':
-    case  'javascript':
-      $o['info'][$action] = $options;
-      break;
+        case  'outlines':
+        case  'pages':
+        case  'openHere':
+        case  'javascript':
+          $o['info'][$action] = $options;
+          break;
 
-    case  'viewerPreferences':
-      if  (!isset($o['info']['viewerPreferences'])) {
-        $this->numObj++;
-        $this->o_viewerPreferences($this->numObj, 'new');
-        $o['info']['viewerPreferences'] = $this->numObj;
-      }
+        case  'viewerPreferences':
+          if  (!isset($o['info']['viewerPreferences'])) {
+            $this->numObj++;
+            $this->o_viewerPreferences($this->numObj, 'new');
+            $o['info']['viewerPreferences'] = $this->numObj;
+          }
 
-      $vp =  $o['info']['viewerPreferences'];
-      $this->o_viewerPreferences($vp, 'add', $options);
+          $vp =  $o['info']['viewerPreferences'];
+          $this->o_viewerPreferences($vp, 'add', $options);
 
-      break;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
-        switch ($k) {
-        case  'outlines':
-          $res.= "\n".'/Outlines '.$v.' 0 R';
-          break;
+          foreach($o['info'] as  $k=>$v) {
+            switch ($k) {
+                case  'outlines':
+                  $res.= "\n".'/Outlines '.$v.' 0 R';
+                  break;
           
-        case  'pages':
-          $res.= "\n".'/Pages '.$v.' 0 R';
-          break;
+                case  'pages':
+                  $res.= "\n".'/Pages '.$v.' 0 R';
+                  break;
 
-        case  'viewerPreferences':
-          $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
-          break;
+                case  'viewerPreferences':
+                  $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
+                  break;
 
-        case  'openHere':
-          $res.= "\n".'/OpenAction '.$v.' 0 R';
-          break;
+                case  'openHere':
+                  $res.= "\n".'/OpenAction '.$v.' 0 R';
+                  break;
 
-        case  'javascript':
-          $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
-          break;
-        }
+                case  'javascript':
+                  $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
+                  break;
+            }
       }
 
       $res.= " >>\nendobj";
@@ -497,37 +497,37 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'pages', 'info'=>array());
-      $this->o_catalog($this->catalogId, 'pages', $id);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'pages', 'info'=>array());
+          $this->o_catalog($this->catalogId, 'pages', $id);
+          break;
 
-    case  'page':
-      if  (!is_array($options)) {
-        // then it will just be the id of the new page
-        $o['info']['pages'][] = $options;
-      } else {
-        // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
-        // and pos is either 'before' or 'after', saying where this page will fit.
-        if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
-
-            // then there is a match
-            // make a space
-            switch  ($options['pos']) {
-            case  'before':
-              $k =  $i;
-              break;
+        case  'page':
+          if  (!is_array($options)) {
+            // then it will just be the id of the new page
+            $o['info']['pages'][] = $options;
+          } else {
+            // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
+            // and pos is either 'before' or 'after', saying where this page will fit.
+            if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
+              $i =  array_search($options['rid'], $o['info']['pages']);
+              if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+
+                // then there is a match
+                // make a space
+                switch  ($options['pos']) {
+                    case  'before':
+                      $k =  $i;
+                      break;
 
-            case  'after':
-              $k = $i+1;
-              break;
+                    case  'after':
+                      $k = $i+1;
+                      break;
 
-            default:
-              $k = -1;
-              break;
-            }
+                    default:
+                      $k = -1;
+                      break;
+                }
 
             if  ($k >= 0) {
               for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
@@ -541,82 +541,82 @@ 
       }
       break;
 
-    case  'procset':
-      $o['info']['procset'] = $options;
-      break;
+        case  'procset':
+          $o['info']['procset'] = $options;
+          break;
 
-    case  'mediaBox':
-      $o['info']['mediaBox'] = $options;
-      // which should be an array of 4 numbers
-      break;
+        case  'mediaBox':
+          $o['info']['mediaBox'] = $options;
+          // which should be an array of 4 numbers
+          break;
 
-    case  'font':
-      $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
-      break;
+        case  'font':
+          $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
+          break;
 
-    case  'extGState':
-      $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
-      break;
+        case  'extGState':
+          $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
+          break;
 
-    case  'xObject':
-      $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
-      break;
+        case  'xObject':
+          $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
+          break;
 
-    case  'out':
-      if  (count($o['info']['pages'])) {
-        $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
-        foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
-        }
+        case  'out':
+          if  (count($o['info']['pages'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
+            foreach($o['info']['pages'] as  $k=>$v) {
+              $res.= $v." 0 R\n";
+            }
 
-        $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
+            $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
 
-        if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
-              isset($o['info']['procset']) ||
-              (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+            if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
+                  isset($o['info']['procset']) ||
+                  (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
+              $res.= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
-            $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
-          }
+              if  (isset($o['info']['procset'])) {
+                $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
+              }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
-            $res.= "\n/Font << ";
-            foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
+                $res.= "\n/Font << ";
+                foreach($o['info']['fonts'] as  $finfo) {
+                  $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
-            $res.= "\n/XObject << ";
-            foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
+                $res.= "\n/XObject << ";
+                foreach($o['info']['xObjects'] as  $finfo) {
+                  $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
-            $res.=  "\n/ExtGState << ";
-            foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+              if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
+                $res.=  "\n/ExtGState << ";
+                foreach ($o['info']['extGStates'] as  $gstate) {
+                  $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+                }
+                $res.=  "\n>>";
+              }
+
+              $res.= "\n>>";
+              if  (isset($o['info']['mediaBox'])) {
+                $tmp = $o['info']['mediaBox'];
+                $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+              }
             }
-            $res.=  "\n>>";
-          }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
-            $tmp = $o['info']['mediaBox'];
-            $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+            $res.= "\n >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
           }
-        }
 
-        $res.= "\n >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
-      }
-
-      return  $res;
+          return  $res;
     }
   }
 
@@ -630,28 +630,28 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
-      $this->o_catalog($this->catalogId, 'outlines', $id);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
+          $this->o_catalog($this->catalogId, 'outlines', $id);
+          break;
 
-    case  'outline':
-      $o['info']['outlines'][] = $options;
-      break;
+        case  'outline':
+          $o['info']['outlines'][] = $options;
+          break;
 
-    case  'out':
-      if  (count($o['info']['outlines'])) {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
-        foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
-        }
+        case  'out':
+          if  (count($o['info']['outlines'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
+            foreach($o['info']['outlines'] as  $k=>$v) {
+              $res.= $v." 0 R ";
+            }
 
-        $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
-      }
+            $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -665,33 +665,33 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
-
-      // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
-        // then we'll need an encoding dictionary
-        $this->numObj++;
-        $this->o_fontEncoding($this->numObj, 'new', $options);
-        $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
-        // we can specify encoding here
-        switch ($options['encoding']) {
-        case  'WinAnsiEncoding':
-        case  'MacRomanEncoding':
-        case  'MacExpertEncoding':
-          $this->objects[$id]['info']['encoding'] =  $options['encoding'];
-          break;
-
-        case  'none':
-          break;
+        case  'new':
+          $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
+          $fontNum =  $this->numFonts;
+          $this->objects[$id]['info']['fontNum'] =  $fontNum;
 
-        default:
-          $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-          break;
-        }
+          // deal with the encoding and the differences
+          if  (isset($options['differences'])) {
+            // then we'll need an encoding dictionary
+            $this->numObj++;
+            $this->o_fontEncoding($this->numObj, 'new', $options);
+            $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
+          } else  if  (isset($options['encoding'])) {
+            // we can specify encoding here
+            switch ($options['encoding']) {
+                case  'WinAnsiEncoding':
+                case  'MacRomanEncoding':
+                case  'MacExpertEncoding':
+                  $this->objects[$id]['info']['encoding'] =  $options['encoding'];
+                  break;
+
+                case  'none':
+                  break;
+
+                default:
+                  $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+                  break;
+            }
       } else {
         $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
       }
@@ -744,21 +744,21 @@ 
       $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
       break;
 
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
-          break;
-        case  'FirstChar':
-        case  'LastChar':
-        case  'Widths':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+                case  'FirstChar':
+                case  'LastChar':
+                case  'Widths':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_font '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to descendent font
@@ -767,60 +767,60 @@ 
       }
       break;
 
-    case  'out':
-      if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
-        // For Unicode fonts, we need to incorporate font data into
-        // sub-sections that are linked from the primary font section.
-        // Look at o_fontGIDtoCID and o_fontDescendentCID functions
-        // for more informaiton.
-        //
-        // All of this code is adapted from the excellent changes made to
-        // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
-
-        $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
-        $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-        // The horizontal identity mapping for 2-byte CIDs; may be used
-        // with CIDFonts using any Registry, Ordering, and Supplement values.
-        $res.=  "/Encoding /Identity-H\n";
-        $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
-        $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-      if  (isset($o['info']['encodingDictionary'])) {
-        // then place a reference to the dictionary
-        $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
-        // use the specified encoding
-        $res.=  "/Encoding /".$o['info']['encoding']."\n";
-      }
+        case  'out':
+          if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
+            // For Unicode fonts, we need to incorporate font data into
+            // sub-sections that are linked from the primary font section.
+            // Look at o_fontGIDtoCID and o_fontDescendentCID functions
+            // for more informaiton.
+            //
+            // All of this code is adapted from the excellent changes made to
+            // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
+
+            $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
+            $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+            // The horizontal identity mapping for 2-byte CIDs; may be used
+            // with CIDFonts using any Registry, Ordering, and Supplement values.
+            $res.=  "/Encoding /Identity-H\n";
+            $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
+            $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          } else {
+          $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+          $res.=  "/Name /F".$o['info']['fontNum']."\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+          if  (isset($o['info']['encodingDictionary'])) {
+            // then place a reference to the dictionary
+            $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
+          } else  if  (isset($o['info']['encoding'])) {
+            // use the specified encoding
+            $res.=  "/Encoding /".$o['info']['encoding']."\n";
+          }
 
-      if  (isset($o['info']['FirstChar'])) {
-        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-      }
+          if  (isset($o['info']['FirstChar'])) {
+            $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+          }
 
-      if  (isset($o['info']['LastChar'])) {
-        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-      }
+          if  (isset($o['info']['LastChar'])) {
+            $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+          }
 
-      if  (isset($o['info']['Widths'])) {
-        $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
-      }
+          if  (isset($o['info']['Widths'])) {
+            $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
+          }
 
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      }
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -834,46 +834,46 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
-      foreach ($o['info'] as  $label => $value) {
-        switch  ($label) {
-        case  'Ascent':
-        case  'CapHeight':
-        case  'Descent':
-        case  'Flags':
-        case  'ItalicAngle':
-        case  'StemV':
-        case  'AvgWidth':
-        case  'Leading':
-        case  'MaxWidth':
-        case  'MissingWidth':
-        case  'StemH':
-        case  'XHeight':
-        case  'CharSet':
-          if  (mb_strlen($value, '8bit')) {
-            $res.= '/'.$label.' '.$value."\n";
-          }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
+          foreach ($o['info'] as  $label => $value) {
+            switch  ($label) {
+                case  'Ascent':
+                case  'CapHeight':
+                case  'Descent':
+                case  'Flags':
+                case  'ItalicAngle':
+                case  'StemV':
+                case  'AvgWidth':
+                case  'Leading':
+                case  'MaxWidth':
+                case  'MissingWidth':
+                case  'StemH':
+                case  'XHeight':
+                case  'CharSet':
+                  if  (mb_strlen($value, '8bit')) {
+                    $res.= '/'.$label.' '.$value."\n";
+                  }
 
-          break;
-        case  'FontFile':
-        case  'FontFile2':
-        case  'FontFile3':
-          $res.= '/'.$label.' '.$value." 0 R\n";
-          break;
+                  break;
+                case  'FontFile':
+                case  'FontFile2':
+                case  'FontFile3':
+                  $res.= '/'.$label.' '.$value." 0 R\n";
+                  break;
 
-        case  'FontBBox':
-          $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
-          break;
+                case  'FontBBox':
+                  $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
+                  break;
 
-        case  'FontName':
-          $res.= '/'.$label.' /'.$value."\n";
-          break;
-        }
+                case  'FontName':
+                  $res.= '/'.$label.' /'.$value."\n";
+                  break;
+            }
       }
 
       $res.= ">>\nendobj";
@@ -892,38 +892,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // the options array should contain 'differences' and maybe 'encoding'
-      $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
-      break;
+        case  'new':
+          // the options array should contain 'differences' and maybe 'encoding'
+          $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
-        $o['info']['encoding'] = 'WinAnsiEncoding';
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
+          if  (!isset($o['info']['encoding'])) {
+            $o['info']['encoding'] = 'WinAnsiEncoding';
+          }
 
-      if  ($o['info']['encoding'] !== 'none') {
-        $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
-      }
+          if  ($o['info']['encoding'] !== 'none') {
+            $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
+          }
 
-      $res.= "/Differences \n[";
+          $res.= "/Differences \n[";
 
-      $onum = -100;
+          $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
-        if  ($num != $onum+1) {
-          // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
-        } else {
-          $res.=  " /".$label;
-        }
+          foreach($o['info']['differences'] as  $num=>$label) {
+            if  ($num != $onum+1) {
+              // we cannot make use of consecutive numbering
+              $res.=  "\n".$num." /".$label;
+            } else {
+              $res.=  " /".$label;
+            }
 
-        $onum = $num;
-      }
+            $onum = $num;
+          }
 
-      $res.= "\n]\n>>\nendobj";
-      return  $res;
+          $res.= "\n]\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -937,82 +937,82 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
-
-      // we need a CID system info section
-      $cidSystemInfoId = ++$this->numObj;
-      $this->o_contents($cidSystemInfoId, 'new', 'raw');
-      $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
-      $this->objects[$cidSystemInfoId]['c'] = $res;
-
-      // and a CID to GID map
-      $cidToGidMapId = ++$this->numObj;
-      $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
-      $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
-      break;
-
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
+
+          // we need a CID system info section
+          $cidSystemInfoId = ++$this->numObj;
+          $this->o_contents($cidSystemInfoId, 'new', 'raw');
+          $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
+          $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+          $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+          $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
+          $res.=  ">>";
+          $this->objects[$cidSystemInfoId]['c'] = $res;
+
+          // and a CID to GID map
+          $cidToGidMapId = ++$this->numObj;
+          $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
+          $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
           break;
 
-        case  'FirstChar':
-        case  'LastChar':
-        case  'MissingWidth':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+
+                case  'FirstChar':
+                case  'LastChar':
+                case  'MissingWidth':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to cid to gid map
       $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
       break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
-//      if  (isset($o['info']['FirstChar'])) {
-//        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-//      }
-
-//      if  (isset($o['info']['LastChar'])) {
-//        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-//      }
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        case  'out':
+          $res =  "\n".$id." 0 obj\n";
+          $res.=  "<</Type /Font\n";
+          $res.=  "/Subtype /CIDFontType2\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+          $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+    //      if  (isset($o['info']['FirstChar'])) {
+    //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+    //      }
+
+    //      if  (isset($o['info']['LastChar'])) {
+    //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+    //      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-      if  (isset($o['info']['MissingWidth'])) {
-        $res.=  "/DW ".$o['info']['MissingWidth']."\n";
-      }
+          if  (isset($o['info']['MissingWidth'])) {
+            $res.=  "/DW ".$o['info']['MissingWidth']."\n";
+          }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
-        $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
-        $w = '';
-        foreach ($cid_widths as $cid => $width) {
-          $w .= $cid.' ['.$width.'] ';
-        }
-        $res.=  "/W [".$w."]\n";
-      }
+          if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+            $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
+            $w = '';
+            foreach ($cid_widths as $cid => $width) {
+              $w .= $cid.' ['.$width.'] ';
+            }
+            $res.=  "/W [".$w."]\n";
+          }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+          $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+          $res.=  ">>\n";
+          $res.=  "endobj";
 
-      return  $res;
+          return  $res;
     }
   }
   
@@ -1026,35 +1026,35 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n";
-      $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
-      $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
-                    $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
+        case  'out':
+          $res = "\n".$id." 0 obj\n";
+          $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
+          $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
+                        $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
+          if  (!$compressed && isset($o['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
 
-        if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
-        }
-        if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
-        }
+            if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $compressed = true;
+              $tmp =  gzcompress($tmp,  6);
+            }
+            if ($compressed) {
+              $res.= "\n/Filter /FlateDecode";
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
   
@@ -1068,31 +1068,31 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
-      $this->o_pages($this->currentNode, 'procset', $id);
-      $this->procsetObjectId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
+          $this->o_pages($this->currentNode, 'procset', $id);
+          $this->procsetObjectId = $id;
+          break;
 
-    case  'add':
-      // this is to add new items to the procset list, despite the fact that this is considered
-      // obselete, the items are required for printing to some postscript printers
-      switch  ($options) {
-      case  'ImageB':
-      case  'ImageC':
-      case  'ImageI':
-        $o['info'][$options] = 1;
-        break;
-      }
+        case  'add':
+          // this is to add new items to the procset list, despite the fact that this is considered
+          // obselete, the items are required for printing to some postscript printers
+          switch  ($options) {
+              case  'ImageB':
+              case  'ImageC':
+              case  'ImageI':
+                $o['info'][$options] = 1;
+                break;
+          }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n[";
-      foreach ($o['info'] as  $label=>$val) {
-        $res.= '/'.$label.' ';
-      }
-      $res.= "]\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n[";
+          foreach ($o['info'] as  $label=>$val) {
+            $res.= '/'.$label.' ';
+          }
+          $res.= "]\nendobj";
+          return  $res;
     }
   }
 
@@ -1106,45 +1106,45 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->infoObject = $id;
-      $date = 'D:'.@date('Ymd');
-      $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
-      break;
-    case  'Title':
-    case  'Author':
-    case  'Subject':
-    case  'Keywords':
-    case  'Creator':
-    case  'Producer':
-    case  'CreationDate':
-    case  'ModDate':
-    case  'Trapped':
-      $o['info'][$action] = $options;
-      break;
+        case  'new':
+          $this->infoObject = $id;
+          $date = 'D:'.@date('Ymd');
+          $this->objects[$id] = array('t'=>'info', 'info'=>array('Creator'=>'R and OS php pdf writer, http://www.ros.co.nz', 'CreationDate'=>$date));
+          break;
+        case  'Title':
+        case  'Author':
+        case  'Subject':
+        case  'Keywords':
+        case  'Creator':
+        case  'Producer':
+        case  'CreationDate':
+        case  'ModDate':
+        case  'Trapped':
+          $o['info'][$action] = $options;
+          break;
 
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      $res = "\n".$id." 0 obj\n<<\n";
-      foreach ($o['info'] as  $k=>$v) {
-        $res.= '/'.$k.' (';
-        // dates must be outputted as-is, without Unicode transformations
-        $raw = ($k === 'CreationDate' || $k === 'ModDate');
-        $c = $v;
+          $res = "\n".$id." 0 obj\n<<\n";
+          foreach ($o['info'] as  $k=>$v) {
+            $res.= '/'.$k.' (';
+            // dates must be outputted as-is, without Unicode transformations
+            $raw = ($k === 'CreationDate' || $k === 'ModDate');
+            $c = $v;
 
-        if  ($this->encrypted) {
-          $c = $this->ARC4($c);
-        }
+            if  ($this->encrypted) {
+              $c = $this->ARC4($c);
+            }
 
-        $res.= ($raw) ? $c : $this->filterText($c);
-        $res.= ")\n";
-      }
+            $res.= ($raw) ? $c : $this->filterText($c);
+            $res.= ")\n";
+          }
 
-      $res.= ">>\nendobj";
-      return  $res;
+          $res.= ">>\nendobj";
+          return  $res;
     }
   }
 
@@ -1158,38 +1158,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      if  (is_array($options)) {
-        $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
-      } else {
-        // then assume a URI action
-        $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
-      }
-      break;
-
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'new':
+          if  (is_array($options)) {
+            $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
+          } else {
+            // then assume a URI action
+            $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>'URI');
+          }
+          break;
 
-      $res = "\n".$id." 0 obj\n<< /Type /Action";
-      switch ($o['type']) {
-      case  'ilink':
-        // there will be an 'label' setting, this is the name of the destination
-        $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
-        break;
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      case  'URI':
-        $res.= "\n/S /URI\n/URI (";
-        if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
-        } else {
-          $res.= $this->filterText($o['info']);
-        }
+          $res = "\n".$id." 0 obj\n<< /Type /Action";
+          switch ($o['type']) {
+              case  'ilink':
+                // there will be an 'label' setting, this is the name of the destination
+                $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+                break;
+
+              case  'URI':
+                $res.= "\n/S /URI\n/URI (";
+                if  ($this->encrypted) {
+                  $res.= $this->filterText($this->ARC4($o['info']));
+                } else {
+                  $res.= $this->filterText($o['info']);
+                }
 
-        $res.= ")";
-        break;
-      }
+                $res.= ")";
+                break;
+          }
 
       $res.= "\n>>\nendobj";
       return  $res;
@@ -1207,39 +1207,39 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // add the annotation to the current page
-      $pageId =  $this->currentPage;
-      $this->o_page($pageId, 'annot', $id);
-
-      // and add the action object which is going to be required
-      switch ($options['type']) {
-      case  'link':
-        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
-        $this->numObj++;
-        $this->o_action($this->numObj, 'new', $options['url']);
-        $this->objects[$id]['info']['actionId'] = $this->numObj;
-        break;
-
-      case  'ilink':
-        // this is to a named internal link
-        $label =  $options['label'];
-        $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
-        $this->numObj++;
-        $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
-        $this->objects[$id]['info']['actionId'] = $this->numObj;
-        break;
-      }
+        case  'new':
+          // add the annotation to the current page
+          $pageId =  $this->currentPage;
+          $this->o_page($pageId, 'annot', $id);
+
+          // and add the action object which is going to be required
+          switch ($options['type']) {
+              case  'link':
+                $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
+                $this->numObj++;
+                $this->o_action($this->numObj, 'new', $options['url']);
+                $this->objects[$id]['info']['actionId'] = $this->numObj;
+                break;
+
+              case  'ilink':
+                // this is to a named internal link
+                $label =  $options['label'];
+                $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
+                $this->numObj++;
+                $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
+                $this->objects[$id]['info']['actionId'] = $this->numObj;
+                break;
+          }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Annot";
-      switch ($o['info']['type']) {
-      case  'link':
-      case  'ilink':
-        $res.=  "\n/Subtype /Link";
-        break;
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Annot";
+          switch ($o['info']['type']) {
+              case  'link':
+              case  'ilink':
+                $res.=  "\n/Subtype /Link";
+                break;
+          }
       $res.= "\n/A ".$o['info']['actionId']." 0 R";
       $res.= "\n/Border [0 0 0]";
       $res.= "\n/H /I";
@@ -1265,77 +1265,77 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->numPages++;
-      $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
-
-      if  (is_array($options)) {
-        // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
-        $options['id'] = $id;
-        $this->o_pages($this->currentNode, 'page', $options);
-      } else {
-        $this->o_pages($this->currentNode, 'page', $id);
-      }
+        case  'new':
+          $this->numPages++;
+          $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
+
+          if  (is_array($options)) {
+            // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
+            $options['id'] = $id;
+            $this->o_pages($this->currentNode, 'page', $options);
+          } else {
+            $this->o_pages($this->currentNode, 'page', $id);
+          }
 
-      $this->currentPage = $id;
-      //make a contents object to go with this page
-      $this->numObj++;
-      $this->o_contents($this->numObj, 'new', $id);
-      $this->currentContents = $this->numObj;
-      $this->objects[$id]['info']['contents'] = array();
-      $this->objects[$id]['info']['contents'][] = $this->numObj;
-
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
-        if  ($target === 'all' || $match === $target) {
-          $this->objects[$id]['info']['contents'][] = $oId;
-        }
-      }
-      break;
+          $this->currentPage = $id;
+          //make a contents object to go with this page
+          $this->numObj++;
+          $this->o_contents($this->numObj, 'new', $id);
+          $this->currentContents = $this->numObj;
+          $this->objects[$id]['info']['contents'] = array();
+          $this->objects[$id]['info']['contents'][] = $this->numObj;
+
+          $match =  ($this->numPages%2 ?  'odd' :  'even');
+          foreach($this->addLooseObjects as  $oId=>$target) {
+            if  ($target === 'all' || $match === $target) {
+              $this->objects[$id]['info']['contents'][] = $oId;
+            }
+          }
+          break;
 
-    case  'content':
-      $o['info']['contents'][] = $options;
-      break;
+        case  'content':
+          $o['info']['contents'][] = $options;
+          break;
 
-    case  'annot':
-      // add an annotation to this page
-      if  (!isset($o['info']['annot'])) {
-        $o['info']['annot'] = array();
-      }
+        case  'annot':
+          // add an annotation to this page
+          if  (!isset($o['info']['annot'])) {
+            $o['info']['annot'] = array();
+          }
 
-      // $options should contain the id of the annotation dictionary
-      $o['info']['annot'][] = $options;
-      break;
+          // $options should contain the id of the annotation dictionary
+          $o['info']['annot'][] = $options;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Page";
+          $res.= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
-        $res.= "\n/Annots [";
-        foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
-        }
-        $res.= " ]";
-      }
+          if  (isset($o['info']['annot'])) {
+            $res.= "\n/Annots [";
+            foreach($o['info']['annot'] as  $aId) {
+              $res.= " ".$aId." 0 R";
+            }
+            $res.= " ]";
+          }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
-        $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
-        $res.= "\n/Contents [\n";
-
-        // reverse the page contents so added objects are below normal content
-        //foreach (array_reverse($o['info']['contents']) as  $cId) {
-        // Back to normal now that I've got transparency working --Benj
-        foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
-        }
-        $res.= "]";
-      }
+          $count =  count($o['info']['contents']);
+          if  ($count == 1) {
+            $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
+          } else  if  ($count>1) {
+            $res.= "\n/Contents [\n";
+
+            // reverse the page contents so added objects are below normal content
+            //foreach (array_reverse($o['info']['contents']) as  $cId) {
+            // Back to normal now that I've got transparency working --Benj
+            foreach ($o['info']['contents'] as  $cId) {
+              $res.= $cId." 0 R\n";
+            }
+            $res.= "]";
+          }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1349,51 +1349,51 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
-        // then this contents is the primary for a page
-        $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
-        // then this page contains some other type of system object
-        $this->objects[$id]['raw'] = 1;
-      }
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
+          if  (mb_strlen($options, '8bit') &&  intval($options)) {
+            // then this contents is the primary for a page
+            $this->objects[$id]['onPage'] = $options;
+          } else  if  ($options === 'raw') {
+            // then this page contains some other type of system object
+            $this->objects[$id]['raw'] = 1;
+          }
+          break;
 
-    case  'add':
-      // add more options to the decleration
-      foreach ($options as  $k=>$v) {
-        $o['info'][$k] = $v;
-      }
+        case  'add':
+          // add more options to the decleration
+          foreach ($options as  $k=>$v) {
+            $o['info'][$k] = $v;
+          }
 
-    case  'out':
-      $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+        case  'out':
+          $tmp = $o['c'];
+          $res =  "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
-        if  (function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
-        }
+          if  (isset($this->objects[$id]['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
+            if  (function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $res.= " /Filter /FlateDecode";
+              $tmp =  gzcompress($tmp,  6);
+            }
 
-        if  ($this->encrypted) {
-          $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
-        }
+            if  ($this->encrypted) {
+              $this->encryptInit($id);
+              $tmp =  $this->ARC4($tmp);
+            }
 
-        foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
-        }
+            foreach($o['info'] as  $k=>$v) {
+              $res.=  "\n/".$k.' '.$v;
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
 
@@ -1403,19 +1403,19 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
-        'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
+            'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
+          ));
+          break;
 
-    case  'out':
-      $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res .= "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
   
@@ -1425,20 +1425,20 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
-        'S' => '/JavaScript',
-        'JS' => '('.$this->filterText($code).')',
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
+            'S' => '/JavaScript',
+            'JS' => '('.$this->filterText($code).')',
+          ));
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1451,28 +1451,28 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      // make the new object
-      $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
-      $this->objects[$id]['info']['Type'] = '/XObject';
-      $this->objects[$id]['info']['Subtype'] = '/Image';
-      $this->objects[$id]['info']['Width'] = $options['iw'];
-      $this->objects[$id]['info']['Height'] = $options['ih'];
-
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
-        if  (!isset($options['channels'])) {
-          $options['channels'] = 3;
-        }
+        case  'new':
+          // make the new object
+          $this->objects[$id] = array('t'=>'image', 'data'=>&$options['data'], 'info'=>array());
+          $this->objects[$id]['info']['Type'] = '/XObject';
+          $this->objects[$id]['info']['Subtype'] = '/Image';
+          $this->objects[$id]['info']['Width'] = $options['iw'];
+          $this->objects[$id]['info']['Height'] = $options['ih'];
+
+          if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
+            if  (!isset($options['channels'])) {
+              $options['channels'] = 3;
+            }
 
-        switch ($options['channels']) {
-        case  1:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
-          break;
+            switch ($options['channels']) {
+                case  1:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
+                  break;
 
-        default:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
-          break;
-        }
+                default:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
+                  break;
+            }
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
@@ -1490,39 +1490,39 @@ 
           $this->objects[$id]['info']['ColorSpace'] =  $tmp;
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              pre_r($tmp);
-              break;
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  pre_r($tmp);
+                  break;
               
             }
           }
         } else {
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              break;              
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  break;              
             }
           }
           $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
@@ -1539,22 +1539,22 @@ 
       $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
       break;
 
-    case  'out':
-      $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+        case  'out':
+          $tmp = &$o['data'];
+          $res =  "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
 
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-        $tmp =  $this->ARC4($tmp);
-      }
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+            $tmp =  $this->ARC4($tmp);
+          }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+          $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -1575,29 +1575,29 @@ 
     }
 
     switch  ($action) {
-    case  "new":
-      $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
+        case  "new":
+          $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
 
-      // Tell the pages about the new resource
-      $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
-      break;
+          // Tell the pages about the new resource
+          $this->numStates++;
+          $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+          break;
 
-    case  "out":
-      $res =
-        "\n" . $id . " 0 obj\n".
-        "<< /Type /ExtGState\n";
+        case  "out":
+          $res =
+            "\n" . $id . " 0 obj\n".
+            "<< /Type /ExtGState\n";
 
-      foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
-          continue;
-        $res.=  "/$parameter $value\n";
-      }
+          foreach ($o["info"] as  $parameter => $value) {
+            if  ( !in_array($parameter,  $valid_params))
+              continue;
+            $res.=  "/$parameter $value\n";
+          }
 
-      $res.=
-        ">>\n".
-        "endobj";
-      return  $res;
+          $res.=
+            ">>\n".
+            "endobj";
+          return  $res;
     }
   }
 
@@ -1611,63 +1611,63 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      // make the new object
-      $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
-      $this->arc4_objnum = $id;
-
-      // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
-
-      if  ($len>32) {
-        $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
-        $owner =  $options['owner'].substr($pad, 0, 32-$len);
-      } else {
-        $owner =  $options['owner'];
-      }
+        case  'new':
+          // make the new object
+          $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
+          $this->arc4_objnum = $id;
+
+          // figure out the additional paramaters required
+          $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
+          $len =  mb_strlen($options['owner'], '8bit');
+
+          if  ($len>32) {
+            $owner =  substr($options['owner'], 0, 32);
+          } else  if  ($len<32) {
+            $owner =  $options['owner'].substr($pad, 0, 32-$len);
+          } else {
+            $owner =  $options['owner'];
+          }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
-        $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
-        $user =  $options['user'].substr($pad, 0, 32-$len);
-      } else {
-        $user =  $options['user'];
-      }
+          $len =  mb_strlen($options['user'], '8bit');
+          if  ($len>32) {
+            $user =  substr($options['user'], 0, 32);
+          } else  if  ($len<32) {
+            $user =  $options['user'].substr($pad, 0, 32-$len);
+          } else {
+            $user =  $options['user'];
+          }
 
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
-      $this->ARC4_init($okey);
-      $ovalue = $this->ARC4($user);
-      $this->objects[$id]['info']['O'] = $ovalue;
-
-      // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
-
-      $ukey =  substr($tmp, 0, 5);
-      $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
-      $this->encrypted = 1;
-      $uvalue = $this->ARC4($pad);
-      $this->objects[$id]['info']['U'] = $uvalue;
-      $this->encryptionKey = $ukey;
-      // initialize the arc4 array
-      break;
+          $tmp =  $this->md5_16($owner);
+          $okey =  substr($tmp, 0, 5);
+          $this->ARC4_init($okey);
+          $ovalue = $this->ARC4($user);
+          $this->objects[$id]['info']['O'] = $ovalue;
+
+          // now make the u value, phew.
+          $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+
+          $ukey =  substr($tmp, 0, 5);
+          $this->ARC4_init($ukey);
+          $this->encryptionKey =  $ukey;
+          $this->encrypted = 1;
+          $uvalue = $this->ARC4($pad);
+          $this->objects[$id]['info']['U'] = $uvalue;
+          $this->encryptionKey = $ukey;
+          // initialize the arc4 array
+          break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
-      // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res =  "\n".$id." 0 obj\n<<";
+          $res.= "\n/Filter /Standard";
+          $res.= "\n/V 1";
+          $res.= "\n/R 2";
+          $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
+          $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+          // and the p-value needs to be converted to account for the twos-complement approach
+          $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
+          $res.= "\n/P ".($o['info']['p']);
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1999,112 +1999,112 @@ 
           // then there must be some keyword
           $key =  substr($row, 0, $pos);
           switch  ($key) {
-          case  'FontName':
-          case  'FullName':
-          case  'FamilyName':
-          case  'Weight':
-          case  'ItalicAngle':
-          case  'IsFixedPitch':
-          case  'CharacterSet':
-          case  'UnderlinePosition':
-          case  'UnderlineThickness':
-          case  'Version':
-          case  'EncodingScheme':
-          case  'CapHeight':
-          case  'XHeight':
-          case  'Ascender':
-          case  'Descender':
-          case  'StdHW':
-          case  'StdVW':
-          case  'StartCharMetrics':
-          case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
-            $data[$key] = trim(substr($row, $pos));
-            break;
-
-          case  'FontBBox':
-            $data[$key] = explode(' ', trim(substr($row, $pos)));
-            break;
-
-          case  'C': // Found in AFM files
-            //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
-            $bits = explode(';', trim($row));
-            $dtmp = array();
-
-            foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
-                if  (count($bits2) >2) {
-                  $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
-                    $dtmp[$bits2[0]][] = $bits2[$i];
+              case  'FontName':
+              case  'FullName':
+              case  'FamilyName':
+              case  'Weight':
+              case  'ItalicAngle':
+              case  'IsFixedPitch':
+              case  'CharacterSet':
+              case  'UnderlinePosition':
+              case  'UnderlineThickness':
+              case  'Version':
+              case  'EncodingScheme':
+              case  'CapHeight':
+              case  'XHeight':
+              case  'Ascender':
+              case  'Descender':
+              case  'StdHW':
+              case  'StdVW':
+              case  'StartCharMetrics':
+              case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
+                $data[$key] = trim(substr($row, $pos));
+                break;
+
+              case  'FontBBox':
+                $data[$key] = explode(' ', trim(substr($row, $pos)));
+                break;
+
+              case  'C': // Found in AFM files
+                //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
+                $bits = explode(';', trim($row));
+                $dtmp = array();
+
+                foreach($bits as  $bit) {
+                  $bits2 =  explode(' ', trim($bit));
+                  if  (mb_strlen($bits2[0], '8bit')) {
+                    if  (count($bits2) >2) {
+                      $dtmp[$bits2[0]] = array();
+                      for  ($i = 1;$i<count($bits2);$i++) {
+                        $dtmp[$bits2[0]][] = $bits2[$i];
+                      }
+                    } else  if  (count($bits2) == 2) {
+                      $dtmp[$bits2[0]] = $bits2[1];
+                    }
                   }
-                } else  if  (count($bits2) == 2) {
-                  $dtmp[$bits2[0]] = $bits2[1];
                 }
-              }
-            }
 
-            $cc = (int)$dtmp['C'];
-            if  ($cc >= 0) {
-              $data['C'][$dtmp['C']] = $dtmp;
-              $data['C'][$dtmp['N']] = $dtmp;
-            } else {
-              $data['C'][$dtmp['N']] = $dtmp;
-            }
+                $cc = (int)$dtmp['C'];
+                if  ($cc >= 0) {
+                  $data['C'][$dtmp['C']] = $dtmp;
+                  $data['C'][$dtmp['N']] = $dtmp;
+                } else {
+                  $data['C'][$dtmp['N']] = $dtmp;
+                }
 
-            if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-              $data['MissingWidth'] = $width;
-            }
+                if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                  $data['MissingWidth'] = $width;
+                }
             
-            break;
-
-          case  'U': // Found in UFM files
-            if ($data['isUnicode']) {
-              // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-              $bits = explode(';', trim($row));
-              $dtmp = array();
-
-              foreach($bits as  $bit) {
-                $bits2 =  explode(' ', trim($bit));
-                if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
-                    $dtmp[$bits2[0]] = array();
-                    for  ($i = 1;$i<count($bits2);$i++) {
-                      $dtmp[$bits2[0]][] = $bits2[$i];
+                break;
+
+              case  'U': // Found in UFM files
+                if ($data['isUnicode']) {
+                  // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+                  $bits = explode(';', trim($row));
+                  $dtmp = array();
+
+                  foreach($bits as  $bit) {
+                    $bits2 =  explode(' ', trim($bit));
+                    if  (mb_strlen($bits2[0], '8bit')) {
+                      if  (count($bits2) >2) {
+                        $dtmp[$bits2[0]] = array();
+                        for  ($i = 1;$i<count($bits2);$i++) {
+                          $dtmp[$bits2[0]][] = $bits2[$i];
+                        }
+                      } else  if  (count($bits2) == 2) {
+                        $dtmp[$bits2[0]] = $bits2[1];
+                      }
                     }
-                  } else  if  (count($bits2) == 2) {
-                    $dtmp[$bits2[0]] = $bits2[1];
                   }
-                }
-              }
 
-              $cc = (int)$dtmp['U'];
-              $glyph = $dtmp['G'];
-              $width = $dtmp['WX'];
-              if  ($cc >= 0) {
-                // Set values in CID to GID map
-                if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
-                }
+                  $cc = (int)$dtmp['U'];
+                  $glyph = $dtmp['G'];
+                  $width = $dtmp['WX'];
+                  if  ($cc >= 0) {
+                    // Set values in CID to GID map
+                    if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
+                      $cidtogid[$cc*2] = chr($glyph >> 8);
+                      $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                    }
 
-                $data['C'][$dtmp['U']] = $dtmp;
-                $data['C'][$dtmp['N']] = $dtmp;
-              } else {
-                $data['C'][$dtmp['N']] = $dtmp;
-              }
+                    $data['C'][$dtmp['U']] = $dtmp;
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  } else {
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-                $data['MissingWidth'] = $width;
-              }
-            }
-            break;
+                  if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                    $data['MissingWidth'] = $width;
+                  }
+                }
+                break;
 
-          case  'KPX':
-            //KPX Adieresis yacute -40
-            $bits = explode(' ', trim($row));
-            $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
-            break;
+              case  'KPX':
+                //KPX Adieresis yacute -40
+                $bits = explode(' ', trim($row));
+                $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
+                break;
           }
         }
       }
@@ -3108,163 +3108,163 @@ 
     if  ($text[$j] === '<') {
       $j++;
       switch ($text[$j]) {
-      case  '/':
-        $j++;
-        if  (mb_strlen($text) <=  $j) {
-          return  $directive;
-        }
+          case  '/':
+            $j++;
+            if  (mb_strlen($text) <=  $j) {
+              return  $directive;
+            }
 
-        switch ($text[$j]) {
-        case  'b':
-        case  'i':
-          $j++;
-          if  ($text[$j] === '>') {
-            $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
+            switch ($text[$j]) {
+                case  'b':
+                case  'i':
+                  $j++;
+                  if  ($text[$j] === '>') {
+                    $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
 
-            if  ($p !==  false) {
-              // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
-            }
+                    if  ($p !==  false) {
+                      // then there is one to remove
+                      $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+                    }
 
-            $directive =  $j-$i+1;
-          }
-          break;
+                    $directive =  $j-$i+1;
+                  }
+                  break;
+
+                case  'c':
+                  // this this might be a callback function
+                  $j++;
+                  $k =  mb_strpos($text, '>', $j);
+
+                  if  ($k !==  false &&  $text[$j] === ':') {
+                    // then this will be treated as a callback directive
+                    $directive =  $k-$i+1;
+                    $f =  0;
+                    // split the remainder on colons to get the function name and the paramater
+                    $tmp =  mb_substr($text, $j+1, $k-$j-1);
+                    $b1 =  mb_strpos($tmp, ':');
+
+                    if  ($b1 !==  false) {
+                      $func =  mb_substr($tmp, 0, $b1);
+                      $parm =  mb_substr($tmp, $b1+1);
+                    } else {
+                      $func =  $tmp;
+                      $parm =  '';
+                    }
 
-        case  'c':
-          // this this might be a callback function
-          $j++;
-          $k =  mb_strpos($text, '>', $j);
-
-          if  ($k !==  false &&  $text[$j] === ':') {
-            // then this will be treated as a callback directive
-            $directive =  $k-$i+1;
-            $f =  0;
-            // split the remainder on colons to get the function name and the paramater
-            $tmp =  mb_substr($text, $j+1, $k-$j-1);
-            $b1 =  mb_strpos($tmp, ':');
-
-            if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
-            } else {
-              $func =  $tmp;
-              $parm =  '';
-            }
+                    if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                      $directive =  0;
+                    } else {
+                      // only call the function if this is the final call
+                      if  ($final) {
+                        // need to assess the text position, calculate the text width to this point
+                        // can use getTextWidth to find the text width I think
+                        $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+
+                        $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
+                        $x =  $tmp[0];
+                        $y =  $tmp[1];
+                        $ret =  $this->$func($info);
+
+                        if  (is_array($ret)) {
+                          // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                          foreach($ret as  $rk => $rv) {
+                            switch ($rk) {
+                                case  'x':
+                                case  'y':
+                                  $$rk =  $rv;
+                                  break;
+                            }
+                      }
+                    }
 
-            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
-            } else {
-              // only call the function if this is the final call
-              if  ($final) {
-                // need to assess the text position, calculate the text width to this point
-                // can use getTextWidth to find the text width I think
-                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
-
-                $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
-                $x =  $tmp[0];
-                $y =  $tmp[1];
-                $ret =  $this->$func($info);
-
-                if  (is_array($ret)) {
-                  // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
-                    switch ($rk) {
-                    case  'x':
-                    case  'y':
-                      $$rk =  $rv;
-                      break;
+                    // also remove from to the stack
+                    // for simplicity, just take from the end, fix this another day
+                    $this->nCallback--;
+                    if  ($this->nCallback<0) {
+                      $this->nCallBack =  0;
                     }
                   }
                 }
-
-                // also remove from to the stack
-                // for simplicity, just take from the end, fix this another day
-                $this->nCallback--;
-                if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
-                }
               }
-            }
-          }
-          break;
+              break;
         }
         break;
 
-      case  'b':
-      case  'i':
-        $j++;
-        if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
-        }
-        break;
+          case  'b':
+          case  'i':
+            $j++;
+            if  ($text[$j] === '>') {
+              $this->currentTextState.=  $text[$j-1];
+              $directive =  $j-$i+1;
+            }
+            break;
 
-      case  'C':
-        $noClose =  1;
-      case  'c':
-        // this this might be a callback function
-        $j++;
-        $k =  mb_strpos($text, '>', $j);
+          case  'C':
+            $noClose =  1;
+          case  'c':
+            // this this might be a callback function
+            $j++;
+            $k =  mb_strpos($text, '>', $j);
 
-        if  ($k !==  false &&  $text[$j] ===  ':') {
-          // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+            if  ($k !==  false &&  $text[$j] ===  ':') {
+              // then this will be treated as a callback directive
+              $directive =  $k-$i+1;
 
-          $f =  0;
+              $f =  0;
 
-          // split the remainder on colons to get the function name and the paramater
-          //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+              // split the remainder on colons to get the function name and the paramater
+              //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
+              $tmp =  mb_substr($text, $j+1, $k-$j-1);
+              $b1 =  mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
-            $func =  mb_substr($tmp, 0, $b1);
-            $parm =  mb_substr($tmp, $b1+1);
-          } else {
-            $func =  $tmp;
-            $parm =  '';
-          }
-
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-            $directive =  0;
-          } else {
-            // only call the function if this is the final call, ie, the one actually doing printing, not measurement
-            if  ($final) {
-              // need to assess the text position, calculate the text width to this point
-              // can use getTextWidth to find the text width I think
-              // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
-
-              $info =  array(
-                'x' => $tmp[0], 
-                'y' => $tmp[1], 
-                'angle' => $angle, 
-                'status' => 'start', 
-                'p' => $parm, 
-                'f' => $func, 
-                'height' => $this->getFontHeight($size), 
-                'descender' => $this->getFontDescender($size)
-              );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
-
-              if  (!isset($noClose) ||  !$noClose) {
-                // only add to the stack if this is a small 'c', therefore is a start-stop pair
-                $this->nCallback++;
-                $info['nCallback'] =  $this->nCallback;
-                $this->callback[$this->nCallback] =  $info;
+              if  ($b1 !==  false) {
+                $func =  mb_substr($tmp, 0, $b1);
+                $parm =  mb_substr($tmp, $b1+1);
+              } else {
+                $func =  $tmp;
+                $parm =  '';
               }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
-                // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                foreach($ret as  $rk => $rv) {
-                  switch ($rk) {
-                  case  'x':
-                  case  'y':
-                    $$rk =  $rv;
-                    break;
+              if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                $directive =  0;
+              } else {
+                // only call the function if this is the final call, ie, the one actually doing printing, not measurement
+                if  ($final) {
+                  // need to assess the text position, calculate the text width to this point
+                  // can use getTextWidth to find the text width I think
+                  // also add the text height and descender
+                  $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+
+                  $info =  array(
+                    'x' => $tmp[0], 
+                    'y' => $tmp[1], 
+                    'angle' => $angle, 
+                    'status' => 'start', 
+                    'p' => $parm, 
+                    'f' => $func, 
+                    'height' => $this->getFontHeight($size), 
+                    'descender' => $this->getFontDescender($size)
+                  );
+                  $x =  $tmp[0];
+                  $y =  $tmp[1];
+
+                  if  (!isset($noClose) ||  !$noClose) {
+                    // only add to the stack if this is a small 'c', therefore is a start-stop pair
+                    $this->nCallback++;
+                    $info['nCallback'] =  $this->nCallback;
+                    $this->callback[$this->nCallback] =  $info;
                   }
+
+                  $ret =  $this->$func($info);
+                  if  (is_array($ret)) {
+                    // then the return from the callback function could set the position, to start with, later will do font colour, and font
+                    foreach($ret as  $rk => $rv) {
+                      switch ($rk) {
+                          case  'x':
+                          case  'y':
+                            $$rk =  $rv;
+                            break;
+                      }
                 }
               }
             }
@@ -3471,29 +3471,29 @@ 
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
-    case  'left':
-      return;
+        case  'left':
+          return;
 
-    case  'right':
-      $x+=  $width-$actual;
-      break;
+        case  'right':
+          $x+=  $width-$actual;
+          break;
 
-    case  'center':
-    case  'centre':
-      $x+=  ($width-$actual) /2;
-      break;
+        case  'center':
+        case  'centre':
+          $x+=  ($width-$actual) /2;
+          break;
 
-    case  'full':
-      // count the number of words
-      $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+        case  'full':
+          // count the number of words
+          $words =  explode(' ', $text);
+          $nspaces =  count($words) -1;
 
-      if  ($nspaces>0) {
-        $adjust =  ($width-$actual) /$nspaces;
-      } else {
-        $adjust =  0;
-      }
-      break;
+          if  ($nspaces>0) {
+            $adjust =  ($width-$actual) /$nspaces;
+          } else {
+            $adjust =  0;
+          }
+          break;
     }
   }
 
@@ -3766,48 +3766,48 @@ 
     if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
       // then it is a valid object, and it is not being added to itself
       switch ($options) {
-      case  'all':
-        // then this object is to be added to this page (done in the next block) and
-        // all future new pages.
-        $this->addLooseObjects[$id] =  'all';
-
-      case  'add':
-        if  (isset($this->objects[$this->currentContents]['onPage'])) {
-          // then the destination contents is the primary for the page
-          // (though this object is actually added to that page)
-          $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
-        }
-        break;
+          case  'all':
+            // then this object is to be added to this page (done in the next block) and
+            // all future new pages.
+            $this->addLooseObjects[$id] =  'all';
+
+          case  'add':
+            if  (isset($this->objects[$this->currentContents]['onPage'])) {
+              // then the destination contents is the primary for the page
+              // (though this object is actually added to that page)
+              $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
+            }
+            break;
 
-      case  'even':
-        $this->addLooseObjects[$id] =  'even';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
-          $this->addObject($id);
-          // hacky huh :)
-        }
-        break;
+          case  'even':
+            $this->addLooseObjects[$id] =  'even';
+            $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
+            if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
+              $this->addObject($id);
+              // hacky huh :)
+            }
+            break;
 
-      case  'odd':
-        $this->addLooseObjects[$id] =  'odd';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
-          $this->addObject($id);
-          // hacky huh :)
-        }
-        break;
+          case  'odd':
+            $this->addLooseObjects[$id] =  'odd';
+            $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
+            if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
+              $this->addObject($id);
+              // hacky huh :)
+            }
+            break;
 
-      case  'next':
-        $this->addLooseObjects[$id] =  'all';
-        break;
+          case  'next':
+            $this->addLooseObjects[$id] =  'all';
+            break;
 
-      case  'nexteven':
-        $this->addLooseObjects[$id] =  'even';
-        break;
+          case  'nexteven':
+            $this->addLooseObjects[$id] =  'even';
+            break;
 
-      case  'nextodd':
-        $this->addLooseObjects[$id] =  'odd';
-        break;
+          case  'nextodd':
+            $this->addLooseObjects[$id] =  'odd';
+            break;
       }
     }
   }
@@ -4025,105 +4025,105 @@ 
         $chunkType =  mb_substr($data, $p+4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
         switch ($chunkType) {
-        case  'IHDR':
-          // this is where all the file information comes from
-          $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
-
-          //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
-            $error =  1;
-
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
-
-            $errormsg =  'unsupported compression method';
-          }
+            case  'IHDR':
+              // this is where all the file information comes from
+              $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
+              $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
+              $info['bitDepth'] =  ord($data[$p+16]);
+              $info['colorType'] =  ord($data[$p+17]);
+              $info['compressionMethod'] =  ord($data[$p+18]);
+              $info['filterMethod'] =  ord($data[$p+19]);
+              $info['interlaceMethod'] =  ord($data[$p+20]);
+
+              //print_r($info);
+              $haveHeader =  1;
+              if  ($info['compressionMethod'] !=  0) {
+                $error =  1;
+
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
+
+                $errormsg =  'unsupported compression method';
+              }
 
-          if  ($info['filterMethod'] !=  0) {
-            $error =  1;
+              if  ($info['filterMethod'] !=  0) {
+                $error =  1;
 
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
-            $errormsg =  'unsupported filter method';
-          }
-          break;
+                $errormsg =  'unsupported filter method';
+              }
+              break;
 
-        case  'PLTE':
-          $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'PLTE':
+              $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'IDAT':
-          $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'IDAT':
+              $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'tRNS':
-          //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
-          //print "tRNS found, color type = ".$info['colorType']."\n";
-          $transparency =  array();
+            case  'tRNS':
+              //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
+              //print "tRNS found, color type = ".$info['colorType']."\n";
+              $transparency =  array();
 
-          if  ($info['colorType'] ==  3) {
-            // indexed color, rbg
-            /* corresponding to entries in the plte chunk
+              if  ($info['colorType'] ==  3) {
+                // indexed color, rbg
+                /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
              Alpha for palette index 1: 1 byte
              ...etc...
             */
-            // there will be one entry for each palette entry. up until the last non-opaque entry.
-            // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
-            $transparency['type'] =  'indexed';
-            $numPalette =  mb_strlen($pdata, '8bit')/3;
-            $trans =  0;
-
-            for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
-                $trans =  $i;
-              }
-            }
+                // there will be one entry for each palette entry. up until the last non-opaque entry.
+                // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
+                $transparency['type'] =  'indexed';
+                $numPalette =  mb_strlen($pdata, '8bit')/3;
+                $trans =  0;
+
+                for  ($i =  $chunkLen;$i >=  0;$i--) {
+                  if  (ord($data[$p+8+$i]) ==  0) {
+                    $trans =  $i;
+                  }
+                }
 
-            $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
-            // grayscale
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  $trans;
+              } elseif ($info['colorType'] ==  0) {
+                // grayscale
+                /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
-            $transparency['type'] =  'indexed';
+                //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
+                $transparency['type'] =  'indexed';
 
-            $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
-            // truecolor
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  ord($data[$p+8+1]);
+              } elseif ($info['colorType'] ==  2) {
+                // truecolor
+                /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
              Green: 2 bytes, range 0 .. (2^bitdepth)-1
              Blue: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
-            // r from truecolor
-            $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
-            // g from truecolor
-            $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
-            // b from truecolor
-
-            $transparency['type'] = 'color-key';
+                $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
+                // r from truecolor
+                $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
+                // g from truecolor
+                $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
+                // b from truecolor
+
+                $transparency['type'] = 'color-key';
             
-          } else {
-            //unsupported transparency type
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
-          }
-          // KS End new code
-          break;
+              } else {
+                //unsupported transparency type
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
+              }
+              // KS End new code
+              break;
 
-        default:
-          break;
+            default:
+              break;
         }
 
         $p+=  $chunkLen+12;
@@ -4168,20 +4168,20 @@ 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {
         switch  ($info['colorType']) {
-        case  3:
-          $color =  'DeviceRGB';
-          $ncolor =  1;
-          break;
+            case  3:
+              $color =  'DeviceRGB';
+              $ncolor =  1;
+              break;
 
-        case  2:
-          $color =  'DeviceRGB';
-          $ncolor =  3;
-          break;
+            case  2:
+              $color =  'DeviceRGB';
+              $ncolor =  3;
+              break;
 
-        case  0:
-          $color =  'DeviceGray';
-          $ncolor =  1;
-          break;
+            case  0:
+              $color =  'DeviceGray';
+              $ncolor =  1;
+              break;
         }
       }
     }
@@ -4469,48 +4469,48 @@ 
    */
   function  transaction($action) {
     switch  ($action) {
-    case  'start':
-      // store all the data away into the checkpoint variable
-      $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
-      unset($data);
-      break;
+        case  'start':
+          // store all the data away into the checkpoint variable
+          $data =  get_object_vars($this);
+          $this->checkpoint =  $data;
+          unset($data);
+          break;
 
-    case  'commit':
-      if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
-        $tmp =  $this->checkpoint['checkpoint'];
-        $this->checkpoint =  $tmp;
-        unset($tmp);
-      } else {
-        $this->checkpoint =  '';
-      }
-      break;
+        case  'commit':
+          if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
+            $tmp =  $this->checkpoint['checkpoint'];
+            $this->checkpoint =  $tmp;
+            unset($tmp);
+          } else {
+            $this->checkpoint =  '';
+          }
+          break;
 
-    case  'rewind':
-      // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        case  'rewind':
+          // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
 
-        foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
-            $this->$k =  $v;
+            foreach ($tmp as  $k => $v) {
+              if  ($k !==  'checkpoint') {
+                $this->$k =  $v;
+              }
+            }
+            unset($tmp);
           }
-        }
-        unset($tmp);
-      }
-      break;
+          break;
 
-    case  'abort':
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
-        foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
-        }
-        unset($tmp);
-      }
-      break;
+        case  'abort':
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
+            foreach ($tmp as  $k => $v) {
+              $this->$k =  $v;
+            }
+            unset($tmp);
+          }
+          break;
     }
   }
 }

Spacing +1069 added lines, -1069 removed lines

@@ -57,7 +57,7 @@ 
   /**
    * this array contains all of the pdf objects, ready for final assembly
    */
-  public  $objects =  array();
+  public  $objects = array();
 
   /**
    * the objectId (number within the objects array) of the document catalog
@@ -114,7 +114,7 @@ 
   /**
    * Number of graphic state resources used
    */
-  private  $numStates =  0;
+  private  $numStates = 0;
 
 
   /**
@@ -146,12 +146,12 @@ 
    * an array which is used to save the state of the document, mainly the colours and styles
    * it is used to temporarily change to another state, the change back to what it was before
    */
-  public  $stateStack =  array();
+  public  $stateStack = array();
 
   /**
    * number of elements within the state stack
    */
-  public  $nStateStack =  0;
+  public  $nStateStack = 0;
 
   /**
    * number of page objects within the document
@@ -217,7 +217,7 @@ 
    * this used so that the code knows which font is the bold version of another font, etc.
    * the value of this array is initialised in the constuctor function.
    */
-  public  $fontFamilies =  array();
+  public  $fontFamilies = array();
  
   /**
    * folder for php serialized formats of font metrics files.
@@ -245,7 +245,7 @@ 
   /**
    * track if the current font is bolded or italicised
    */
-  public  $currentTextState =  '';
+  public  $currentTextState = '';
 
   /**
    * messages are stored here during processing, these can be selected afterwards to give some useful debug information
@@ -280,25 +280,25 @@ 
   /**
    * array which forms a stack to keep track of nested callback functions
    */
-  public  $callback =  array();
+  public  $callback = array();
 
   /**
    * the number of callback functions in the callback array
    */
-  public  $nCallback =  0;
+  public  $nCallback = 0;
 
   /**
    * store label->id pairs for named destinations, these will be used to replace internal links
    * done this way so that destinations can be defined after the location that links to them
    */
-  public  $destinations =  array();
+  public  $destinations = array();
 
   /**
    * store the stack for the transaction commands, each item in here is a record of the values of all the
    * publiciables within the class, so that the user can rollback at will (from each 'start' command)
    * note that this includes the objects array, so these can be large.
    */
-  public  $checkpoint =  '';
+  public  $checkpoint = '';
 
   /* Table of Image origin filenames and image labels which were already added with o_image().
    * Allows to merge identical images
@@ -318,7 +318,7 @@ 
    * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
    * @var boolean whether text will be treated as Unicode or not.
    */
-  function  Cpdf ($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
+  function  Cpdf($pageSize = array(0, 0, 612, 792), $isUnicode = false, $fontcache = '', $tmp = '') {
     $this->isUnicode = $isUnicode;
     $this->fontcache = $fontcache;
     $this->tmp = $tmp;
@@ -349,33 +349,33 @@ 
    *destination object, used to specify the location for the user to jump to, presently on opening
    */
   protected function  o_destination($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
     switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
+      $tmp = '';
+      switch ($options['type']) {
       case  'XYZ':
       case  'FitR':
-        $tmp =   ' '.$options['p3'].$tmp;
+        $tmp = ' '.$options['p3'].$tmp;
       case  'FitH':
       case  'FitV':
       case  'FitBH':
       case  'FitBV':
-        $tmp =   ' '.$options['p1'].' '.$options['p2'].$tmp;
+        $tmp = ' '.$options['p1'].' '.$options['p2'].$tmp;
       case  'Fit':
       case  'FitB':
-        $tmp =   $options['type'].$tmp;
+        $tmp = $options['type'].$tmp;
         $this->objects[$id]['info']['string'] = $tmp;
         $this->objects[$id]['info']['page'] = $options['page'];
       }
       break;
 
     case  'out':
-      $tmp =  $o['info'];
+      $tmp = $o['info'];
       $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
       return  $res;
     }
@@ -386,18 +386,18 @@ 
    * set the viewer preferences
    */
   protected function  o_viewerPreferences($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
       break;
 
     case  'add':
-      foreach($options as  $k=>$v) {
-        switch  ($k) {
+      foreach ($options as  $k=>$v) {
+        switch ($k) {
         case  'HideToolbar':
         case  'HideMenubar':
         case  'HideWindowUI':
@@ -413,10 +413,10 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\n";
+      $res .= "\n>>\n";
       return  $res;
     }
   }
@@ -426,11 +426,11 @@ 
    * define the document catalog, the overall controller for the document
    */
   protected function  o_catalog($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
       $this->catalogId = $id;
@@ -444,13 +444,13 @@ 
       break;
 
     case  'viewerPreferences':
-      if  (!isset($o['info']['viewerPreferences'])) {
+      if (!isset($o['info']['viewerPreferences'])) {
         $this->numObj++;
         $this->o_viewerPreferences($this->numObj, 'new');
         $o['info']['viewerPreferences'] = $this->numObj;
       }
 
-      $vp =  $o['info']['viewerPreferences'];
+      $vp = $o['info']['viewerPreferences'];
       $this->o_viewerPreferences($vp, 'add', $options);
 
       break;
@@ -458,31 +458,31 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
+      foreach ($o['info'] as  $k=>$v) {
         switch ($k) {
         case  'outlines':
-          $res.= "\n".'/Outlines '.$v.' 0 R';
+          $res .= "\n".'/Outlines '.$v.' 0 R';
           break;
           
         case  'pages':
-          $res.= "\n".'/Pages '.$v.' 0 R';
+          $res .= "\n".'/Pages '.$v.' 0 R';
           break;
 
         case  'viewerPreferences':
-          $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
+          $res .= "\n".'/ViewerPreferences '.$v.' 0 R';
           break;
 
         case  'openHere':
-          $res.= "\n".'/OpenAction '.$v.' 0 R';
+          $res .= "\n".'/OpenAction '.$v.' 0 R';
           break;
 
         case  'javascript':
-          $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
+          $res .= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
           break;
         }
       }
 
-      $res.= " >>\nendobj";
+      $res .= " >>\nendobj";
       return  $res;
     }
   }
@@ -492,36 +492,36 @@ 
    * object which is a parent to the pages in the document
    */
   protected function  o_pages($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'pages', 'info'=>array());
       $this->o_catalog($this->catalogId, 'pages', $id);
       break;
 
     case  'page':
-      if  (!is_array($options)) {
+      if (!is_array($options)) {
         // then it will just be the id of the new page
         $o['info']['pages'][] = $options;
       } else {
         // then it should be an array having 'id','rid','pos', where rid=the page to which this one will be placed relative
         // and pos is either 'before' or 'after', saying where this page will fit.
-        if  (isset($options['id']) &&  isset($options['rid']) &&  isset($options['pos'])) {
-          $i =  array_search($options['rid'], $o['info']['pages']);
-          if  (isset($o['info']['pages'][$i]) &&  $o['info']['pages'][$i] == $options['rid']) {
+        if (isset($options['id']) && isset($options['rid']) && isset($options['pos'])) {
+          $i = array_search($options['rid'], $o['info']['pages']);
+          if (isset($o['info']['pages'][$i]) && $o['info']['pages'][$i] == $options['rid']) {
 
             // then there is a match
             // make a space
-            switch  ($options['pos']) {
+            switch ($options['pos']) {
             case  'before':
-              $k =  $i;
+              $k = $i;
               break;
 
             case  'after':
-              $k = $i+1;
+              $k = $i + 1;
               break;
 
             default:
@@ -529,9 +529,9 @@ 
               break;
             }
 
-            if  ($k >= 0) {
-              for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
-                $o['info']['pages'][$j+1] = $o['info']['pages'][$j];
+            if ($k >= 0) {
+              for ($j = count($o['info']['pages']) - 1; $j >= $k; $j--) {
+                $o['info']['pages'][$j + 1] = $o['info']['pages'][$j];
               }
 
               $o['info']['pages'][$k] = $options['id'];
@@ -555,7 +555,7 @@ 
       break;
 
     case  'extGState':
-      $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
+      $o['info']['extGStates'][] = array('objNum' => $options['objNum'], 'stateNum' => $options['stateNum']);
       break;
 
     case  'xObject':
@@ -563,55 +563,55 @@ 
       break;
 
     case  'out':
-      if  (count($o['info']['pages'])) {
+      if (count($o['info']['pages'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
-        foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
+        foreach ($o['info']['pages'] as  $k=>$v) {
+          $res .= $v." 0 R\n";
         }
 
-        $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
+        $res .= "]\n/Count ".count($this->objects[$id]['info']['pages']);
 
-        if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
+        if ((isset($o['info']['fonts']) && count($o['info']['fonts'])) ||
               isset($o['info']['procset']) ||
-              (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+              (isset($o['info']['extGStates']) && count($o['info']['extGStates']))) {
+          $res .= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
-            $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
+          if (isset($o['info']['procset'])) {
+            $res .= "\n/ProcSet ".$o['info']['procset']." 0 R";
           }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
-            $res.= "\n/Font << ";
-            foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+          if (isset($o['info']['fonts']) && count($o['info']['fonts'])) {
+            $res .= "\n/Font << ";
+            foreach ($o['info']['fonts'] as  $finfo) {
+              $res .= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
             }
-            $res.= "\n>>";
+            $res .= "\n>>";
           }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
-            $res.= "\n/XObject << ";
-            foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+          if (isset($o['info']['xObjects']) && count($o['info']['xObjects'])) {
+            $res .= "\n/XObject << ";
+            foreach ($o['info']['xObjects'] as  $finfo) {
+              $res .= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
             }
-            $res.= "\n>>";
+            $res .= "\n>>";
           }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
-            $res.=  "\n/ExtGState << ";
+          if (isset($o['info']['extGStates']) && count($o['info']['extGStates'])) {
+            $res .= "\n/ExtGState << ";
             foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+              $res .= "\n/GS".$gstate['stateNum']." ".$gstate['objNum']." 0 R";
             }
-            $res.=  "\n>>";
+            $res .= "\n>>";
           }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
+          $res .= "\n>>";
+          if (isset($o['info']['mediaBox'])) {
             $tmp = $o['info']['mediaBox'];
-            $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+            $res .= "\n/MediaBox [".sprintf('%.3F', $tmp[0]).' '.sprintf('%.3F', $tmp[1]).' '.sprintf('%.3F', $tmp[2]).' '.sprintf('%.3F', $tmp[3]).']';
           }
         }
 
-        $res.= "\n >>\nendobj";
+        $res .= "\n >>\nendobj";
       } else {
         $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
       }
@@ -625,11 +625,11 @@ 
    * define the outlines in the doc, empty for now
    */
   protected function  o_outlines($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
       $this->o_catalog($this->catalogId, 'outlines', $id);
@@ -640,13 +640,13 @@ 
       break;
 
     case  'out':
-      if  (count($o['info']['outlines'])) {
+      if (count($o['info']['outlines'])) {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
-        foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
+        foreach ($o['info']['outlines'] as  $k=>$v) {
+          $res .= $v." 0 R ";
         }
 
-        $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
+        $res .= "] /Count ".count($o['info']['outlines'])." >>\nendobj";
       } else {
         $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
       }
@@ -660,40 +660,40 @@ 
    * an object to hold the font description
    */
   protected function  o_font($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
-      $fontNum =  $this->numFonts;
-      $this->objects[$id]['info']['fontNum'] =  $fontNum;
+      $this->objects[$id] = array('t' => 'font', 'info' => array('name' => $options['name'], 'fontFileName' => $options['fontFileName'], 'SubType' => 'Type1'));
+      $fontNum = $this->numFonts;
+      $this->objects[$id]['info']['fontNum'] = $fontNum;
 
       // deal with the encoding and the differences
-      if  (isset($options['differences'])) {
+      if (isset($options['differences'])) {
         // then we'll need an encoding dictionary
         $this->numObj++;
         $this->o_fontEncoding($this->numObj, 'new', $options);
-        $this->objects[$id]['info']['encodingDictionary'] =  $this->numObj;
-      } else  if  (isset($options['encoding'])) {
+        $this->objects[$id]['info']['encodingDictionary'] = $this->numObj;
+      } else  if (isset($options['encoding'])) {
         // we can specify encoding here
         switch ($options['encoding']) {
         case  'WinAnsiEncoding':
         case  'MacRomanEncoding':
         case  'MacExpertEncoding':
-          $this->objects[$id]['info']['encoding'] =  $options['encoding'];
+          $this->objects[$id]['info']['encoding'] = $options['encoding'];
           break;
 
         case  'none':
           break;
 
         default:
-          $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+          $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
           break;
         }
       } else {
-        $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+        $this->objects[$id]['info']['encoding'] = 'WinAnsiEncoding';
       }
 
       if ($this->fonts[$options['fontFileName']]['isUnicode']) {
@@ -709,29 +709,29 @@ 
         $this->o_contents($toUnicodeId, 'new', 'raw');
         $this->objects[$id]['info']['toUnicode'] = $toUnicodeId;
         
-        $stream =  "/CIDInit /ProcSet findresource begin\n";
-        $stream.=  "12 dict begin\n";
-        $stream.=  "begincmap\n";
-        $stream.=  "/CIDSystemInfo\n";
-        $stream.=  "<</Registry (Adobe)\n";
-        $stream.=  "/Ordering (UCS)\n";
-        $stream.=  "/Supplement 0\n";
-        $stream.=  ">> def\n";
-        $stream.=  "/CMapName /Adobe-Identity-UCS def\n";
-        $stream.=  "/CMapType 2 def\n";
-        $stream.=  "1 begincodespacerange\n";
-        $stream.=  "<0000> <FFFF>\n";
-        $stream.=  "endcodespacerange\n";
-        $stream.=  "1 beginbfrange\n";
-        $stream.=  "<0000> <FFFF> <0000>\n";
-        $stream.=  "endbfrange\n";
-        $stream.=  "endcmap\n";
-        $stream.=  "CMapName currentdict /CMap defineresource pop\n";
-        $stream.=  "end\n";
-        $stream.=  "end\n";
-
-        $res =   "<</Length " . mb_strlen($stream, '8bit') . " >>\n";
-        $res .=  "stream\n" . $stream . "endstream";
+        $stream = "/CIDInit /ProcSet findresource begin\n";
+        $stream .= "12 dict begin\n";
+        $stream .= "begincmap\n";
+        $stream .= "/CIDSystemInfo\n";
+        $stream .= "<</Registry (Adobe)\n";
+        $stream .= "/Ordering (UCS)\n";
+        $stream .= "/Supplement 0\n";
+        $stream .= ">> def\n";
+        $stream .= "/CMapName /Adobe-Identity-UCS def\n";
+        $stream .= "/CMapType 2 def\n";
+        $stream .= "1 begincodespacerange\n";
+        $stream .= "<0000> <FFFF>\n";
+        $stream .= "endcodespacerange\n";
+        $stream .= "1 beginbfrange\n";
+        $stream .= "<0000> <FFFF> <0000>\n";
+        $stream .= "endbfrange\n";
+        $stream .= "endcmap\n";
+        $stream .= "CMapName currentdict /CMap defineresource pop\n";
+        $stream .= "end\n";
+        $stream .= "end\n";
+
+        $res = "<</Length ".mb_strlen($stream, '8bit')." >>\n";
+        $res .= "stream\n".$stream."endstream";
 
         $this->objects[$toUnicodeId]['c'] = $res;
 
@@ -746,9 +746,9 @@ 
 
     case  'add':
       foreach ($options as  $k => $v) {
-        switch  ($k) {
+        switch ($k) {
         case  'BaseFont':
-          $o['info']['name'] =  $v;
+          $o['info']['name'] = $v;
           break;
         case  'FirstChar':
         case  'LastChar':
@@ -756,7 +756,7 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
+          $o['info'][$k] = $v;
           break;
         }
       }
@@ -777,47 +777,47 @@ 
         // All of this code is adapted from the excellent changes made to
         // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
 
-        $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
-        $res.=  "/BaseFont /".$o['info']['name']."\n";
+        $res = "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
+        $res .= "/BaseFont /".$o['info']['name']."\n";
 
         // The horizontal identity mapping for 2-byte CIDs; may be used
         // with CIDFonts using any Registry, Ordering, and Supplement values.
-        $res.=  "/Encoding /Identity-H\n";
-        $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
-        $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
-        $res.=  ">>\n";
-        $res.=  "endobj";
+        $res .= "/Encoding /Identity-H\n";
+        $res .= "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
+        $res .= "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
+        $res .= ">>\n";
+        $res .= "endobj";
       } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
+      $res = "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+      $res .= "/Name /F".$o['info']['fontNum']."\n";
+      $res .= "/BaseFont /".$o['info']['name']."\n";
 
-      if  (isset($o['info']['encodingDictionary'])) {
+      if (isset($o['info']['encodingDictionary'])) {
         // then place a reference to the dictionary
-        $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
+        $res .= "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
+      } else  if (isset($o['info']['encoding'])) {
         // use the specified encoding
-        $res.=  "/Encoding /".$o['info']['encoding']."\n";
+        $res .= "/Encoding /".$o['info']['encoding']."\n";
       }
 
-      if  (isset($o['info']['FirstChar'])) {
-        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+      if (isset($o['info']['FirstChar'])) {
+        $res .= "/FirstChar ".$o['info']['FirstChar']."\n";
       }
 
-      if  (isset($o['info']['LastChar'])) {
-        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+      if (isset($o['info']['LastChar'])) {
+        $res .= "/LastChar ".$o['info']['LastChar']."\n";
       }
 
-      if  (isset($o['info']['Widths'])) {
-        $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
+      if (isset($o['info']['Widths'])) {
+        $res .= "/Widths ".$o['info']['Widths']." 0 R\n";
       }
 
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+      if (isset($o['info']['FontDescriptor'])) {
+        $res .= "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
       }
 
-        $res.=  ">>\n";
-        $res.=  "endobj";
+        $res .= ">>\n";
+        $res .= "endobj";
       }
 
       return  $res;
@@ -829,11 +829,11 @@ 
    * a font descriptor, needed for including additional fonts
    */
   protected function  o_fontDescriptor($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
       break;
@@ -841,7 +841,7 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
       foreach ($o['info'] as  $label => $value) {
-        switch  ($label) {
+        switch ($label) {
         case  'Ascent':
         case  'CapHeight':
         case  'Descent':
@@ -855,28 +855,28 @@ 
         case  'StemH':
         case  'XHeight':
         case  'CharSet':
-          if  (mb_strlen($value, '8bit')) {
-            $res.= '/'.$label.' '.$value."\n";
+          if (mb_strlen($value, '8bit')) {
+            $res .= '/'.$label.' '.$value."\n";
           }
 
           break;
         case  'FontFile':
         case  'FontFile2':
         case  'FontFile3':
-          $res.= '/'.$label.' '.$value." 0 R\n";
+          $res .= '/'.$label.' '.$value." 0 R\n";
           break;
 
         case  'FontBBox':
-          $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
+          $res .= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
           break;
 
         case  'FontName':
-          $res.= '/'.$label.' /'.$value."\n";
+          $res .= '/'.$label.' /'.$value."\n";
           break;
         }
       }
 
-      $res.= ">>\nendobj";
+      $res .= ">>\nendobj";
 
       return  $res;
     }
@@ -887,11 +887,11 @@ 
    * the font encoding
    */
   protected function  o_fontEncoding($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       // the options array should contain 'differences' and maybe 'encoding'
       $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
@@ -899,30 +899,30 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
+      if (!isset($o['info']['encoding'])) {
         $o['info']['encoding'] = 'WinAnsiEncoding';
       }
 
-      if  ($o['info']['encoding'] !== 'none') {
-        $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
+      if ($o['info']['encoding'] !== 'none') {
+        $res .= "/BaseEncoding /".$o['info']['encoding']."\n";
       }
 
-      $res.= "/Differences \n[";
+      $res .= "/Differences \n[";
 
       $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
-        if  ($num != $onum+1) {
+      foreach ($o['info']['differences'] as  $num=>$label) {
+        if ($num != $onum + 1) {
           // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
+          $res .= "\n".$num." /".$label;
         } else {
-          $res.=  " /".$label;
+          $res .= " /".$label;
         }
 
         $onum = $num;
       }
 
-      $res.= "\n]\n>>\nendobj";
+      $res .= "\n]\n>>\nendobj";
       return  $res;
     }
   }
@@ -932,22 +932,22 @@ 
    * a descendent cid font,  needed for unicode fonts
    */
   protected function  o_fontDescendentCID($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
+      $this->objects[$id] = array('t'=>'fontDescendentCID', 'info'=>$options);
 
       // we need a CID system info section
       $cidSystemInfoId = ++$this->numObj;
       $this->o_contents($cidSystemInfoId, 'new', 'raw');
       $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
+      $res = "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+      $res .= "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+      $res .= "/Supplement 0\n"; // The supplement number of the character collection.
+      $res .= ">>";
       $this->objects[$cidSystemInfoId]['c'] = $res;
 
       // and a CID to GID map
@@ -958,9 +958,9 @@ 
 
     case  'add':
       foreach ($options as  $k => $v) {
-        switch  ($k) {
+        switch ($k) {
         case  'BaseFont':
-          $o['info']['name'] =  $v;
+          $o['info']['name'] = $v;
           break;
 
         case  'FirstChar':
@@ -969,7 +969,7 @@ 
         case  'FontDescriptor':
         case  'SubType':
           $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
+          $o['info'][$k] = $v;
           break;
         }
       }
@@ -979,11 +979,11 @@ 
       break;
 
     case  'out':
-      $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+      $res = "\n".$id." 0 obj\n";
+      $res .= "<</Type /Font\n";
+      $res .= "/Subtype /CIDFontType2\n";
+      $res .= "/BaseFont /".$o['info']['name']."\n";
+      $res .= "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
 //      if  (isset($o['info']['FirstChar'])) {
 //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
 //      }
@@ -991,26 +991,26 @@ 
 //      if  (isset($o['info']['LastChar'])) {
 //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
 //      }
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+      if (isset($o['info']['FontDescriptor'])) {
+        $res .= "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
       }
 
-      if  (isset($o['info']['MissingWidth'])) {
-        $res.=  "/DW ".$o['info']['MissingWidth']."\n";
+      if (isset($o['info']['MissingWidth'])) {
+        $res .= "/DW ".$o['info']['MissingWidth']."\n";
       }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+      if (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
         $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
         $w = '';
         foreach ($cid_widths as $cid => $width) {
           $w .= $cid.' ['.$width.'] ';
         }
-        $res.=  "/W [".$w."]\n";
+        $res .= "/W [".$w."]\n";
       }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+      $res .= "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+      $res .= ">>\n";
+      $res .= "endobj";
 
       return  $res;
     }
@@ -1021,13 +1021,13 @@ 
    * a font glyph to character map,  needed for unicode fonts
    */
   protected function  o_fontGIDtoCIDMap($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
+      $this->objects[$id] = array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
       break;
 
     case  'out':
@@ -1036,24 +1036,24 @@ 
       $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
                     $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
-        $res.= $tmp;
+      if (!$compressed && isset($o['raw'])) {
+        $res .= $tmp;
       } else {
-        $res.=  "<<";
+        $res .= "<<";
 
-        if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
+        if (!$compressed && function_exists('gzcompress') && $this->options['compression']) {
           // then implement ZLIB based compression on this content stream
           $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
+          $tmp = gzcompress($tmp, 6);
         }
         if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
+          $res .= "\n/Filter /FlateDecode";
         }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
+        $res .= "\n/Length ".mb_strlen($tmp, '8bit').">>\nstream\n".$tmp."\nendstream";
       }
 
-      $res.= "\nendobj";
+      $res .= "\nendobj";
       return  $res;
     }
   }
@@ -1063,11 +1063,11 @@ 
    * the document procset, solves some problems with printing to old PS printers
    */
   protected function  o_procset($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
       $this->o_pages($this->currentNode, 'procset', $id);
@@ -1077,7 +1077,7 @@ 
     case  'add':
       // this is to add new items to the procset list, despite the fact that this is considered
       // obselete, the items are required for printing to some postscript printers
-      switch  ($options) {
+      switch ($options) {
       case  'ImageB':
       case  'ImageC':
       case  'ImageI':
@@ -1089,9 +1089,9 @@ 
     case  'out':
       $res = "\n".$id." 0 obj\n[";
       foreach ($o['info'] as  $label=>$val) {
-        $res.= '/'.$label.' ';
+        $res .= '/'.$label.' ';
       }
-      $res.= "]\nendobj";
+      $res .= "]\nendobj";
       return  $res;
     }
   }
@@ -1101,11 +1101,11 @@ 
    * define the document information
    */
   protected function  o_info($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->infoObject = $id;
       $date = 'D:'.@date('Ymd');
@@ -1124,26 +1124,26 @@ 
       break;
 
     case  'out':
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
       }
 
       $res = "\n".$id." 0 obj\n<<\n";
       foreach ($o['info'] as  $k=>$v) {
-        $res.= '/'.$k.' (';
+        $res .= '/'.$k.' (';
         // dates must be outputted as-is, without Unicode transformations
         $raw = ($k === 'CreationDate' || $k === 'ModDate');
         $c = $v;
 
-        if  ($this->encrypted) {
+        if ($this->encrypted) {
           $c = $this->ARC4($c);
         }
 
-        $res.= ($raw) ? $c : $this->filterText($c);
-        $res.= ")\n";
+        $res .= ($raw) ? $c : $this->filterText($c);
+        $res .= ")\n";
       }
 
-      $res.= ">>\nendobj";
+      $res .= ">>\nendobj";
       return  $res;
     }
   }
@@ -1153,13 +1153,13 @@ 
    * an action object, used to link to URLS initially
    */
   protected function  o_action($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
-      if  (is_array($options)) {
+      if (is_array($options)) {
         $this->objects[$id] = array('t'=>'action', 'info'=>$options, 'type'=>$options['type']);
       } else {
         // then assume a URI action
@@ -1168,7 +1168,7 @@ 
       break;
 
     case  'out':
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
       }
 
@@ -1176,22 +1176,22 @@ 
       switch ($o['type']) {
       case  'ilink':
         // there will be an 'label' setting, this is the name of the destination
-        $res.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+        $res .= "\n/S /GoTo\n/D ".$this->destinations[(string) $o['info']['label']]." 0 R";
         break;
 
       case  'URI':
-        $res.= "\n/S /URI\n/URI (";
-        if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
+        $res .= "\n/S /URI\n/URI (";
+        if ($this->encrypted) {
+          $res .= $this->filterText($this->ARC4($o['info']));
         } else {
-          $res.= $this->filterText($o['info']);
+          $res .= $this->filterText($o['info']);
         }
 
-        $res.= ")";
+        $res .= ")";
         break;
       }
 
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1202,14 +1202,14 @@ 
    * initially will support just link annotations
    */
   protected function  o_annotation($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       // add the annotation to the current page
-      $pageId =  $this->currentPage;
+      $pageId = $this->currentPage;
       $this->o_page($pageId, 'annot', $id);
 
       // and add the action object which is going to be required
@@ -1223,7 +1223,7 @@ 
 
       case  'ilink':
         // this is to a named internal link
-        $label =  $options['label'];
+        $label = $options['label'];
         $this->objects[$id] = array('t'=>'annotation', 'info'=>$options);
         $this->numObj++;
         $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
@@ -1237,20 +1237,20 @@ 
       switch ($o['info']['type']) {
       case  'link':
       case  'ilink':
-        $res.=  "\n/Subtype /Link";
+        $res .= "\n/Subtype /Link";
         break;
       }
-      $res.= "\n/A ".$o['info']['actionId']." 0 R";
-      $res.= "\n/Border [0 0 0]";
-      $res.= "\n/H /I";
-      $res.= "\n/Rect [ ";
+      $res .= "\n/A ".$o['info']['actionId']." 0 R";
+      $res .= "\n/Border [0 0 0]";
+      $res .= "\n/H /I";
+      $res .= "\n/Rect [ ";
 
-      foreach($o['info']['rect'] as  $v) {
-        $res.=  sprintf("%.4F ", $v);
+      foreach ($o['info']['rect'] as  $v) {
+        $res .= sprintf("%.4F ", $v);
       }
 
-      $res.= "]";
-      $res.= "\n>>\nendobj";
+      $res .= "]";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1260,16 +1260,16 @@ 
    * a page object, it also creates a contents object to hold its contents
    */
   protected function  o_page($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->numPages++;
       $this->objects[$id] = array('t'=>'page', 'info'=>array('parent'=>$this->currentNode, 'pageNum'=>$this->numPages));
 
-      if  (is_array($options)) {
+      if (is_array($options)) {
         // then this must be a page insertion, array should contain 'rid','pos'=[before|after]
         $options['id'] = $id;
         $this->o_pages($this->currentNode, 'page', $options);
@@ -1285,9 +1285,9 @@ 
       $this->objects[$id]['info']['contents'] = array();
       $this->objects[$id]['info']['contents'][] = $this->numObj;
 
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
-        if  ($target === 'all' || $match === $target) {
+      $match = ($this->numPages % 2 ? 'odd' : 'even');
+      foreach ($this->addLooseObjects as  $oId=>$target) {
+        if ($target === 'all' || $match === $target) {
           $this->objects[$id]['info']['contents'][] = $oId;
         }
       }
@@ -1299,7 +1299,7 @@ 
 
     case  'annot':
       // add an annotation to this page
-      if  (!isset($o['info']['annot'])) {
+      if (!isset($o['info']['annot'])) {
         $o['info']['annot'] = array();
       }
 
@@ -1309,32 +1309,32 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+      $res .= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
-        $res.= "\n/Annots [";
-        foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
+      if (isset($o['info']['annot'])) {
+        $res .= "\n/Annots [";
+        foreach ($o['info']['annot'] as  $aId) {
+          $res .= " ".$aId." 0 R";
         }
-        $res.= " ]";
+        $res .= " ]";
       }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
-        $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
-        $res.= "\n/Contents [\n";
+      $count = count($o['info']['contents']);
+      if ($count == 1) {
+        $res .= "\n/Contents ".$o['info']['contents'][0]." 0 R";
+      } else  if ($count > 1) {
+        $res .= "\n/Contents [\n";
 
         // reverse the page contents so added objects are below normal content
         //foreach (array_reverse($o['info']['contents']) as  $cId) {
         // Back to normal now that I've got transparency working --Benj
         foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
+          $res .= $cId." 0 R\n";
         }
-        $res.= "]";
+        $res .= "]";
       }
 
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1344,17 +1344,17 @@ 
    * the contents objects hold all of the content which appears on pages
    */
   protected function  o_contents($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
+      if (mb_strlen($options, '8bit') && intval($options)) {
         // then this contents is the primary for a page
         $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
+      } else  if ($options === 'raw') {
         // then this page contains some other type of system object
         $this->objects[$id]['raw'] = 1;
       }
@@ -1368,63 +1368,63 @@ 
 
     case  'out':
       $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+      $res = "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
-        $res.= $tmp;
+      if (isset($this->objects[$id]['raw'])) {
+        $res .= $tmp;
       } else {
-        $res.=  "<<";
-        if  (function_exists('gzcompress') &&  $this->options['compression']) {
+        $res .= "<<";
+        if (function_exists('gzcompress') && $this->options['compression']) {
           // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
+          $res .= " /Filter /FlateDecode";
+          $tmp = gzcompress($tmp, 6);
         }
 
-        if  ($this->encrypted) {
+        if ($this->encrypted) {
           $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
+          $tmp = $this->ARC4($tmp);
         }
 
-        foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
+        foreach ($o['info'] as  $k=>$v) {
+          $res .= "\n/".$k.' '.$v;
         }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
+        $res .= "\n/Length ".mb_strlen($tmp, '8bit')." >>\nstream\n".$tmp."\nendstream";
       }
 
-      $res.= "\nendobj";
+      $res .= "\nendobj";
       return  $res;
     }
   }
 
   protected function  o_embedjs($id, $action, $code = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
-        'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
+        'Names' => '[(EmbeddedJS) '.($id + 1).' 0 R]'
       ));
       break;
 
     case  'out':
       $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
   
   protected function  o_javascript($id, $action, $code = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  'new':
       $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
         'S' => '/JavaScript',
@@ -1434,10 +1434,10 @@ 
 
     case  'out':
       $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
-      $res.= "\n>>\nendobj";
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1446,7 +1446,7 @@ 
    * an image object, will be an XObject in the document, includes description and data
    */
   protected function  o_image($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
@@ -1459,8 +1459,8 @@ 
       $this->objects[$id]['info']['Width'] = $options['iw'];
       $this->objects[$id]['info']['Height'] = $options['ih'];
 
-      if  (!isset($options['type']) ||  $options['type'] === 'jpg') {
-        if  (!isset($options['channels'])) {
+      if (!isset($options['type']) || $options['type'] === 'jpg') {
+        if (!isset($options['channels'])) {
           $options['channels'] = 3;
         }
 
@@ -1476,30 +1476,30 @@ 
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
-      } else  if  ($options['type'] === 'png') {
+      } else  if ($options['type'] === 'png') {
         $this->objects[$id]['info']['Filter'] = '/FlateDecode';
         $this->objects[$id]['info']['DecodeParms'] = '<< /Predictor 15 /Colors '.$options['ncolor'].' /Columns '.$options['iw'].' /BitsPerComponent '.$options['bitsPerComponent'].'>>';
 
-        if  (mb_strlen($options['pdata'], '8bit')) {
-          $tmp =  ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') /3-1) .' ';
+        if (mb_strlen($options['pdata'], '8bit')) {
+          $tmp = ' [ /Indexed /DeviceRGB '.(mb_strlen($options['pdata'], '8bit') / 3 - 1).' ';
           $this->numObj++;
           $this->o_contents($this->numObj, 'new');
           $this->objects[$this->numObj]['c'] = $options['pdata'];
-          $tmp.= $this->numObj.' 0 R';
-          $tmp.= ' ]';
-          $this->objects[$id]['info']['ColorSpace'] =  $tmp;
-          if  (isset($options['transparency'])) {
+          $tmp .= $this->numObj.' 0 R';
+          $tmp .= ' ]';
+          $this->objects[$id]['info']['ColorSpace'] = $tmp;
+          if (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
+              $this->objects[$id]['info']['Mask'] = $tmp;
               break;
 
             case 'color-key':
               $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                $options['transparency']['r'].' '.$options['transparency']['r'].
+                $options['transparency']['g'].' '.$options['transparency']['g'].
+                $options['transparency']['b'].' '.$options['transparency']['b'].
                 ' ] ';
               $this->objects[$id]['info']['Mask'] = $tmp;
               pre_r($tmp);
@@ -1508,18 +1508,18 @@ 
             }
           }
         } else {
-          if  (isset($options['transparency'])) {
+          if (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
             case  'indexed':
               $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
+              $this->objects[$id]['info']['Mask'] = $tmp;
               break;
 
             case 'color-key':
               $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                $options['transparency']['r'].' '.$options['transparency']['r'].' '.
+                $options['transparency']['g'].' '.$options['transparency']['g'].' '.
+                $options['transparency']['b'].' '.$options['transparency']['b'].
                 ' ] ';
               $this->objects[$id]['info']['Mask'] = $tmp;
               break;              
@@ -1541,18 +1541,18 @@ 
 
     case  'out':
       $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+      $res = "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
+      foreach ($o['info'] as  $k=>$v) {
+        $res .= "\n/".$k.' '.$v;
       }
 
-      if  ($this->encrypted) {
+      if ($this->encrypted) {
         $this->encryptInit($id);
-        $tmp =  $this->ARC4($tmp);
+        $tmp = $this->ARC4($tmp);
       }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+      $res .= "\n/Length ".mb_strlen($tmp, '8bit').">>\nstream\n".$tmp."\nendstream\nendobj";
 
       return  $res;
     }
@@ -1562,39 +1562,39 @@ 
   /**
    * graphics state object
    */
-  protected function  o_extGState($id,  $action,  $options = "") {
-    static  $valid_params =  array("LW",  "LC",  "LC",  "LJ",  "ML",
-                                   "D",  "RI",  "OP",  "op",  "OPM",
-                                   "Font",  "BG",  "BG2",  "UCR",
-                                   "TR",  "TR2",  "HT",  "FL",
-                                   "SM",  "SA",  "BM",  "SMask",
-                                   "CA",  "ca",  "AIS",  "TK");
+  protected function  o_extGState($id, $action, $options = "") {
+    static  $valid_params = array("LW", "LC", "LC", "LJ", "ML",
+                                   "D", "RI", "OP", "op", "OPM",
+                                   "Font", "BG", "BG2", "UCR",
+                                   "TR", "TR2", "HT", "FL",
+                                   "SM", "SA", "BM", "SMask",
+                                   "CA", "ca", "AIS", "TK");
 
-    if  ($action !==  "new") {
+    if ($action !== "new") {
       $o = & $this->objects[$id];
     }
 
-    switch  ($action) {
+    switch ($action) {
     case  "new":
-      $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
+      $this->objects[$id] = array('t' => 'extGState', 'info' => $options);
 
       // Tell the pages about the new resource
       $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+      $this->o_pages($this->currentNode, 'extGState', array("objNum" => $id, "stateNum" => $this->numStates));
       break;
 
     case  "out":
       $res =
-        "\n" . $id . " 0 obj\n".
+        "\n".$id." 0 obj\n".
         "<< /Type /ExtGState\n";
 
       foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
+        if (!in_array($parameter, $valid_params))
           continue;
-        $res.=  "/$parameter $value\n";
+        $res .= "/$parameter $value\n";
       }
 
-      $res.=
+      $res .=
         ">>\n".
         "endobj";
       return  $res;
@@ -1606,7 +1606,7 @@ 
    * encryption object.
    */
   protected function  o_encryption($id, $action, $options = '') {
-    if  ($action !== 'new') {
+    if ($action !== 'new') {
       $o = & $this->objects[$id];
     }
 
@@ -1617,38 +1617,38 @@ 
       $this->arc4_objnum = $id;
 
       // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
+      $pad = chr(0x28).chr(0xBF).chr(0x4E).chr(0x5E).chr(0x4E).chr(0x75).chr(0x8A).chr(0x41).chr(0x64).chr(0x00).chr(0x4E).chr(0x56).chr(0xFF).chr(0xFA).chr(0x01).chr(0x08).chr(0x2E).chr(0x2E).chr(0x00).chr(0xB6).chr(0xD0).chr(0x68).chr(0x3E).chr(0x80).chr(0x2F).chr(0x0C).chr(0xA9).chr(0xFE).chr(0x64).chr(0x53).chr(0x69).chr(0x7A);
+      $len = mb_strlen($options['owner'], '8bit');
 
-      if  ($len>32) {
-        $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
-        $owner =  $options['owner'].substr($pad, 0, 32-$len);
+      if ($len > 32) {
+        $owner = substr($options['owner'], 0, 32);
+      } else  if ($len < 32) {
+        $owner = $options['owner'].substr($pad, 0, 32 - $len);
       } else {
-        $owner =  $options['owner'];
+        $owner = $options['owner'];
       }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
-        $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
-        $user =  $options['user'].substr($pad, 0, 32-$len);
+      $len = mb_strlen($options['user'], '8bit');
+      if ($len > 32) {
+        $user = substr($options['user'], 0, 32);
+      } else  if ($len < 32) {
+        $user = $options['user'].substr($pad, 0, 32 - $len);
       } else {
-        $user =  $options['user'];
+        $user = $options['user'];
       }
 
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
+      $tmp = $this->md5_16($owner);
+      $okey = substr($tmp, 0, 5);
       $this->ARC4_init($okey);
       $ovalue = $this->ARC4($user);
       $this->objects[$id]['info']['O'] = $ovalue;
 
       // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+      $tmp = $this->md5_16($user.$ovalue.chr($options['p']).chr(255).chr(255).chr(255).$this->fileIdentifier);
 
-      $ukey =  substr($tmp, 0, 5);
+      $ukey = substr($tmp, 0, 5);
       $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
+      $this->encryptionKey = $ukey;
       $this->encrypted = 1;
       $uvalue = $this->ARC4($pad);
       $this->objects[$id]['info']['U'] = $uvalue;
@@ -1657,16 +1657,16 @@ 
       break;
 
     case  'out':
-      $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+      $res = "\n".$id." 0 obj\n<<";
+      $res .= "\n/Filter /Standard";
+      $res .= "\n/V 1";
+      $res .= "\n/R 2";
+      $res .= "\n/O (".$this->filterText($o['info']['O']).')';
+      $res .= "\n/U (".$this->filterText($o['info']['U']).')';
       // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
+      $o['info']['p'] = (($o['info']['p'] ^ 255) + 1) * -1;
+      $res .= "\n/P ".($o['info']['p']);
+      $res .= "\n>>\nendobj";
       return  $res;
     }
   }
@@ -1681,10 +1681,10 @@ 
    * calculate the 16 byte version of the 128 bit md5 digest of the string
    */
   function  md5_16($string) {
-    $tmp =  md5($string);
+    $tmp = md5($string);
     $out = '';
-    for  ($i = 0;$i <= 30;$i = $i+2) {
-      $out.= chr(hexdec(substr($tmp, $i, 2)));
+    for ($i = 0; $i <= 30; $i = $i + 2) {
+      $out .= chr(hexdec(substr($tmp, $i, 2)));
     }
     return  $out;
   }
@@ -1694,13 +1694,13 @@ 
    * initialize the encryption for processing a particular object
    */
   function  encryptInit($id) {
-    $tmp =  $this->encryptionKey;
-    $hex =  dechex($id);
-    if  (mb_strlen($hex, '8bit') <6) {
-      $hex =  substr('000000', 0, 6-mb_strlen($hex, '8bit')) .$hex;
+    $tmp = $this->encryptionKey;
+    $hex = dechex($id);
+    if (mb_strlen($hex, '8bit') < 6) {
+      $hex = substr('000000', 0, 6 - mb_strlen($hex, '8bit')).$hex;
     }
-    $tmp.=  chr(hexdec(substr($hex, 4, 2))) .chr(hexdec(substr($hex, 2, 2))) .chr(hexdec(substr($hex, 0, 2))) .chr(0) .chr(0);
-    $key =  $this->md5_16($tmp);
+    $tmp .= chr(hexdec(substr($hex, 4, 2))).chr(hexdec(substr($hex, 2, 2))).chr(hexdec(substr($hex, 0, 2))).chr(0).chr(0);
+    $key = $this->md5_16($tmp);
     $this->ARC4_init(substr($key, 0, 10));
   }
 
@@ -1709,28 +1709,28 @@ 
    * initialize the ARC4 encryption
    */
   function  ARC4_init($key = '') {
-    $this->arc4 =  '';
+    $this->arc4 = '';
 
     // setup the control array
-    if  (mb_strlen($key, '8bit') == 0) {
+    if (mb_strlen($key, '8bit') == 0) {
       return;
     }
 
-    $k =  '';
-    while (mb_strlen($k, '8bit') <256) {
-      $k.= $key;
+    $k = '';
+    while (mb_strlen($k, '8bit') < 256) {
+      $k .= $key;
     }
 
     $k = substr($k, 0, 256);
-    for  ($i = 0;$i<256;$i++) {
-      $this->arc4.=  chr($i);
+    for ($i = 0; $i < 256; $i++) {
+      $this->arc4 .= chr($i);
     }
 
     $j = 0;
 
-    for  ($i = 0;$i<256;$i++) {
-      $t =  $this->arc4[$i];
-      $j =  ($j + ord($t)  + ord($k[$i])) %256;
+    for ($i = 0; $i < 256; $i++) {
+      $t = $this->arc4[$i];
+      $j = ($j + ord($t) + ord($k[$i])) % 256;
       $this->arc4[$i] = $this->arc4[$j];
       $this->arc4[$j] = $t;
     }
@@ -1744,16 +1744,16 @@ 
     $len = mb_strlen($text, '8bit');
     $a = 0;
     $b = 0;
-    $c =  $this->arc4;
+    $c = $this->arc4;
     $out = '';
-    for  ($i = 0;$i<$len;$i++) {
-      $a =  ($a+1) %256;
-      $t =  $c[$a];
-      $b =  ($b+ord($t)) %256;
+    for ($i = 0; $i < $len; $i++) {
+      $a = ($a + 1) % 256;
+      $t = $c[$a];
+      $b = ($b + ord($t)) % 256;
       $c[$a] = $c[$b];
       $c[$b] = $t;
-      $k =  ord($c[(ord($c[$a]) +ord($c[$b])) %256]);
-      $out.= chr(ord($text[$i])  ^ $k);
+      $k = ord($c[(ord($c[$a]) + ord($c[$b])) % 256]);
+      $out .= chr(ord($text[$i]) ^ $k);
     }
     return  $out;
   }
@@ -1768,7 +1768,7 @@ 
    */
   function  addLink($url, $x0, $y0, $x1, $y1) {
     $this->numObj++;
-    $info =  array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
+    $info = array('type'=>'link', 'url'=>$url, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
   }
 
@@ -1778,7 +1778,7 @@ 
    */
   function  addInternalLink($label, $x0, $y0, $x1, $y1) {
     $this->numObj++;
-    $info =  array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
+    $info = array('type'=>'ilink', 'label'=>$label, 'rect'=>array($x0, $y0, $x1, $y1));
     $this->o_annotation($this->numObj, 'new', $info);
   }
 
@@ -1791,21 +1791,21 @@ 
   function  setEncryption($userPass = '', $ownerPass = '', $pc = array()) {
     $p = bindec(11000000);
 
-    $options =  array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
+    $options = array('print'=>4, 'modify'=>8, 'copy'=>16, 'add'=>32);
 
-    foreach($pc as  $k=>$v) {
-      if  ($v &&  isset($options[$k])) {
-        $p+= $options[$k];
-      } else  if  (isset($options[$v])) {
-        $p+= $options[$v];
+    foreach ($pc as  $k=>$v) {
+      if ($v && isset($options[$k])) {
+        $p += $options[$k];
+      } else  if (isset($options[$v])) {
+        $p += $options[$v];
       }
     }
 
     // implement encryption on the document
-    if  ($this->arc4_objnum ==  0) {
+    if ($this->arc4_objnum == 0) {
       // then the block does not exist already, add it.
       $this->numObj++;
-      if  (mb_strlen($ownerPass) == 0) {
+      if (mb_strlen($ownerPass) == 0) {
         $ownerPass = $userPass;
       }
 
@@ -1825,7 +1825,7 @@ 
    * return the pdf stream as a string returned from the function
    */
   function  output($debug = false) {
-    if  ($debug) {
+    if ($debug) {
       // turn compression off
       $this->options['compression'] = 0;
     }
@@ -1837,12 +1837,12 @@ 
       $this->o_embedjs($js_id, 'new');
       $this->o_javascript(++$this->numObj, 'new', $this->javascript);
       
-      $id =  $this->catalogId;
+      $id = $this->catalogId;
       
       $this->o_catalog($id, 'javascript', $js_id);
     }
 
-    if  ($this->arc4_objnum) {
+    if ($this->arc4_objnum) {
       $this->ARC4_init($this->encryptionKey);
     }
 
@@ -1853,32 +1853,32 @@ 
     $content = '%PDF-1.3';
     $pos = mb_strlen($content, '8bit');
 
-    foreach($this->objects as  $k=>$v) {
+    foreach ($this->objects as  $k=>$v) {
       $tmp = 'o_'.$v['t'];
       $cont = $this->$tmp($k, 'out');
-      $content.= $cont;
+      $content .= $cont;
       $xref[] = $pos;
-      $pos+= mb_strlen($cont, '8bit');
+      $pos += mb_strlen($cont, '8bit');
     }
 
-    $content.= "\nxref\n0 ".(count($xref) +1) ."\n0000000000 65535 f \n";
+    $content .= "\nxref\n0 ".(count($xref) + 1)."\n0000000000 65535 f \n";
 
-    foreach($xref as  $p) {
-      $content.= str_pad($p,  10,  "0",  STR_PAD_LEFT)  . " 00000 n \n";
+    foreach ($xref as  $p) {
+      $content .= str_pad($p, 10, "0", STR_PAD_LEFT)." 00000 n \n";
     }
 
-    $content.= "trailer\n<<\n/Size ".(count($xref) +1) ."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
+    $content .= "trailer\n<<\n/Size ".(count($xref) + 1)."\n/Root 1 0 R\n/Info ".$this->infoObject." 0 R\n";
 
     // if encryption has been applied to this document then add the marker for this dictionary
-    if  ($this->arc4_objnum > 0) {
-      $content.=  "/Encrypt ".$this->arc4_objnum." 0 R\n";
+    if ($this->arc4_objnum > 0) {
+      $content .= "/Encrypt ".$this->arc4_objnum." 0 R\n";
     }
 
-    if  (mb_strlen($this->fileIdentifier, '8bit')) {
-      $content.=  "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
+    if (mb_strlen($this->fileIdentifier, '8bit')) {
+      $content .= "/ID[<".$this->fileIdentifier."><".$this->fileIdentifier.">]\n";
     }
 
-    $content.=  ">>\nstartxref\n".$pos."\n%%EOF\n";
+    $content .= ">>\nstartxref\n".$pos."\n%%EOF\n";
 
     return  $content;
   }
@@ -1892,7 +1892,7 @@ 
    */
   function  newDocument($pageSize = array(0, 0, 612, 792)) {
     $this->numObj = 0;
-    $this->objects =  array();
+    $this->objects = array();
 
     $this->numObj++;
     $this->o_catalog($this->numObj, 'new');
@@ -1904,7 +1904,7 @@ 
     $this->o_pages($this->numObj, 'new');
 
     $this->o_pages($this->numObj, 'mediaBox', $pageSize);
-    $this->currentNode =  3;
+    $this->currentNode = 3;
 
     $this->numObj++;
     $this->o_procset($this->numObj, 'new');
@@ -1917,7 +1917,7 @@ 
 
     // need to store the first page id as there is no way to get it to the user during
     // startup
-    $this->firstPageId =  $this->currentContents;
+    $this->firstPageId = $this->currentContents;
   }
 
   /**
@@ -1933,12 +1933,12 @@ 
     // assume that $font contains the path and file but not the extension
     $pos = strrpos($font, '/');
 
-    if  ($pos === false) {
-      $dir =  './';
-      $name =  $font;
+    if ($pos === false) {
+      $dir = './';
+      $name = $font;
     } else {
-      $dir = substr($font, 0, $pos+1);
-      $name = substr($font, $pos+1);
+      $dir = substr($font, 0, $pos + 1);
+      $name = substr($font, $pos + 1);
     }
     
     $fontcache = $this->fontcache;
@@ -1954,31 +1954,31 @@ 
     
     $this->addMessage('openFont: '.$font.' - '.$name);
 
-    $metrics_name = $name . (($this->isUnicode) ? '.ufm' : '.afm');
+    $metrics_name = $name.(($this->isUnicode) ? '.ufm' : '.afm');
     
     // Core fonts don't currently work with composite fonts (for Unicode support).
     // The .ufm files have been removed so we need to check whether or not to use the
     // .ufm or .afm.
-    if ($this->isUnicode && !file_exists($dir . '/' . $metrics_name)) { $metrics_name = $name . '.afm'; }
+    if ($this->isUnicode && !file_exists($dir.'/'.$metrics_name)) { $metrics_name = $name.'.afm'; }
     
-    $cache_name = 'php_' . $metrics_name;
+    $cache_name = 'php_'.$metrics_name;
     $this->addMessage('metrics: '.$metrics_name.', cache: '.$cache_name);
-    if  (file_exists($fontcache . $cache_name)) {
-      $this->addMessage('openFont: php file exists ' . $fontcache . $cache_name);
-      $tmp =  file_get_contents($fontcache . $cache_name);
+    if (file_exists($fontcache.$cache_name)) {
+      $this->addMessage('openFont: php file exists '.$fontcache.$cache_name);
+      $tmp = file_get_contents($fontcache.$cache_name);
       eval($tmp);
 
-      if  (!isset($this->fonts[$font]['_version_']) ||  $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
+      if (!isset($this->fonts[$font]['_version_']) || $this->fonts[$font]['_version_'] != $this->fontcacheVersion) {
         // if the font file is old, then clear it out and prepare for re-creation
         $this->addMessage('openFont: clear out, make way for new version.');
         unset($this->fonts[$font]);
       }
     }
 
-    if  (!isset($this->fonts[$font]) &&  file_exists($dir . $metrics_name)) {
+    if (!isset($this->fonts[$font]) && file_exists($dir.$metrics_name)) {
       // then rebuild the php_<font>.afm file from the <font>.afm file
-      $this->addMessage('openFont: build php file from ' . $dir . $metrics_name);
-      $data =  array();
+      $this->addMessage('openFont: build php file from '.$dir.$metrics_name);
+      $data = array();
       
       // Since we're not going to enable Unicode for the core fonts we need to use a font-based
       // setting for Unicode support rather than a global setting.
@@ -1986,19 +1986,19 @@ 
       
       $cidtogid = '';
       if ($data['isUnicode']) {
-        $cidtogid = str_pad('', 256*256*2, "\x00");
+        $cidtogid = str_pad('', 256 * 256 * 2, "\x00");
       }
 
-      $file =  file($dir . $metrics_name);
+      $file = file($dir.$metrics_name);
 
       foreach ($file as  $rowA) {
         $row = trim($rowA);
         $pos = strpos($row, ' ');
 
-        if  ($pos) {
+        if ($pos) {
           // then there must be some keyword
-          $key =  substr($row, 0, $pos);
-          switch  ($key) {
+          $key = substr($row, 0, $pos);
+          switch ($key) {
           case  'FontName':
           case  'FullName':
           case  'FamilyName':
@@ -2030,29 +2030,29 @@ 
             $bits = explode(';', trim($row));
             $dtmp = array();
 
-            foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
-                if  (count($bits2) >2) {
+            foreach ($bits as  $bit) {
+              $bits2 = explode(' ', trim($bit));
+              if (mb_strlen($bits2[0], '8bit')) {
+                if (count($bits2) > 2) {
                   $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
+                  for ($i = 1; $i < count($bits2); $i++) {
                     $dtmp[$bits2[0]][] = $bits2[$i];
                   }
-                } else  if  (count($bits2) == 2) {
+                } else  if (count($bits2) == 2) {
                   $dtmp[$bits2[0]] = $bits2[1];
                 }
               }
             }
 
-            $cc = (int)$dtmp['C'];
-            if  ($cc >= 0) {
+            $cc = (int) $dtmp['C'];
+            if ($cc >= 0) {
               $data['C'][$dtmp['C']] = $dtmp;
               $data['C'][$dtmp['N']] = $dtmp;
             } else {
               $data['C'][$dtmp['N']] = $dtmp;
             }
 
-            if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+            if (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
               $data['MissingWidth'] = $width;
             }
             
@@ -2064,28 +2064,28 @@ 
               $bits = explode(';', trim($row));
               $dtmp = array();
 
-              foreach($bits as  $bit) {
-                $bits2 =  explode(' ', trim($bit));
-                if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
+              foreach ($bits as  $bit) {
+                $bits2 = explode(' ', trim($bit));
+                if (mb_strlen($bits2[0], '8bit')) {
+                  if (count($bits2) > 2) {
                     $dtmp[$bits2[0]] = array();
-                    for  ($i = 1;$i<count($bits2);$i++) {
+                    for ($i = 1; $i < count($bits2); $i++) {
                       $dtmp[$bits2[0]][] = $bits2[$i];
                     }
-                  } else  if  (count($bits2) == 2) {
+                  } else  if (count($bits2) == 2) {
                     $dtmp[$bits2[0]] = $bits2[1];
                   }
                 }
               }
 
-              $cc = (int)$dtmp['U'];
+              $cc = (int) $dtmp['U'];
               $glyph = $dtmp['G'];
               $width = $dtmp['WX'];
-              if  ($cc >= 0) {
+              if ($cc >= 0) {
                 // Set values in CID to GID map
                 if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                  $cidtogid[$cc * 2] = chr($glyph >> 8);
+                  $cidtogid[$cc * 2 + 1] = chr($glyph & 0xFF);
                 }
 
                 $data['C'][$dtmp['U']] = $dtmp;
@@ -2094,7 +2094,7 @@ 
                 $data['C'][$dtmp['N']] = $dtmp;
               }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+              if (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
                 $data['MissingWidth'] = $width;
               }
             }
@@ -2110,10 +2110,10 @@ 
       }
 
       //    echo $cidtogid; die("CIDtoGID Displayed!");
-      if  (function_exists('gzcompress') &&  $this->options['compression']) {
+      if (function_exists('gzcompress') && $this->options['compression']) {
         // then implement ZLIB based compression on CIDtoGID string
         $data['CIDtoGID_Compressed'] = true;
-        $cidtogid =  gzcompress($cidtogid,  6);
+        $cidtogid = gzcompress($cidtogid, 6);
       }
       $data['CIDtoGID'] = base64_encode($cidtogid);
       $data['_version_'] = $this->fontcacheVersion;
@@ -2121,12 +2121,12 @@ 
 
       //Because of potential trouble with php safe mode, expect that the folder already exists.
       //If not existing, this will hit performance because of missing cached results.
-      if ( is_dir(substr($fontcache,0,-1)) ) {
-        file_put_contents($fontcache . $cache_name,  '$this->fonts[$font]=' . var_export($data,  true)  . ';');
+      if (is_dir(substr($fontcache, 0, -1))) {
+        file_put_contents($fontcache.$cache_name, '$this->fonts[$font]='.var_export($data, true).';');
       }
     }
     
-    if  (!isset($this->fonts[$font])) {
+    if (!isset($this->fonts[$font])) {
       $this->addMessage("openFont: no font file found for $font.  Do you need to run load_font.php?");
       //echo 'Font not Found '.$font;
     }
@@ -2142,59 +2142,59 @@ 
    * and 'differences' => an array of mappings between numbers 0->255 and character names.
    *
    */
-  function  selectFont($fontName, $encoding =  '', $set =  true) {
+  function  selectFont($fontName, $encoding = '', $set = true) {
     $ext = substr($fontName, -4);
-    if  ($ext === '.afm' || $ext === '.ufm') {
-      $fontName = substr($fontName, 0, mb_strlen($fontName)-4);
+    if ($ext === '.afm' || $ext === '.ufm') {
+      $fontName = substr($fontName, 0, mb_strlen($fontName) - 4);
     }
 
-    if  (!isset($this->fonts[$fontName])) {
+    if (!isset($this->fonts[$fontName])) {
       $this->addMessage("selectFont: selecting - $fontName - $encoding, $set");
 
       // load the file
       $this->openFont($fontName);
 
-      if  (isset($this->fonts[$fontName])) {
+      if (isset($this->fonts[$fontName])) {
         $this->numObj++;
         $this->numFonts++;
 
         //$this->numFonts = md5($fontName);
-        $pos =  strrpos($fontName, '/');
+        $pos = strrpos($fontName, '/');
         //      $dir = substr($fontName,0,$pos+1);
-        $name =  substr($fontName, $pos+1);
-        $options =  array('name' => $name, 'fontFileName' => $fontName);
+        $name = substr($fontName, $pos + 1);
+        $options = array('name' => $name, 'fontFileName' => $fontName);
 
-        if  (is_array($encoding)) {
+        if (is_array($encoding)) {
           // then encoding and differences might be set
-          if  (isset($encoding['encoding'])) {
-            $options['encoding'] =  $encoding['encoding'];
+          if (isset($encoding['encoding'])) {
+            $options['encoding'] = $encoding['encoding'];
           }
 
-          if  (isset($encoding['differences'])) {
-            $options['differences'] =  $encoding['differences'];
+          if (isset($encoding['differences'])) {
+            $options['differences'] = $encoding['differences'];
           }
-        } else  if  (mb_strlen($encoding, '8bit')) {
+        } else  if (mb_strlen($encoding, '8bit')) {
           // then perhaps only the encoding has been set
-          $options['encoding'] =  $encoding;
+          $options['encoding'] = $encoding;
         }
 
-        $fontObj =  $this->numObj;
+        $fontObj = $this->numObj;
         $this->o_font($this->numObj, 'new', $options);
-        $this->fonts[$fontName]['fontNum'] =  $this->numFonts;
+        $this->fonts[$fontName]['fontNum'] = $this->numFonts;
 
         // if this is a '.afm' font, and there is a '.pfa' file to go with it ( as there
         // should be for all non-basic fonts), then load it into an object and put the
         // references into the font object
-        $basefile =  $fontName;
-        if  (file_exists($basefile.'.pfb')) {
-          $fbtype =  'pfb';
-        } else  if  (file_exists($basefile.'.ttf')) {
-          $fbtype =  'ttf';
+        $basefile = $fontName;
+        if (file_exists($basefile.'.pfb')) {
+          $fbtype = 'pfb';
+        } else  if (file_exists($basefile.'.ttf')) {
+          $fbtype = 'ttf';
         } else {
-          $fbtype =  '';
+          $fbtype = '';
         }
 
-        $fbfile =  $basefile.'.'.$fbtype;
+        $fbfile = $basefile.'.'.$fbtype;
 
         //      $pfbfile = substr($fontName,0,strlen($fontName)-4).'.pfb';
         //      $ttffile = substr($fontName,0,strlen($fontName)-4).'.ttf';
@@ -2202,60 +2202,60 @@ 
 
         // OAR - I don't understand this old check
         // if  (substr($fontName, -4) ===  '.afm' &&  strlen($fbtype)) {
-        if  (mb_strlen($fbtype, '8bit')) {
-          $adobeFontName =  $this->fonts[$fontName]['FontName'];
+        if (mb_strlen($fbtype, '8bit')) {
+          $adobeFontName = $this->fonts[$fontName]['FontName'];
           //        $fontObj = $this->numObj;
           $this->addMessage('selectFont: adding font file - '.$fbfile.' - '.$adobeFontName);
 
           // find the array of font widths, and put that into an object.
-          $firstChar =  -1;
-          $lastChar =  0;
-          $widths =  array();
+          $firstChar = -1;
+          $lastChar = 0;
+          $widths = array();
           $cid_widths = array();
 
           foreach ($this->fonts[$fontName]['C'] as  $num => $d) {
-            if  (intval($num) >0 ||  $num ==  '0') {
+            if (intval($num) > 0 || $num == '0') {
               if (!$this->fonts[$fontName]['isUnicode']) {
                 // With Unicode, widths array isn't used
-                if  ($lastChar>0 &&  $num>$lastChar+1) {
-                  for ($i =  $lastChar+1;$i<$num;$i++) {
-                    $widths[] =  0;
+                if ($lastChar > 0 && $num > $lastChar + 1) {
+                  for ($i = $lastChar + 1; $i < $num; $i++) {
+                    $widths[] = 0;
                   }
                 }
               }
 
-              $widths[] =  $d['WX'];
+              $widths[] = $d['WX'];
 
               if ($this->fonts[$fontName]['isUnicode']) {
-                $cid_widths[$num] =  $d['WX'];
+                $cid_widths[$num] = $d['WX'];
               }
 
-              if  ($firstChar ==  -1) {
-                $firstChar =  $num;
+              if ($firstChar == -1) {
+                $firstChar = $num;
               }
 
-              $lastChar =  $num;
+              $lastChar = $num;
             }
           }
 
           // also need to adjust the widths for the differences array
-          if  (isset($options['differences'])) {
-            foreach($options['differences'] as  $charNum => $charName) {
-              if  ($charNum > $lastChar) {
+          if (isset($options['differences'])) {
+            foreach ($options['differences'] as  $charNum => $charName) {
+              if ($charNum > $lastChar) {
                 if (!$this->fonts[$fontName]['isUnicode']) {
                   // With Unicode, widths array isn't used
-                  for ($i =  $lastChar + 1; $i <=  $charNum; $i++) {
-                    $widths[] =  0;
+                  for ($i = $lastChar + 1; $i <= $charNum; $i++) {
+                    $widths[] = 0;
                   }
                 }
 
-                $lastChar =  $charNum;
+                $lastChar = $charNum;
               }
 
-              if  (isset($this->fonts[$fontName]['C'][$charName])) {
-                $widths[$charNum-$firstChar] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+              if (isset($this->fonts[$fontName]['C'][$charName])) {
+                $widths[$charNum - $firstChar] = $this->fonts[$fontName]['C'][$charName]['WX'];
                 if ($this->fonts[$fontName]['isUnicode']) {
-                  $cid_widths[$charName] =  $this->fonts[$fontName]['C'][$charName]['WX'];
+                  $cid_widths[$charName] = $this->fonts[$fontName]['C'][$charName]['WX'];
                 }
               }
             }
@@ -2275,21 +2275,21 @@ 
 
             $this->numObj++;
             $this->o_contents($this->numObj, 'new', 'raw');
-            $this->objects[$this->numObj]['c'].=  '[';
+            $this->objects[$this->numObj]['c'] .= '[';
 
-            foreach($widths as  $width) {
-              $this->objects[$this->numObj]['c'].=  ' '.$width;
+            foreach ($widths as  $width) {
+              $this->objects[$this->numObj]['c'] .= ' '.$width;
             }
 
-            $this->objects[$this->numObj]['c'].=  ' ]';
-            $widthid =  $this->numObj;
+            $this->objects[$this->numObj]['c'] .= ' ]';
+            $widthid = $this->numObj;
           }
 
           $missing_width = 500;
           $stemV = 70;
 
           if (isset($this->fonts[$fontName]['MissingWidth'])) {
-            $missing_width =  $this->fonts[$fontName]['MissingWidth'];
+            $missing_width = $this->fonts[$fontName]['MissingWidth'];
           }
           if (isset($this->fonts[$fontName]['StdVW'])) {
             $stemV = $this->fonts[$fontName]['StdVW'];
@@ -2300,28 +2300,28 @@ 
           // load the pfb file, and put that into an object too.
           // note that pdf supports only binary format type 1 font files, though there is a
           // simple utility to convert them from pfa to pfb.
-          $data =  file_get_contents($fbfile);
+          $data = file_get_contents($fbfile);
 
           // create the font descriptor
           $this->numObj++;
-          $fontDescriptorId =  $this->numObj;
+          $fontDescriptorId = $this->numObj;
 
           $this->numObj++;
-          $pfbid =  $this->numObj;
+          $pfbid = $this->numObj;
 
           // determine flags (more than a little flakey, hopefully will not matter much)
-          $flags =  0;
+          $flags = 0;
 
-          if  ($this->fonts[$fontName]['ItalicAngle'] !=  0) {
-            $flags+=  pow(2, 6);
+          if ($this->fonts[$fontName]['ItalicAngle'] != 0) {
+            $flags += pow(2, 6);
           }
 
-          if  ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
-            $flags+=  1;
+          if ($this->fonts[$fontName]['IsFixedPitch'] === 'true') {
+            $flags += 1;
           }
 
-          $flags+=  pow(2, 5); // assume non-sybolic
-          $list =  array(
+          $flags += pow(2, 5); // assume non-sybolic
+          $list = array(
             'Ascent' => 'Ascender', 
             'CapHeight' => 'CapHeight', 
             'MissingWidth' => 'MissingWidth', 
@@ -2329,51 +2329,51 @@ 
             'FontBBox' => 'FontBBox', 
             'ItalicAngle' => 'ItalicAngle'
           );
-          $fdopt =  array(
+          $fdopt = array(
             'Flags' => $flags, 
             'FontName' => $adobeFontName, 
             'StemV' => $stemV
           );
 
-          foreach($list as  $k => $v) {
-            if  (isset($this->fonts[$fontName][$v])) {
-              $fdopt[$k] =  $this->fonts[$fontName][$v];
+          foreach ($list as  $k => $v) {
+            if (isset($this->fonts[$fontName][$v])) {
+              $fdopt[$k] = $this->fonts[$fontName][$v];
             }
           }
 
-          if  ($fbtype === 'pfb') {
-            $fdopt['FontFile'] =  $pfbid;
-          } else  if  ($fbtype === 'ttf') {
-            $fdopt['FontFile2'] =  $pfbid;
+          if ($fbtype === 'pfb') {
+            $fdopt['FontFile'] = $pfbid;
+          } else  if ($fbtype === 'ttf') {
+            $fdopt['FontFile2'] = $pfbid;
           }
 
           $this->o_fontDescriptor($fontDescriptorId, 'new', $fdopt);
 
           // embed the font program
           $this->o_contents($this->numObj, 'new');
-          $this->objects[$pfbid]['c'].=  $data;
+          $this->objects[$pfbid]['c'] .= $data;
 
           // determine the cruicial lengths within this file
-          if  ($fbtype === 'pfb') {
-            $l1 =  strpos($data, 'eexec') +6;
-            $l2 =  strpos($data, '00000000') -$l1;
-            $l3 =  mb_strlen($data, '8bit') -$l2-$l1;
+          if ($fbtype === 'pfb') {
+            $l1 = strpos($data, 'eexec') + 6;
+            $l2 = strpos($data, '00000000') - $l1;
+            $l3 = mb_strlen($data, '8bit') - $l2 - $l1;
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1, 'Length2' => $l2, 'Length3' => $l3));
-          } else  if  ($fbtype == 'ttf') {
-            $l1 =  mb_strlen($data, '8bit');
+          } else  if ($fbtype == 'ttf') {
+            $l1 = mb_strlen($data, '8bit');
             $this->o_contents($this->numObj, 'add', array('Length1' => $l1));
           }
 
           // tell the font object about all this new stuff
-          $tmp =  array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
+          $tmp = array('BaseFont' => $adobeFontName, 'MissingWidth' => $missing_width, 'Widths' => $widthid, 'FirstChar' => $firstChar, 'LastChar' => $lastChar, 'FontDescriptor' => $fontDescriptorId);
 
-          if  ($fbtype === 'ttf') {
-            $tmp['SubType'] =  'TrueType';
+          if ($fbtype === 'ttf') {
+            $tmp['SubType'] = 'TrueType';
           }
 
           $this->addMessage('adding extra info to font.('.$fontObj.')');
 
-          foreach($tmp as  $fk => $fv) {
+          foreach ($tmp as  $fk => $fv) {
             $this->addMessage($fk." : ".$fv);
           }
 
@@ -2384,20 +2384,20 @@ 
 
         // also set the differences here, note that this means that these will take effect only the
         //first time that a font is selected, else they are ignored
-        if  (isset($options['differences'])) {
-          $this->fonts[$fontName]['differences'] =  $options['differences'];
+        if (isset($options['differences'])) {
+          $this->fonts[$fontName]['differences'] = $options['differences'];
         }
       }
     }
 
-    if  ($set &&  isset($this->fonts[$fontName])) {
+    if ($set && isset($this->fonts[$fontName])) {
       // so if for some reason the font was not set in the last one then it will not be selected
-      $this->currentBaseFont =  $fontName;
+      $this->currentBaseFont = $fontName;
 
       // the next lines mean that if a new font is selected, then the current text state will be
       // applied to it as well.
-      $this->currentFont =  $this->currentBaseFont;
-      $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+      $this->currentFont = $this->currentBaseFont;
+      $this->currentFontNum = $this->fonts[$this->currentFont]['fontNum'];
 
       //$this->setCurrentFont();
     }
@@ -2437,8 +2437,8 @@ 
     //   } else {
     //     // the this font must not have the right family member for the current state
     //     // simply assume the base font
-    $this->currentFont =  $this->currentBaseFont;
-    $this->currentFontNum =  $this->fonts[$this->currentFont]['fontNum'];
+    $this->currentFont = $this->currentBaseFont;
+    $this->currentFontNum = $this->fonts[$this->currentFont]['fontNum'];
     //  }
   }
 
@@ -2458,17 +2458,17 @@ 
    * @access private
    */
   function  addContent($content) {
-    $this->objects[$this->currentContents]['c'].=  $content;
+    $this->objects[$this->currentContents]['c'] .= $content;
   }
 
 
   /**
    * sets the colour for fill operations
    */
-  function  setColor($r, $g, $b, $force =  0) {
-    if  ($r >=  0 &&  ($force ||  $r !=  $this->currentColour['r'] ||  $g !=  $this->currentColour['g'] ||  $b !=  $this->currentColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' rg';
-      $this->currentColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+  function  setColor($r, $g, $b, $force = 0) {
+    if ($r >= 0 && ($force || $r != $this->currentColour['r'] || $g != $this->currentColour['g'] || $b != $this->currentColour['b'])) {
+      $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' rg';
+      $this->currentColour = array('r' => $r, 'g' => $g, 'b' => $b);
     }
   }
 
@@ -2476,10 +2476,10 @@ 
   /**
    * sets the colour for stroke operations
    */
-  function  setStrokeColor($r, $g, $b, $force =  0) {
-    if  ($r >=  0 &&  ($force ||  $r !=  $this->currentStrokeColour['r'] ||  $g !=  $this->currentStrokeColour['g'] ||  $b !=  $this->currentStrokeColour['b'])) {
-      $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $r) .' '.sprintf('%.3F', $g) .' '.sprintf('%.3F', $b) .' RG';
-      $this->currentStrokeColour =  array('r' => $r, 'g' => $g, 'b' => $b);
+  function  setStrokeColor($r, $g, $b, $force = 0) {
+    if ($r >= 0 && ($force || $r != $this->currentStrokeColour['r'] || $g != $this->currentStrokeColour['g'] || $b != $this->currentStrokeColour['b'])) {
+      $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $r).' '.sprintf('%.3F', $g).' '.sprintf('%.3F', $b).' RG';
+      $this->currentStrokeColour = array('r' => $r, 'g' => $g, 'b' => $b);
     }
   }
 
@@ -2491,8 +2491,8 @@ 
     // Create a new graphics state object
     // FIXME: should actually keep track of states that have already been created...
     $this->numObj++;
-    $this->o_extGState($this->numObj,  'new',  $parameters);
-    $this->objects[ $this->currentContents ]['c'].=  "\n/GS" . $this->numStates . " gs";
+    $this->o_extGState($this->numObj, 'new', $parameters);
+    $this->objects[$this->currentContents]['c'] .= "\n/GS".$this->numStates." gs";
   }
 
 
@@ -2514,16 +2514,16 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
+    if (!in_array($mode, $blend_modes))
       $mode = "Normal";
     
     // Only create a new graphics state if required
-    if ( $mode == $this->currentLineTransparency["mode"]  &&
-         $opacity == $this->currentLineTransparency["opacity"] )
+    if ($mode == $this->currentLineTransparency["mode"] &&
+         $opacity == $this->currentLineTransparency["opacity"])
       return;
 
     $options = array("BM" => "/$mode",
-                     "CA" => (float)$opacity);
+                     "CA" => (float) $opacity);
 
     $this->setGraphicsState($options);
   }
@@ -2546,15 +2546,15 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
+    if (!in_array($mode, $blend_modes))
       $mode = "Normal";
 
-    if ( $mode == $this->currentFillTransparency["mode"]  &&
-         $opacity == $this->currentFillTransparency["opacity"] )
+    if ($mode == $this->currentFillTransparency["mode"] &&
+         $opacity == $this->currentFillTransparency["opacity"])
       return;
 
     $options = array("BM" => "/$mode",
-                     "ca" => (float)$opacity);
+                     "ca" => (float) $opacity);
     
     $this->setGraphicsState($options);
   }
@@ -2564,7 +2564,7 @@ 
    */
   function  line($x1, $y1, $x2, $y2) {
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' m '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' l S';
+      "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' m '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' l S';
   }
 
 
@@ -2575,17 +2575,17 @@ 
     // in the current line style, draw a bezier curve from (x0,y0) to (x3,y3) using the other two points
     // as the control points for the curve.
     $this->objects[$this->currentContents]['c'] .=
-      "\n".sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' m '.sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1);
+      "\n".sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' m '.sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1);
 
     $this->objects[$this->currentContents]['c'] .=
-      ' '.sprintf('%.3F', $x2) .' '.sprintf('%.3F', $y2) .' '.sprintf('%.3F', $x3) .' '.sprintf('%.3F', $y3) .' c S';
+      ' '.sprintf('%.3F', $x2).' '.sprintf('%.3F', $y2).' '.sprintf('%.3F', $x3).' '.sprintf('%.3F', $y3).' c S';
   }
 
 
   /**
    * draw a part of an ellipse
    */
-  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 =  0, $angle =  0, $nSeg =  8) {
+  function  partEllipse($x0, $y0, $astart, $afinish, $r1, $r2 = 0, $angle = 0, $nSeg = 8) {
     $this->ellipse($x0, $y0, $r1, $r2, $angle, $nSeg, $astart, $afinish, 0);
   }
 
@@ -2593,8 +2593,8 @@ 
   /**
    * draw a filled ellipse
    */
-  function  filledEllipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360) {
-    return  $this->ellipse($x0, $y0, $r1, $r2 =  0, $angle, $nSeg, $astart, $afinish, 1, 1);
+  function  filledEllipse($x0, $y0, $r1, $r2 = 0, $angle = 0, $nSeg = 8, $astart = 0, $afinish = 360) {
+    return  $this->ellipse($x0, $y0, $r1, $r2 = 0, $angle, $nSeg, $astart, $afinish, 1, 1);
   }
 
 
@@ -2608,78 +2608,78 @@ 
    * nSeg is not allowed to be less than 2, as this will simply draw a line (and will even draw a
    * pretty crappy shape at 2, as we are approximating with bezier curves.
    */
-  function  ellipse($x0, $y0, $r1, $r2 =  0, $angle =  0, $nSeg =  8, $astart =  0, $afinish =  360, $close =  1, $fill =  0) {
-    if  ($r1 ==  0) {
+  function  ellipse($x0, $y0, $r1, $r2 = 0, $angle = 0, $nSeg = 8, $astart = 0, $afinish = 360, $close = 1, $fill = 0) {
+    if ($r1 == 0) {
       return;
     }
 
-    if  ($r2 ==  0) {
-      $r2 =  $r1;
+    if ($r2 == 0) {
+      $r2 = $r1;
     }
 
-    if  ($nSeg < 2) {
-      $nSeg =  2;
+    if ($nSeg < 2) {
+      $nSeg = 2;
     }
 
-    $astart =  deg2rad((float)$astart);
-    $afinish =  deg2rad((float)$afinish);
-    $totalAngle = $afinish-$astart;
+    $astart = deg2rad((float) $astart);
+    $afinish = deg2rad((float) $afinish);
+    $totalAngle = $afinish - $astart;
 
-    $dt =  $totalAngle/$nSeg;
-    $dtm =  $dt/3;
+    $dt = $totalAngle / $nSeg;
+    $dtm = $dt / 3;
 
-    if  ($angle !=  0) {
-      $a =  -1*deg2rad((float)$angle);
+    if ($angle != 0) {
+      $a = -1 * deg2rad((float) $angle);
 
-      $tmp  =  "\n q ";
-      $tmp .=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp .=  sprintf('%.3F', $x0) .' '.sprintf('%.3F', $y0) .' cm';
+      $tmp  = "\n q ";
+      $tmp .= sprintf('%.3F', cos($a)).' '.sprintf('%.3F', (-1.0 * sin($a))).' '.sprintf('%.3F', sin($a)).' '.sprintf('%.3F', cos($a)).' ';
+      $tmp .= sprintf('%.3F', $x0).' '.sprintf('%.3F', $y0).' cm';
 
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+      $this->objects[$this->currentContents]['c'] .= $tmp;
 
-      $x0 =  0;
-      $y0 =  0;
+      $x0 = 0;
+      $y0 = 0;
     }
 
-    $t1 =  $astart;
-    $a0 =  $x0 + $r1*cos($t1);
-    $b0 =  $y0 + $r2*sin($t1);
-    $c0 =  -$r1 * sin($t1);
-    $d0 =  $r2 * cos($t1);
+    $t1 = $astart;
+    $a0 = $x0 + $r1 * cos($t1);
+    $b0 = $y0 + $r2 * sin($t1);
+    $c0 = -$r1 * sin($t1);
+    $d0 = $r2 * cos($t1);
 
-    $this->objects[$this->currentContents]['c'] .=  "\n".sprintf('%.3F', $a0) .' '.sprintf('%.3F', $b0) .' m ';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $a0).' '.sprintf('%.3F', $b0).' m ';
 
-    for  ($i = 1; $i <=  $nSeg; $i++) {
+    for ($i = 1; $i <= $nSeg; $i++) {
       // draw this bit of the total curve
-      $t1 =  $i * $dt + $astart;
-      $a1 =  $x0 + $r1 * cos($t1);
-      $b1 =  $y0 + $r2 * sin($t1);
+      $t1 = $i * $dt + $astart;
+      $a1 = $x0 + $r1 * cos($t1);
+      $b1 = $y0 + $r2 * sin($t1);
       $c1 = -$r1 * sin($t1);
-      $d1 =  $r2 * cos($t1);
+      $d1 = $r2 * cos($t1);
 
       $this->objects[$this->currentContents]['c']
-        .=  "\n".sprintf('%.3F', ($a0+$c0*$dtm)) .' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
+        .=  "\n".sprintf('%.3F', ($a0 + $c0 * $dtm)).' '.sprintf('%.3F', ($b0 + $d0 * $dtm));
 
       $this->objects[$this->currentContents]['c'] .=
-        ' '.sprintf('%.3F', ($a1-$c1*$dtm)) .' '.sprintf('%.3F', ($b1-$d1*$dtm)) .' '.sprintf('%.3F', $a1) .' '.sprintf('%.3F', $b1) .' c';
+        ' '.sprintf('%.3F', ($a1 - $c1 * $dtm)).' '.sprintf('%.3F', ($b1 - $d1 * $dtm)).' '.sprintf('%.3F', $a1).' '.sprintf('%.3F', $b1).' c';
 
-      $a0 =  $a1;
-      $b0 =  $b1;
-      $c0 =  $c1;
-      $d0 =  $d1;
+      $a0 = $a1;
+      $b0 = $b1;
+      $c0 = $c1;
+      $d0 = $d1;
     }
 
-    if  ($fill) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+    if ($fill) {
+      $this->objects[$this->currentContents]['c'] .= ' f';
     } else if ($close) {
-        $this->objects[$this->currentContents]['c'].=  ' s';
+        $this->objects[$this->currentContents]['c'] .= ' s';
         // small 's' signifies closing the path as well
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+      $this->objects[$this->currentContents]['c'] .= ' S';
     }
 
-    if  ($angle !=  0) {
-      $this->objects[$this->currentContents]['c'].=  ' Q';
+    if ($angle != 0) {
+      $this->objects[$this->currentContents]['c'] .= ' Q';
     }
   }
 
@@ -2697,38 +2697,38 @@ 
    *   (2,1) is 2 on, 1 off, 2 on, 1 off.. etc
    * phase is a modifier on the dash pattern which is used to shift the point at which the pattern starts.
    */
-  function  setLineStyle($width =  1, $cap =  '', $join =  '', $dash =  '', $phase =  0) {
+  function  setLineStyle($width = 1, $cap = '', $join = '', $dash = '', $phase = 0) {
     // this is quite inefficient in that it sets all the parameters whenever 1 is changed, but will fix another day
-    $string =  '';
+    $string = '';
 
-    if  ($width>0) {
-      $string.=  $width.' w';
+    if ($width > 0) {
+      $string .= $width.' w';
     }
 
-    $ca =  array('butt' => 0, 'round' => 1, 'square' => 2);
+    $ca = array('butt' => 0, 'round' => 1, 'square' => 2);
 
-    if  (isset($ca[$cap])) {
-      $string.=  ' '.$ca[$cap].' J';
+    if (isset($ca[$cap])) {
+      $string .= ' '.$ca[$cap].' J';
     }
 
-    $ja =  array('miter' => 0, 'round' => 1, 'bevel' => 2);
+    $ja = array('miter' => 0, 'round' => 1, 'bevel' => 2);
 
-    if  (isset($ja[$join])) {
-      $string.=  ' '.$ja[$join].' j';
+    if (isset($ja[$join])) {
+      $string .= ' '.$ja[$join].' j';
     }
 
-    if  (is_array($dash)) {
-      $string.=  ' [';
+    if (is_array($dash)) {
+      $string .= ' [';
 
       foreach ($dash as  $len) {
-        $string.=  ' '.$len;
+        $string .= ' '.$len;
       }
 
-      $string.=  ' ] '.$phase.' d';
+      $string .= ' ] '.$phase.' d';
     }
 
-    $this->currentLineStyle =  $string;
-    $this->objects[$this->currentContents]['c'].=  "\n".$string;
+    $this->currentLineStyle = $string;
+    $this->objects[$this->currentContents]['c'] .= "\n".$string;
   }
 
 
@@ -2736,18 +2736,18 @@ 
   /**
    * draw a polygon, the syntax for this is similar to the GD polygon command
    */
-  function  polygon($p, $np, $f =  0) {
-    $this->objects[$this->currentContents]['c'].=  "\n";
-    $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[0]) .' '.sprintf('%.3F', $p[1]) .' m ';
+  function  polygon($p, $np, $f = 0) {
+    $this->objects[$this->currentContents]['c'] .= "\n";
+    $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[0]).' '.sprintf('%.3F', $p[1]).' m ';
 
-    for  ($i =  2; $i < $np * 2; $i =  $i + 2) {
-      $this->objects[$this->currentContents]['c'].=  sprintf('%.3F', $p[$i]) .' '.sprintf('%.3F', $p[$i+1]) .' l ';
+    for ($i = 2; $i < $np * 2; $i = $i + 2) {
+      $this->objects[$this->currentContents]['c'] .= sprintf('%.3F', $p[$i]).' '.sprintf('%.3F', $p[$i + 1]).' l ';
     }
 
-    if  ($f ==  1) {
-      $this->objects[$this->currentContents]['c'].=  ' f';
+    if ($f == 1) {
+      $this->objects[$this->currentContents]['c'] .= ' f';
     } else {
-      $this->objects[$this->currentContents]['c'].=  ' S';
+      $this->objects[$this->currentContents]['c'] .= ' S';
     }
   }
 
@@ -2757,7 +2757,7 @@ 
    * the coordinates of the upper-right corner
    */
   function  filledRectangle($x1, $y1, $width, $height) {
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re f';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re f';
   }
 
 
@@ -2766,7 +2766,7 @@ 
    * the coordinates of the upper-right corner
    */
   function  rectangle($x1, $y1, $width, $height) {
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $x1) .' '.sprintf('%.3F', $y1) .' '.sprintf('%.3F', $width) .' '.sprintf('%.3F', $height) .' re S';
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $x1).' '.sprintf('%.3F', $y1).' '.sprintf('%.3F', $width).' '.sprintf('%.3F', $height).' re S';
   }
 
 
@@ -2774,47 +2774,47 @@ 
    * add a new page to the document
    * this also makes the new page the current active object
    */
-  function  newPage($insert =  0, $id =  0, $pos =  'after') {
+  function  newPage($insert = 0, $id = 0, $pos = 'after') {
     // if there is a state saved, then go up the stack closing them
     // then on the new page, re-open them with the right setings
 
-    if  ($this->nStateStack) {
-      for  ($i =  $this->nStateStack;$i >=  1;$i--) {
+    if ($this->nStateStack) {
+      for ($i = $this->nStateStack; $i >= 1; $i--) {
         $this->restoreState($i);
       }
     }
 
     $this->numObj++;
 
-    if  ($insert) {
+    if ($insert) {
       // the id from the ezPdf class is the id of the contents of the page, not the page object itself
       // query that object to find the parent
-      $rid =  $this->objects[$id]['onPage'];
-      $opt =  array('rid' => $rid, 'pos' => $pos);
+      $rid = $this->objects[$id]['onPage'];
+      $opt = array('rid' => $rid, 'pos' => $pos);
       $this->o_page($this->numObj, 'new', $opt);
     } else {
       $this->o_page($this->numObj, 'new');
     }
 
     // if there is a stack saved, then put that onto the page
-    if  ($this->nStateStack) {
-      for  ($i =  1;$i <=  $this->nStateStack;$i++) {
+    if ($this->nStateStack) {
+      for ($i = 1; $i <= $this->nStateStack; $i++) {
         $this->saveState($i);
       }
     }
 
     // and if there has been a stroke or fill colour set, then transfer them
-    if  ($this->currentColour['r'] >=  0) {
+    if ($this->currentColour['r'] >= 0) {
       $this->setColor($this->currentColour['r'], $this->currentColour['g'], $this->currentColour['b'], 1);
     }
 
-    if  ($this->currentStrokeColour['r'] >=  0) {
+    if ($this->currentStrokeColour['r'] >= 0) {
       $this->setStrokeColor($this->currentStrokeColour['r'], $this->currentStrokeColour['g'], $this->currentStrokeColour['b'], 1);
     }
 
     // if there is a line style set, then put this in too
-    if  (mb_strlen($this->currentLineStyle, '8bit')) {
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->currentLineStyle;
+    if (mb_strlen($this->currentLineStyle, '8bit')) {
+      $this->objects[$this->currentContents]['c'] .= "\n".$this->currentLineStyle;
     }
 
     // the call to the o_page object set currentContents to the present page, so this can be returned as the page id
@@ -2826,7 +2826,7 @@ 
    * output the pdf code, streaming it to the browser
    * the relevant headers are set so that hopefully the browser will recognise it
    */
-  function  stream($options =  '') {
+  function  stream($options = '') {
     // setting the options allows the adjustment of the headers
     // values at the moment are:
     // 'Content-Disposition' => 'filename'  - sets the filename, though not too sure how well this will
@@ -2836,36 +2836,36 @@ 
     //    them, so I am leaving it off by default.
     // 'compress' = > 1 or 0 - apply content stream compression, this is on (1) by default
     // 'Attachment' => 1 or 0 - if 1, force the browser to open a download dialog
-    if  (!is_array($options)) {
-      $options =  array();
+    if (!is_array($options)) {
+      $options = array();
     }
 
-    if  ( headers_sent())
+    if (headers_sent())
       die("Unable to stream pdf: headers already sent");
 
-    if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
-      $tmp =  ltrim($this->output(1));
+    if (isset($options['compress']) && $options['compress'] == 0) {
+      $tmp = ltrim($this->output(1));
     } else {
-      $tmp =  ltrim($this->output());
+      $tmp = ltrim($this->output());
     }
 
     header("Cache-Control: private");
     header("Content-type: application/pdf");
 
     //FIXME: I don't know that this is sufficient for determining content length (i.e. what about transport compression?)
-    header("Content-Length: " . mb_strlen($tmp, '8bit'));
-    $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
+    header("Content-Length: ".mb_strlen($tmp, '8bit'));
+    $fileName = (isset($options['Content-Disposition']) ? $options['Content-Disposition'] : 'file.pdf');
 
-    if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+    if (!isset($options["Attachment"]))
+      $options["Attachment"] = true;
 
-    $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
+    $attachment = $options["Attachment"] ? "attachment" : "inline";
 
     header("Content-Disposition: $attachment; filename=\"$fileName\"");
 
-    if  (isset($options['Accept-Ranges']) &&  $options['Accept-Ranges'] ==  1) {
+    if (isset($options['Accept-Ranges']) && $options['Accept-Ranges'] == 1) {
       //FIXME: Is this the correct value ... spec says 1#range-unit
-      header("Accept-Ranges: " . mb_strlen($tmp, '8bit'));
+      header("Accept-Ranges: ".mb_strlen($tmp, '8bit'));
     }
 
     echo  $tmp;
@@ -2877,12 +2877,12 @@ 
    * return the height in units of the current font in the given size
    */
   function  getFontHeight($size) {
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
     
     // for the current font, and the given size, what is the height of the font in user units
-    $h =  $this->fonts[$this->currentFont]['FontBBox'][3]-$this->fonts[$this->currentFont]['FontBBox'][1];
+    $h = $this->fonts[$this->currentFont]['FontBBox'][3] - $this->fonts[$this->currentFont]['FontBBox'][1];
 
     // have to adjust by a font offset for Windows fonts.  unfortunately it looks like
     // the bounding box calculations are wrong and I don't know why.
@@ -2894,10 +2894,10 @@ 
       // Courier font.
       //
       // Both have been added manually to the .afm and .ufm files.
-      $h += (int)$this->fonts[$this->currentFont]['FontHeightOffset'];
+      $h += (int) $this->fonts[$this->currentFont]['FontHeightOffset'];
     }
 
-    return  $size*$h/1000;
+    return  $size * $h / 1000;
   }
 
 
@@ -2908,14 +2908,14 @@ 
    */
   function  getFontDescender($size) {
     // note that this will most likely return a negative value
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     //$h = $this->fonts[$this->currentFont]['FontBBox'][1];
     $h = $this->fonts[$this->currentFont]['Descender'];
 
-    return  $size*$h/1000;
+    return  $size * $h / 1000;
   }
 
 
@@ -2933,7 +2933,7 @@ 
   	$cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
       $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
-      $text =  $this->utf8toUtf16BE($text, $bom);
+      $text = $this->utf8toUtf16BE($text, $bom);
     } else {
       if (in_array('Windows-1252', mb_list_encodings())) {
         $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
@@ -3034,7 +3034,7 @@ 
    * @return string UTF-16 result string
    */
   function  utf8toUtf16BE(&$text, $bom = true) {
-    $cf =  $this->currentFont;
+    $cf = $this->currentFont;
     if (!$this->fonts[$cf]['isUnicode']) return $text;
     $out = $bom ? "\xFE\xFF" : '';
     
@@ -3067,15 +3067,15 @@ 
    */
   function  PRVTgetTextPosition($x, $y, $angle, $size, $wa, $text) {
     // given this information return an array containing x and y for the end position as elements 0 and 1
-    $w =  $this->getTextWidth($size, $text);
+    $w = $this->getTextWidth($size, $text);
 
     // need to adjust for the number of spaces in this text
-    $words =  explode(' ', $text);
-    $nspaces =  count($words) -1;
-    $w+=  $wa*$nspaces;
-    $a =  deg2rad((float)$angle);
+    $words = explode(' ', $text);
+    $nspaces = count($words) - 1;
+    $w += $wa * $nspaces;
+    $a = deg2rad((float) $angle);
 
-    return  array(cos($a) *$w+$x, -sin($a) *$w+$y);
+    return  array(cos($a) * $w + $x, -sin($a) * $w + $y);
   }
 
 
@@ -3086,8 +3086,8 @@ 
    */
   function  PRVTcheckTextDirective(&$text, $i, &$f) {
     return  0;
-    $x =  0;
-    $y =  0;
+    $x = 0;
+    $y = 0;
     return  $this->PRVTcheckTextDirective1($text, $i, $f, 0, $x, $y);
   }
 
@@ -3101,16 +3101,16 @@ 
    *
    * @access private
    */
-  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size =  0, $angle =  0, $wordSpaceAdjust =  0) {
+  function  PRVTcheckTextDirective1(&$text, $i, &$f, $final, &$x, &$y, $size = 0, $angle = 0, $wordSpaceAdjust = 0) {
     return  0;
-    $directive =  0;
-    $j =  $i;
-    if  ($text[$j] === '<') {
+    $directive = 0;
+    $j = $i;
+    if ($text[$j] === '<') {
       $j++;
       switch ($text[$j]) {
       case  '/':
         $j++;
-        if  (mb_strlen($text) <=  $j) {
+        if (mb_strlen($text) <= $j) {
           return  $directive;
         }
 
@@ -3118,60 +3118,60 @@ 
         case  'b':
         case  'i':
           $j++;
-          if  ($text[$j] === '>') {
-            $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
+          if ($text[$j] === '>') {
+            $p = mb_strrpos($this->currentTextState, $text[$j - 1]);
 
-            if  ($p !==  false) {
+            if ($p !== false) {
               // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+              $this->currentTextState = mb_substr($this->currentTextState, 0, $p).substr($this->currentTextState, $p + 1);
             }
 
-            $directive =  $j-$i+1;
+            $directive = $j - $i + 1;
           }
           break;
 
         case  'c':
           // this this might be a callback function
           $j++;
-          $k =  mb_strpos($text, '>', $j);
+          $k = mb_strpos($text, '>', $j);
 
-          if  ($k !==  false &&  $text[$j] === ':') {
+          if ($k !== false && $text[$j] === ':') {
             // then this will be treated as a callback directive
-            $directive =  $k-$i+1;
-            $f =  0;
+            $directive = $k - $i + 1;
+            $f = 0;
             // split the remainder on colons to get the function name and the paramater
-            $tmp =  mb_substr($text, $j+1, $k-$j-1);
-            $b1 =  mb_strpos($tmp, ':');
+            $tmp = mb_substr($text, $j + 1, $k - $j - 1);
+            $b1 = mb_strpos($tmp, ':');
 
-            if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
+            if ($b1 !== false) {
+              $func = mb_substr($tmp, 0, $b1);
+              $parm = mb_substr($tmp, $b1 + 1);
             } else {
-              $func =  $tmp;
-              $parm =  '';
+              $func = $tmp;
+              $parm = '';
             }
 
-            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $directive =  0;
+            if (!isset($func) || !mb_strlen(trim($func), '8bit')) {
+              $directive = 0;
             } else {
               // only call the function if this is the final call
-              if  ($final) {
+              if ($final) {
                 // need to assess the text position, calculate the text width to this point
                 // can use getTextWidth to find the text width I think
-                $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+                $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-                $info =  array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
-                $x =  $tmp[0];
-                $y =  $tmp[1];
-                $ret =  $this->$func($info);
+                $info = array('x' => $tmp[0], 'y' => $tmp[1], 'angle' => $angle, 'status' => 'end', 'p' => $parm, 'nCallback' => $this->nCallback);
+                $x = $tmp[0];
+                $y = $tmp[1];
+                $ret = $this->$func($info);
 
-                if  (is_array($ret)) {
+                if (is_array($ret)) {
                   // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                  foreach($ret as  $rk => $rv) {
+                  foreach ($ret as  $rk => $rv) {
                     switch ($rk) {
                     case  'x':
                     case  'y':
-                      $$rk =  $rv;
+                      $$rk = $rv;
                       break;
                     }
                   }
@@ -3180,8 +3180,8 @@ 
                 // also remove from to the stack
                 // for simplicity, just take from the end, fix this another day
                 $this->nCallback--;
-                if  ($this->nCallback<0) {
-                  $this->nCallBack =  0;
+                if ($this->nCallback < 0) {
+                  $this->nCallBack = 0;
                 }
               }
             }
@@ -3193,49 +3193,49 @@ 
       case  'b':
       case  'i':
         $j++;
-        if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
+        if ($text[$j] === '>') {
+          $this->currentTextState .= $text[$j - 1];
+          $directive = $j - $i + 1;
         }
         break;
 
       case  'C':
-        $noClose =  1;
+        $noClose = 1;
       case  'c':
         // this this might be a callback function
         $j++;
-        $k =  mb_strpos($text, '>', $j);
+        $k = mb_strpos($text, '>', $j);
 
-        if  ($k !==  false &&  $text[$j] ===  ':') {
+        if ($k !== false && $text[$j] === ':') {
           // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+          $directive = $k - $i + 1;
 
-          $f =  0;
+          $f = 0;
 
           // split the remainder on colons to get the function name and the paramater
           //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
-          $tmp =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+          $tmp = mb_substr($text, $j + 1, $k - $j - 1);
+          $b1 = mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
-            $func =  mb_substr($tmp, 0, $b1);
-            $parm =  mb_substr($tmp, $b1+1);
+          if ($b1 !== false) {
+            $func = mb_substr($tmp, 0, $b1);
+            $parm = mb_substr($tmp, $b1 + 1);
           } else {
-            $func =  $tmp;
-            $parm =  '';
+            $func = $tmp;
+            $parm = '';
           }
 
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-            $directive =  0;
+          if (!isset($func) || !mb_strlen(trim($func), '8bit')) {
+            $directive = 0;
           } else {
             // only call the function if this is the final call, ie, the one actually doing printing, not measurement
-            if  ($final) {
+            if ($final) {
               // need to assess the text position, calculate the text width to this point
               // can use getTextWidth to find the text width I think
               // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+              $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
 
-              $info =  array(
+              $info = array(
                 'x' => $tmp[0], 
                 'y' => $tmp[1], 
                 'angle' => $angle, 
@@ -3245,24 +3245,24 @@ 
                 'height' => $this->getFontHeight($size), 
                 'descender' => $this->getFontDescender($size)
               );
-              $x =  $tmp[0];
-              $y =  $tmp[1];
+              $x = $tmp[0];
+              $y = $tmp[1];
 
-              if  (!isset($noClose) ||  !$noClose) {
+              if (!isset($noClose) || !$noClose) {
                 // only add to the stack if this is a small 'c', therefore is a start-stop pair
                 $this->nCallback++;
-                $info['nCallback'] =  $this->nCallback;
-                $this->callback[$this->nCallback] =  $info;
+                $info['nCallback'] = $this->nCallback;
+                $this->callback[$this->nCallback] = $info;
               }
 
-              $ret =  $this->$func($info);
-              if  (is_array($ret)) {
+              $ret = $this->$func($info);
+              if (is_array($ret)) {
                 // then the return from the callback function could set the position, to start with, later will do font colour, and font
-                foreach($ret as  $rk => $rv) {
+                foreach ($ret as  $rk => $rv) {
                   switch ($rk) {
                   case  'x':
                   case  'y':
-                    $$rk =  $rv;
+                    $$rk = $rv;
                     break;
                   }
                 }
@@ -3281,16 +3281,16 @@ 
   /**
    * add text to the document, at a specified location, size and angle on the page
    */
-  function  addText($x, $y, $size, $text, $angle =  0, $wordSpaceAdjust =  0) {
-    if  (!$this->numFonts) {
+  function  addText($x, $y, $size, $text, $angle = 0, $wordSpaceAdjust = 0) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     // if there are any open callbacks, then they should be called, to show the start of the line
-    if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+    if ($this->nCallback > 0) {
+      for ($i = $this->nCallback; $i > 0; $i--) {
         // call each function
-        $info =  array('x' => $x,
+        $info = array('x' => $x,
                        'y' => $y,
                        'angle' => $angle,
                        'status' => 'sol',
@@ -3299,28 +3299,28 @@ 
                        'height' => $this->callback[$i]['height'],
                        'descender' => $this->callback[$i]['descender']);
 
-        $func =  $this->callback[$i]['f'];
+        $func = $this->callback[$i]['f'];
         $this->$func($info);
       }
     }
 
-    if  ($angle ==  0) {
-      $this->objects[$this->currentContents]['c'].=  "\n".'BT '.sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Td';
+    if ($angle == 0) {
+      $this->objects[$this->currentContents]['c'] .= "\n".'BT '.sprintf('%.3F', $x).' '.sprintf('%.3F', $y).' Td';
     } else {
-      $a =  deg2rad((float)$angle);
-      $tmp =  "\n".'BT ';
-      $tmp.=  sprintf('%.3F', cos($a)) .' '.sprintf('%.3F', (-1.0*sin($a))) .' '.sprintf('%.3F', sin($a)) .' '.sprintf('%.3F', cos($a)) .' ';
-      $tmp.=  sprintf('%.3F', $x) .' '.sprintf('%.3F', $y) .' Tm';
-      $this->objects[$this->currentContents]['c'].=  $tmp;
+      $a = deg2rad((float) $angle);
+      $tmp = "\n".'BT ';
+      $tmp .= sprintf('%.3F', cos($a)).' '.sprintf('%.3F', (-1.0 * sin($a))).' '.sprintf('%.3F', sin($a)).' '.sprintf('%.3F', cos($a)).' ';
+      $tmp .= sprintf('%.3F', $x).' '.sprintf('%.3F', $y).' Tm';
+      $this->objects[$this->currentContents]['c'] .= $tmp;
     }
 
-    if  ($wordSpaceAdjust !=  0 ||  $wordSpaceAdjust !=  $this->wordSpaceAdjust) {
-      $this->wordSpaceAdjust =  $wordSpaceAdjust;
-      $this->objects[$this->currentContents]['c'].=  ' '.sprintf('%.3F', $wordSpaceAdjust) .' Tw';
+    if ($wordSpaceAdjust != 0 || $wordSpaceAdjust != $this->wordSpaceAdjust) {
+      $this->wordSpaceAdjust = $wordSpaceAdjust;
+      $this->objects[$this->currentContents]['c'] .= ' '.sprintf('%.3F', $wordSpaceAdjust).' Tw';
     }
 
-    $len =  mb_strlen($text);
-    $start =  0;
+    $len = mb_strlen($text);
+    $start = 0;
 
     /*
      for ($i = 0;$i<$len;$i++){
@@ -3365,20 +3365,20 @@ 
 
      }
     */
-    if  ($start < $len) {
-      $part =  $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
-      $this->objects[$this->currentContents]['c'].=  ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size) .' Tf ';
-      $this->objects[$this->currentContents]['c'].=  ' ('.$this->filterText($part, false) .') Tj';
+    if ($start < $len) {
+      $part = $text; // OAR - Don't need this anymore, given that $start always equals zero.  substr($text, $start);
+      $this->objects[$this->currentContents]['c'] .= ' /F'.$this->currentFontNum.' '.sprintf('%.1F', $size).' Tf ';
+      $this->objects[$this->currentContents]['c'] .= ' ('.$this->filterText($part, false).') Tj';
     }
 
-    $this->objects[$this->currentContents]['c'].=  ' ET';
+    $this->objects[$this->currentContents]['c'] .= ' ET';
 
     // if there are any open callbacks, then they should be called, to show the end of the line
-    if  ($this->nCallback>0) {
-      for  ($i =  $this->nCallback;$i>0;$i--) {
+    if ($this->nCallback > 0) {
+      for ($i = $this->nCallback; $i > 0; $i--) {
         // call each function
-        $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
-        $info =  array(
+        $tmp = $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, $text);
+        $info = array(
           'x' => $tmp[0], 
           'y' => $tmp[1], 
           'angle' => $angle,
@@ -3388,7 +3388,7 @@ 
           'height' => $this->callback[$i]['height'], 
           'descender' => $this->callback[$i]['descender']
         );
-        $func =  $this->callback[$i]['f'];
+        $func = $this->callback[$i]['f'];
         $this->$func($info);
       }
     }
@@ -3399,68 +3399,68 @@ 
    * calculate how wide a given text string will be on a page, at a given size.
    * this can be called externally, but is alse used by the other class functions
    */
-  function  getTextWidth($size, $text, $spacing =  0) {
+  function  getTextWidth($size, $text, $spacing = 0) {
     // this function should not change any of the settings, though it will need to
     // track any directives which change during calculation, so copy them at the start
     // and put them back at the end.
-    $store_currentTextState =  $this->currentTextState;
+    $store_currentTextState = $this->currentTextState;
 
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
     // converts a number or a float to a string so it can get the width
-    $text =  "$text";
+    $text = "$text";
 
     // hmm, this is where it all starts to get tricky - use the font information to
     // calculate the width of each character, add them up and convert to user units
-    $w =  0;
-    $cf =  $this->currentFont;
-    $space_scale =  1000 / $size;
-    if ( $this->fonts[$cf]['isUnicode']) {
+    $w = 0;
+    $cf = $this->currentFont;
+    $space_scale = 1000 / $size;
+    if ($this->fonts[$cf]['isUnicode']) {
       // for Unicode, use the code points array to calculate width rather
       // than just the string itself
-      $unicode =  $this->utf8toCodePointsArray($text);
+      $unicode = $this->utf8toCodePointsArray($text);
 
       foreach ($unicode as $char) {
         // check if we have to replace character
-      if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+      if (isset($this->fonts[$cf]['differences'][$char])) {
+          $char = $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
-        if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+        if (isset($this->fonts[$cf]['C'][$char]['WX'])) {
+          $w += $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
-        if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+        if ($char == 32) {  // Space
+          $w += $spacing * $space_scale;
         }
       }
 
     } else {
-      $len =  mb_strlen($text, 'Windows-1252');
+      $len = mb_strlen($text, 'Windows-1252');
 
-      for  ($i =  0; $i < $len; $i++) {
-        $char =  ord($text[$i]);
+      for ($i = 0; $i < $len; $i++) {
+        $char = ord($text[$i]);
         // check if we have to replace character
-        if  ( isset($this->fonts[$cf]['differences'][$char])) {
-          $char =  $this->fonts[$cf]['differences'][$char];
+        if (isset($this->fonts[$cf]['differences'][$char])) {
+          $char = $this->fonts[$cf]['differences'][$char];
         }
         // add the character width
-        if  ( isset($this->fonts[$cf]['C'][$char]['WX'])) {
-        $w+=  $this->fonts[$cf]['C'][$char]['WX'];
+        if (isset($this->fonts[$cf]['C'][$char]['WX'])) {
+        $w += $this->fonts[$cf]['C'][$char]['WX'];
         }
         // add additional padding for space
-        if  ( $char ==  32) {  // Space
-          $w+=  $spacing * $space_scale;
+        if ($char == 32) {  // Space
+          $w += $spacing * $space_scale;
         }
       }
     }
 
-    $this->currentTextState =  $store_currentTextState;
+    $this->currentTextState = $store_currentTextState;
     $this->setCurrentFont();
 
-    return  $w*$size/1000;
+    return  $w * $size / 1000;
   }
 
 
@@ -3470,28 +3470,28 @@ 
    * @access private
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
-    switch  ($justification) {
+    switch ($justification) {
     case  'left':
       return;
 
     case  'right':
-      $x+=  $width-$actual;
+      $x += $width - $actual;
       break;
 
     case  'center':
     case  'centre':
-      $x+=  ($width-$actual) /2;
+      $x += ($width - $actual) / 2;
       break;
 
     case  'full':
       // count the number of words
-      $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+      $words = explode(' ', $text);
+      $nspaces = count($words) - 1;
 
-      if  ($nspaces>0) {
-        $adjust =  ($width-$actual) /$nspaces;
+      if ($nspaces > 0) {
+        $adjust = ($width - $actual) / $nspaces;
       } else {
-        $adjust =  0;
+        $adjust = 0;
       }
       break;
     }
@@ -3504,9 +3504,9 @@ 
    * and return the remainder.
    * justification and angle can also be specified for the text
    */
-  function  addTextWrap($x, $y, $width, $size, $text, $justification =  'left', $angle =  0, $test =  0) {
+  function  addTextWrap($x, $y, $width, $size, $text, $justification = 'left', $angle = 0, $test = 0) {
   	// TODO - need to support Unicode
-    $cf =  $this->currentFont;
+    $cf = $this->currentFont;
     if ($this->fonts[$cf]['isUnicode']) {
         die("addTextWrap does not support Unicode yet!");
     }
@@ -3518,89 +3518,89 @@ 
 
     // need to store the initial text state, as this will change during the width calculation
     // but will need to be re-set before printing, so that the chars work out right
-    $store_currentTextState =  $this->currentTextState;
+    $store_currentTextState = $this->currentTextState;
 
-    if  (!$this->numFonts) {
+    if (!$this->numFonts) {
       $this->selectFont($this->defaultFont);
     }
 
-    if  ($width <=  0) {
+    if ($width <= 0) {
       // error, pretend it printed ok, otherwise risking a loop
       return  '';
     }
 
-    $w =  0;
-    $break =  0;
-    $breakWidth =  0;
-    $len =  mb_strlen($text);
-    $cf =  $this->currentFont;
-    $tw =  $width/$size*1000;
+    $w = 0;
+    $break = 0;
+    $breakWidth = 0;
+    $len = mb_strlen($text);
+    $cf = $this->currentFont;
+    $tw = $width / $size * 1000;
 
-    for  ($i =  0;$i<$len;$i++) {
-      $f =  1;
-      $directive =  0;
+    for ($i = 0; $i < $len; $i++) {
+      $f = 1;
+      $directive = 0;
       //$this->PRVTcheckTextDirective($text,$i,$f);
-      if  ($directive) {
-        if  ($f) {
+      if ($directive) {
+        if ($f) {
           $this->setCurrentFont();
-          $cf =  $this->currentFont;
+          $cf = $this->currentFont;
         }
 
-        $i =  $i+$directive-1;
+        $i = $i + $directive - 1;
       } else {
-        $cOrd =  ord($text[$i]);
+        $cOrd = ord($text[$i]);
 
-        if  (isset($this->fonts[$cf]['differences'][$cOrd])) {
+        if (isset($this->fonts[$cf]['differences'][$cOrd])) {
           // then this character is being replaced by another
-          $cOrd2 =  $this->fonts[$cf]['differences'][$cOrd];
+          $cOrd2 = $this->fonts[$cf]['differences'][$cOrd];
         } else {
-          $cOrd2 =  $cOrd;
+          $cOrd2 = $cOrd;
         }
 
-        if  (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
-          $w+=  $this->fonts[$cf]['C'][$cOrd2]['WX'];
+        if (isset($this->fonts[$cf]['C'][$cOrd2]['WX'])) {
+          $w += $this->fonts[$cf]['C'][$cOrd2]['WX'];
         }
 
-        if  ($w>$tw) {
+        if ($w > $tw) {
           // then we need to truncate this line
-          if  ($break>0) {
+          if ($break > 0) {
             // then we have somewhere that we can split :)
-            if  ($text[$break] ===  ' ') {
-              $tmp =  mb_substr($text, 0, $break);
+            if ($text[$break] === ' ') {
+              $tmp = mb_substr($text, 0, $break);
             } else {
-              $tmp =  mb_substr($text, 0, $break+1);
+              $tmp = mb_substr($text, 0, $break + 1);
             }
 
-            $adjust =  0;
+            $adjust = 0;
             $this->PRVTadjustWrapText($tmp, $breakWidth, $width, $x, $adjust, $justification);
 
             // reset the text state
-            $this->currentTextState =  $store_currentTextState;
+            $this->currentTextState = $store_currentTextState;
             $this->setCurrentFont();
 
-            if  (!$test) {
+            if (!$test) {
               $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
-            return  mb_substr($text, $break+1);
+            return  mb_substr($text, $break + 1);
           } else {
             // just split before the current character
-            $tmp =  mb_substr($text, 0, $i);
-            $adjust =  0;
-            $ctmp =  ord($text[$i]);
+            $tmp = mb_substr($text, 0, $i);
+            $adjust = 0;
+            $ctmp = ord($text[$i]);
 
-            if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-              $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+            if (isset($this->fonts[$cf]['differences'][$ctmp])) {
+              $ctmp = $this->fonts[$cf]['differences'][$ctmp];
             }
 
-            $tmpw =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+            $tmpw = ($w - $this->fonts[$cf]['C'][$ctmp]['WX']) * $size / 1000;
             $this->PRVTadjustWrapText($tmp, $tmpw, $width, $x, $adjust, $justification);
 
             // reset the text state
-            $this->currentTextState =  $store_currentTextState;
+            $this->currentTextState = $store_currentTextState;
             $this->setCurrentFont();
 
-            if  (!$test) {
+            if (!$test) {
               $this->addText($x, $y, $size, $tmp, $angle, $adjust);
             }
 
@@ -3608,39 +3608,39 @@ 
           }
         }
 
-        if  ($text[$i] ===  '-') {
-          $break =  $i;
-          $breakWidth =  $w*$size/1000;
+        if ($text[$i] === '-') {
+          $break = $i;
+          $breakWidth = $w * $size / 1000;
         }
 
-        if  ($text[$i] ===  ' ') {
-          $break =  $i;
-          $ctmp =  ord($text[$i]);
+        if ($text[$i] === ' ') {
+          $break = $i;
+          $ctmp = ord($text[$i]);
 
-          if  (isset($this->fonts[$cf]['differences'][$ctmp])) {
-            $ctmp =  $this->fonts[$cf]['differences'][$ctmp];
+          if (isset($this->fonts[$cf]['differences'][$ctmp])) {
+            $ctmp = $this->fonts[$cf]['differences'][$ctmp];
           }
 
-          $breakWidth =  ($w-$this->fonts[$cf]['C'][$ctmp]['WX']) *$size/1000;
+          $breakWidth = ($w - $this->fonts[$cf]['C'][$ctmp]['WX']) * $size / 1000;
         }
       }
     }
 
     // then there was no need to break this line
-    if  ($justification ===  'full') {
-      $justification =  'left';
+    if ($justification === 'full') {
+      $justification = 'left';
     }
 
-    $adjust =  0;
-    $tmpw =  $w*$size/1000;
+    $adjust = 0;
+    $tmpw = $w * $size / 1000;
 
     $this->PRVTadjustWrapText($text, $tmpw, $width, $x, $adjust, $justification);
 
     // reset the text state
-    $this->currentTextState =  $store_currentTextState;
+    $this->currentTextState = $store_currentTextState;
     $this->setCurrentFont();
 
-    if  (!$test) {
+    if (!$test) {
       $this->addText($x, $y, $size, $text, $angle, $adjust, $angle);
     }
 
@@ -3654,45 +3654,45 @@ 
    * This is to get around not being able to have open 'q' across pages
    *
    */
-  function  saveState($pageEnd =  0) {
-    if  ($pageEnd) {
+  function  saveState($pageEnd = 0) {
+    if ($pageEnd) {
       // this will be called at a new page to return the state to what it was on the
       // end of the previous page, before the stack was closed down
       // This is to get around not being able to have open 'q' across pages
-      $opt =  $this->stateStack[$pageEnd];
+      $opt = $this->stateStack[$pageEnd];
       // ok to use this as stack starts numbering at 1
       $this->setColor($opt['col']['r'], $opt['col']['g'], $opt['col']['b'], 1);
       $this->setStrokeColor($opt['str']['r'], $opt['str']['g'], $opt['str']['b'], 1);
-      $this->objects[$this->currentContents]['c'].=  "\n".$opt['lin'];
+      $this->objects[$this->currentContents]['c'] .= "\n".$opt['lin'];
       //    $this->currentLineStyle = $opt['lin'];
     } else {
       $this->nStateStack++;
-      $this->stateStack[$this->nStateStack] =  array(
+      $this->stateStack[$this->nStateStack] = array(
         'col' => $this->currentColour, 
         'str' => $this->currentStrokeColour, 
         'lin' => $this->currentLineStyle
       );
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
   }
 
 
   /**
    * restore a previously saved state
    */
-  function  restoreState($pageEnd =  0) {
-    if  (!$pageEnd) {
-      $n =  $this->nStateStack;
-      $this->currentColour =  $this->stateStack[$n]['col'];
-      $this->currentStrokeColour =  $this->stateStack[$n]['str'];
-      $this->objects[$this->currentContents]['c'].=  "\n".$this->stateStack[$n]['lin'];
-      $this->currentLineStyle =  $this->stateStack[$n]['lin'];
+  function  restoreState($pageEnd = 0) {
+    if (!$pageEnd) {
+      $n = $this->nStateStack;
+      $this->currentColour = $this->stateStack[$n]['col'];
+      $this->currentStrokeColour = $this->stateStack[$n]['str'];
+      $this->objects[$this->currentContents]['c'] .= "\n".$this->stateStack[$n]['lin'];
+      $this->currentLineStyle = $this->stateStack[$n]['lin'];
       unset($this->stateStack[$n]);
       $this->nStateStack--;
     }
     
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
@@ -3704,12 +3704,12 @@ 
    */
   function  openObject() {
     $this->nStack++;
-    $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
+    $this->stack[$this->nStack] = array('c' => $this->currentContents, 'p' => $this->currentPage);
     // add a new object of the content type, to hold the data flow
     $this->numObj++;
     $this->o_contents($this->numObj, 'new');
-    $this->currentContents =  $this->numObj;
-    $this->looseObjects[$this->numObj] =  1;
+    $this->currentContents = $this->numObj;
+    $this->looseObjects[$this->numObj] = 1;
 
     return  $this->numObj;
   }
@@ -3720,12 +3720,12 @@ 
    */
   function  reopenObject($id) {
     $this->nStack++;
-    $this->stack[$this->nStack] =  array('c' => $this->currentContents, 'p' => $this->currentPage);
-    $this->currentContents =  $id;
+    $this->stack[$this->nStack] = array('c' => $this->currentContents, 'p' => $this->currentPage);
+    $this->currentContents = $id;
 
     // also if this object is the primary contents for a page, then set the current page to its parent
-    if  (isset($this->objects[$id]['onPage'])) {
-      $this->currentPage =  $this->objects[$id]['onPage'];
+    if (isset($this->objects[$id]['onPage'])) {
+      $this->currentPage = $this->objects[$id]['onPage'];
     }
   }
 
@@ -3736,9 +3736,9 @@ 
   function  closeObject() {
     // close the object, as long as there was one open in the first place, which will be indicated by
     // an objectId on the stack.
-    if  ($this->nStack>0) {
-      $this->currentContents =  $this->stack[$this->nStack]['c'];
-      $this->currentPage =  $this->stack[$this->nStack]['p'];
+    if ($this->nStack > 0) {
+      $this->currentContents = $this->stack[$this->nStack]['c'];
+      $this->currentPage = $this->stack[$this->nStack]['p'];
       $this->nStack--;
       // easier to probably not worry about removing the old entries, they will be overwritten
       // if there are new ones.
@@ -3752,8 +3752,8 @@ 
   function  stopObject($id) {
     // if an object has been appearing on pages up to now, then stop it, this page will
     // be the last one that could contian it.
-    if  (isset($this->addLooseObjects[$id])) {
-      $this->addLooseObjects[$id] =  '';
+    if (isset($this->addLooseObjects[$id])) {
+      $this->addLooseObjects[$id] = '';
     }
   }
 
@@ -3761,18 +3761,18 @@ 
   /**
    * after an object has been created, it wil only show if it has been added, using this function.
    */
-  function  addObject($id, $options =  'add') {
+  function  addObject($id, $options = 'add') {
     // add the specified object to the page
-    if  (isset($this->looseObjects[$id]) &&  $this->currentContents !=  $id) {
+    if (isset($this->looseObjects[$id]) && $this->currentContents != $id) {
       // then it is a valid object, and it is not being added to itself
       switch ($options) {
       case  'all':
         // then this object is to be added to this page (done in the next block) and
         // all future new pages.
-        $this->addLooseObjects[$id] =  'all';
+        $this->addLooseObjects[$id] = 'all';
 
       case  'add':
-        if  (isset($this->objects[$this->currentContents]['onPage'])) {
+        if (isset($this->objects[$this->currentContents]['onPage'])) {
           // then the destination contents is the primary for the page
           // (though this object is actually added to that page)
           $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
@@ -3780,33 +3780,33 @@ 
         break;
 
       case  'even':
-        $this->addLooseObjects[$id] =  'even';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  0) {
+        $this->addLooseObjects[$id] = 'even';
+        $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+        if ($this->objects[$pageObjectId]['info']['pageNum'] % 2 == 0) {
           $this->addObject($id);
           // hacky huh :)
         }
         break;
 
       case  'odd':
-        $this->addLooseObjects[$id] =  'odd';
-        $pageObjectId =  $this->objects[$this->currentContents]['onPage'];
-        if  ($this->objects[$pageObjectId]['info']['pageNum']%2 ==  1) {
+        $this->addLooseObjects[$id] = 'odd';
+        $pageObjectId = $this->objects[$this->currentContents]['onPage'];
+        if ($this->objects[$pageObjectId]['info']['pageNum'] % 2 == 1) {
           $this->addObject($id);
           // hacky huh :)
         }
         break;
 
       case  'next':
-        $this->addLooseObjects[$id] =  'all';
+        $this->addLooseObjects[$id] = 'all';
         break;
 
       case  'nexteven':
-        $this->addLooseObjects[$id] =  'even';
+        $this->addLooseObjects[$id] = 'even';
         break;
 
       case  'nextodd':
-        $this->addLooseObjects[$id] =  'odd';
+        $this->addLooseObjects[$id] = 'odd';
         break;
       }
     }
@@ -3817,8 +3817,8 @@ 
    * return a storable representation of a specific object
    */
   function  serializeObject($id) {
-    if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
+    if (array_key_exists($id, $this->objects))
+      return  var_export($this->objects[$id], true);
   }
 
 
@@ -3826,8 +3826,8 @@ 
    * restore an object from its stored representation.  returns its new object id.
    */
   function  restoreSerializedObject($obj) {
-    $obj_id =  $this->openObject();
-    eval('$this->objects[$obj_id] = ' . $obj . ';');
+    $obj_id = $this->openObject();
+    eval('$this->objects[$obj_id] = '.$obj.';');
     $this->closeObject();
     return  $obj_id;
   }
@@ -3836,12 +3836,12 @@ 
   /**
    * add content to the documents info object
    */
-  function  addInfo($label, $value =  0) {
+  function  addInfo($label, $value = 0) {
     // this will only work if the label is one of the valid ones.
     // modify this so that arrays can be passed as well.
     // if $label is an array then assume that it is key => value pairs
     // else assume that they are both scalar, anything else will probably error
-    if  (is_array($label)) {
+    if (is_array($label)) {
       foreach ($label as  $l => $v) {
         $this->o_info($this->infoObject, $l, $v);
       }
@@ -3854,9 +3854,9 @@ 
   /**
    * set the viewer preferences of the document, it is up to the browser to obey these.
    */
-  function  setPreferences($label, $value =  0) {
+  function  setPreferences($label, $value = 0) {
     // this will only work if the label is one of the valid ones.
-    if  (is_array($label)) {
+    if (is_array($label)) {
       foreach ($label as  $l => $v) {
         $this->o_catalog($this->catalogId, 'viewerPreferences', array($l => $v));
       }
@@ -3873,10 +3873,10 @@ 
    */
   function  PRVT_getBytes(&$data, $pos, $num) {
     // return the integer represented by $num bytes from $pos within $data
-    $ret =  0;
-    for  ($i =  0;$i<$num;$i++) {
-      $ret =  $ret*256;
-      $ret+=  ord($data[$pos+$i]);
+    $ret = 0;
+    for ($i = 0; $i < $num; $i++) {
+      $ret = $ret * 256;
+      $ret += ord($data[$pos + $i]);
     }
 
     return  $ret;
@@ -3887,9 +3887,9 @@ 
    * add a PNG image into the document, from a GD object
    * this should work with remote files
    */
-  function addImagePng($file, $x, $y, $w =  0, $h =  0, &$img) {
+  function addImagePng($file, $x, $y, $w = 0, $h = 0, &$img) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
+	if (isset($this->imagelist[$file])) {
 	  $data = null;
 	} else {
   	  // Example for transparency handling on new image. Retain for current image
@@ -3905,7 +3905,7 @@ 
 	  //default, but explicitely set to ensure pdf compatibility
       imagesavealpha($img, false);
       
-      $error =  0;
+      $error = 0;
       //DEBUG_IMG_TEMP
       //debugpng
       if (DEBUGPNG) print '[addImagePng '.$file.']';
@@ -3923,7 +3923,7 @@ 
         if (DEBUGPNG) print 'trouble writing file from GD';
 	  }
 
-      if  ($error) {
+      if ($error) {
         $this->addMessage('PNG error - ('.$file.') '.$errormsg);
         return;
       }
@@ -3937,9 +3937,9 @@ 
    * add a PNG image into the document, from a file
    * this should work with remote files
    */
-  function  addPngFromFile($file, $x, $y, $w =  0, $h =  0) {
+  function  addPngFromFile($file, $x, $y, $w = 0, $h = 0) {
     //if already cached, need not to read again
-	if ( isset($this->imagelist[$file]) ) {
+	if (isset($this->imagelist[$file])) {
 	  $img = null;
 	} else {
       //png files typically contain an alpha channel.
@@ -3958,18 +3958,18 @@ 
       }
       $sx = imagesx($imgtmp);
       $sy = imagesy($imgtmp);
-      $img = imagecreatetruecolor($sx,$sy);
+      $img = imagecreatetruecolor($sx, $sy);
       imagealphablending($img, true);
   	  $ti = imagecolortransparent($imgtmp);
 	  if ($ti >= 0) {
-	    $tc = imagecolorsforindex($imgtmp,$ti);
-        $ti = imagecolorallocate($img,$tc['red'],$tc['green'],$tc['blue']);
-        imagefill($img,0,0,$ti);
+	    $tc = imagecolorsforindex($imgtmp, $ti);
+        $ti = imagecolorallocate($img, $tc['red'], $tc['green'], $tc['blue']);
+        imagefill($img, 0, 0, $ti);
         imagecolortransparent($img, $ti);
       } else {
-        imagefill($img,1,1,imagecolorallocate($img,255,255,255));
+        imagefill($img, 1, 1, imagecolorallocate($img, 255, 255, 255));
       }
-      imagecopy($img,$imgtmp,0,0,0,0,$sx,$sy);
+      imagecopy($img, $imgtmp, 0, 0, 0, 0, $sx, $sy);
       imagedestroy($imgtmp);
     }
     $this->addImagePng($file, $x, $y, $w, $h, $img);
@@ -3979,8 +3979,8 @@ 
   /**
    * add a PNG image into the document, from a memory buffer of the file
    */
-  function  addPngFromBuf($file, $x, $y, $w =  0, $h =  0, &$data) {
-	if ( isset($this->imagelist[$file]) ) {
+  function  addPngFromBuf($file, $x, $y, $w = 0, $h = 0, &$data) {
+	if (isset($this->imagelist[$file])) {
       //debugpng
       //if (DEBUGPNG) print '[addPngFromBuf Duplicate '.$file.']';
 	  $data = null;
@@ -3995,81 +3995,81 @@ 
       }
       //debugpng
       //if (DEBUGPNG) print '[addPngFromBuf file='.$file.']';
-    $error =  0;
+    $error = 0;
 
-    if  (!$error) {
-      $header =  chr(137) .chr(80) .chr(78) .chr(71) .chr(13) .chr(10) .chr(26) .chr(10);
-      if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
-        $error =  1;
+    if (!$error) {
+      $header = chr(137).chr(80).chr(78).chr(71).chr(13).chr(10).chr(26).chr(10);
+      if (mb_substr($data, 0, 8, '8bit') != $header) {
+        $error = 1;
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
 
-        $errormsg =  'this file does not have a valid header';
+        $errormsg = 'this file does not have a valid header';
       }
     }
 
 
-    if  (!$error) {
+    if (!$error) {
       // set pointer
-      $p =  8;
-      $len =  mb_strlen($data, '8bit');
+      $p = 8;
+      $len = mb_strlen($data, '8bit');
 
       // cycle through the file, identifying chunks
-      $haveHeader =  0;
-      $info =  array();
-      $idata =  '';
-      $pdata =  '';
-
-      while  ($p < $len) {
-        $chunkLen =  $this->PRVT_getBytes($data, $p, 4);
-        $chunkType =  mb_substr($data, $p+4, 4, '8bit');
+      $haveHeader = 0;
+      $info = array();
+      $idata = '';
+      $pdata = '';
+
+      while ($p < $len) {
+        $chunkLen = $this->PRVT_getBytes($data, $p, 4);
+        $chunkType = mb_substr($data, $p + 4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
         switch ($chunkType) {
         case  'IHDR':
           // this is where all the file information comes from
-          $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
+          $info['width'] = $this->PRVT_getBytes($data, $p + 8, 4);
+          $info['height'] = $this->PRVT_getBytes($data, $p + 12, 4);
+          $info['bitDepth'] = ord($data[$p + 16]);
+          $info['colorType'] = ord($data[$p + 17]);
+          $info['compressionMethod'] = ord($data[$p + 18]);
+          $info['filterMethod'] = ord($data[$p + 19]);
+          $info['interlaceMethod'] = ord($data[$p + 20]);
 
           //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
-            $error =  1;
+          $haveHeader = 1;
+          if ($info['compressionMethod'] != 0) {
+            $error = 1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
 
-            $errormsg =  'unsupported compression method';
+            $errormsg = 'unsupported compression method';
           }
 
-          if  ($info['filterMethod'] !=  0) {
-            $error =  1;
+          if ($info['filterMethod'] != 0) {
+            $error = 1;
 
             //debugpng
             if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
-            $errormsg =  'unsupported filter method';
+            $errormsg = 'unsupported filter method';
           }
           break;
 
         case  'PLTE':
-          $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+          $pdata .= mb_substr($data, $p + 8, $chunkLen, '8bit');
           break;
 
         case  'IDAT':
-          $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+          $idata .= mb_substr($data, $p + 8, $chunkLen, '8bit');
           break;
 
         case  'tRNS':
           //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
           //print "tRNS found, color type = ".$info['colorType']."\n";
-          $transparency =  array();
+          $transparency = array();
 
-          if  ($info['colorType'] ==  3) {
+          if ($info['colorType'] == 3) {
             // indexed color, rbg
             /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
@@ -4078,38 +4078,38 @@ 
             */
             // there will be one entry for each palette entry. up until the last non-opaque entry.
             // set up an array, stretching over all palette entries which will be o (opaque) or 1 (transparent)
-            $transparency['type'] =  'indexed';
-            $numPalette =  mb_strlen($pdata, '8bit')/3;
-            $trans =  0;
+            $transparency['type'] = 'indexed';
+            $numPalette = mb_strlen($pdata, '8bit') / 3;
+            $trans = 0;
 
-            for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
-                $trans =  $i;
+            for ($i = $chunkLen; $i >= 0; $i--) {
+              if (ord($data[$p + 8 + $i]) == 0) {
+                $trans = $i;
               }
             }
 
-            $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
+            $transparency['data'] = $trans;
+          } elseif ($info['colorType'] == 0) {
             // grayscale
             /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
             */
             //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
-            $transparency['type'] =  'indexed';
+            $transparency['type'] = 'indexed';
 
-            $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
+            $transparency['data'] = ord($data[$p + 8 + 1]);
+          } elseif ($info['colorType'] == 2) {
             // truecolor
             /* corresponding to entries in the plte chunk
              Red: 2 bytes, range 0 .. (2^bitdepth)-1
              Green: 2 bytes, range 0 .. (2^bitdepth)-1
              Blue: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
+            $transparency['r'] = $this->PRVT_getBytes($data, $p + 8, 2);
             // r from truecolor
-            $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
+            $transparency['g'] = $this->PRVT_getBytes($data, $p + 10, 2);
             // g from truecolor
-            $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
+            $transparency['b'] = $this->PRVT_getBytes($data, $p + 12, 2);
             // b from truecolor
 
             $transparency['type'] = 'color-key';
@@ -4126,67 +4126,67 @@ 
           break;
         }
 
-        $p+=  $chunkLen+12;
+        $p += $chunkLen + 12;
       }
 
 
       if (!$haveHeader) {
-        $error =  1;
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
 
-        $errormsg =  'information header is missing';
+        $errormsg = 'information header is missing';
       }
 
-      if  (isset($info['interlaceMethod']) &&  $info['interlaceMethod']) {
-        $error =  1;
+      if (isset($info['interlaceMethod']) && $info['interlaceMethod']) {
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
 
-        $errormsg =  'There appears to be no support for interlaced images in pdf.';
+        $errormsg = 'There appears to be no support for interlaced images in pdf.';
       }
     }
 
-    if  (!$error &&  $info['bitDepth'] > 8) {
-      $error =  1;
+    if (!$error && $info['bitDepth'] > 8) {
+      $error = 1;
 
       //debugpng
       if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
 
-      $errormsg =  'only bit depth of 8 or less is supported';
+      $errormsg = 'only bit depth of 8 or less is supported';
     }
 
-    if  (!$error) {
-      if  ($info['colorType'] !=  2 &&  $info['colorType'] !=  0 &&  $info['colorType'] !=  3) {
-        $error =  1;
+    if (!$error) {
+      if ($info['colorType'] != 2 && $info['colorType'] != 0 && $info['colorType'] != 3) {
+        $error = 1;
 
         //debugpng
         if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
 
-        $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
+        $errormsg = 'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {
-        switch  ($info['colorType']) {
+        switch ($info['colorType']) {
         case  3:
-          $color =  'DeviceRGB';
-          $ncolor =  1;
+          $color = 'DeviceRGB';
+          $ncolor = 1;
           break;
 
         case  2:
-          $color =  'DeviceRGB';
-          $ncolor =  3;
+          $color = 'DeviceRGB';
+          $ncolor = 3;
           break;
 
         case  0:
-          $color =  'DeviceGray';
-          $ncolor =  1;
+          $color = 'DeviceGray';
+          $ncolor = 1;
           break;
         }
       }
     }
 
-    if  ($error) {
+    if ($error) {
       $this->addMessage('PNG error - ('.$file.') '.$errormsg);
       return;
     }
@@ -4194,84 +4194,84 @@ 
       //print_r($info);
       // so this image is ok... add it in.
       $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
+      $im = $this->numImages;
+      $label = 'I'.$im;
       $this->numObj++;
 
       //  $this->o_image($this->numObj,'new',array('label' => $label,'data' => $idata,'iw' => $w,'ih' => $h,'type' => 'png','ic' => $info['width']));
-      $options =  array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
+      $options = array('label' => $label, 'data' => $idata, 'bitsPerComponent' => $info['bitDepth'], 'pdata' => $pdata, 'iw' => $info['width'], 'ih' => $info['height'], 'type' => 'png', 'color' => $color, 'ncolor' => $ncolor);
 
-      if  (isset($transparency)) {
-        $options['transparency'] =  $transparency;
+      if (isset($transparency)) {
+        $options['transparency'] = $transparency;
       }
 
       $this->o_image($this->numObj, 'new', $options);
       $this->imagelist[$file] = array('label' =>$label, 'w' => $info['width'], 'h' => $info['height']);
     }
 
-    if  ($w <=  0 && $h <=  0) {
-      $w =  $info['width'];
-      $h =  $info['height'];
+    if ($w <= 0 && $h <= 0) {
+      $w = $info['width'];
+      $h = $info['height'];
     }
 
-    if  ($w <=  0) {
-      $w =  $h/$info['height']*$info['width'];
+    if ($w <= 0) {
+      $w = $h / $info['height'] * $info['width'];
     }
 
-    if  ($h <=  0) {
-      $h =  $w*$info['height']/$info['width'];
+    if ($h <= 0) {
+      $h = $w * $info['height'] / $info['width'];
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
-    $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+    $this->objects[$this->currentContents]['c'] .= "\n/".$label.' Do';
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
   /**
    * add a JPEG image into the document, from a file
    */
-  function  addJpegFromFile($img, $x, $y, $w =  0, $h =  0) {
+  function  addJpegFromFile($img, $x, $y, $w = 0, $h = 0) {
     // attempt to add a jpeg image straight from a file, using no GD commands
     // note that this function is unable to operate on a remote file.
 
-    if  (!file_exists($img)) {
+    if (!file_exists($img)) {
       return;
     }
 
-	if ( isset($this->imagelist[$img]) ) {
+	if (isset($this->imagelist[$img])) {
 	  $data = null;
       $imageWidth = $this->imagelist[$img]['w'];
       $imageHeight = $this->imagelist[$img]['h'];
-      $channels =  $this->imagelist[$img]['c'];
+      $channels = $this->imagelist[$img]['c'];
 	} else {
-      $tmp =  getimagesize($img);
-      $imageWidth =  $tmp[0];
-      $imageHeight =  $tmp[1];
+      $tmp = getimagesize($img);
+      $imageWidth = $tmp[0];
+      $imageHeight = $tmp[1];
 
-      if  (isset($tmp['channels'])) {
-        $channels =  $tmp['channels'];
+      if (isset($tmp['channels'])) {
+        $channels = $tmp['channels'];
       } else {
-        $channels =  3;
+        $channels = 3;
       }
 
       //$fp = fopen($img,'rb');
-      $data =  file_get_contents($img);
+      $data = file_get_contents($img);
       //fread($fp,filesize($img));
       //fclose($fp);
     }
 
-    if  ($w <=  0 &&  $h <=  0) {
-      $w =  $imageWidth;
+    if ($w <= 0 && $h <= 0) {
+      $w = $imageWidth;
     }
 
-    if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+    if ($w == 0) {
+      $w = $h / $imageHeight * $imageWidth;
     }
 
-    if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+    if ($h == 0) {
+      $h = $w * $imageHeight / $imageWidth;
     }
 
     $this->addJpegImage_common($data, $x, $y, $w, $h, $imageWidth, $imageHeight, $channels, $img);
@@ -4283,7 +4283,7 @@ 
    * this function is not all that reliable, and I would probably encourage people to use
    * the file based functions
    */
-  function  addImage(&$img, $x, $y, $w =  0, $h =  0, $quality =  75) {
+  function  addImage(&$img, $x, $y, $w = 0, $h = 0, $quality = 75) {
     /* Todo:
      * Pass in original filename as $imgname
      * If already cached like image_iscached(), allow empty $img
@@ -4302,25 +4302,25 @@ 
 
     // there seems to be some problem here in that images that have quality set above 75 do not appear
     // not too sure why this is, but in the meantime I have restricted this to 75.
-    if  ($quality>75) {
-      $quality =  75;
+    if ($quality > 75) {
+      $quality = 75;
     }
 
     // if the width or height are set to zero, then set the other one based on keeping the image
     // height/width ratio the same, if they are both zero, then give up :)
-    $imageWidth =  imagesx($img);
-    $imageHeight =  imagesy($img);
+    $imageWidth = imagesx($img);
+    $imageHeight = imagesy($img);
 
-    if  ($w <=  0 &&  $h <=  0) {
+    if ($w <= 0 && $h <= 0) {
       return;
     }
 
-    if  ($w ==  0) {
-      $w =  $h/$imageHeight*$imageWidth;
+    if ($w == 0) {
+      $w = $h / $imageHeight * $imageWidth;
     }
 
-    if  ($h ==  0) {
-      $h =  $w*$imageHeight/$imageWidth;
+    if ($h == 0) {
+      $h = $w * $imageHeight / $imageWidth;
     }
 
     // gotta get the data out of the img..
@@ -4346,8 +4346,8 @@ 
    *
    * @access private
    */
-  function  addJpegImage_common(&$data, $x, $y, $w =  0, $h =  0, $imageWidth, $imageHeight, $channels =  3, $imgname) {
-    if ( isset($this->imagelist[$imgname]) ) {
+  function  addJpegImage_common(&$data, $x, $y, $w = 0, $h = 0, $imageWidth, $imageHeight, $channels = 3, $imgname) {
+    if (isset($this->imagelist[$imgname])) {
       $label = $this->imagelist[$imgname]['label'];
       //debugpng
       //if (DEBUGPNG) print '[addJpegImage_common Duplicate '.$imgname.']';
@@ -4361,24 +4361,24 @@ 
       // note that this function is not to be called externally
       // it is just the common code between the GD and the file options
       $this->numImages++;
-      $im =  $this->numImages;
-      $label =  'I'.$im;
+      $im = $this->numImages;
+      $label = 'I'.$im;
       $this->numObj++;
       $this->o_image($this->numObj, 'new', array('label' => $label, 'data' => &$data, 'iw' => $imageWidth, 'ih' => $imageHeight, 'channels' => $channels));
-      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels );
+      $this->imagelist[$imgname] = array('label' =>$label, 'w' => $imageWidth, 'h' => $imageHeight, 'c'=> $channels);
     }
 
-    $this->objects[$this->currentContents]['c'].=  "\nq";
-    $this->objects[$this->currentContents]['c'].=  "\n".sprintf('%.3F', $w) ." 0 0 ".sprintf('%.3F', $h) ." ".sprintf('%.3F', $x) ." ".sprintf('%.3F', $y) ." cm";
-    $this->objects[$this->currentContents]['c'].=  "\n/".$label.' Do';
-    $this->objects[$this->currentContents]['c'].=  "\nQ";
+    $this->objects[$this->currentContents]['c'] .= "\nq";
+    $this->objects[$this->currentContents]['c'] .= "\n".sprintf('%.3F', $w)." 0 0 ".sprintf('%.3F', $h)." ".sprintf('%.3F', $x)." ".sprintf('%.3F', $y)." cm";
+    $this->objects[$this->currentContents]['c'] .= "\n/".$label.' Do';
+    $this->objects[$this->currentContents]['c'] .= "\nQ";
   }
 
 
   /**
    * specify where the document should open when it first starts
    */
-  function  openHere($style, $a =  0, $b =  0, $c =  0) {
+  function  openHere($style, $a = 0, $b = 0, $c = 0) {
     // this function will open the document at a specified page, in a specified style
     // the values for style, and the required paramters are:
     // 'XYZ'  left, top, zoom
@@ -4391,7 +4391,7 @@ 
     // 'FitBV' left
     $this->numObj++;
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
-    $id =  $this->catalogId;
+    $id = $this->catalogId;
     $this->o_catalog($id, 'openHere', $this->numObj);
   }
   
@@ -4403,16 +4403,16 @@ 
   /**
    * create a labelled destination within the document
    */
-  function  addDestination($label, $style, $a =  0, $b =  0, $c =  0) {
+  function  addDestination($label, $style, $a = 0, $b = 0, $c = 0) {
     // associates the given label with the destination, it is done this way so that a destination can be specified after
     // it has been linked to
     // styles are the same as the 'openHere' function
     $this->numObj++;
     $this->o_destination($this->numObj, 'new', array('page' => $this->currentPage, 'type' => $style, 'p1' => $a, 'p2' => $b, 'p3' => $c));
-    $id =  $this->numObj;
+    $id = $this->numObj;
 
     // store the label->idf relationship, note that this means that labels can be used only once
-    $this->destinations["$label"] =  $id;
+    $this->destinations["$label"] = $id;
   }
 
 
@@ -4421,9 +4421,9 @@ 
    * and for the user to add new ones for their fonts. The default bahavious can be overridden should
    * that be desired.
    */
-  function  setFontFamily($family, $options =  '') {
-    if  (!is_array($options)) {
-      if  ($family ===  'init') {
+  function  setFontFamily($family, $options = '') {
+    if (!is_array($options)) {
+      if ($family === 'init') {
         // set the known family groups
         // these font families will be used to enable bold and italic markers to be included
         // within text streams. html forms will be used... <b></b> <i></i>
@@ -4449,8 +4449,8 @@ 
 
       // the user is trying to set a font family
       // note that this can also be used to set the base ones to something else
-      if  (mb_strlen($family)) {
-        $this->fontFamilies[$family] =  $options;
+      if (mb_strlen($family)) {
+        $this->fontFamilies[$family] = $options;
       }
     }
   }
@@ -4460,7 +4460,7 @@ 
    * used to add messages for use in debugging
    */
   function  addMessage($message) {
-    $this->messages.=  $message."\n";
+    $this->messages .= $message."\n";
   }
 
 
@@ -4468,33 +4468,33 @@ 
    * a few functions which should allow the document to be treated transactionally.
    */
   function  transaction($action) {
-    switch  ($action) {
+    switch ($action) {
     case  'start':
       // store all the data away into the checkpoint variable
-      $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
+      $data = get_object_vars($this);
+      $this->checkpoint = $data;
       unset($data);
       break;
 
     case  'commit':
-      if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
-        $tmp =  $this->checkpoint['checkpoint'];
-        $this->checkpoint =  $tmp;
+      if (is_array($this->checkpoint) && isset($this->checkpoint['checkpoint'])) {
+        $tmp = $this->checkpoint['checkpoint'];
+        $this->checkpoint = $tmp;
         unset($tmp);
       } else {
-        $this->checkpoint =  '';
+        $this->checkpoint = '';
       }
       break;
 
     case  'rewind':
       // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
-      if  (is_array($this->checkpoint)) {
+      if (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        $tmp = $this->checkpoint;
 
         foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
-            $this->$k =  $v;
+          if ($k !== 'checkpoint') {
+            $this->$k = $v;
           }
         }
         unset($tmp);
@@ -4502,11 +4502,11 @@ 
       break;
 
     case  'abort':
-      if  (is_array($this->checkpoint)) {
+      if (is_array($this->checkpoint)) {
         // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        $tmp = $this->checkpoint;
         foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
+          $this->$k = $v;
         }
         unset($tmp);
       }

Braces +57 added lines, -27 removed lines

@@ -1589,8 +1589,9 @@ 
         "<< /Type /ExtGState\n";
 
       foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
-          continue;
+        if  ( !in_array($parameter,  $valid_params)) {
+                  continue;
+        }
         $res.=  "/$parameter $value\n";
       }
 
@@ -2514,13 +2515,15 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+    if ( !in_array($mode, $blend_modes) ) {
+          $mode = "Normal";
+    }
     
     // Only create a new graphics state if required
     if ( $mode == $this->currentLineTransparency["mode"]  &&
-         $opacity == $this->currentLineTransparency["opacity"] )
-      return;
+         $opacity == $this->currentLineTransparency["opacity"] ) {
+          return;
+    }
 
     $options = array("BM" => "/$mode",
                      "CA" => (float)$opacity);
@@ -2546,12 +2549,14 @@ 
                                 "ColorDogde", "ColorBurn", "HardLight",
                                 "SoftLight", "Difference", "Exclusion");
 
-    if ( !in_array($mode, $blend_modes) )
-      $mode = "Normal";
+    if ( !in_array($mode, $blend_modes) ) {
+          $mode = "Normal";
+    }
 
     if ( $mode == $this->currentFillTransparency["mode"]  &&
-         $opacity == $this->currentFillTransparency["opacity"] )
-      return;
+         $opacity == $this->currentFillTransparency["opacity"] ) {
+          return;
+    }
 
     $options = array("BM" => "/$mode",
                      "ca" => (float)$opacity);
@@ -2840,8 +2845,9 @@ 
       $options =  array();
     }
 
-    if  ( headers_sent())
-      die("Unable to stream pdf: headers already sent");
+    if  ( headers_sent()) {
+          die("Unable to stream pdf: headers already sent");
+    }
 
     if  ( isset($options['compress']) &&  $options['compress'] ==  0) {
       $tmp =  ltrim($this->output(1));
@@ -2856,8 +2862,9 @@ 
     header("Content-Length: " . mb_strlen($tmp, '8bit'));
     $fileName =  (isset($options['Content-Disposition']) ?  $options['Content-Disposition'] :  'file.pdf');
 
-    if  ( !isset($options["Attachment"]))
-      $options["Attachment"] =  true;
+    if  ( !isset($options["Attachment"])) {
+          $options["Attachment"] =  true;
+    }
 
     $attachment =  $options["Attachment"] ?  "attachment" :  "inline";
 
@@ -3035,7 +3042,9 @@ 
    */
   function  utf8toUtf16BE(&$text, $bom = true) {
     $cf =  $this->currentFont;
-    if (!$this->fonts[$cf]['isUnicode']) return $text;
+    if (!$this->fonts[$cf]['isUnicode']) {
+        return $text;
+    }
     $out = $bom ? "\xFE\xFF" : '';
     
     $unicode = $this->utf8toCodePointsArray($text);
@@ -3817,8 +3826,9 @@ 
    * return a storable representation of a specific object
    */
   function  serializeObject($id) {
-    if  ( array_key_exists($id,  $this->objects))
-      return  var_export($this->objects[$id],  true);
+    if  ( array_key_exists($id,  $this->objects)) {
+          return  var_export($this->objects[$id],  true);
+    }
   }
 
 
@@ -3908,7 +3918,9 @@ 
       $error =  0;
       //DEBUG_IMG_TEMP
       //debugpng
-      if (DEBUGPNG) print '[addImagePng '.$file.']';
+      if (DEBUGPNG) {
+          print '[addImagePng '.$file.']';
+      }
 
       ob_start();
       @imagepng($img);
@@ -3920,7 +3932,9 @@ 
         $errormsg = 'trouble writing file from GD';
         //DEBUG_IMG_TEMP
         //debugpng
-        if (DEBUGPNG) print 'trouble writing file from GD';
+        if (DEBUGPNG) {
+            print 'trouble writing file from GD';
+        }
 	  }
 
       if  ($error) {
@@ -4002,7 +4016,9 @@ 
       if  (mb_substr($data, 0, 8, '8bit') !=  $header) {
         $error =  1;
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile this file does not have a valid header '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile this file does not have a valid header '.$file.']';
+        }
 
         $errormsg =  'this file does not have a valid header';
       }
@@ -4041,7 +4057,9 @@ 
             $error =  1;
 
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported compression method '.$file.']';
+            }
 
             $errormsg =  'unsupported compression method';
           }
@@ -4050,7 +4068,9 @@ 
             $error =  1;
 
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported filter method '.$file.']';
+            }
 
             $errormsg =  'unsupported filter method';
           }
@@ -4117,7 +4137,9 @@ 
           } else {
             //unsupported transparency type
             //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
+            if (DEBUGPNG) {
+                print '[addPngFromFile unsupported transparency type '.$file.']';
+            }
           }
           // KS End new code
           break;
@@ -4134,7 +4156,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile information header is missing '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile information header is missing '.$file.']';
+        }
 
         $errormsg =  'information header is missing';
       }
@@ -4143,7 +4167,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile no support for interlaced images in pdf '.$file.']';
+        }
 
         $errormsg =  'There appears to be no support for interlaced images in pdf.';
       }
@@ -4153,7 +4179,9 @@ 
       $error =  1;
 
       //debugpng
-      if (DEBUGPNG) print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+      if (DEBUGPNG) {
+          print '[addPngFromFile bit depth of 8 or less is supported '.$file.']';
+      }
 
       $errormsg =  'only bit depth of 8 or less is supported';
     }
@@ -4163,7 +4191,9 @@ 
         $error =  1;
 
         //debugpng
-        if (DEBUGPNG) print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
+        if (DEBUGPNG) {
+            print '[addPngFromFile alpha channel not supported: '.$info['colorType'].' '.$file.']';
+        }
 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {

main/inc/lib/phpmailer/class.phpmailer.php

Doc Comments +15 added lines, -3 removed lines

@@ -891,6 +891,7 @@ 
   /**
    * Creates recipient headers.
    * @access public
+   * @param string $type
    * @return string
    */
   public function AddrAppend($type, $addr) {
@@ -1258,6 +1259,9 @@ 
   /**
    * Returns the start of a message boundary.
    * @access private
+   * @param string $charSet
+   * @param string $contentType
+   * @param string $encoding
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
@@ -1311,6 +1315,7 @@ 
   /**
    *  Returns a formatted header line.
    * @access public
+   * @param string $name
    * @return string
    */
   public function HeaderLine($name, $value) {
@@ -1320,6 +1325,7 @@ 
   /**
    * Returns a formatted mail line.
    * @access public
+   * @param string $value
    * @return string
    */
   public function TextLine($value) {
@@ -1521,6 +1527,7 @@ 
   /**
    * Encode a header string to best (shortest) of Q, B, quoted or none.
    * @access public
+   * @param string $str
    * @return string
    */
   public function EncodeHeader($str, $position = 'text') {
@@ -1647,7 +1654,6 @@ 
   * Encode string to quoted-printable.
   * Only uses standard PHP, slow, but will always work
   * @access public
-  * @param string $string the text to encode
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
@@ -1917,6 +1923,7 @@ 
   /**
    * Adds the error message to the error container.
    * @access protected
+   * @param string $msg
    * @return void
    */
   protected function SetError($msg) {
@@ -1966,6 +1973,7 @@ 
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   private function Lang($key) {
@@ -1992,6 +2000,7 @@ 
   /**
    * Changes every end of line from CR or LF to CRLF.
    * @access private
+   * @param string $str
    * @return string
    */
   private function FixEOL($str) {
@@ -2203,8 +2212,6 @@ 
    * Set the private key file and password to sign the message.
    *
    * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
     $tmp="";
@@ -2318,6 +2325,11 @@ 
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
+  /**
+   * @param integer $isSent
+   * @param string $subject
+   * @param string $body
+   */
   protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
       $params = array($isSent,$to,$cc,$bcc,$subject,$body);

Indentation +1454 added lines, -1454 removed lines

@@ -42,441 +42,441 @@ 
 
 class PHPMailer {
 
-  /////////////////////////////////////////////////
-  // PROPERTIES, PUBLIC
-  /////////////////////////////////////////////////
-
-  /**
-   * Email priority (1 = High, 3 = Normal, 5 = low).
-   * @var int
-   */
-  public $Priority          = 3;
-
-  /**
-   * Sets the CharSet of the message.
-   * @var string
-   */
-  public $CharSet           = 'iso-8859-1';
-
-  /**
-   * Sets the Content-type of the message.
-   * @var string
-   */
-  public $ContentType       = 'text/plain';
-
-  /**
-   * Sets the Encoding of the message. Options for this are
-   *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
-   * @var string
-   */
-  public $Encoding          = '8bit';
-
-  /**
-   * Holds the most recent mailer error message.
-   * @var string
-   */
-  public $ErrorInfo         = '';
-
-  /**
-   * Sets the From email address for the message.
-   * @var string
-   */
-  public $From              = 'root@localhost';
-
-  /**
-   * Sets the From name of the message.
-   * @var string
-   */
-  public $FromName          = 'Root User';
-
-  /**
-   * Sets the Sender email (Return-Path) of the message.  If not empty,
-   * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-   * @var string
-   */
-  public $Sender            = '';
-
-  /**
-   * Sets the Subject of the message.
-   * @var string
-   */
-  public $Subject           = '';
-
-  /**
-   * Sets the Body of the message.  This can be either an HTML or text body.
-   * If HTML then run IsHTML(true).
-   * @var string
-   */
-  public $Body              = '';
-
-  /**
-   * Sets the text-only body of the message.  This automatically sets the
-   * email to multipart/alternative.  This body can be read by mail
-   * clients that do not have HTML email capability such as mutt. Clients
-   * that can read HTML will view the normal Body.
-   * @var string
-   */
-  public $AltBody           = '';
-
-  /**
-   * Sets word wrapping on the body of the message to a given number of
-   * characters.
-   * @var int
-   */
-  public $WordWrap          = 0;
-
-  /**
-   * Method to send mail: ("mail", "sendmail", or "smtp").
-   * @var string
-   */
-  public $Mailer            = 'mail';
-
-  /**
-   * Sets the path of the sendmail program.
-   * @var string
-   */
-  public $Sendmail          = '/usr/sbin/sendmail';
-
-  /**
-   * Path to PHPMailer plugins.  Useful if the SMTP class
-   * is in a different directory than the PHP include path.
-   * @var string
-   */
-  public $PluginDir         = '';
-
-  /**
-   * Sets the email address that a reading confirmation will be sent.
-   * @var string
-   */
-  public $ConfirmReadingTo  = '';
-
-  /**
-   * Sets the hostname to use in Message-Id and Received headers
-   * and as default HELO string. If empty, the value returned
-   * by SERVER_NAME is used or 'localhost.localdomain'.
-   * @var string
-   */
-  public $Hostname          = '';
-
-  /**
-   * Sets the message ID to be used in the Message-Id header.
-   * If empty, a unique id will be generated.
-   * @var string
-   */
-  public $MessageID         = '';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES FOR SMTP
-  /////////////////////////////////////////////////
-
-  /**
-   * Sets the SMTP hosts.  All hosts must be separated by a
-   * semicolon.  You can also specify a different port
-   * for each host by using this format: [hostname:port]
-   * (e.g. "smtp1.example.com:25;smtp2.example.com").
-   * Hosts will be tried in order.
-   * @var string
-   */
-  public $Host          = 'localhost';
-
-  /**
-   * Sets the default SMTP server port.
-   * @var int
-   */
-  public $Port          = 25;
-
-  /**
-   * Sets the SMTP HELO of the message (Default is $Hostname).
-   * @var string
-   */
-  public $Helo          = '';
-
-  /**
-   * Sets connection prefix.
-   * Options are "", "ssl" or "tls"
-   * @var string
-   */
-  public $SMTPSecure    = '';
-
-  /**
-   * Sets SMTP authentication. Utilizes the Username and Password variables.
-   * @var bool
-   */
-  public $SMTPAuth      = false;
-
-  /**
-   * Sets SMTP username.
-   * @var string
-   */
-  public $Username      = '';
-
-  /**
-   * Sets SMTP password.
-   * @var string
-   */
-  public $Password      = '';
-
-  /**
-   * Sets the SMTP server timeout in seconds.
-   * This function will not work with the win32 version.
-   * @var int
-   */
-  public $Timeout       = 10;
-
-  /**
-   * Sets SMTP class debugging on or off.
-   * @var bool
-   */
-  public $SMTPDebug     = false;
-
-  /**
-   * Prevents the SMTP connection from being closed after each mail
-   * sending.  If this is set to true then to close the connection
-   * requires an explicit call to SmtpClose().
-   * @var bool
-   */
-  public $SMTPKeepAlive = false;
-
-  /**
-   * Provides the ability to have the TO field process individual
-   * emails, instead of sending to entire TO addresses
-   * @var bool
-   */
-  public $SingleTo      = false;
-
-   /**
-   * If SingleTo is true, this provides the array to hold the email addresses
-   * @var bool
-   */
-  public $SingleToArray = array();
-
- /**
-   * Provides the ability to change the line ending
-   * @var string
-   */
-  public $LE              = "\n";
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * @var string
-   */
-  public $DKIM_selector   = 'phpmailer';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_identity   = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_domain     = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_private    = '';
-
-  /**
-   * Callback Action function name
-   * the function that handles the result of the send email action. Parameters:
-   *   bool    $result        result of the send action
-   *   string  $to            email address of the recipient
-   *   string  $cc            cc email addresses
-   *   string  $bcc           bcc email addresses
-   *   string  $subject       the subject
-   *   string  $body          the email body
-   * @var string
-   */
-  public $action_function = ''; //'callbackAction';
-
-  /**
-   * Sets the PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.1';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private   $smtp           = NULL;
-  private   $to             = array();
-  private   $cc             = array();
-  private   $bcc            = array();
-  private   $ReplyTo        = array();
-  private   $all_recipients = array();
-  private   $attachment     = array();
-  private   $CustomHeader   = array();
-  private   $message_type   = '';
-  private   $boundary       = array();
-  protected $language       = array();
-  private   $error_count    = 0;
-  private   $sign_cert_file = "";
-  private   $sign_key_file  = "";
-  private   $sign_key_pass  = "";
-  private   $exceptions     = false;
-
-  /////////////////////////////////////////////////
-  // CONSTANTS
-  /////////////////////////////////////////////////
-
-  const STOP_MESSAGE  = 0; // message only, continue processing
-  const STOP_CONTINUE = 1; // message?, likely ok to continue processing
-  const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
-
-  /////////////////////////////////////////////////
-  // METHODS, VARIABLES
-  /////////////////////////////////////////////////
-
-  /**
-   * Constructor
-   * @param boolean $exceptions Should we throw external exceptions?
-   */
-  public function __construct($exceptions = false) {
+    /////////////////////////////////////////////////
+    // PROPERTIES, PUBLIC
+    /////////////////////////////////////////////////
+
+    /**
+     * Email priority (1 = High, 3 = Normal, 5 = low).
+     * @var int
+     */
+    public $Priority          = 3;
+
+    /**
+     * Sets the CharSet of the message.
+     * @var string
+     */
+    public $CharSet           = 'iso-8859-1';
+
+    /**
+     * Sets the Content-type of the message.
+     * @var string
+     */
+    public $ContentType       = 'text/plain';
+
+    /**
+     * Sets the Encoding of the message. Options for this are
+     *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @var string
+     */
+    public $Encoding          = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     * @var string
+     */
+    public $ErrorInfo         = '';
+
+    /**
+     * Sets the From email address for the message.
+     * @var string
+     */
+    public $From              = 'root@localhost';
+
+    /**
+     * Sets the From name of the message.
+     * @var string
+     */
+    public $FromName          = 'Root User';
+
+    /**
+     * Sets the Sender email (Return-Path) of the message.  If not empty,
+     * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @var string
+     */
+    public $Sender            = '';
+
+    /**
+     * Sets the Subject of the message.
+     * @var string
+     */
+    public $Subject           = '';
+
+    /**
+     * Sets the Body of the message.  This can be either an HTML or text body.
+     * If HTML then run IsHTML(true).
+     * @var string
+     */
+    public $Body              = '';
+
+    /**
+     * Sets the text-only body of the message.  This automatically sets the
+     * email to multipart/alternative.  This body can be read by mail
+     * clients that do not have HTML email capability such as mutt. Clients
+     * that can read HTML will view the normal Body.
+     * @var string
+     */
+    public $AltBody           = '';
+
+    /**
+     * Sets word wrapping on the body of the message to a given number of
+     * characters.
+     * @var int
+     */
+    public $WordWrap          = 0;
+
+    /**
+     * Method to send mail: ("mail", "sendmail", or "smtp").
+     * @var string
+     */
+    public $Mailer            = 'mail';
+
+    /**
+     * Sets the path of the sendmail program.
+     * @var string
+     */
+    public $Sendmail          = '/usr/sbin/sendmail';
+
+    /**
+     * Path to PHPMailer plugins.  Useful if the SMTP class
+     * is in a different directory than the PHP include path.
+     * @var string
+     */
+    public $PluginDir         = '';
+
+    /**
+     * Sets the email address that a reading confirmation will be sent.
+     * @var string
+     */
+    public $ConfirmReadingTo  = '';
+
+    /**
+     * Sets the hostname to use in Message-Id and Received headers
+     * and as default HELO string. If empty, the value returned
+     * by SERVER_NAME is used or 'localhost.localdomain'.
+     * @var string
+     */
+    public $Hostname          = '';
+
+    /**
+     * Sets the message ID to be used in the Message-Id header.
+     * If empty, a unique id will be generated.
+     * @var string
+     */
+    public $MessageID         = '';
+
+    /////////////////////////////////////////////////
+    // PROPERTIES FOR SMTP
+    /////////////////////////////////////////////////
+
+    /**
+     * Sets the SMTP hosts.  All hosts must be separated by a
+     * semicolon.  You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * Hosts will be tried in order.
+     * @var string
+     */
+    public $Host          = 'localhost';
+
+    /**
+     * Sets the default SMTP server port.
+     * @var int
+     */
+    public $Port          = 25;
+
+    /**
+     * Sets the SMTP HELO of the message (Default is $Hostname).
+     * @var string
+     */
+    public $Helo          = '';
+
+    /**
+     * Sets connection prefix.
+     * Options are "", "ssl" or "tls"
+     * @var string
+     */
+    public $SMTPSecure    = '';
+
+    /**
+     * Sets SMTP authentication. Utilizes the Username and Password variables.
+     * @var bool
+     */
+    public $SMTPAuth      = false;
+
+    /**
+     * Sets SMTP username.
+     * @var string
+     */
+    public $Username      = '';
+
+    /**
+     * Sets SMTP password.
+     * @var string
+     */
+    public $Password      = '';
+
+    /**
+     * Sets the SMTP server timeout in seconds.
+     * This function will not work with the win32 version.
+     * @var int
+     */
+    public $Timeout       = 10;
+
+    /**
+     * Sets SMTP class debugging on or off.
+     * @var bool
+     */
+    public $SMTPDebug     = false;
+
+    /**
+     * Prevents the SMTP connection from being closed after each mail
+     * sending.  If this is set to true then to close the connection
+     * requires an explicit call to SmtpClose().
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Provides the ability to have the TO field process individual
+     * emails, instead of sending to entire TO addresses
+     * @var bool
+     */
+    public $SingleTo      = false;
+
+    /**
+     * If SingleTo is true, this provides the array to hold the email addresses
+     * @var bool
+     */
+    public $SingleToArray = array();
+
+    /**
+     * Provides the ability to change the line ending
+     * @var string
+     */
+    public $LE              = "\n";
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * @var string
+     */
+    public $DKIM_selector   = 'phpmailer';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address 'you@yourdomain.com'
+     * @var string
+     */
+    public $DKIM_identity   = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address 'you@yourdomain.com'
+     * @var string
+     */
+    public $DKIM_domain     = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address 'you@yourdomain.com'
+     * @var string
+     */
+    public $DKIM_private    = '';
+
+    /**
+     * Callback Action function name
+     * the function that handles the result of the send email action. Parameters:
+     *   bool    $result        result of the send action
+     *   string  $to            email address of the recipient
+     *   string  $cc            cc email addresses
+     *   string  $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     * @var string
+     */
+    public $action_function = ''; //'callbackAction';
+
+    /**
+     * Sets the PHPMailer Version number
+     * @var string
+     */
+    public $Version         = '5.1';
+
+    /////////////////////////////////////////////////
+    // PROPERTIES, PRIVATE AND PROTECTED
+    /////////////////////////////////////////////////
+
+    private   $smtp           = NULL;
+    private   $to             = array();
+    private   $cc             = array();
+    private   $bcc            = array();
+    private   $ReplyTo        = array();
+    private   $all_recipients = array();
+    private   $attachment     = array();
+    private   $CustomHeader   = array();
+    private   $message_type   = '';
+    private   $boundary       = array();
+    protected $language       = array();
+    private   $error_count    = 0;
+    private   $sign_cert_file = "";
+    private   $sign_key_file  = "";
+    private   $sign_key_pass  = "";
+    private   $exceptions     = false;
+
+    /////////////////////////////////////////////////
+    // CONSTANTS
+    /////////////////////////////////////////////////
+
+    const STOP_MESSAGE  = 0; // message only, continue processing
+    const STOP_CONTINUE = 1; // message?, likely ok to continue processing
+    const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
+
+    /////////////////////////////////////////////////
+    // METHODS, VARIABLES
+    /////////////////////////////////////////////////
+
+    /**
+     * Constructor
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = false) {
     $this->exceptions = ($exceptions == true);
-  }
-
-  /**
-   * Sets message type to HTML.
-   * @param bool $ishtml
-   * @return void
-   */
-  public function IsHTML($ishtml = true) {
+    }
+
+    /**
+     * Sets message type to HTML.
+     * @param bool $ishtml
+     * @return void
+     */
+    public function IsHTML($ishtml = true) {
     if ($ishtml) {
-      $this->ContentType = 'text/html';
+        $this->ContentType = 'text/html';
     } else {
-      $this->ContentType = 'text/plain';
+        $this->ContentType = 'text/plain';
+    }
     }
-  }
 
-  /**
-   * Sets Mailer to send message using SMTP.
-   * @return void
-   */
-  public function IsSMTP() {
+    /**
+     * Sets Mailer to send message using SMTP.
+     * @return void
+     */
+    public function IsSMTP() {
     $this->Mailer = 'smtp';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using PHP mail() function.
-   * @return void
-   */
-  public function IsMail() {
+    /**
+     * Sets Mailer to send message using PHP mail() function.
+     * @return void
+     */
+    public function IsMail() {
     $this->Mailer = 'mail';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using the $Sendmail program.
-   * @return void
-   */
-  public function IsSendmail() {
+    /**
+     * Sets Mailer to send message using the $Sendmail program.
+     * @return void
+     */
+    public function IsSendmail() {
     if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
+        $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using the qmail MTA.
-   * @return void
-   */
-  public function IsQmail() {
+    /**
+     * Sets Mailer to send message using the qmail MTA.
+     * @return void
+     */
+    public function IsQmail() {
     if (stristr(ini_get('sendmail_path'), 'qmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
+        $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, RECIPIENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds a "To" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddAddress($address, $name = '') {
+    }
+
+    /////////////////////////////////////////////////
+    // METHODS, RECIPIENTS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds a "To" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddAddress($address, $name = '') {
     return $this->AddAnAddress('to', $address, $name);
-  }
-
-  /**
-   * Adds a "Cc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddCC($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Cc" address.
+     * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddCC($address, $name = '') {
     return $this->AddAnAddress('cc', $address, $name);
-  }
-
-  /**
-   * Adds a "Bcc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddBCC($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Bcc" address.
+     * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddBCC($address, $name = '') {
     return $this->AddAnAddress('bcc', $address, $name);
-  }
-
-  /**
-   * Adds a "Reply-to" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean
-   */
-  public function AddReplyTo($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Reply-to" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean
+     */
+    public function AddReplyTo($address, $name = '') {
     return $this->AddAnAddress('ReplyTo', $address, $name);
-  }
-
-  /**
-   * Adds an address to one of the recipient arrays
-   * Addresses that have been added already return false, but do not throw exceptions
-   * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-   * @param string $address The email address to send to
-   * @param string $name
-   * @return boolean true on success, false if address already used or invalid in some way
-   * @access private
-   */
-  private function AddAnAddress($kind, $address, $name = '') {
+    }
+
+    /**
+     * Adds an address to one of the recipient arrays
+     * Addresses that have been added already return false, but do not throw exceptions
+     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access private
+     */
+    private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      error_log('Invalid recipient array: ' . $kind);
-      return false;
+        error_log('Invalid recipient array: ' . $kind);
+        return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
+        $this->SetError($this->Lang('invalid_address').': '. $address);
+        if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      error_log($this->Lang('invalid_address').': '.$address);
-      return false;
+        }
+        error_log($this->Lang('invalid_address').': '.$address);
+        return false;
     }
     if ($kind != 'ReplyTo') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
+        if (!isset($this->all_recipients[strtolower($address)])) {
         array_push($this->$kind, array($address, $name));
         $this->all_recipients[strtolower($address)] = true;
         return true;
-      }
+        }
     } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+        if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
         $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
+        return true;
+    }
     }
-  }
-  return false;
+    return false;
 }
 
 /**
@@ -485,125 +485,125 @@ 
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+    public function SetFrom($address, $name = '',$auto=1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
+        $this->SetError($this->Lang('invalid_address').': '. $address);
+        if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      error_log($this->Lang('invalid_address').': '.$address);
-      return false;
+        }
+        error_log($this->Lang('invalid_address').': '.$address);
+        return false;
     }
     $this->From = $address;
     $this->FromName = $name;
     if ($auto) {
-      if (empty($this->ReplyTo)) {
+        if (empty($this->ReplyTo)) {
         $this->AddAnAddress('ReplyTo', $address, $name);
-      }
-      if (empty($this->Sender)) {
+        }
+        if (empty($this->Sender)) {
         $this->Sender = $address;
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Check that a string looks roughly like an email address should
-   * Static so it can be used without instantiation
-   * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
-   * Conforms approximately to RFC2822
-   * @link http://www.hexillion.com/samples/#Regex Original pattern found here
-   * @param string $address The email address to check
-   * @return boolean
-   * @static
-   * @access public
-   */
-  public static function ValidateAddress($address) {
+    }
+
+    /**
+     * Check that a string looks roughly like an email address should
+     * Static so it can be used without instantiation
+     * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
+     * Conforms approximately to RFC2822
+     * @link http://www.hexillion.com/samples/#Regex Original pattern found here
+     * @param string $address The email address to check
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+        if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
-      } else {
+        } else {
         return true;
-      }
+        }
     } else {
-      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+        return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+    }
     }
-  }
 
-  /////////////////////////////////////////////////
-  // METHODS, MAIL SENDING
-  /////////////////////////////////////////////////
+    /////////////////////////////////////////////////
+    // METHODS, MAIL SENDING
+    /////////////////////////////////////////////////
 
-  /**
-   * Creates message and assigns Mailer. If the message is
-   * not sent successfully then it returns false.  Use the ErrorInfo
-   * variable to view description of the error.
-   * @return bool
-   */
-  public function Send() {
+    /**
+     * Creates message and assigns Mailer. If the message is
+     * not sent successfully then it returns false.  Use the ErrorInfo
+     * variable to view description of the error.
+     * @return bool
+     */
+    public function Send() {
     try {
-      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+        if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-      }
+        }
 
-      // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+        // Set whether the message is multipart/alternative
+        if(!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
-      }
+        }
 
-      $this->error_count = 0; // reset errors
-      $this->SetMessageType();
-      $header = $this->CreateHeader();
-      $body = $this->CreateBody();
+        $this->error_count = 0; // reset errors
+        $this->SetMessageType();
+        $header = $this->CreateHeader();
+        $body = $this->CreateBody();
 
-      if (empty($this->Body)) {
+        if (empty($this->Body)) {
         throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
+        }
 
-      // digitally sign with DKIM if enabled
-      if ($this->DKIM_domain && $this->DKIM_private) {
+        // digitally sign with DKIM if enabled
+        if ($this->DKIM_domain && $this->DKIM_private) {
         $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
         $header = str_replace("\r\n","\n",$header_dkim) . $header;
-      }
+        }
 
-      // Choose the mailer and send through it
-      switch($this->Mailer) {
+        // Choose the mailer and send through it
+        switch($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($header, $body);
         case 'smtp':
           return $this->SmtpSend($header, $body);
         default:
           return $this->MailSend($header, $body);
-      }
+        }
 
     } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
+        $this->SetError($e->getMessage());
+        if ($this->exceptions) {
         throw $e;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Sends mail using the $Sendmail program.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function SendmailSend($header, $body) {
+        }
+        return false;
+    }
+    }
+
+    /**
+     * Sends mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @access protected
+     * @return bool
+     */
+    protected function SendmailSend($header, $body) {
     if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+        $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
+        $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
     }
     if ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $key => $val) {
+        foreach ($this->SingleToArray as $key => $val) {
         if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
         fputs($mail, "To: " . $val . "\n");
         fputs($mail, $header);
@@ -613,164 +613,164 @@ 
         $isSent = ($result == 0) ? 1 : 0;
         $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        }
         }
-      }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
+        if(!@$mail = popen($sendmail, 'w')) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-      if($result != 0) {
+        }
+        fputs($mail, $header);
+        fputs($mail, $body);
+        $result = pclose($mail);
+        // implement call back function if it exists
+        $isSent = ($result == 0) ? 1 : 0;
+        $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+        if($result != 0) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Sends mail using the PHP mail() function.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function MailSend($header, $body) {
+    }
+
+    /**
+     * Sends mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @access protected
+     * @return bool
+     */
+    protected function MailSend($header, $body) {
     $toArr = array();
     foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
+        $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-      if ($this->SingleTo === true && count($toArr) > 1) {
+        $old_from = ini_get('sendmail_from');
+        ini_set('sendmail_from', $this->Sender);
+        if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+            // implement call back function if it exists
+            $isSent = ($rt == 1) ? 1 : 0;
+            $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
-      } else {
+        } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
+        }
     } else {
-      if ($this->SingleTo === true && count($toArr) > 1) {
+        if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+            // implement call back function if it exists
+            $isSent = ($rt == 1) ? 1 : 0;
+            $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
-      } else {
+        } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
+        }
     }
     if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
+        ini_set('sendmail_from', $old_from);
     }
     if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
-  }
-
-  /**
-   * Sends mail via SMTP using PhpSMTP
-   * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @uses SMTP
-   * @access protected
-   * @return bool
-   */
-  protected function SmtpSend($header, $body) {
+    }
+
+    /**
+     * Sends mail via SMTP using PhpSMTP
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @uses SMTP
+     * @access protected
+     * @return bool
+     */
+    protected function SmtpSend($header, $body) {
     require_once $this->PluginDir . 'class.smtp.php';
     $bad_rcpt = array();
 
     if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
     if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
     foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
+        if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      }
+        }
     }
     foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
+        if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      }
+        }
     }
     foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
+        if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      }
+        }
     }
 
 
     if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+        $badaddresses = implode(', ', $bad_rcpt);
+        throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
     }
     if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
     if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
+        $this->smtp->Reset();
     }
     return true;
-  }
-
-  /**
-   * Initiates a connection to an SMTP server.
-   * Returns false if the operation failed.
-   * @uses SMTP
-   * @access public
-   * @return bool
-   */
-  public function SmtpConnect() {
+    }
+
+    /**
+     * Initiates a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @uses SMTP
+     * @access public
+     * @return bool
+     */
+    public function SmtpConnect() {
     if(is_null($this->smtp)) {
-      $this->smtp = new SMTP();
+        $this->smtp = new SMTP();
     }
 
     $this->smtp->do_debug = $this->SMTPDebug;
@@ -780,14 +780,14 @@ 
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+        while($index < count($hosts) && !$connection) {
         $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-          $host = $hostinfo[1];
-          $port = $hostinfo[2];
+            $host = $hostinfo[1];
+            $port = $hostinfo[2];
         } else {
-          $host = $hosts[$index];
-          $port = $this->Port;
+            $host = $hosts[$index];
+            $port = $this->Port;
         }
 
         $tls = ($this->SMTPSecure == 'tls');
@@ -795,140 +795,140 @@ 
 
         if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
 
-          $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-          $this->smtp->Hello($hello);
+            $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+            $this->smtp->Hello($hello);
 
-          if ($tls) {
+            if ($tls) {
             if (!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
+                throw new phpmailerException($this->Lang('tls'));
             }
 
             //We must resend HELO after tls negotiation
             $this->smtp->Hello($hello);
-          }
+            }
 
-          $connection = true;
-          if ($this->SMTPAuth) {
+            $connection = true;
+            if ($this->SMTPAuth) {
             if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
-              throw new phpmailerException($this->Lang('authenticate'));
+                throw new phpmailerException($this->Lang('authenticate'));
+            }
             }
-          }
         }
         $index++;
         if (!$connection) {
-          throw new phpmailerException($this->Lang('connect_host'));
+            throw new phpmailerException($this->Lang('connect_host'));
+        }
         }
-      }
     } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      throw $e;
+        $this->smtp->Reset();
+        throw $e;
     }
     return true;
-  }
+    }
 
-  /**
-   * Closes the active SMTP session if one exists.
-   * @return void
-   */
-  public function SmtpClose() {
+    /**
+     * Closes the active SMTP session if one exists.
+     * @return void
+     */
+    public function SmtpClose() {
     if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+        if($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
-      }
-    }
-  }
-
-  /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
-  * @param string $lang_path Path to the language file directory
-  * @access public
-  */
-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+        }
+    }
+    }
+
+    /**
+     * Sets the language for all class error messages.
+     * Returns false if it cannot load the language file.  The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
+     * @param string $lang_path Path to the language file directory
+     * @access public
+     */
+    function SetLanguage($langcode = 'en', $lang_path = 'language/') {
     //Define full set of translatable strings
     $PHPMAILER_LANG = array(
-      'provide_address' => 'You must provide at least one recipient email address.',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'execute' => 'Could not execute: ',
-      'instantiate' => 'Could not instantiate mail function.',
-      'authenticate' => 'SMTP Error: Could not authenticate.',
-      'from_failed' => 'The following From address failed: ',
-      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-      'data_not_accepted' => 'SMTP Error: Data not accepted.',
-      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-      'file_access' => 'Could not access file: ',
-      'file_open' => 'File Error: Could not open file: ',
-      'encoding' => 'Unknown encoding: ',
-      'signing' => 'Signing Error: ',
-      'smtp_error' => 'SMTP server error: ',
-      'empty_message' => 'Message body empty',
-      'invalid_address' => 'Invalid address',
-      'variable_set' => 'Cannot set or reset variable: '
+        'provide_address' => 'You must provide at least one recipient email address.',
+        'mailer_not_supported' => ' mailer is not supported.',
+        'execute' => 'Could not execute: ',
+        'instantiate' => 'Could not instantiate mail function.',
+        'authenticate' => 'SMTP Error: Could not authenticate.',
+        'from_failed' => 'The following From address failed: ',
+        'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+        'data_not_accepted' => 'SMTP Error: Data not accepted.',
+        'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+        'file_access' => 'Could not access file: ',
+        'file_open' => 'File Error: Could not open file: ',
+        'encoding' => 'Unknown encoding: ',
+        'signing' => 'Signing Error: ',
+        'smtp_error' => 'SMTP server error: ',
+        'empty_message' => 'Message body empty',
+        'invalid_address' => 'Invalid address',
+        'variable_set' => 'Cannot set or reset variable: '
     );
     //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
     $l = true;
     if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+        $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
     }
     $this->language = $PHPMAILER_LANG;
     return ($l == true); //Returns false if language not found
-  }
+    }
 
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
-  public function GetTranslations() {
+    /**
+     * Return the current array of language strings
+     * @return array
+     */
+    public function GetTranslations() {
     return $this->language;
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MESSAGE CREATION
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates recipient headers.
-   * @access public
-   * @return string
-   */
-  public function AddrAppend($type, $addr) {
+    }
+
+    /////////////////////////////////////////////////
+    // METHODS, MESSAGE CREATION
+    /////////////////////////////////////////////////
+
+    /**
+     * Creates recipient headers.
+     * @access public
+     * @return string
+     */
+    public function AddrAppend($type, $addr) {
     $addr_str = $type . ': ';
     $addresses = array();
     foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
+        $addresses[] = $this->AddrFormat($a);
     }
     $addr_str .= implode(', ', $addresses);
     $addr_str .= $this->LE;
 
     return $addr_str;
-  }
-
-  /**
-   * Formats an address correctly.
-   * @access public
-   * @return string
-   */
-  public function AddrFormat($addr) {
+    }
+
+    /**
+     * Formats an address correctly.
+     * @access public
+     * @return string
+     */
+    public function AddrFormat($addr) {
     if (empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
+        return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
-  }
-
-  /**
-   * Wraps message for use with mailers that do not
-   * automatically perform wrapping and for quoted-printable.
-   * Original written by philippe.
-   * @param string $message The message to wrap
-   * @param integer $length The line length to wrap to
-   * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-   * @access public
-   * @return string
-   */
-  public function WrapText($message, $length, $qp_mode = false) {
+        return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+    }
+    }
+
+    /**
+     * Wraps message for use with mailers that do not
+     * automatically perform wrapping and for quoted-printable.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function WrapText($message, $length, $qp_mode = false) {
     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap
@@ -936,140 +936,140 @@ 
 
     $message = $this->FixEOL($message);
     if (substr($message, -1) == $this->LE) {
-      $message = substr($message, 0, -1);
+        $message = substr($message, 0, -1);
     }
 
     $line = explode($this->LE, $message);
     $message = '';
     for ($i=0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+        $line_part = explode(' ', $line[$i]);
+        $buf = '';
+        for ($e = 0; $e<count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - 1;
-          if ($e != 0) {
+            $space_left = $length - strlen($buf) - 1;
+            if ($e != 0) {
             if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
+                $len = $space_left;
+                if ($is_utf8) {
                 $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
+                } elseif (substr($word, $len - 1, 1) == "=") {
                 $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
+                } elseif (substr($word, $len - 2, 1) == "=") {
                 $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+                }
+                $part = substr($word, 0, $len);
+                $word = substr($word, $len);
+                $buf .= ' ' . $part;
+                $message .= $buf . sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+                $message .= $buf . $soft_break;
             }
             $buf = '';
-          }
-          while (strlen($word) > 0) {
+            }
+            while (strlen($word) > 0) {
             $len = $length;
             if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
+                $len = $this->UTF8CharBoundary($word, $len);
             } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
+                $len--;
             } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
+                $len -= 2;
             }
             $part = substr($word, 0, $len);
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+                $message .= $part . sprintf("=%s", $this->LE);
             } else {
-              $buf = $part;
+                $buf = $part;
+            }
             }
-          }
         } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+            $buf_o = $buf;
+            $buf .= ($e == 0) ? $word : (' ' . $word);
 
-          if (strlen($buf) > $length and $buf_o != '') {
+            if (strlen($buf) > $length and $buf_o != '') {
             $message .= $buf_o . $soft_break;
             $buf = $word;
-          }
+            }
+        }
         }
-      }
-      $message .= $buf . $this->LE;
+        $message .= $buf . $this->LE;
     }
 
     return $message;
-  }
-
-  /**
-   * Finds last character boundary prior to maxLength in a utf-8
-   * quoted (printable) encoded string.
-   * Original written by Colin Brown.
-   * @access public
-   * @param string $encodedText utf-8 QP text
-   * @param int    $maxLength   find last character boundary prior to this length
-   * @return int
-   */
-  public function UTF8CharBoundary($encodedText, $maxLength) {
+    }
+
+    /**
+     * Finds last character boundary prior to maxLength in a utf-8
+     * quoted (printable) encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param int    $maxLength   find last character boundary prior to this length
+     * @return int
+     */
+    public function UTF8CharBoundary($encodedText, $maxLength) {
     $foundSplitPos = false;
     $lookBack = 3;
     while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
+        $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+        $encodedCharPos = strpos($lastChunk, "=");
+        if ($encodedCharPos !== false) {
         // Found start of encoded character byte within $lookBack block.
         // Check the encoded byte value (the 2 chars after the '=')
         $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
         $dec = hexdec($hex);
         if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
+            // If the encoded char was found at pos 0, it will fit
+            // otherwise reduce maxLength to start of the encoded char
+            $maxLength = ($encodedCharPos == 0) ? $maxLength :
           $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
+            $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
+            // Reduce maxLength to split at start of character
+            $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+            $foundSplitPos = true;
         } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
+            $lookBack += 3;
         }
-      } else {
+        } else {
         // No encoded character found
         $foundSplitPos = true;
-      }
+        }
     }
     return $maxLength;
-  }
+    }
 
 
-  /**
-   * Set the body wrapping.
-   * @access public
-   * @return void
-   */
-  public function SetWordWrap() {
+    /**
+     * Set the body wrapping.
+     * @access public
+     * @return void
+     */
+    public function SetWordWrap() {
     if($this->WordWrap < 1) {
-      return;
+        return;
     }
 
     switch($this->message_type) {
-      case 'alt':
+        case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
         break;
-      default:
+        default:
         $this->Body = $this->WrapText($this->Body, $this->WordWrap);
         break;
     }
-  }
+    }
 
-  /**
-   * Assembles message header.
-   * @access public
-   * @return string The assembled header
-   */
-  public function CreateHeader() {
+    /**
+     * Assembles message header.
+     * @access public
+     * @return string The assembled header
+     */
+    public function CreateHeader() {
     $result = '';
 
     // Set the boundaries
@@ -1079,24 +1079,24 @@ 
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
     if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
+        $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+        $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
     if($this->Mailer != 'mail') {
-      if ($this->SingleTo === true) {
+        if ($this->SingleTo === true) {
         foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
+            $this->SingleToArray[] = $this->AddrFormat($t);
         }
-      } else {
+        } else {
         if(count($this->to) > 0) {
-          $result .= $this->AddrAppend('To', $this->to);
+            $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
-          $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+            $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+        }
         }
-      }
     }
 
     $from = array();
@@ -1106,97 +1106,97 @@ 
 
     // sendmail and mail() extract Cc from the header before sending
     if(count($this->cc) > 0) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
+        $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
     if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
+        $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
     if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
+        $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
     if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+        $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
     if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+        $result .= $this->HeaderLine('Message-ID',$this->MessageID);
     } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+        $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
 
     if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+        $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
     }
 
     // Add custom headers
     for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+        $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
+        $result .= $this->HeaderLine('MIME-Version', '1.0');
+        $result .= $this->GetMailMIME();
     }
 
     return $result;
-  }
-
-  /**
-   * Returns the message MIME.
-   * @access public
-   * @return string
-   */
-  public function GetMailMIME() {
+    }
+
+    /**
+     * Returns the message MIME.
+     * @access public
+     * @return string
+     */
+    public function GetMailMIME() {
     $result = '';
     switch($this->message_type) {
-      case 'plain':
+        case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
-      case 'attachments':
+        case 'attachments':
       case 'alt_attachments':
         if($this->InlineImageExists()){
-          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+            $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
-          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+            $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+            $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         }
         break;
-      case 'alt':
+        case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         break;
     }
 
     if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
+        $result .= $this->LE.$this->LE;
     }
 
     return $result;
-  }
-
-  /**
-   * Assembles the message body.  Returns an empty string on failure.
-   * @access public
-   * @return string The assembled message body
-   */
-  public function CreateBody() {
+    }
+
+    /**
+     * Assembles the message body.  Returns an empty string on failure.
+     * @access public
+     * @return string The assembled message body
+     */
+    public function CreateBody() {
     $body = '';
 
     if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME();
+        $body .= $this->GetMailMIME();
     }
 
     $this->SetWordWrap();
 
     switch($this->message_type) {
-      case 'alt':
+        case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
@@ -1205,16 +1205,16 @@ 
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[1]);
         break;
-      case 'plain':
+        case 'plain':
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         break;
-      case 'attachments':
+        case 'attachments':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE;
         $body .= $this->AttachAll();
         break;
-      case 'alt_attachments':
+        case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
         $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
@@ -1229,46 +1229,46 @@ 
     }
 
     if ($this->IsError()) {
-      $body = '';
+        $body = '';
     } elseif ($this->sign_key_file) {
-      try {
+        try {
         $file = tempnam('', 'mail');
         file_put_contents($file, $body); //TODO check this worked
         $signed = tempnam("", "signed");
         if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
-          @unlink($file);
-          @unlink($signed);
-          $body = file_get_contents($signed);
+            @unlink($file);
+            @unlink($signed);
+            $body = file_get_contents($signed);
         } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
+            @unlink($file);
+            @unlink($signed);
+            throw new phpmailerException($this->Lang("signing").openssl_error_string());
         }
-      } catch (phpmailerException $e) {
+        } catch (phpmailerException $e) {
         $body = '';
         if ($this->exceptions) {
-          throw $e;
+            throw $e;
+        }
         }
-      }
     }
 
     return $body;
-  }
+    }
 
-  /**
-   * Returns the start of a message boundary.
-   * @access private
-   */
-  private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+    /**
+     * Returns the start of a message boundary.
+     * @access private
+     */
+    private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
     if($charSet == '') {
-      $charSet = $this->CharSet;
+        $charSet = $this->CharSet;
     }
     if($contentType == '') {
-      $contentType = $this->ContentType;
+        $contentType = $this->ContentType;
     }
     if($encoding == '') {
-      $encoding = $this->Encoding;
+        $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
@@ -1277,80 +1277,80 @@ 
     $result .= $this->LE;
 
     return $result;
-  }
+    }
 
-  /**
-   * Returns the end of a message boundary.
-   * @access private
-   */
-  private function EndBoundary($boundary) {
+    /**
+     * Returns the end of a message boundary.
+     * @access private
+     */
+    private function EndBoundary($boundary) {
     return $this->LE . '--' . $boundary . '--' . $this->LE;
-  }
-
-  /**
-   * Sets the message type.
-   * @access private
-   * @return void
-   */
-  private function SetMessageType() {
+    }
+
+    /**
+     * Sets the message type.
+     * @access private
+     * @return void
+     */
+    private function SetMessageType() {
     if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
-      $this->message_type = 'plain';
+        $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+        if(count($this->attachment) > 0) {
         $this->message_type = 'attachments';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+        }
+        if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+        }
+        if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
-      }
+        }
+    }
     }
-  }
 
-  /**
-   *  Returns a formatted header line.
-   * @access public
-   * @return string
-   */
-  public function HeaderLine($name, $value) {
+    /**
+     *  Returns a formatted header line.
+     * @access public
+     * @return string
+     */
+    public function HeaderLine($name, $value) {
     return $name . ': ' . $value . $this->LE;
-  }
-
-  /**
-   * Returns a formatted mail line.
-   * @access public
-   * @return string
-   */
-  public function TextLine($value) {
+    }
+
+    /**
+     * Returns a formatted mail line.
+     * @access public
+     * @return string
+     */
+    public function TextLine($value) {
     return $value . $this->LE;
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, ATTACHMENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds an attachment from a path on the filesystem.
-   * Returns false if the file could not be found
-   * or accessed.
-   * @param string $path Path to the attachment.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /////////////////////////////////////////////////
+    // CLASS METHODS, ATTACHMENTS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds an attachment from a path on the filesystem.
+     * Returns false if the file could not be found
+     * or accessed.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return bool
+     */
+    public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-      if ( !@is_file($path) ) {
+        if ( !@is_file($path) ) {
         throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-      }
-      $filename = basename($path);
-      if ( $name == '' ) {
+        }
+        $filename = basename($path);
+        if ( $name == '' ) {
         $name = $filename;
-      }
+        }
 
-      $this->attachment[] = array(
+        $this->attachment[] = array(
         0 => $path,
         1 => $filename,
         2 => $name,
@@ -1359,36 +1359,36 @@ 
         5 => false,  // isStringAttachment
         6 => 'attachment',
         7 => 0
-      );
+        );
 
     } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
+        $this->SetError($e->getMessage());
+        if ($this->exceptions) {
         throw $e;
-      }
-      error_log($e->getMessage()."\n");
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+        }
+        error_log($e->getMessage()."\n");
+        if ( $e->getCode() == self::STOP_CRITICAL ) {
         return false;
-      }
+        }
     }
     return true;
-  }
+    }
 
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
-  public function GetAttachments() {
+    /**
+     * Return the current array of attachments
+     * @return array
+     */
+    public function GetAttachments() {
     return $this->attachment;
-  }
-
-  /**
-   * Attaches all fs, string, and binary attachments to the message.
-   * Returns an empty string on failure.
-   * @access private
-   * @return string
-   */
-  private function AttachAll() {
+    }
+
+    /**
+     * Attaches all fs, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access private
+     * @return string
+     */
+    private function AttachAll() {
     // Return text of body
     $mime = array();
     $cidUniq = array();
@@ -1396,70 +1396,70 @@ 
 
     // Add all attachments
     foreach ($this->attachment as $attachment) {
-      // Check for string attachment
-      $bString = $attachment[5];
-      if ($bString) {
+        // Check for string attachment
+        $bString = $attachment[5];
+        if ($bString) {
         $string = $attachment[0];
-      } else {
+        } else {
         $path = $attachment[0];
-      }
-
-      if (in_array($attachment[0], $incl)) { continue; }
-      $filename    = $attachment[1];
-      $name        = $attachment[2];
-      $encoding    = $attachment[3];
-      $type        = $attachment[4];
-      $disposition = $attachment[6];
-      $cid         = $attachment[7];
-      $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-      $cidUniq[$cid] = true;
-
-      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-      if($disposition == 'inline') {
+        }
+
+        if (in_array($attachment[0], $incl)) { continue; }
+        $filename    = $attachment[1];
+        $name        = $attachment[2];
+        $encoding    = $attachment[3];
+        $type        = $attachment[4];
+        $disposition = $attachment[6];
+        $cid         = $attachment[7];
+        $incl[]      = $attachment[0];
+        if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+        $cidUniq[$cid] = true;
+
+        $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
+        $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
+        $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
+
+        if($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-      }
+        }
 
-      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
+        $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
-      // Encode as string attachment
-      if($bString) {
+        // Encode as string attachment
+        if($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
         if($this->IsError()) {
-          return '';
+            return '';
         }
         $mime[] = $this->LE.$this->LE;
-      } else {
+        } else {
         $mime[] = $this->EncodeFile($path, $encoding);
         if($this->IsError()) {
-          return '';
+            return '';
         }
         $mime[] = $this->LE.$this->LE;
-      }
+        }
     }
 
     $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
 
     return join('', $mime);
-  }
-
-  /**
-   * Encodes attachment in requested format.
-   * Returns an empty string on failure.
-   * @param string $path The full path to the file
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @see EncodeFile()
-   * @access private
-   * @return string
-   */
-  private function EncodeFile($path, $encoding = 'base64') {
+    }
+
+    /**
+     * Encodes attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @see EncodeFile()
+     * @access private
+     * @return string
+     */
+    private function EncodeFile($path, $encoding = 'base64') {
     try {
-      if (!is_readable($path)) {
+        if (!is_readable($path)) {
         throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-      }
+        }
         $magic_quotes = get_magic_quotes_runtime();
         if ($magic_quotes) {
             if (version_compare(PHP_VERSION, '5.3.0', '<')) {
@@ -1479,114 +1479,114 @@ 
         }
         return $file_buffer;
     } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
-  }
-
-  /**
-   * Encodes string to requested format.
-   * Returns an empty string on failure.
-   * @param string $str The text to encode
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @access public
-   * @return string
-   */
-  public function EncodeString ($str, $encoding = 'base64') {
+        $this->SetError($e->getMessage());
+        return '';
+    }
+    }
+
+    /**
+     * Encodes string to requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function EncodeString ($str, $encoding = 'base64') {
     $encoded = '';
     switch(strtolower($encoding)) {
-      case 'base64':
+        case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
-      case '7bit':
+        case '7bit':
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
         if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+            $encoded .= $this->LE;
         break;
-      case 'binary':
+        case 'binary':
         $encoded = $str;
         break;
-      case 'quoted-printable':
+        case 'quoted-printable':
         $encoded = $this->EncodeQP($str);
         break;
-      default:
+        default:
         $this->SetError($this->Lang('encoding') . $encoding);
         break;
     }
     return $encoded;
-  }
-
-  /**
-   * Encode a header string to best (shortest) of Q, B, quoted or none.
-   * @access public
-   * @return string
-   */
-  public function EncodeHeader($str, $position = 'text') {
+    }
+
+    /**
+     * Encode a header string to best (shortest) of Q, B, quoted or none.
+     * @access public
+     * @return string
+     */
+    public function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
-      case 'phrase':
+        case 'phrase':
         if (!preg_match('/[\200-\377]/', $str)) {
-          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+            // Can't use addslashes as we don't know what value has magic_quotes_sybase
+            $encoded = addcslashes($str, "\0..\37\177\\\"");
+            if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
             return ($encoded);
-          } else {
+            } else {
             return ("\"$encoded\"");
-          }
+            }
         }
         $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
         break;
-      case 'comment':
+        case 'comment':
         $x = preg_match_all('/[()"]/', $str, $matches);
         // Fall-through
-      case 'text':
+        case 'text':
       default:
         $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
         break;
     }
 
     if ($x == 0) {
-      return ($str);
+        return ($str);
     }
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
     if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      // Modified by Ivan Tcholakov, 24-JAN-2010.
-      //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-      if ($this->HasMultiBytes($str)) {
-      //
+        $encoding = 'B';
+        // Modified by Ivan Tcholakov, 24-JAN-2010.
+        //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
+        if ($this->HasMultiBytes($str)) {
+        //
         // Use a custom function which correctly encodes and wraps long
         // multibyte strings without breaking lines within a character
         $encoded = $this->Base64EncodeWrapMB($str);
-      } else {
+        } else {
         $encoded = base64_encode($str);
         $maxlen -= $maxlen % 4;
         $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
+        }
     } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+        $encoding = 'Q';
+        $encoded = $this->EncodeQ($str, $position);
+        $encoded = $this->WrapText($encoded, $maxlen, true);
+        $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
     }
 
     $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
     $encoded = trim(str_replace("\n", $this->LE, $encoded));
 
     return $encoded;
-  }
-
-  /**
-   * Checks if a string contains multibyte characters.
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return bool
-   */
+    }
+
+    /**
+     * Checks if a string contains multibyte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return bool
+     */
     public function HasMultiBytes($str)
     {
         if (function_exists('mb_strlen')) {
@@ -1597,15 +1597,15 @@ 
 
     }
 
-  /**
-   * Correctly encodes and wraps long multibyte strings for mail headers
-   * without breaking lines within a character.
-   * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return string
-   */
-  public function Base64EncodeWrapMB($str) {
+    /**
+     * Correctly encodes and wraps long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return string
+     */
+    public function Base64EncodeWrapMB($str) {
     $start = "=?".$this->CharSet."?B?";
     $end = "?=";
     $encoded = "";
@@ -1622,9 +1622,9 @@ 
     $offset = $avgLength = floor($length * $ratio * .75);
 
     for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
+        $lookBack = 0;
 
-      do {
+        do {
         $offset = $avgLength - $lookBack;
         // Modified by Ivan Tcholakov, 24-JAN-2010.
         //$chunk = mb_substr($str, $i, $offset, $this->CharSet);
@@ -1632,85 +1632,85 @@ 
         //
         $chunk = base64_encode($chunk);
         $lookBack++;
-      }
-      while (strlen($chunk) > $length);
+        }
+        while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+        $encoded .= $chunk . $this->LE;
     }
 
     // Chomp the last linefeed
     $encoded = substr($encoded, 0, -strlen($this->LE));
     return $encoded;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @return string
-  */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
+    }
+
+    /**
+     * Encode string to quoted-printable.
+     * Only uses standard PHP, slow, but will always work
+     * @access public
+     * @param string $string the text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     */
+    public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
     while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
+        $linlen = strlen($line);
+        $newline = '';
+        for($i = 0; $i < $linlen; $i++) {
         $c = substr( $line, $i, 1 );
         $dec = ord( $c );
         if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
+            $c = '=2E';
         }
         if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+            if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+            } else if ( $space_conv ) {
             $c = '=20';
-          }
+            }
         } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
+            $h2 = floor($dec/16);
+            $h1 = floor($dec%16);
+            $c = $escape.$hex[$h2].$hex[$h1];
         }
         if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+            $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
+            $newline = '';
+            // check if newline first character will be point or not
+            if ( $dec == 46 ) {
             $c = '=2E';
-          }
+            }
         }
         $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
+        } // end of for
+        $output .= $newline.$eol;
     } // end of while
     return $output;
-  }
-
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
-  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
+    }
+
+    /**
+     * Encode string to RFC2045 (6.7) quoted-printable format
+     * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
+     * Also results in same content as you started with after decoding
+     * @see EncodeQPphp()
+     * @access public
+     * @param string $string the text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
+     * @return string
+     * @author Marcus Bointon
+     */
+    public function EncodeQP($string, $line_max = 76, $space_conv = false) {
     if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
+        return quoted_printable_encode($string);
     }
     $filters = stream_get_filters();
     if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
+        return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
     }
     $fp = fopen('php://temp/', 'r+');
     $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
@@ -1723,32 +1723,32 @@ 
     $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
     fclose($fp);
     return $out;
-  }
-
-  /**
-   * Encode string to q encoding.
-   * @link http://tools.ietf.org/html/rfc2047
-   * @param string $str the text to encode
-   * @param string $position Where the text is going to be used, see the RFC for what that means
-   * @access public
-   * @return string
-   */
-  public function EncodeQ ($str, $position = 'text') {
+    }
+
+    /**
+     * Encode string to q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function EncodeQ ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
     switch (strtolower($position)) {
-      case 'phrase':
+        case 'phrase':
         $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
-      case 'comment':
+        case 'comment':
         $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-      case 'text':
+        case 'text':
       default:
         // Replace every high ascii, control =, ? and _ characters
         //TODO using /e (equivalent to eval()) is probably not a good idea
         $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
+                "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
     }
 
@@ -1756,187 +1756,187 @@ 
     $encoded = str_replace(' ', '_', $encoded);
 
     return $encoded;
-  }
-
-  /**
-   * Adds a string or binary attachment (non-filesystem) to the list.
-   * This method can be used to attach ascii or binary data,
-   * such as a BLOB record from a database.
-   * @param string $string String attachment data.
-   * @param string $filename Name of the attachment.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return void
-   */
-  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /**
+     * Adds a string or binary attachment (non-filesystem) to the list.
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return void
+     */
+    public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
     // Append to $attachment array
     $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
+        0 => $string,
+        1 => $filename,
+        2 => basename($filename),
+        3 => $encoding,
+        4 => $type,
+        5 => true,  // isStringAttachment
+        6 => 'attachment',
+        7 => 0
     );
-  }
-
-  /**
-   * Adds an embedded attachment.  This can include images, sounds, and
-   * just about any other document.  Make sure to set the $type to an
-   * image type.  For JPEG images use "image/jpeg" and for GIF images
-   * use "image/gif".
-   * @param string $path Path to the attachment.
-   * @param string $cid Content ID of the attachment.  Use this to identify
-   *        the Id for accessing the image in an HTML form.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /**
+     * Adds an embedded attachment.  This can include images, sounds, and
+     * just about any other document.  Make sure to set the $type to an
+     * image type.  For JPEG images use "image/jpeg" and for GIF images
+     * use "image/gif".
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment.  Use this to identify
+     *        the Id for accessing the image in an HTML form.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return bool
+     */
+    public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
     if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
+        $this->SetError($this->Lang('file_access') . $path);
+        return false;
     }
 
     $filename = basename($path);
     if ( $name == '' ) {
-      $name = $filename;
+        $name = $filename;
     }
 
     // Append to $attachment array
     $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
+        0 => $path,
+        1 => $filename,
+        2 => $name,
+        3 => $encoding,
+        4 => $type,
+        5 => false,  // isStringAttachment
+        6 => 'inline',
+        7 => $cid
     );
 
     return true;
-  }
-
-  /**
-   * Returns true if an inline attachment is present.
-   * @access public
-   * @return bool
-   */
-  public function InlineImageExists() {
+    }
+
+    /**
+     * Returns true if an inline attachment is present.
+     * @access public
+     * @return bool
+     */
+    public function InlineImageExists() {
     foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
+        if ($attachment[6] == 'inline') {
         return true;
-      }
+        }
     }
     return false;
-  }
+    }
 
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MESSAGE RESET
-  /////////////////////////////////////////////////
+    /////////////////////////////////////////////////
+    // CLASS METHODS, MESSAGE RESET
+    /////////////////////////////////////////////////
 
-  /**
-   * Clears all recipients assigned in the TO array.  Returns void.
-   * @return void
-   */
-  public function ClearAddresses() {
+    /**
+     * Clears all recipients assigned in the TO array.  Returns void.
+     * @return void
+     */
+    public function ClearAddresses() {
     foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
+        unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the CC array.  Returns void.
-   * @return void
-   */
-  public function ClearCCs() {
+    /**
+     * Clears all recipients assigned in the CC array.  Returns void.
+     * @return void
+     */
+    public function ClearCCs() {
     foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
+        unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the BCC array.  Returns void.
-   * @return void
-   */
-  public function ClearBCCs() {
+    /**
+     * Clears all recipients assigned in the BCC array.  Returns void.
+     * @return void
+     */
+    public function ClearBCCs() {
     foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
+        unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the ReplyTo array.  Returns void.
-   * @return void
-   */
-  public function ClearReplyTos() {
+    /**
+     * Clears all recipients assigned in the ReplyTo array.  Returns void.
+     * @return void
+     */
+    public function ClearReplyTos() {
     $this->ReplyTo = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the TO, CC and BCC
-   * array.  Returns void.
-   * @return void
-   */
-  public function ClearAllRecipients() {
+    }
+
+    /**
+     * Clears all recipients assigned in the TO, CC and BCC
+     * array.  Returns void.
+     * @return void
+     */
+    public function ClearAllRecipients() {
     $this->to = array();
     $this->cc = array();
     $this->bcc = array();
     $this->all_recipients = array();
-  }
-
-  /**
-   * Clears all previously set filesystem, string, and binary
-   * attachments.  Returns void.
-   * @return void
-   */
-  public function ClearAttachments() {
+    }
+
+    /**
+     * Clears all previously set filesystem, string, and binary
+     * attachments.  Returns void.
+     * @return void
+     */
+    public function ClearAttachments() {
     $this->attachment = array();
-  }
+    }
 
-  /**
-   * Clears all custom headers.  Returns void.
-   * @return void
-   */
-  public function ClearCustomHeaders() {
+    /**
+     * Clears all custom headers.  Returns void.
+     * @return void
+     */
+    public function ClearCustomHeaders() {
     $this->CustomHeader = array();
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MISCELLANEOUS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds the error message to the error container.
-   * @access protected
-   * @return void
-   */
-  protected function SetError($msg) {
+    }
+
+    /////////////////////////////////////////////////
+    // CLASS METHODS, MISCELLANEOUS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds the error message to the error container.
+     * @access protected
+     * @return void
+     */
+    protected function SetError($msg) {
     $this->error_count++;
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+        $lasterror = $this->smtp->getError();
+        if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
         $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
+        }
     }
     $this->ErrorInfo = $msg;
-  }
-
-  /**
-   * Returns the proper RFC 822 formatted date.
-   * @access public
-   * @return string
-   * @static
-   */
-  public static function RFCDate() {
+    }
+
+    /**
+     * Returns the proper RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function RFCDate() {
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
@@ -1944,346 +1944,346 @@ 
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
-  }
-
-  /**
-   * Returns the server hostname or 'localhost.localdomain' if unknown.
-   * @access private
-   * @return string
-   */
-  private function ServerHostname() {
+    }
+
+    /**
+     * Returns the server hostname or 'localhost.localdomain' if unknown.
+     * @access private
+     * @return string
+     */
+    private function ServerHostname() {
     if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
+        $result = $this->Hostname;
     } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
+        $result = $_SERVER['SERVER_NAME'];
     } else {
-      $result = 'localhost.localdomain';
+        $result = 'localhost.localdomain';
     }
 
     return $result;
-  }
-
-  /**
-   * Returns a message in the appropriate language.
-   * @access private
-   * @return string
-   */
-  private function Lang($key) {
+    }
+
+    /**
+     * Returns a message in the appropriate language.
+     * @access private
+     * @return string
+     */
+    private function Lang($key) {
     if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
+        $this->SetLanguage('en'); // set the default language
     }
 
     if(isset($this->language[$key])) {
-      return $this->language[$key];
+        return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+        return 'Language string failed to load: ' . $key;
+    }
     }
-  }
 
-  /**
-   * Returns true if an error occurred.
-   * @access public
-   * @return bool
-   */
-  public function IsError() {
+    /**
+     * Returns true if an error occurred.
+     * @access public
+     * @return bool
+     */
+    public function IsError() {
     return ($this->error_count > 0);
-  }
-
-  /**
-   * Changes every end of line from CR or LF to CRLF.
-   * @access private
-   * @return string
-   */
-  private function FixEOL($str) {
+    }
+
+    /**
+     * Changes every end of line from CR or LF to CRLF.
+     * @access private
+     * @return string
+     */
+    private function FixEOL($str) {
     $str = str_replace("\r\n", "\n", $str);
     $str = str_replace("\r", "\n", $str);
     $str = str_replace("\n", $this->LE, $str);
     return $str;
-  }
-
-  /**
-   * Adds a custom header.
-   * @access public
-   * @return void
-   */
-  public function AddCustomHeader($custom_header) {
+    }
+
+    /**
+     * Adds a custom header.
+     * @access public
+     * @return void
+     */
+    public function AddCustomHeader($custom_header) {
     $this->CustomHeader[] = explode(':', $custom_header, 2);
-  }
-
-  /**
-   * Evaluates the message and returns modifications for inline images and backgrounds
-   * @access public
-   * @return $message
-   */
-  public function MsgHTML($message, $basedir = '') {
+    }
+
+    /**
+     * Evaluates the message and returns modifications for inline images and backgrounds
+     * @access public
+     * @return $message
+     */
+    public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
     if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+        foreach($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
         if (!preg_match('#^[A-z]+://#',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+            $filename = basename($url);
+            $directory = dirname($url);
+            ($directory == '.')?$directory='':'';
+            $cid = 'cid:' . md5($filename);
+            $ext = pathinfo($filename, PATHINFO_EXTENSION);
+            $mimeType  = self::_mime_types($ext);
+            if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+            if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+            if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
+            }
+        }
         }
-      }
     }
     $this->IsHTML(true);
     $this->Body = $message;
     $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
     if (!empty($textMsg) && empty($this->AltBody)) {
-      $this->AltBody = html_entity_decode($textMsg);
+        $this->AltBody = html_entity_decode($textMsg);
     }
     if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
-    }
-  }
-
-  /**
-   * Gets the MIME type of the embedded or inline image
-   * @param string File extension
-   * @access public
-   * @return string MIME type of ext
-   * @static
-   */
-  public static function _mime_types($ext = '') {
+        $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+    }
+    }
+
+    /**
+     * Gets the MIME type of the embedded or inline image
+     * @param string File extension
+     * @access public
+     * @return string MIME type of ext
+     * @static
+     */
+    public static function _mime_types($ext = '') {
     $mimes = array(
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'doc'   =>  'application/msword',
-      'bin'   =>  'application/macbinary',
-      'dms'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'class' =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php'   =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xhtml' =>  'application/xhtml+xml',
-      'xht'   =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mpga'  =>  'audio/mpeg',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'txt'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'log'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'qt'    =>  'video/quicktime',
-      'mov'   =>  'video/quicktime',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'xl'    =>  'application/excel',
-      'eml'   =>  'message/rfc822'
+        'hqx'   =>  'application/mac-binhex40',
+        'cpt'   =>  'application/mac-compactpro',
+        'doc'   =>  'application/msword',
+        'bin'   =>  'application/macbinary',
+        'dms'   =>  'application/octet-stream',
+        'lha'   =>  'application/octet-stream',
+        'lzh'   =>  'application/octet-stream',
+        'exe'   =>  'application/octet-stream',
+        'class' =>  'application/octet-stream',
+        'psd'   =>  'application/octet-stream',
+        'so'    =>  'application/octet-stream',
+        'sea'   =>  'application/octet-stream',
+        'dll'   =>  'application/octet-stream',
+        'oda'   =>  'application/oda',
+        'pdf'   =>  'application/pdf',
+        'ai'    =>  'application/postscript',
+        'eps'   =>  'application/postscript',
+        'ps'    =>  'application/postscript',
+        'smi'   =>  'application/smil',
+        'smil'  =>  'application/smil',
+        'mif'   =>  'application/vnd.mif',
+        'xls'   =>  'application/vnd.ms-excel',
+        'ppt'   =>  'application/vnd.ms-powerpoint',
+        'wbxml' =>  'application/vnd.wap.wbxml',
+        'wmlc'  =>  'application/vnd.wap.wmlc',
+        'dcr'   =>  'application/x-director',
+        'dir'   =>  'application/x-director',
+        'dxr'   =>  'application/x-director',
+        'dvi'   =>  'application/x-dvi',
+        'gtar'  =>  'application/x-gtar',
+        'php'   =>  'application/x-httpd-php',
+        'php4'  =>  'application/x-httpd-php',
+        'php3'  =>  'application/x-httpd-php',
+        'phtml' =>  'application/x-httpd-php',
+        'phps'  =>  'application/x-httpd-php-source',
+        'js'    =>  'application/x-javascript',
+        'swf'   =>  'application/x-shockwave-flash',
+        'sit'   =>  'application/x-stuffit',
+        'tar'   =>  'application/x-tar',
+        'tgz'   =>  'application/x-tar',
+        'xhtml' =>  'application/xhtml+xml',
+        'xht'   =>  'application/xhtml+xml',
+        'zip'   =>  'application/zip',
+        'mid'   =>  'audio/midi',
+        'midi'  =>  'audio/midi',
+        'mpga'  =>  'audio/mpeg',
+        'mp2'   =>  'audio/mpeg',
+        'mp3'   =>  'audio/mpeg',
+        'aif'   =>  'audio/x-aiff',
+        'aiff'  =>  'audio/x-aiff',
+        'aifc'  =>  'audio/x-aiff',
+        'ram'   =>  'audio/x-pn-realaudio',
+        'rm'    =>  'audio/x-pn-realaudio',
+        'rpm'   =>  'audio/x-pn-realaudio-plugin',
+        'ra'    =>  'audio/x-realaudio',
+        'rv'    =>  'video/vnd.rn-realvideo',
+        'wav'   =>  'audio/x-wav',
+        'bmp'   =>  'image/bmp',
+        'gif'   =>  'image/gif',
+        'jpeg'  =>  'image/jpeg',
+        'jpg'   =>  'image/jpeg',
+        'jpe'   =>  'image/jpeg',
+        'png'   =>  'image/png',
+        'tiff'  =>  'image/tiff',
+        'tif'   =>  'image/tiff',
+        'css'   =>  'text/css',
+        'html'  =>  'text/html',
+        'htm'   =>  'text/html',
+        'shtml' =>  'text/html',
+        'txt'   =>  'text/plain',
+        'text'  =>  'text/plain',
+        'log'   =>  'text/plain',
+        'rtx'   =>  'text/richtext',
+        'rtf'   =>  'text/rtf',
+        'xml'   =>  'text/xml',
+        'xsl'   =>  'text/xml',
+        'mpeg'  =>  'video/mpeg',
+        'mpg'   =>  'video/mpeg',
+        'mpe'   =>  'video/mpeg',
+        'qt'    =>  'video/quicktime',
+        'mov'   =>  'video/quicktime',
+        'avi'   =>  'video/x-msvideo',
+        'movie' =>  'video/x-sgi-movie',
+        'doc'   =>  'application/msword',
+        'word'  =>  'application/msword',
+        'xl'    =>  'application/excel',
+        'eml'   =>  'message/rfc822'
     );
     return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
-  }
-
-  /**
-  * Set (or reset) Class Objects (variables)
-  *
-  * Usage Example:
-  * $page->set('X-Priority', '3');
-  *
-  * @access public
-  * @param string $name Parameter Name
-  * @param mixed $value Parameter Value
-  * NOTE: will not work with arrays, there are no arrays to set/reset
-  * @todo Should this not be using __set() magic function?
-  */
-  public function set($name, $value = '') {
+    }
+
+    /**
+     * Set (or reset) Class Objects (variables)
+     *
+     * Usage Example:
+     * $page->set('X-Priority', '3');
+     *
+     * @access public
+     * @param string $name Parameter Name
+     * @param mixed $value Parameter Value
+     * NOTE: will not work with arrays, there are no arrays to set/reset
+     * @todo Should this not be using __set() magic function?
+     */
+    public function set($name, $value = '') {
     try {
-      if (isset($this->$name) ) {
+        if (isset($this->$name) ) {
         $this->$name = $value;
-      } else {
+        } else {
         throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
-      }
+        }
     } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
+        $this->SetError($e->getMessage());
+        if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Strips newlines to prevent header injection.
-   * @access public
-   * @param string $str String
-   * @return string
-   */
-  public function SecureHeader($str) {
+    }
+
+    /**
+     * Strips newlines to prevent header injection.
+     * @access public
+     * @param string $str String
+     * @return string
+     */
+    public function SecureHeader($str) {
     $str = str_replace("\r", '', $str);
     $str = str_replace("\n", '', $str);
     return trim($str);
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function Sign($cert_filename, $key_filename, $key_pass) {
+    }
+
+    /**
+     * Set the private key file and password to sign the message.
+     *
+     * @access public
+     * @param string $key_filename Parameter File Name
+     * @param string $key_pass Password for private key
+     */
+    public function Sign($cert_filename, $key_filename, $key_pass) {
     $this->sign_cert_file = $cert_filename;
     $this->sign_key_file = $key_filename;
     $this->sign_key_pass = $key_pass;
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function DKIM_QP($txt) {
+    }
+
+    /**
+     * Set the private key file and password to sign the message.
+     *
+     * @access public
+     * @param string $key_filename Parameter File Name
+     * @param string $key_pass Password for private key
+     */
+    public function DKIM_QP($txt) {
     $tmp="";
     $line="";
     for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+        $ord=ord($txt[$i]);
+        if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
         $line.=$txt[$i];
-      } else {
+        } else {
         $line.="=".sprintf("%02X",$ord);
-      }
+        }
     }
     return $line;
-  }
-
-  /**
-   * Generate DKIM signature
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_Sign($s) {
+    }
+
+    /**
+     * Generate DKIM signature
+     *
+     * @access public
+     * @param string $s Header
+     */
+    public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
     if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+        $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
     } else {
-      $privKey = $privKeyStr;
+        $privKey = $privKeyStr;
     }
     if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
+        return base64_encode($signature);
+    }
     }
-  }
 
-  /**
-   * Generate DKIM Canonicalization Header
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_HeaderC($s) {
+    /**
+     * Generate DKIM Canonicalization Header
+     *
+     * @access public
+     * @param string $s Header
+     */
+    public function DKIM_HeaderC($s) {
     $s=preg_replace("/\r\n\s+/"," ",$s);
     $lines=explode("\r\n",$s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+        list($heading,$value)=explode(":",$line,2);
+        $heading=strtolower($heading);
+        $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+        $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
     }
     $s=implode("\r\n",$lines);
     return $s;
-  }
-
-  /**
-   * Generate DKIM Canonicalization Body
-   *
-   * @access public
-   * @param string $body Message Body
-   */
-  public function DKIM_BodyC($body) {
+    }
+
+    /**
+     * Generate DKIM Canonicalization Body
+     *
+     * @access public
+     * @param string $body Message Body
+     */
+    public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);
     // END stabilize line endings
     while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+        $body=substr($body,0,strlen($body)-2);
     }
     return $body;
-  }
-
-  /**
-   * Create the DKIM header, body, as new header
-   *
-   * @access public
-   * @param string $headers_line Header lines
-   * @param string $subject Subject
-   * @param string $body Body
-   */
-  public function DKIM_Add($headers_line,$subject,$body) {
+    }
+
+    /**
+     * Create the DKIM header, body, as new header
+     *
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     */
+    public function DKIM_Add($headers_line,$subject,$body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
@@ -2291,11 +2291,11 @@ 
     $subject_header       = "Subject: $subject";
     $headers              = explode("\r\n",$headers_line);
     foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
+        if (strpos($header,'From:') === 0) {
         $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
+        } elseif (strpos($header,'To:') === 0) {
         $to_header=$header;
-      }
+        }
     }
     $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
     $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
@@ -2316,20 +2316,20 @@ 
     $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
-  }
+    }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+    protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+        $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+        call_user_func_array($this->action_function,$params);
+    }
     }
-  }
 }
 
 class phpmailerException extends Exception {
-  public function errorMessage() {
+    public function errorMessage() {
     $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
     return $errorMsg;
-  }
+    }
 }
 ?>

Spacing +235 added lines, -236 removed lines

@@ -38,7 +38,7 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<')) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 
 class PHPMailer {
 
@@ -50,64 +50,64 @@ 
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  public $Priority          = 3;
+  public $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  public $CharSet           = 'iso-8859-1';
+  public $CharSet = 'iso-8859-1';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  public $ContentType       = 'text/plain';
+  public $ContentType = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
-  public $Encoding          = '8bit';
+  public $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  public $ErrorInfo         = '';
+  public $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  public $From              = 'root@localhost';
+  public $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  public $FromName          = 'Root User';
+  public $FromName = 'Root User';
 
   /**
    * Sets the Sender email (Return-Path) of the message.  If not empty,
    * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
    * @var string
    */
-  public $Sender            = '';
+  public $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  public $Subject           = '';
+  public $Subject = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
-  public $Body              = '';
+  public $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -116,39 +116,39 @@ 
    * that can read HTML will view the normal Body.
    * @var string
    */
-  public $AltBody           = '';
+  public $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  public $WordWrap          = 0;
+  public $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  public $Mailer            = 'mail';
+  public $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  public $Sendmail          = '/usr/sbin/sendmail';
+  public $Sendmail = '/usr/sbin/sendmail';
 
   /**
    * Path to PHPMailer plugins.  Useful if the SMTP class
    * is in a different directory than the PHP include path.
    * @var string
    */
-  public $PluginDir         = '';
+  public $PluginDir = '';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  public $ConfirmReadingTo  = '';
+  public $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -156,14 +156,14 @@ 
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  public $Hostname          = '';
+  public $Hostname = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
-  public $MessageID         = '';
+  public $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -177,57 +177,57 @@ 
    * Hosts will be tried in order.
    * @var string
    */
-  public $Host          = 'localhost';
+  public $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  public $Port          = 25;
+  public $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  public $Helo          = '';
+  public $Helo = '';
 
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
    * @var string
    */
-  public $SMTPSecure    = '';
+  public $SMTPSecure = '';
 
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  public $SMTPAuth      = false;
+  public $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  public $Username      = '';
+  public $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  public $Password      = '';
+  public $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
    */
-  public $Timeout       = 10;
+  public $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  public $SMTPDebug     = false;
+  public $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -242,7 +242,7 @@ 
    * emails, instead of sending to entire TO addresses
    * @var bool
    */
-  public $SingleTo      = false;
+  public $SingleTo = false;
 
    /**
    * If SingleTo is true, this provides the array to hold the email addresses
@@ -254,34 +254,34 @@ 
    * Provides the ability to change the line ending
    * @var string
    */
-  public $LE              = "\n";
+  public $LE = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
-  public $DKIM_selector   = 'phpmailer';
+  public $DKIM_selector = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_identity   = '';
+  public $DKIM_identity = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_domain     = '';
+  public $DKIM_domain = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_private    = '';
+  public $DKIM_private = '';
 
   /**
    * Callback Action function name
@@ -300,7 +300,7 @@ 
    * Sets the PHPMailer Version number
    * @var string
    */
-  public $Version         = '5.1';
+  public $Version = '5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
@@ -451,13 +451,13 @@ 
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      error_log('Invalid recipient array: ' . $kind);
+      error_log('Invalid recipient array: '.$kind);
       return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -485,11 +485,11 @@ 
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+  public function SetFrom($address, $name = '', $auto = 1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -522,7 +522,7 @@ 
    */
   public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+      if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
       } else {
         return true;
@@ -549,7 +549,7 @@ 
       }
 
       // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+      if (!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
       }
 
@@ -564,12 +564,12 @@ 
 
       // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
+        $header_dkim = $this->DKIM_Add($header, $this->Subject, $body);
+        $header = str_replace("\r\n", "\n", $header_dkim).$header;
       }
 
       // Choose the mailer and send through it
-      switch($this->Mailer) {
+      switch ($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($header, $body);
         case 'smtp':
@@ -602,32 +602,32 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        if (!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
-        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, "To: ".$val."\n");
         fputs($mail, $header);
         fputs($mail, $body);
         $result = pclose($mail);
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
+        if ($result != 0) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      if (!@$mail = popen($sendmail, 'w')) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
       fputs($mail, $header);
       fputs($mail, $body);
       $result = pclose($mail);
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-      if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
+      if ($result != 0) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
     }
     return true;
@@ -642,13 +642,13 @@ 
    */
   protected function MailSend($header, $body) {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+    if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -656,13 +656,13 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -670,19 +670,19 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
@@ -698,64 +698,64 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'class.smtp.php';
+    require_once $this->PluginDir.'class.smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+    if (!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       }
     }
 
 
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+    if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+      throw new phpmailerException($this->Lang('recipients_failed').$badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     }
     return true;
@@ -769,7 +769,7 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP();
     }
 
@@ -780,7 +780,7 @@ 
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+      while ($index < count($hosts) && !$connection) {
         $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
           $host = $hostinfo[1];
@@ -793,7 +793,7 @@ 
         $tls = ($this->SMTPSecure == 'tls');
         $ssl = ($this->SMTPSecure == 'ssl');
 
-        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+        if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) {
 
           $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
           $this->smtp->Hello($hello);
@@ -831,8 +831,8 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+    if (!is_null($this->smtp)) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -894,7 +894,7 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
@@ -914,7 +914,7 @@ 
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
   }
 
@@ -941,10 +941,10 @@ 
 
     $line = explode($this->LE, $message);
     $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
+    for ($i = 0; $i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+      for ($e = 0; $e < count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
           $space_left = $length - strlen($buf) - 1;
@@ -960,10 +960,10 @@ 
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+              $buf .= ' '.$part;
+              $message .= $buf.sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+              $message .= $buf.$soft_break;
             }
             $buf = '';
           }
@@ -980,22 +980,22 @@ 
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+              $message .= $part.sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+          $buf .= ($e == 0) ? $word : (' '.$word);
 
           if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
+            $message .= $buf_o.$soft_break;
             $buf = $word;
           }
         }
       }
-      $message .= $buf . $this->LE;
+      $message .= $buf.$this->LE;
     }
 
     return $message;
@@ -1024,8 +1024,7 @@ 
         if ($dec < 128) { // Single byte character.
           // If the encoded char was found at pos 0, it will fit
           // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
+          $maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
@@ -1049,11 +1048,11 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
@@ -1074,24 +1073,24 @@ 
 
     // Set the boundaries
     $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
+    $this->boundary[1] = 'b1_'.$uniq_id;
+    $this->boundary[2] = 'b2_'.$uniq_id;
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
+    if ($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-        if(count($this->to) > 0) {
+        if (count($this->to) > 0) {
           $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
           $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1105,38 +1104,38 @@ 
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (count($this->cc) > 0) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    if ($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
 
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+    if ($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -1154,27 +1153,27 @@ 
    */
   public function GetMailMIME() {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
       case 'attachments':
       case 'alt_attachments':
-        if($this->InlineImageExists()){
+        if ($this->InlineImageExists()) {
           $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+          $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
@@ -1195,7 +1194,7 @@ 
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -1216,11 +1215,11 @@ 
         break;
       case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $body .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
@@ -1261,16 +1260,16 @@ 
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
-    $result .= $this->TextLine('--' . $boundary);
+    $result .= $this->TextLine('--'.$boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
@@ -1284,7 +1283,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1293,16 +1292,16 @@ 
    * @return void
    */
   private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+    if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+      if (count($this->attachment) > 0) {
         $this->message_type = 'attachments';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
       }
     }
@@ -1314,7 +1313,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1323,7 +1322,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1342,11 +1341,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-      if ( !@is_file($path) ) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+      if (!@is_file($path)) {
+        throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE);
       }
       $filename = basename($path);
-      if ( $name == '' ) {
+      if ($name == '') {
         $name = $filename;
       }
 
@@ -1356,7 +1355,7 @@ 
         2 => $name,
         3 => $encoding,
         4 => $type,
-        5 => false,  // isStringAttachment
+        5 => false, // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
@@ -1367,7 +1366,7 @@ 
         throw $e;
       }
       error_log($e->getMessage()."\n");
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1412,29 +1411,29 @@ 
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      if ($disposition == 'inline' && isset($cidUniq[$cid])) { continue; }
       $cidUniq[$cid] = true;
 
       $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
       $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
-      if($disposition == 'inline') {
+      if ($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
       // Encode as string attachment
-      if($bString) {
+      if ($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
@@ -1458,7 +1457,7 @@ 
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+        throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE);
       }
         $magic_quotes = get_magic_quotes_runtime();
         if ($magic_quotes) {
@@ -1492,9 +1491,9 @@ 
    * @access public
    * @return string
    */
-  public function EncodeString ($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1512,7 +1511,7 @@ 
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1554,7 +1553,7 @@ 
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
+    if (strlen($str) / 3 < $x) {
       $encoding = 'B';
       // Modified by Ivan Tcholakov, 24-JAN-2010.
       //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
@@ -1635,7 +1634,7 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1651,37 +1650,37 @@ 
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+  public function EncodeQPphp($input = '', $line_max = 76, $space_conv = false) {
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
-    while( list(, $line) = each($lines) ) {
+    while (list(, $line) = each($lines)) {
       $linlen = strlen($line);
       $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+      for ($i = 0; $i < $linlen; $i++) {
+        $c = substr($line, $i, 1);
+        $dec = ord($c);
+        if (($i == 0) && ($dec == 46)) { // convert first point in the line into =2E
           $c = '=2E';
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+        if ($dec == 32) {
+          if ($i == ($linlen - 1)) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+          } else if ($space_conv) {
             $c = '=20';
           }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
+        } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+          $h2 = floor($dec / 16);
+          $h1 = floor($dec % 16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+        if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -1733,7 +1732,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeQ ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
@@ -1776,7 +1775,7 @@ 
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
-      5 => true,  // isStringAttachment
+      5 => true, // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
@@ -1797,13 +1796,13 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if ( $name == '' ) {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1814,7 +1813,7 @@ 
       2 => $name,
       3 => $encoding,
       4 => $type,
-      5 => false,  // isStringAttachment
+      5 => false, // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
@@ -1828,7 +1827,7 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
@@ -1845,7 +1844,7 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -1856,7 +1855,7 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -1867,7 +1866,7 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -1924,7 +1923,7 @@ 
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
       $lasterror = $this->smtp->getError();
       if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+        $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n";
       }
     }
     $this->ErrorInfo = $msg;
@@ -1940,7 +1939,7 @@ 
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -1969,14 +1968,14 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+      return 'Language string failed to load: '.$key;
     }
   }
 
@@ -2017,19 +2016,19 @@ 
    */
   public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
+        if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($directory == '.') ? $directory = '' : '';
+          $cid = 'cid:'.md5($filename);
           $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+          $mimeType = self::_mime_types($ext);
+          if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
+          if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
+          if ($this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType)) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
           }
         }
@@ -2037,12 +2036,12 @@ 
     }
     $this->IsHTML(true);
     $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
     if (!empty($textMsg) && empty($this->AltBody)) {
       $this->AltBody = html_entity_decode($textMsg);
     }
     if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n";
     }
   }
 
@@ -2160,10 +2159,10 @@ 
   */
   public function set($name, $value = '') {
     try {
-      if (isset($this->$name) ) {
+      if (isset($this->$name)) {
         $this->$name = $value;
       } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL);
       }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
@@ -2207,14 +2206,14 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
+    $tmp = "";
+    $line = "";
+    for ($i = 0; $i < strlen($txt); $i++) {
+      $ord = ord($txt[$i]);
+      if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+        $line .= $txt[$i];
       } else {
-        $line.="=".sprintf("%02X",$ord);
+        $line .= "=".sprintf("%02X", $ord);
       }
     }
     return $line;
@@ -2228,8 +2227,8 @@ 
    */
   public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+    if ($this->DKIM_passphrase != '') {
+      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
@@ -2245,15 +2244,15 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
+    $s = preg_replace("/\r\n\s+/", " ", $s);
+    $lines = explode("\r\n", $s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+      list($heading, $value) = explode(":", $line, 2);
+      $heading = strtolower($heading);
+      $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces
+      $lines[$key] = $heading.":".trim($value); // Don't forget to remove WSP around the value
     }
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
     return $s;
   }
 
@@ -2266,11 +2265,11 @@ 
   public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
+    $body = str_replace("\r\n", "\n", $body);
+    $body = str_replace("\n", "\r\n", $body);
     // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+      $body = substr($body, 0, strlen($body) - 2);
     }
     return $body;
   }
@@ -2283,52 +2282,52 @@ 
    * @param string $subject Subject
    * @param string $body Body
    */
-  public function DKIM_Add($headers_line,$subject,$body) {
+  public function DKIM_Add($headers_line, $subject, $body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $DKIMtime             = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
+    $headers              = explode("\r\n", $headers_line);
+    foreach ($headers as $header) {
+      if (strpos($header, 'From:') === 0) {
+        $from_header = $header;
+      } elseif (strpos($header, 'To:') === 0) {
+        $to_header = $header;
       }
     }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+    $DKIMlen  = strlen($body); // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n".
+                "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n".
                 "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\td=".$this->DKIM_domain.";".$ident."\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tbh=".$DKIMb64.";\r\n".
                 "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $toSign   = $this->DKIM_HeaderC($from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+      $params = array($isSent, $to, $cc, $bcc, $subject, $body);
+      call_user_func_array($this->action_function, $params);
     }
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
     return $errorMsg;
   }
 }

Braces +9 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<') ) {
+    exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+}
 
 class PHPMailer {
 
@@ -1502,8 +1504,9 @@ 
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                  $encoded .= $this->LE;
+        }
         break;
       case 'binary':
         $encoded = $str;
@@ -2264,7 +2267,9 @@ 
    * @param string $body Message Body
    */
   public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
+    if ($body == '') {
+        return "\r\n";
+    }
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);

main/inc/lib/phpmailer/class.pop3.php

Doc Comments +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
    * @param string $host
    * @param integer $port
    * @param integer $tval
-   * @return boolean
+   * @return boolean|null
    */
   public function Connect ($host, $port = false, $tval = 30) {
     //  Are we already connected?

Indentation +203 added lines, -203 removed lines

@@ -60,103 +60,103 @@ 
  */
 
 class POP3 {
-  /**
-   * Default POP3 port
-   * @var int
-   */
-  public $POP3_PORT = 110;
-
-  /**
-   * Default Timeout
-   * @var int
-   */
-  public $POP3_TIMEOUT = 30;
-
-  /**
-   * POP3 Carriage Return + Line Feed
-   * @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   * Displaying Debug warnings? (0 = now, 1+ = yes)
-   * @var int
-   */
-  public $do_debug = 2;
-
-  /**
-   * POP3 Mail Server
-   * @var string
-   */
-  public $host;
-
-  /**
-   * POP3 Port
-   * @var int
-   */
-  public $port;
-
-  /**
-   * POP3 Timeout Value
-   * @var int
-   */
-  public $tval;
-
-  /**
-   * POP3 Username
-   * @var string
-   */
-  public $username;
-
-  /**
-   * POP3 Password
-   * @var string
-   */
-  public $password;
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private $pop_conn;
-  private $connected;
-  private $error;     //  Error log array
-
-  /**
-   * Constructor, sets the initial values
-   * @access public
-   * @return POP3
-   */
-  public function __construct() {
+    /**
+     * Default POP3 port
+     * @var int
+     */
+    public $POP3_PORT = 110;
+
+    /**
+     * Default Timeout
+     * @var int
+     */
+    public $POP3_TIMEOUT = 30;
+
+    /**
+     * POP3 Carriage Return + Line Feed
+     * @var string
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Displaying Debug warnings? (0 = now, 1+ = yes)
+     * @var int
+     */
+    public $do_debug = 2;
+
+    /**
+     * POP3 Mail Server
+     * @var string
+     */
+    public $host;
+
+    /**
+     * POP3 Port
+     * @var int
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value
+     * @var int
+     */
+    public $tval;
+
+    /**
+     * POP3 Username
+     * @var string
+     */
+    public $username;
+
+    /**
+     * POP3 Password
+     * @var string
+     */
+    public $password;
+
+    /////////////////////////////////////////////////
+    // PROPERTIES, PRIVATE AND PROTECTED
+    /////////////////////////////////////////////////
+
+    private $pop_conn;
+    private $connected;
+    private $error;     //  Error log array
+
+    /**
+     * Constructor, sets the initial values
+     * @access public
+     * @return POP3
+     */
+    public function __construct() {
     $this->pop_conn  = 0;
     $this->connected = false;
     $this->error     = null;
-  }
-
-  /**
-   * Combination of public events - connect, login, disconnect
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @param string $username
-   * @param string $password
-   */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
+    }
+
+    /**
+     * Combination of public events - connect, login, disconnect
+     * @access public
+     * @param string $host
+     * @param integer $port
+     * @param integer $tval
+     * @param string $username
+     * @param string $password
+     */
+    public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
     $this->host = $host;
 
     //  If no port value is passed, retrieve it
     if ($port == false) {
-      $this->port = $this->POP3_PORT;
+        $this->port = $this->POP3_PORT;
     } else {
-      $this->port = $port;
+        $this->port = $port;
     }
 
     //  If no port value is passed, retrieve it
     if ($tval == false) {
-      $this->tval = $this->POP3_TIMEOUT;
+        $this->tval = $this->POP3_TIMEOUT;
     } else {
-      $this->tval = $tval;
+        $this->tval = $tval;
     }
 
     $this->do_debug = $debug_level;
@@ -170,13 +170,13 @@ 
     $result = $this->Connect($this->host, $this->port, $this->tval);
 
     if ($result) {
-      $login_result = $this->Login($this->username, $this->password);
+        $login_result = $this->Login($this->username, $this->password);
 
-      if ($login_result) {
+        if ($login_result) {
         $this->Disconnect();
 
         return true;
-      }
+        }
 
     }
 
@@ -184,20 +184,20 @@ 
     $this->Disconnect();
 
     return false;
-  }
-
-  /**
-   * Connect to the POP3 server
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @return boolean
-   */
-  public function Connect ($host, $port = false, $tval = 30) {
+    }
+
+    /**
+     * Connect to the POP3 server
+     * @access public
+     * @param string $host
+     * @param integer $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function Connect ($host, $port = false, $tval = 30) {
     //  Are we already connected?
     if ($this->connected) {
-      return true;
+        return true;
     }
 
     /*
@@ -209,45 +209,45 @@ 
 
     //  Connect to the POP3 server
     $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
+                    $port,    //  Port #
+                    $errno,   //  Error Number
+                    $errstr,  //  Error Message
+                    $tval);   //  Timeout (seconds)
 
     //  Restore the error handler
     restore_error_handler();
 
     //  Does the Error Log now contain anything?
     if ($this->error && $this->do_debug >= 1) {
-      $this->displayErrors();
+        $this->displayErrors();
     }
 
     //  Did we connect?
     if ($this->pop_conn == false) {
-      //  It would appear not...
-      $this->error = array(
+        //  It would appear not...
+        $this->error = array(
         'error' => "Failed to connect to server $host on port $port",
         'errno' => $errno,
         'errstr' => $errstr
-      );
+        );
 
-      if ($this->do_debug >= 1) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
 
-      return false;
+        return false;
     }
 
     //  Increase the stream time-out
 
     //  Check for PHP 4.3.0 or later
     if (version_compare(phpversion(), '5.0.0', 'ge')) {
-      stream_set_timeout($this->pop_conn, $tval, 0);
+        stream_set_timeout($this->pop_conn, $tval, 0);
     } else {
-      //  Does not work on Windows
-      if (substr(PHP_OS, 0, 3) !== 'WIN') {
+        //  Does not work on Windows
+        if (substr(PHP_OS, 0, 3) !== 'WIN') {
         socket_set_timeout($this->pop_conn, $tval, 0);
-      }
+        }
     }
 
     //  Get the POP3 server response
@@ -257,33 +257,33 @@ 
     if ($this->checkResponse($pop3_response)) {
     //  The connection is established and the POP3 server is talking
     $this->connected = true;
-      return true;
+        return true;
     }
 
-  }
+    }
 
-  /**
-   * Login to the POP3 server (does not support APOP yet)
-   * @access public
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function Login ($username = '', $password = '') {
+    /**
+     * Login to the POP3 server (does not support APOP yet)
+     * @access public
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    public function Login ($username = '', $password = '') {
     if ($this->connected == false) {
-      $this->error = 'Not connected to POP3 server';
+        $this->error = 'Not connected to POP3 server';
 
-      if ($this->do_debug >= 1) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
     }
 
     if (empty($username)) {
-      $username = $this->username;
+        $username = $this->username;
     }
 
     if (empty($password)) {
-      $password = $this->password;
+        $password = $this->password;
     }
 
     $pop_username = "USER $username" . $this->CRLF;
@@ -294,114 +294,114 @@ 
     $pop3_response = $this->getResponse();
 
     if ($this->checkResponse($pop3_response)) {
-      //  Send the Password
-      $this->sendString($pop_password);
-      $pop3_response = $this->getResponse();
+        //  Send the Password
+        $this->sendString($pop_password);
+        $pop3_response = $this->getResponse();
 
-      if ($this->checkResponse($pop3_response)) {
+        if ($this->checkResponse($pop3_response)) {
         return true;
-      } else {
+        } else {
         return false;
-      }
+        }
     } else {
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-   * Disconnect from the POP3 server
-   * @access public
-   */
-  public function Disconnect () {
+    /**
+     * Disconnect from the POP3 server
+     * @access public
+     */
+    public function Disconnect () {
     $this->sendString('QUIT');
 
     fclose($this->pop_conn);
-  }
-
-  /////////////////////////////////////////////////
-  //  Private Methods
-  /////////////////////////////////////////////////
-
-  /**
-   * Get the socket response back.
-   * $size is the maximum number of bytes to retrieve
-   * @access private
-   * @param integer $size
-   * @return string
-   */
-  private function getResponse ($size = 128) {
+    }
+
+    /////////////////////////////////////////////////
+    //  Private Methods
+    /////////////////////////////////////////////////
+
+    /**
+     * Get the socket response back.
+     * $size is the maximum number of bytes to retrieve
+     * @access private
+     * @param integer $size
+     * @return string
+     */
+    private function getResponse ($size = 128) {
     $pop3_response = fgets($this->pop_conn, $size);
 
     return $pop3_response;
-  }
-
-  /**
-   * Send a string down the open socket connection to the POP3 server
-   * @access private
-   * @param string $string
-   * @return integer
-   */
-  private function sendString ($string) {
+    }
+
+    /**
+     * Send a string down the open socket connection to the POP3 server
+     * @access private
+     * @param string $string
+     * @return integer
+     */
+    private function sendString ($string) {
     $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
 
     return $bytes_sent;
-  }
-
-  /**
-   * Checks the POP3 server response for +OK or -ERR
-   * @access private
-   * @param string $string
-   * @return boolean
-   */
-  private function checkResponse ($string) {
+    }
+
+    /**
+     * Checks the POP3 server response for +OK or -ERR
+     * @access private
+     * @param string $string
+     * @return boolean
+     */
+    private function checkResponse ($string) {
     if (substr($string, 0, 3) !== '+OK') {
-      $this->error = array(
+        $this->error = array(
         'error' => "Server reported an error: $string",
         'errno' => 0,
         'errstr' => ''
-      );
+        );
 
-      if ($this->do_debug >= 1) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
 
-      return false;
+        return false;
     } else {
-      return true;
+        return true;
     }
 
-  }
+    }
 
-  /**
-   * If debug is enabled, display the error message array
-   * @access private
-   */
-  private function displayErrors () {
+    /**
+     * If debug is enabled, display the error message array
+     * @access private
+     */
+    private function displayErrors () {
     echo '<pre>';
 
     foreach ($this->error as $single_error) {
-      print_r($single_error);
+        print_r($single_error);
     }
 
     echo '</pre>';
-  }
-
-  /**
-   * Takes over from PHP for the socket warning handler
-   * @access private
-   * @param integer $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param integer $errline
-   */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
+    }
+
+    /**
+     * Takes over from PHP for the socket warning handler
+     * @access private
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     */
+    private function catchWarning ($errno, $errstr, $errfile, $errline) {
     $this->error[] = array(
-      'error' => "Connecting to the POP3 server raised a PHP warning: ",
-      'errno' => $errno,
-      'errstr' => $errstr
+        'error' => "Connecting to the POP3 server raised a PHP warning: ",
+        'errno' => $errno,
+        'errstr' => $errstr
     );
-  }
+    }
 
-  //  End of class
+    //  End of class
 }
 ?>
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -120,7 +120,7 @@ 
 
   private $pop_conn;
   private $connected;
-  private $error;     //  Error log array
+  private $error; //  Error log array
 
   /**
    * Constructor, sets the initial values
@@ -142,7 +142,7 @@ 
    * @param string $username
    * @param string $password
    */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
+  public function Authorise($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
     $this->host = $host;
 
     //  If no port value is passed, retrieve it
@@ -194,7 +194,7 @@ 
    * @param integer $tval
    * @return boolean
    */
-  public function Connect ($host, $port = false, $tval = 30) {
+  public function Connect($host, $port = false, $tval = 30) {
     //  Are we already connected?
     if ($this->connected) {
       return true;
@@ -208,11 +208,11 @@ 
     set_error_handler(array(&$this, 'catchWarning'));
 
     //  Connect to the POP3 server
-    $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
+    $this->pop_conn = fsockopen($host, //  POP3 Host
+                  $port, //  Port #
+                  $errno, //  Error Number
+                  $errstr, //  Error Message
+                  $tval); //  Timeout (seconds)
 
     //  Restore the error handler
     restore_error_handler();
@@ -269,7 +269,7 @@ 
    * @param string $password
    * @return boolean
    */
-  public function Login ($username = '', $password = '') {
+  public function Login($username = '', $password = '') {
     if ($this->connected == false) {
       $this->error = 'Not connected to POP3 server';
 
@@ -286,8 +286,8 @@ 
       $password = $this->password;
     }
 
-    $pop_username = "USER $username" . $this->CRLF;
-    $pop_password = "PASS $password" . $this->CRLF;
+    $pop_username = "USER $username".$this->CRLF;
+    $pop_password = "PASS $password".$this->CRLF;
 
     //  Send the Username
     $this->sendString($pop_username);
@@ -312,7 +312,7 @@ 
    * Disconnect from the POP3 server
    * @access public
    */
-  public function Disconnect () {
+  public function Disconnect() {
     $this->sendString('QUIT');
 
     fclose($this->pop_conn);
@@ -329,7 +329,7 @@ 
    * @param integer $size
    * @return string
    */
-  private function getResponse ($size = 128) {
+  private function getResponse($size = 128) {
     $pop3_response = fgets($this->pop_conn, $size);
 
     return $pop3_response;
@@ -341,7 +341,7 @@ 
    * @param string $string
    * @return integer
    */
-  private function sendString ($string) {
+  private function sendString($string) {
     $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
 
     return $bytes_sent;
@@ -353,7 +353,7 @@ 
    * @param string $string
    * @return boolean
    */
-  private function checkResponse ($string) {
+  private function checkResponse($string) {
     if (substr($string, 0, 3) !== '+OK') {
       $this->error = array(
         'error' => "Server reported an error: $string",
@@ -376,7 +376,7 @@ 
    * If debug is enabled, display the error message array
    * @access private
    */
-  private function displayErrors () {
+  private function displayErrors() {
     echo '<pre>';
 
     foreach ($this->error as $single_error) {
@@ -394,7 +394,7 @@ 
    * @param string $errfile
    * @param integer $errline
    */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
+  private function catchWarning($errno, $errstr, $errfile, $errline) {
     $this->error[] = array(
       'error' => "Connecting to the POP3 server raised a PHP warning: ",
       'errno' => $errno,

main/inc/lib/phpmailer/class.smtp.php

Doc Comments +4 added lines

@@ -321,6 +321,7 @@ 
    * SMTP CODE FAILURE: 451,554

    * SMTP CODE ERROR  : 500,501,503,421

    * @access public

+   * @param string $msg_data
    * @return bool

    */

   public function Data($msg_data) {

@@ -488,6 +489,8 @@ 
   /**

    * Sends a HELO/EHLO command.

    * @access private

+   * @param string $hello
+   * @param string $host
    * @return bool

    */

   private function SendHello($hello, $host) {

@@ -528,6 +531,7 @@ 
    * SMTP CODE SUCCESS: 552,451,452

    * SMTP CODE SUCCESS: 500,501,421

    * @access public

+   * @param string $from
    * @return bool

    */

   public function Mail($from) {

Indentation +429 added lines, -429 removed lines

@@ -47,130 +47,130 @@ 
  */

 

 class SMTP {

-  /**

-   *  SMTP server port

-   *  @var int

-   */

-  public $SMTP_PORT = 25;

-

-  /**

-   *  SMTP reply line ending

-   *  @var string

-   */

-  public $CRLF = "\r\n";

-

-  /**

-   *  Sets whether debugging is turned on

-   *  @var bool

-   */

-  public $do_debug;       // the level of debug to perform

-

-  /**

-   *  Sets VERP use on/off (default is off)

-   *  @var bool

-   */

-  public $do_verp = false;

-

-  /////////////////////////////////////////////////

-  // PROPERTIES, PRIVATE AND PROTECTED

-  /////////////////////////////////////////////////

-

-  private $smtp_conn; // the socket to the server

-  private $error;     // error if any on the last call

-  private $helo_rply; // the reply the server sent to us for HELO

-

-  /**

-   * Initialize the class so that the data is in a known state.

-   * @access public

-   * @return void

-   */

-  public function __construct() {

+    /**

+     *  SMTP server port

+     *  @var int

+     */

+    public $SMTP_PORT = 25;

+

+    /**

+     *  SMTP reply line ending

+     *  @var string

+     */

+    public $CRLF = "\r\n";

+

+    /**

+     *  Sets whether debugging is turned on

+     *  @var bool

+     */

+    public $do_debug;       // the level of debug to perform

+

+    /**

+     *  Sets VERP use on/off (default is off)

+     *  @var bool

+     */

+    public $do_verp = false;

+

+    /////////////////////////////////////////////////

+    // PROPERTIES, PRIVATE AND PROTECTED

+    /////////////////////////////////////////////////

+

+    private $smtp_conn; // the socket to the server

+    private $error;     // error if any on the last call

+    private $helo_rply; // the reply the server sent to us for HELO

+

+    /**

+     * Initialize the class so that the data is in a known state.

+     * @access public

+     * @return void

+     */

+    public function __construct() {

     $this->smtp_conn = 0;

     $this->error = null;

     $this->helo_rply = null;

 

     $this->do_debug = 0;

-  }

-

-  /////////////////////////////////////////////////

-  // CONNECTION FUNCTIONS

-  /////////////////////////////////////////////////

-

-  /**

-   * Connect to the server specified on the port specified.

-   * If the port is not specified use the default SMTP_PORT.

-   * If tval is specified then a connection will try and be

-   * established with the server for that number of seconds.

-   * If tval is not specified the default is 30 seconds to

-   * try on the connection.

-   *

-   * SMTP CODE SUCCESS: 220

-   * SMTP CODE FAILURE: 421

-   * @access public

-   * @return bool

-   */

-  public function Connect($host, $port = 0, $tval = 30) {

+    }

+

+    /////////////////////////////////////////////////

+    // CONNECTION FUNCTIONS

+    /////////////////////////////////////////////////

+

+    /**

+     * Connect to the server specified on the port specified.

+     * If the port is not specified use the default SMTP_PORT.

+     * If tval is specified then a connection will try and be

+     * established with the server for that number of seconds.

+     * If tval is not specified the default is 30 seconds to

+     * try on the connection.

+     *

+     * SMTP CODE SUCCESS: 220

+     * SMTP CODE FAILURE: 421

+     * @access public

+     * @return bool

+     */

+    public function Connect($host, $port = 0, $tval = 30) {

     // set the error val to null so there is no confusion

     $this->error = null;

 

     // make sure we are __not__ connected

     if($this->connected()) {

-      // already connected, generate error

-      $this->error = array("error" => "Already connected to a server");

-      return false;

+        // already connected, generate error

+        $this->error = array("error" => "Already connected to a server");

+        return false;

     }

 

     if(empty($port)) {

-      $port = $this->SMTP_PORT;

+        $port = $this->SMTP_PORT;

     }

 

     // connect to the smtp server

     $this->smtp_conn = @fsockopen($host,    // the host of the server

-                                 $port,    // the port to use

-                                 $errno,   // error number if any

-                                 $errstr,  // error message if any

-                                 $tval);   // give up after ? secs

+                                    $port,    // the port to use

+                                    $errno,   // error number if any

+                                    $errstr,  // error message if any

+                                    $tval);   // give up after ? secs

     // verify we connected properly

     if(empty($this->smtp_conn)) {

-      $this->error = array("error" => "Failed to connect to server",

-                           "errno" => $errno,

-                           "errstr" => $errstr);

-      if($this->do_debug >= 1) {

+        $this->error = array("error" => "Failed to connect to server",

+                            "errno" => $errno,

+                            "errstr" => $errstr);

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // SMTP server can take longer to respond, give longer timeout for first read

     // Windows does not have support for this timeout function

     if(substr(PHP_OS, 0, 3) != "WIN")

-     socket_set_timeout($this->smtp_conn, $tval, 0);

+        socket_set_timeout($this->smtp_conn, $tval, 0);

 

     // get any announcement

     $announce = $this->get_lines();

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';

     }

 

     return true;

-  }

-

-  /**

-   * Initiate a TLS communication with the server.

-   *

-   * SMTP CODE 220 Ready to start TLS

-   * SMTP CODE 501 Syntax error (no parameters allowed)

-   * SMTP CODE 454 TLS not available due to temporary reason

-   * @access public

-   * @return bool success

-   */

-  public function StartTLS() {

+    }

+

+    /**

+     * Initiate a TLS communication with the server.

+     *

+     * SMTP CODE 220 Ready to start TLS

+     * SMTP CODE 501 Syntax error (no parameters allowed)

+     * SMTP CODE 454 TLS not available due to temporary reason

+     * @access public

+     * @return bool success

+     */

+    public function StartTLS() {

     $this->error = null; # to avoid confusion

 

     if(!$this->connected()) {

-      $this->error = array("error" => "Called StartTLS() without being connected");

-      return false;

+        $this->error = array("error" => "Called StartTLS() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);

@@ -179,35 +179,35 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 220) {

-      $this->error =

-         array("error"     => "STARTTLS not accepted from server",

-               "smtp_code" => $code,

-               "smtp_msg"  => substr($rply,4));

-      if($this->do_debug >= 1) {

+        $this->error =

+            array("error"     => "STARTTLS not accepted from server",

+                "smtp_code" => $code,

+                "smtp_msg"  => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Begin encrypted connection

     if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

-      return false;

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Performs SMTP authentication.  Must be run after running the

-   * Hello() method.  Returns true if successfully authenticated.

-   * @access public

-   * @return bool

-   */

-  public function Authenticate($username, $password) {

+    }

+

+    /**

+     * Performs SMTP authentication.  Must be run after running the

+     * Hello() method.  Returns true if successfully authenticated.

+     * @access public

+     * @return bool

+     */

+    public function Authenticate($username, $password) {

     // Start authentication

     fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);

 

@@ -215,14 +215,14 @@ 
     $code = substr($rply,0,3);

 

     if($code != 334) {

-      $this->error =

+        $this->error =

         array("error" => "AUTH not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Send encoded username

@@ -232,14 +232,14 @@ 
     $code = substr($rply,0,3);

 

     if($code != 334) {

-      $this->error =

+        $this->error =

         array("error" => "Username not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     // Send encoded password

@@ -249,87 +249,87 @@ 
     $code = substr($rply,0,3);

 

     if($code != 235) {

-      $this->error =

+        $this->error =

         array("error" => "Password not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Returns true if connected to a server otherwise false

-   * @access public

-   * @return bool

-   */

-  public function Connected() {

+    }

+

+    /**

+     * Returns true if connected to a server otherwise false

+     * @access public

+     * @return bool

+     */

+    public function Connected() {

     if(!empty($this->smtp_conn)) {

-      $sock_status = socket_get_status($this->smtp_conn);

-      if($sock_status["eof"]) {

+        $sock_status = socket_get_status($this->smtp_conn);

+        if($sock_status["eof"]) {

         // the socket is valid but we are not connected

         if($this->do_debug >= 1) {

             echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";

         }

         $this->Close();

         return false;

-      }

-      return true; // everything looks good

+        }

+        return true; // everything looks good

     }

     return false;

-  }

-

-  /**

-   * Closes the socket and cleans up the state of the class.

-   * It is not considered good to use this function without

-   * first trying to use QUIT.

-   * @access public

-   * @return void

-   */

-  public function Close() {

+    }

+

+    /**

+     * Closes the socket and cleans up the state of the class.

+     * It is not considered good to use this function without

+     * first trying to use QUIT.

+     * @access public

+     * @return void

+     */

+    public function Close() {

     $this->error = null; // so there is no confusion

     $this->helo_rply = null;

     if(!empty($this->smtp_conn)) {

-      // close the connection and cleanup

-      fclose($this->smtp_conn);

-      $this->smtp_conn = 0;

-    }

-  }

-

-  /////////////////////////////////////////////////

-  // SMTP COMMANDS

-  /////////////////////////////////////////////////

-

-  /**

-   * Issues a data command and sends the msg_data to the server

-   * finializing the mail transaction. $msg_data is the message

-   * that is to be send with the headers. Each header needs to be

-   * on a single line followed by a <CRLF> with the message headers

-   * and the message body being seperated by and additional <CRLF>.

-   *

-   * Implements rfc 821: DATA <CRLF>

-   *

-   * SMTP CODE INTERMEDIATE: 354

-   *     [data]

-   *     <CRLF>.<CRLF>

-   *     SMTP CODE SUCCESS: 250

-   *     SMTP CODE FAILURE: 552,554,451,452

-   * SMTP CODE FAILURE: 451,554

-   * SMTP CODE ERROR  : 500,501,503,421

-   * @access public

-   * @return bool

-   */

-  public function Data($msg_data) {

+        // close the connection and cleanup

+        fclose($this->smtp_conn);

+        $this->smtp_conn = 0;

+    }

+    }

+

+    /////////////////////////////////////////////////

+    // SMTP COMMANDS

+    /////////////////////////////////////////////////

+

+    /**

+     * Issues a data command and sends the msg_data to the server

+     * finializing the mail transaction. $msg_data is the message

+     * that is to be send with the headers. Each header needs to be

+     * on a single line followed by a <CRLF> with the message headers

+     * and the message body being seperated by and additional <CRLF>.

+     *

+     * Implements rfc 821: DATA <CRLF>

+     *

+     * SMTP CODE INTERMEDIATE: 354

+     *     [data]

+     *     <CRLF>.<CRLF>

+     *     SMTP CODE SUCCESS: 250

+     *     SMTP CODE FAILURE: 552,554,451,452

+     * SMTP CODE FAILURE: 451,554

+     * SMTP CODE ERROR  : 500,501,503,421

+     * @access public

+     * @return bool

+     */

+    public function Data($msg_data) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Data() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Data() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"DATA" . $this->CRLF);

@@ -338,18 +338,18 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 354) {

-      $this->error =

+        $this->error =

         array("error" => "DATA command not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     /* the server is ready to accept data!

@@ -380,49 +380,49 @@ 
     $field = substr($lines[0],0,strpos($lines[0],":"));

     $in_headers = false;

     if(!empty($field) && !strstr($field," ")) {

-      $in_headers = true;

+        $in_headers = true;

     }

 

     $max_line_length = 998; // used below; set here for ease in change

 

     while(list(,$line) = @each($lines)) {

-      $lines_out = null;

-      if($line == "" && $in_headers) {

+        $lines_out = null;

+        if($line == "" && $in_headers) {

         $in_headers = false;

-      }

-      // ok we need to break this line up into several smaller lines

-      while(strlen($line) > $max_line_length) {

+        }

+        // ok we need to break this line up into several smaller lines

+        while(strlen($line) > $max_line_length) {

         $pos = strrpos(substr($line,0,$max_line_length)," ");

 

         // Patch to fix DOS attack

         if(!$pos) {

-          $pos = $max_line_length - 1;

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos);

+            $pos = $max_line_length - 1;

+            $lines_out[] = substr($line,0,$pos);

+            $line = substr($line,$pos);

         } else {

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos + 1);

+            $lines_out[] = substr($line,0,$pos);

+            $line = substr($line,$pos + 1);

         }

 

         /* if processing headers add a LWSP-char to the front of new line

          * rfc 822 on long msg headers

          */

         if($in_headers) {

-          $line = "\t" . $line;

+            $line = "\t" . $line;

         }

-      }

-      $lines_out[] = $line;

+        }

+        $lines_out[] = $line;

 

-      // send the lines to the server

-      while(list(,$line_out) = @each($lines_out)) {

+        // send the lines to the server

+        while(list(,$line_out) = @each($lines_out)) {

         if(strlen($line_out) > 0)

         {

-          if(substr($line_out, 0, 1) == ".") {

+            if(substr($line_out, 0, 1) == ".") {

             $line_out = "." . $line_out;

-          }

+            }

         }

         fputs($this->smtp_conn,$line_out . $this->CRLF);

-      }

+        }

     }

 

     // message data has been sent

@@ -432,111 +432,111 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "DATA not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the HELO command to the smtp server.

-   * This makes sure that we and the server are in

-   * the same known state.

-   *

-   * Implements from rfc 821: HELO <SP> <domain> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE ERROR  : 500, 501, 504, 421

-   * @access public

-   * @return bool

-   */

-  public function Hello($host = '') {

+    }

+

+    /**

+     * Sends the HELO command to the smtp server.

+     * This makes sure that we and the server are in

+     * the same known state.

+     *

+     * Implements from rfc 821: HELO <SP> <domain> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE ERROR  : 500, 501, 504, 421

+     * @access public

+     * @return bool

+     */

+    public function Hello($host = '') {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

+        $this->error = array(

             "error" => "Called Hello() without being connected");

-      return false;

+        return false;

     }

 

     // if hostname for HELO was not specified send default

     if(empty($host)) {

-      // determine appropriate default to send to server

-      $host = "localhost";

+        // determine appropriate default to send to server

+        $host = "localhost";

     }

 

     // Send extended hello first (RFC 2821)

     if(!$this->SendHello("EHLO", $host)) {

-      if(!$this->SendHello("HELO", $host)) {

+        if(!$this->SendHello("HELO", $host)) {

         return false;

-      }

+        }

     }

 

     return true;

-  }

-

-  /**

-   * Sends a HELO/EHLO command.

-   * @access private

-   * @return bool

-   */

-  private function SendHello($hello, $host) {

+    }

+

+    /**

+     * Sends a HELO/EHLO command.

+     * @access private

+     * @return bool

+     */

+    private function SendHello($hello, $host) {

     fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);

 

     $rply = $this->get_lines();

     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => $hello . " not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     $this->helo_rply = $rply;

 

     return true;

-  }

-

-  /**

-   * Starts a mail transaction from the email address specified in

-   * $from. Returns true if successful or false otherwise. If True

-   * the mail transaction is started and then one or more Recipient

-   * commands may be called followed by a Data command.

-   *

-   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE SUCCESS: 552,451,452

-   * SMTP CODE SUCCESS: 500,501,421

-   * @access public

-   * @return bool

-   */

-  public function Mail($from) {

+    }

+

+    /**

+     * Starts a mail transaction from the email address specified in

+     * $from. Returns true if successful or false otherwise. If True

+     * the mail transaction is started and then one or more Recipient

+     * commands may be called followed by a Data command.

+     *

+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE SUCCESS: 552,451,452

+     * SMTP CODE SUCCESS: 500,501,421

+     * @access public

+     * @return bool

+     */

+    public function Mail($from) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Mail() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Mail() without being connected");

+        return false;

     }

 

     $useVerp = ($this->do_verp ? "XVERP" : "");

@@ -546,40 +546,40 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "MAIL not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the quit command to the server and then closes the socket

-   * if there is no error or the $close_on_error argument is true.

-   *

-   * Implements from rfc 821: QUIT <CRLF>

-   *

-   * SMTP CODE SUCCESS: 221

-   * SMTP CODE ERROR  : 500

-   * @access public

-   * @return bool

-   */

-  public function Quit($close_on_error = true) {

+    }

+

+    /**

+     * Sends the quit command to the server and then closes the socket

+     * if there is no error or the $close_on_error argument is true.

+     *

+     * Implements from rfc 821: QUIT <CRLF>

+     *

+     * SMTP CODE SUCCESS: 221

+     * SMTP CODE ERROR  : 500

+     * @access public

+     * @return bool

+     */

+    public function Quit($close_on_error = true) {

     $this->error = null; // so there is no confusion

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Quit() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Quit() without being connected");

+        return false;

     }

 

     // send the quit command to the server

@@ -589,7 +589,7 @@ 
     $byemsg = $this->get_lines();

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

     }

 

     $rval = true;

@@ -597,42 +597,42 @@ 
 

     $code = substr($byemsg,0,3);

     if($code != 221) {

-      // use e as a tmp var cause Close will overwrite $this->error

-      $e = array("error" => "SMTP server rejected quit command",

-                 "smtp_code" => $code,

-                 "smtp_rply" => substr($byemsg,4));

-      $rval = false;

-      if($this->do_debug >= 1) {

+        // use e as a tmp var cause Close will overwrite $this->error

+        $e = array("error" => "SMTP server rejected quit command",

+                    "smtp_code" => $code,

+                    "smtp_rply" => substr($byemsg,4));

+        $rval = false;

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';

-      }

+        }

     }

 

     if(empty($e) || $close_on_error) {

-      $this->Close();

+        $this->Close();

     }

 

     return $rval;

-  }

-

-  /**

-   * Sends the command RCPT to the SMTP server with the TO: argument of $to.

-   * Returns true if the recipient was accepted false if it was rejected.

-   *

-   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250,251

-   * SMTP CODE FAILURE: 550,551,552,553,450,451,452

-   * SMTP CODE ERROR  : 500,501,503,421

-   * @access public

-   * @return bool

-   */

-  public function Recipient($to) {

+    }

+

+    /**

+     * Sends the command RCPT to the SMTP server with the TO: argument of $to.

+     * Returns true if the recipient was accepted false if it was rejected.

+     *

+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250,251

+     * SMTP CODE FAILURE: 550,551,552,553,450,451,452

+     * SMTP CODE ERROR  : 500,501,503,421

+     * @access public

+     * @return bool

+     */

+    public function Recipient($to) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Recipient() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Recipient() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);

@@ -641,41 +641,41 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250 && $code != 251) {

-      $this->error =

+        $this->error =

         array("error" => "RCPT not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * Sends the RSET command to abort and transaction that is

-   * currently in progress. Returns true if successful false

-   * otherwise.

-   *

-   * Implements rfc 821: RSET <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE ERROR  : 500,501,504,421

-   * @access public

-   * @return bool

-   */

-  public function Reset() {

+    }

+

+    /**

+     * Sends the RSET command to abort and transaction that is

+     * currently in progress. Returns true if successful false

+     * otherwise.

+     *

+     * Implements rfc 821: RSET <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE ERROR  : 500,501,504,421

+     * @access public

+     * @return bool

+     */

+    public function Reset() {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-              "error" => "Called Reset() without being connected");

-      return false;

+        $this->error = array(

+                "error" => "Called Reset() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"RSET" . $this->CRLF);

@@ -684,46 +684,46 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "RSET failed",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

 

     return true;

-  }

-

-  /**

-   * Starts a mail transaction from the email address specified in

-   * $from. Returns true if successful or false otherwise. If True

-   * the mail transaction is started and then one or more Recipient

-   * commands may be called followed by a Data command. This command

-   * will send the message to the users terminal if they are logged

-   * in and send them an email.

-   *

-   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE SUCCESS: 552,451,452

-   * SMTP CODE SUCCESS: 500,501,502,421

-   * @access public

-   * @return bool

-   */

-  public function SendAndMail($from) {

+    }

+

+    /**

+     * Starts a mail transaction from the email address specified in

+     * $from. Returns true if successful or false otherwise. If True

+     * the mail transaction is started and then one or more Recipient

+     * commands may be called followed by a Data command. This command

+     * will send the message to the users terminal if they are logged

+     * in and send them an email.

+     *

+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE SUCCESS: 552,451,452

+     * SMTP CODE SUCCESS: 500,501,502,421

+     * @access public

+     * @return bool

+     */

+    public function SendAndMail($from) {

     $this->error = null; // so no confusion is caused

 

     if(!$this->connected()) {

-      $this->error = array(

-          "error" => "Called SendAndMail() without being connected");

-      return false;

+        $this->error = array(

+            "error" => "Called SendAndMail() without being connected");

+        return false;

     }

 

     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);

@@ -732,82 +732,82 @@ 
     $code = substr($rply,0,3);

 

     if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

     }

 

     if($code != 250) {

-      $this->error =

+        $this->error =

         array("error" => "SAML not accepted from server",

-              "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

+                "smtp_code" => $code,

+                "smtp_msg" => substr($rply,4));

+        if($this->do_debug >= 1) {

         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

-      }

-      return false;

+        }

+        return false;

     }

     return true;

-  }

-

-  /**

-   * This is an optional command for SMTP that this class does not

-   * support. This method is here to make the RFC821 Definition

-   * complete for this class and __may__ be implimented in the future

-   *

-   * Implements from rfc 821: TURN <CRLF>

-   *

-   * SMTP CODE SUCCESS: 250

-   * SMTP CODE FAILURE: 502

-   * SMTP CODE ERROR  : 500, 503

-   * @access public

-   * @return bool

-   */

-  public function Turn() {

+    }

+

+    /**

+     * This is an optional command for SMTP that this class does not

+     * support. This method is here to make the RFC821 Definition

+     * complete for this class and __may__ be implimented in the future

+     *

+     * Implements from rfc 821: TURN <CRLF>

+     *

+     * SMTP CODE SUCCESS: 250

+     * SMTP CODE FAILURE: 502

+     * SMTP CODE ERROR  : 500, 503

+     * @access public

+     * @return bool

+     */

+    public function Turn() {

     $this->error = array("error" => "This method, TURN, of the SMTP ".

                                     "is not implemented");

     if($this->do_debug >= 1) {

-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';

+        echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';

     }

     return false;

-  }

-

-  /**

-  * Get the current error

-  * @access public

-  * @return array

-  */

-  public function getError() {

+    }

+

+    /**

+     * Get the current error

+     * @access public

+     * @return array

+     */

+    public function getError() {

     return $this->error;

-  }

-

-  /////////////////////////////////////////////////

-  // INTERNAL FUNCTIONS

-  /////////////////////////////////////////////////

-

-  /**

-   * Read in as many lines as possible

-   * either before eof or socket timeout occurs on the operation.

-   * With SMTP we can tell if we have more lines to read if the

-   * 4th character is '-' symbol. If it is a space then we don't

-   * need to read anything else.

-   * @access private

-   * @return string

-   */

-  private function get_lines() {

+    }

+

+    /////////////////////////////////////////////////

+    // INTERNAL FUNCTIONS

+    /////////////////////////////////////////////////

+

+    /**

+     * Read in as many lines as possible

+     * either before eof or socket timeout occurs on the operation.

+     * With SMTP we can tell if we have more lines to read if the

+     * 4th character is '-' symbol. If it is a space then we don't

+     * need to read anything else.

+     * @access private

+     * @return string

+     */

+    private function get_lines() {

     $data = "";

     while($str = @fgets($this->smtp_conn,515)) {

-      if($this->do_debug >= 4) {

+        if($this->do_debug >= 4) {

         echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';

         echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';

-      }

-      $data .= $str;

-      if($this->do_debug >= 4) {

+        }

+        $data .= $str;

+        if($this->do_debug >= 4) {

         echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';

-      }

-      // if 4th character is a space, we are done reading, break the loop

-      if(substr($str,3,1) == " ") { break; }

+        }

+        // if 4th character is a space, we are done reading, break the loop

+        if(substr($str,3,1) == " ") { break; }

     }

     return $data;

-  }

+    }

 

 }

 

Spacing +154 added lines, -154 removed lines

@@ -63,7 +63,7 @@ 
    *  Sets whether debugging is turned on

    *  @var bool

    */

-  public $do_debug;       // the level of debug to perform

+  public $do_debug; // the level of debug to perform

 

   /**

    *  Sets VERP use on/off (default is off)

@@ -76,7 +76,7 @@ 
   /////////////////////////////////////////////////

 

   private $smtp_conn; // the socket to the server

-  private $error;     // error if any on the last call

+  private $error; // error if any on the last call

   private $helo_rply; // the reply the server sent to us for HELO

 

   /**

@@ -114,43 +114,43 @@ 
     $this->error = null;

 

     // make sure we are __not__ connected

-    if($this->connected()) {

+    if ($this->connected()) {

       // already connected, generate error

       $this->error = array("error" => "Already connected to a server");

       return false;

     }

 

-    if(empty($port)) {

+    if (empty($port)) {

       $port = $this->SMTP_PORT;

     }

 

     // connect to the smtp server

-    $this->smtp_conn = @fsockopen($host,    // the host of the server

-                                 $port,    // the port to use

-                                 $errno,   // error number if any

-                                 $errstr,  // error message if any

-                                 $tval);   // give up after ? secs

+    $this->smtp_conn = @fsockopen($host, // the host of the server

+                                 $port, // the port to use

+                                 $errno, // error number if any

+                                 $errstr, // error message if any

+                                 $tval); // give up after ? secs

     // verify we connected properly

-    if(empty($this->smtp_conn)) {

+    if (empty($this->smtp_conn)) {

       $this->error = array("error" => "Failed to connect to server",

                            "errno" => $errno,

                            "errstr" => $errstr);

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": $errstr ($errno)".$this->CRLF.'<br />';

       }

       return false;

     }

 

     // SMTP server can take longer to respond, give longer timeout for first read

     // Windows does not have support for this timeout function

-    if(substr(PHP_OS, 0, 3) != "WIN")

+    if (substr(PHP_OS, 0, 3) != "WIN")

      socket_set_timeout($this->smtp_conn, $tval, 0);

 

     // get any announcement

     $announce = $this->get_lines();

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$announce.$this->CRLF.'<br />';

     }

 

     return true;

@@ -168,33 +168,33 @@ 
   public function StartTLS() {

     $this->error = null; # to avoid confusion

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array("error" => "Called StartTLS() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);

+    fputs($this->smtp_conn, "STARTTLS".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 220) {

+    if ($code != 220) {

       $this->error =

          array("error"     => "STARTTLS not accepted from server",

                "smtp_code" => $code,

-               "smtp_msg"  => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+               "smtp_msg"  => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Begin encrypted connection

-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

+    if (!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

       return false;

     }

 

@@ -209,52 +209,52 @@ 
    */

   public function Authenticate($username, $password) {

     // Start authentication

-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);

+    fputs($this->smtp_conn, "AUTH LOGIN".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 334) {

+    if ($code != 334) {

       $this->error =

         array("error" => "AUTH not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Send encoded username

-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);

+    fputs($this->smtp_conn, base64_encode($username).$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 334) {

+    if ($code != 334) {

       $this->error =

         array("error" => "Username not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Send encoded password

-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);

+    fputs($this->smtp_conn, base64_encode($password).$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 235) {

+    if ($code != 235) {

       $this->error =

         array("error" => "Password not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -268,12 +268,12 @@ 
    * @return bool

    */

   public function Connected() {

-    if(!empty($this->smtp_conn)) {

+    if (!empty($this->smtp_conn)) {

       $sock_status = socket_get_status($this->smtp_conn);

-      if($sock_status["eof"]) {

+      if ($sock_status["eof"]) {

         // the socket is valid but we are not connected

-        if($this->do_debug >= 1) {

-            echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";

+        if ($this->do_debug >= 1) {

+            echo "SMTP -> NOTICE:".$this->CRLF."EOF caught while checking if connected";

         }

         $this->Close();

         return false;

@@ -293,7 +293,7 @@ 
   public function Close() {

     $this->error = null; // so there is no confusion

     $this->helo_rply = null;

-    if(!empty($this->smtp_conn)) {

+    if (!empty($this->smtp_conn)) {

       // close the connection and cleanup

       fclose($this->smtp_conn);

       $this->smtp_conn = 0;

@@ -326,28 +326,28 @@ 
   public function Data($msg_data) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Data() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"DATA" . $this->CRLF);

+    fputs($this->smtp_conn, "DATA".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 354) {

+    if ($code != 354) {

       $this->error =

         array("error" => "DATA command not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -364,9 +364,9 @@ 
      */

 

     // normalize the line breaks so we know the explode works

-    $msg_data = str_replace("\r\n","\n",$msg_data);

-    $msg_data = str_replace("\r","\n",$msg_data);

-    $lines = explode("\n",$msg_data);

+    $msg_data = str_replace("\r\n", "\n", $msg_data);

+    $msg_data = str_replace("\r", "\n", $msg_data);

+    $lines = explode("\n", $msg_data);

 

     /* we need to find a good way to determine is headers are

      * in the msg_data or if it is a straight msg body

@@ -377,71 +377,71 @@ 
      * headers.

      */

 

-    $field = substr($lines[0],0,strpos($lines[0],":"));

+    $field = substr($lines[0], 0, strpos($lines[0], ":"));

     $in_headers = false;

-    if(!empty($field) && !strstr($field," ")) {

+    if (!empty($field) && !strstr($field, " ")) {

       $in_headers = true;

     }

 

     $max_line_length = 998; // used below; set here for ease in change

 

-    while(list(,$line) = @each($lines)) {

+    while (list(,$line) = @each($lines)) {

       $lines_out = null;

-      if($line == "" && $in_headers) {

+      if ($line == "" && $in_headers) {

         $in_headers = false;

       }

       // ok we need to break this line up into several smaller lines

-      while(strlen($line) > $max_line_length) {

-        $pos = strrpos(substr($line,0,$max_line_length)," ");

+      while (strlen($line) > $max_line_length) {

+        $pos = strrpos(substr($line, 0, $max_line_length), " ");

 

         // Patch to fix DOS attack

-        if(!$pos) {

+        if (!$pos) {

           $pos = $max_line_length - 1;

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos);

+          $lines_out[] = substr($line, 0, $pos);

+          $line = substr($line, $pos);

         } else {

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos + 1);

+          $lines_out[] = substr($line, 0, $pos);

+          $line = substr($line, $pos + 1);

         }

 

         /* if processing headers add a LWSP-char to the front of new line

          * rfc 822 on long msg headers

          */

-        if($in_headers) {

-          $line = "\t" . $line;

+        if ($in_headers) {

+          $line = "\t".$line;

         }

       }

       $lines_out[] = $line;

 

       // send the lines to the server

-      while(list(,$line_out) = @each($lines_out)) {

-        if(strlen($line_out) > 0)

+      while (list(,$line_out) = @each($lines_out)) {

+        if (strlen($line_out) > 0)

         {

-          if(substr($line_out, 0, 1) == ".") {

-            $line_out = "." . $line_out;

+          if (substr($line_out, 0, 1) == ".") {

+            $line_out = ".".$line_out;

           }

         }

-        fputs($this->smtp_conn,$line_out . $this->CRLF);

+        fputs($this->smtp_conn, $line_out.$this->CRLF);

       }

     }

 

     // message data has been sent

-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);

+    fputs($this->smtp_conn, $this->CRLF.".".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "DATA not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -463,21 +463,21 @@ 
   public function Hello($host = '') {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

             "error" => "Called Hello() without being connected");

       return false;

     }

 

     // if hostname for HELO was not specified send default

-    if(empty($host)) {

+    if (empty($host)) {

       // determine appropriate default to send to server

       $host = "localhost";

     }

 

     // Send extended hello first (RFC 2821)

-    if(!$this->SendHello("EHLO", $host)) {

-      if(!$this->SendHello("HELO", $host)) {

+    if (!$this->SendHello("EHLO", $host)) {

+      if (!$this->SendHello("HELO", $host)) {

         return false;

       }

     }

@@ -491,22 +491,22 @@ 
    * @return bool

    */

   private function SendHello($hello, $host) {

-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);

+    fputs($this->smtp_conn, $hello." ".$host.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER: ".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

-        array("error" => $hello . " not accepted from server",

+        array("error" => $hello." not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -533,29 +533,29 @@ 
   public function Mail($from) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Mail() without being connected");

       return false;

     }

 

     $useVerp = ($this->do_verp ? "XVERP" : "");

-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);

+    fputs($this->smtp_conn, "MAIL FROM:<".$from.">".$useVerp.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "MAIL not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -576,38 +576,38 @@ 
   public function Quit($close_on_error = true) {

     $this->error = null; // so there is no confusion

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Quit() without being connected");

       return false;

     }

 

     // send the quit command to the server

-    fputs($this->smtp_conn,"quit" . $this->CRLF);

+    fputs($this->smtp_conn, "quit".$this->CRLF);

 

     // get any good-bye messages

     $byemsg = $this->get_lines();

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$byemsg.$this->CRLF.'<br />';

     }

 

     $rval = true;

     $e = null;

 

-    $code = substr($byemsg,0,3);

-    if($code != 221) {

+    $code = substr($byemsg, 0, 3);

+    if ($code != 221) {

       // use e as a tmp var cause Close will overwrite $this->error

       $e = array("error" => "SMTP server rejected quit command",

                  "smtp_code" => $code,

-                 "smtp_rply" => substr($byemsg,4));

+                 "smtp_rply" => substr($byemsg, 4));

       $rval = false;

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$e["error"].": ".$byemsg.$this->CRLF.'<br />';

       }

     }

 

-    if(empty($e) || $close_on_error) {

+    if (empty($e) || $close_on_error) {

       $this->Close();

     }

 

@@ -629,28 +629,28 @@ 
   public function Recipient($to) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Recipient() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);

+    fputs($this->smtp_conn, "RCPT TO:<".$to.">".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250 && $code != 251) {

+    if ($code != 250 && $code != 251) {

       $this->error =

         array("error" => "RCPT not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -672,28 +672,28 @@ 
   public function Reset() {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Reset() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"RSET" . $this->CRLF);

+    fputs($this->smtp_conn, "RSET".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "RSET failed",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -720,28 +720,28 @@ 
   public function SendAndMail($from) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

           "error" => "Called SendAndMail() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);

+    fputs($this->smtp_conn, "SAML FROM:".$from.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "SAML not accepted from server",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -764,8 +764,8 @@ 
   public function Turn() {

     $this->error = array("error" => "This method, TURN, of the SMTP ".

                                     "is not implemented");

-    if($this->do_debug >= 1) {

-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';

+    if ($this->do_debug >= 1) {

+      echo "SMTP -> NOTICE: ".$this->error["error"].$this->CRLF.'<br />';

     }

     return false;

   }

@@ -794,17 +794,17 @@ 
    */

   private function get_lines() {

     $data = "";

-    while($str = @fgets($this->smtp_conn,515)) {

-      if($this->do_debug >= 4) {

-        echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';

-        echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';

+    while ($str = @fgets($this->smtp_conn, 515)) {

+      if ($this->do_debug >= 4) {

+        echo "SMTP -> get_lines(): \$data was \"$data\"".$this->CRLF.'<br />';

+        echo "SMTP -> get_lines(): \$str is \"$str\"".$this->CRLF.'<br />';

       }

       $data .= $str;

-      if($this->do_debug >= 4) {

-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';

+      if ($this->do_debug >= 4) {

+        echo "SMTP -> get_lines(): \$data is \"$data\"".$this->CRLF.'<br />';

       }

       // if 4th character is a space, we are done reading, break the loop

-      if(substr($str,3,1) == " ") { break; }

+      if (substr($str, 3, 1) == " ") { break; }

     }

     return $data;

   }

Braces +3 added lines, -2 removed lines

@@ -143,8 +143,9 @@
 

     // SMTP server can take longer to respond, give longer timeout for first read

     // Windows does not have support for this timeout function

-    if(substr(PHP_OS, 0, 3) != "WIN")

-     socket_set_timeout($this->smtp_conn, $tval, 0);

+    if(substr(PHP_OS, 0, 3) != "WIN") {
+         socket_set_timeout($this->smtp_conn, $tval, 0);
+    }
 

     // get any announcement

     $announce = $this->get_lines();

main/inc/lib/phpseclib/Crypt/DES.php

Doc Comments +2 added lines

@@ -742,6 +742,7 @@ 
      * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @return Crypt_DES
      * @access public
      */
@@ -1445,6 +1446,7 @@ 
      *
      * @see Crypt_DES::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {

Indentation +28 added lines, -28 removed lines

@@ -1137,7 +1137,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1332,7 +1332,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1518,13 +1518,13 @@ 
         $t = unpack('Nl/Nr', $block);
         list($l, $r) = array($t['l'], $t['r']);
         $block = ($shuffle[$ipmap[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                 ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                 ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                 ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                 ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                 ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                 ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                 ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                    ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
@@ -1540,9 +1540,9 @@ 
 
             // S-box indexing.
             $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                 $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                 $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
-                 $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
+                    $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                    $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+                    $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
             // end of "the Feistel (F) function"
 
             $l = $r;
@@ -1551,13 +1551,13 @@ 
 
         // Perform the inverse IP permutation.
         return ($shuffle[$invipmap[($l >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-               ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-               ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-               ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-               ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-               ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-               ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-               ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
     }
 
     /**
@@ -2025,13 +2025,13 @@ 
         $t = unpack('Nl/Nr', $key);
         list($l, $r) = array($t['l'], $t['r']);
         $key = ($this->shuffle[$pc1map[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-               ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-               ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-               ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-               ($this->shuffle[$pc1map[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-               ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-               ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-               ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+                ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+                ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+                ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+                ($this->shuffle[$pc1map[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+                ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
         $key = unpack('Nc/Nd', $key);
         $c = ($key['c'] >> 4) & 0x0FFFFFFF;
         $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
@@ -2045,9 +2045,9 @@ 
 
             // Perform the PC-2 transformation.
             $cp = $pc2mapc1[$c >> 24] | $pc2mapc2[($c >> 16) & 0xFF] |
-                  $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
+                    $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
             $dp = $pc2mapd1[$d >> 24] | $pc2mapd2[($d >> 16) & 0xFF] |
-                  $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
+                    $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
 
             // Reorder: odd bytes/even bytes. Push the result in key schedule.
             $keys[] = array(

Spacing +95 added lines, -95 removed lines

@@ -747,7 +747,7 @@ 
      */
     function Crypt_DES($mode = CRYPT_DES_MODE_CBC)
     {
-        if ( !defined('CRYPT_DES_MODE') ) {
+        if (!defined('CRYPT_DES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('des', mcrypt_list_algorithms()):
                     define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
@@ -757,7 +757,7 @@ 
             }
         }
 
-        switch ( CRYPT_DES_MODE ) {
+        switch (CRYPT_DES_MODE) {
             case CRYPT_DES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_DES_MODE_ECB:
@@ -823,7 +823,7 @@ 
      */
     function setKey($key)
     {
-        $this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
+        $this->keys = (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
         $this->enchanged = true;
         $this->dechanged = true;
     }
@@ -845,7 +845,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -869,12 +869,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -911,7 +911,7 @@ 
     function _generate_xor(&$iv)
     {
         $xor = $iv;
-        for ($j = 4; $j <= 8; $j+=4) {
+        for ($j = 4; $j <= 8; $j += 4) {
             $temp = substr($iv, -$j, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -953,7 +953,7 @@ 
             $plaintext = $this->_pad($plaintext);
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->enchanged) {
                 mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
                 if ($this->mode == 'ncfb') {
@@ -975,11 +975,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -992,15 +992,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->keys, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
                         $iv = substr($ciphertext, -8);
-                        $len%= 8;
+                        $len %= 8;
                     } else {
                         while ($len >= 8) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
-                            $ciphertext.= $iv;
-                            $len-= 8;
-                            $i+= 8;
+                            $ciphertext .= $iv;
+                            $len -= 8;
+                            $i += 8;
                         }
                     }
                 } 
@@ -1008,7 +1008,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -1035,17 +1035,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $ciphertext.= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
+                    $ciphertext .= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8);
                     $block = $this->_processBlock($block ^ $xor, CRYPT_DES_ENCRYPT);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -1054,25 +1054,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['encrypted'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['encrypted']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
@@ -1091,11 +1091,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -1103,41 +1103,41 @@ 
                 }
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT) ^ substr($plaintext, $i, 8);
-                    $ciphertext.= $iv;
-                    $len-= 8;
-                    $i+= 8;
+                    $ciphertext .= $iv;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -1162,7 +1162,7 @@ 
             $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->dechanged) {
                 mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
                 if ($this->mode == 'ncfb') {
@@ -1184,11 +1184,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1196,13 +1196,13 @@ 
                 }
                 if ($len >= 8) {
                     $cb = substr($ciphertext, $i, $len - $len % 8);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -8);
-                    $len%= 8;
+                    $len %= 8;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1230,15 +1230,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $plaintext.= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
+                    $plaintext .= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                     $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
+                    $plaintext .= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -1248,25 +1248,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['ciphertext'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['ciphertext']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1285,11 +1285,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1298,14 +1298,14 @@ 
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $cb = substr($ciphertext, $i, 8);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= 8;
-                    $i+= 8;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1313,26 +1313,26 @@ 
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -2100,7 +2100,7 @@ 
      */
     function inline_crypt_setup($des_rounds = 1)
     {
-        $lambda_functions =& Crypt_DES::get_lambda_functions();
+        $lambda_functions = & Crypt_DES::get_lambda_functions();
         $block_size = 8;
         $mode = $this->mode;
 
@@ -2139,7 +2139,7 @@ 
                     ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
 
-                '.'' /* Extract L0 and R0 */ .'
+                '.'' /* Extract L0 and R0 */.'
                 $l = $in[1];
                 $r = $in[2];
             ';
@@ -2153,19 +2153,19 @@ 
                 // Merge key schedule.
                 for ($i = 0; $i < 8; ++$i) {
                     $_cryptBlock .= '
-                        $b1 = (($' . $r . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $r . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $r . ' >> 31) & 0x00000001)  ^ ($' . $r . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $l . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $r.' >>  3) & 0x1FFFFFFF)  ^ ($'.$r.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $r.' >> 31) & 0x00000001)  ^ ($'.$r.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $l.'  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
                               $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
                               $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $l . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $l.';
 
-                        $b1 = (($' . $l . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $l . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $l . ' >> 31) & 0x00000001)  ^ ($' . $l . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $r . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $l.' >>  3) & 0x1FFFFFFF)  ^ ($'.$l.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $l.' >> 31) & 0x00000001)  ^ ($'.$l.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $r.'  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
                               $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
                               $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $r . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $r.';
                     ';
                 }
 
@@ -2177,21 +2177,21 @@ 
 
             // Perform the inverse IP permutation.
             $_cryptBlock .= '$in = (
-                    ($shuffle[$invipmap[($' . $r . ' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffle[$invipmap[($' . $r . ' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffle[$invipmap[($' . $r . ' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffle[$invipmap[($' . $l . ' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffle[$invipmap[ $' . $r . '        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffle[$invipmap[ $' . $l . '        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+                    ($shuffle[$invipmap[($' . $r.' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffle[$invipmap[($' . $l.' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$invipmap[($' . $r.' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$invipmap[($' . $l.' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$invipmap[($' . $r.' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$invipmap[($' . $l.' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$invipmap[ $' . $r.'        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$invipmap[ $' . $l.'        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
             ';
 
             // Generating mode of operation code:
             switch ($mode) {
                 case CRYPT_DES_MODE_ECB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2205,7 +2205,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2220,7 +2220,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CBC:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2240,7 +2240,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2262,7 +2262,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CTR:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2299,7 +2299,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2337,7 +2337,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $buffer = &$self->enbuffer;
@@ -2386,7 +2386,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $buffer = &$self->debuffer;
@@ -2438,7 +2438,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_OFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2475,7 +2475,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);

main/inc/lib/phpseclib/Crypt/Hash.php

Doc Comments +1 added lines, -2 removed lines

@@ -783,8 +783,7 @@
      * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
      * possibility of overflow exists, care has to be taken.  Math_BigInteger() could be used but this should be faster.
      *
-     * @param Integer $...
-     * @return Integer
+     * @return double
      * @see _sha256()
      * @access private
      */

Indentation +34 added lines, -34 removed lines

@@ -257,27 +257,27 @@ 
         switch ($hash) {
             case 'md2':
                  $this->b = 16;
-                 $this->hash = array($this, '_md2');
-                 break;
+                    $this->hash = array($this, '_md2');
+                    break;
             case 'md5':
             case 'md5-96':
                  $this->b = 64;
-                 $this->hash = array($this, '_md5');
-                 break;
+                    $this->hash = array($this, '_md5');
+                    break;
             case 'sha256':
                  $this->b = 64;
-                 $this->hash = array($this, '_sha256');
-                 break;
+                    $this->hash = array($this, '_sha256');
+                    break;
             case 'sha384':
             case 'sha512':
                  $this->b = 128;
-                 $this->hash = array($this, '_sha512');
-                 break;
+                    $this->hash = array($this, '_sha512');
+                    break;
             case 'sha1':
             case 'sha1-96':
             default:
                  $this->b = 64;
-                 $this->hash = array($this, '_sha1');
+                    $this->hash = array($this, '_sha1');
         }
 
         $this->ipad = str_repeat(chr(0x36), $this->b);
@@ -378,24 +378,24 @@ 
     function _md2($m)
     {
         static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
+                41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
+                19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
+                76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
             138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
             245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
             148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
+                39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
             181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
             150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
             112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
+                96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
+                85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
             234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
             129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
+                8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
             203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
             166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+                31,  26, 219, 153, 141,  51, 159,  17, 131, 20
         );
 
         // Step 1. Append Padding Bytes
@@ -494,11 +494,11 @@ 
             // Extend the sixteen 32-bit words into sixty-four 32-bit words
             for ($i = 16; $i < 64; $i++) {
                 $s0 = $this->_rightRotate($w[$i - 15],  7) ^
-                      $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
+                        $this->_rightRotate($w[$i - 15], 18) ^
+                        $this->_rightShift( $w[$i - 15],  3);
                 $s1 = $this->_rightRotate($w[$i - 2], 17) ^
-                      $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
+                        $this->_rightRotate($w[$i - 2], 19) ^
+                        $this->_rightShift( $w[$i - 2], 10);
                 $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
 
             }
@@ -509,18 +509,18 @@ 
             // Main loop
             for ($i = 0; $i < 64; $i++) {
                 $s0 = $this->_rightRotate($a,  2) ^
-                      $this->_rightRotate($a, 13) ^
-                      $this->_rightRotate($a, 22);
+                        $this->_rightRotate($a, 13) ^
+                        $this->_rightRotate($a, 22);
                 $maj = ($a & $b) ^
-                       ($a & $c) ^
-                       ($b & $c);
+                        ($a & $c) ^
+                        ($b & $c);
                 $t2 = $this->_add($s0, $maj);
 
                 $s1 = $this->_rightRotate($e,  6) ^
-                      $this->_rightRotate($e, 11) ^
-                      $this->_rightRotate($e, 25);
+                        $this->_rightRotate($e, 11) ^
+                        $this->_rightRotate($e, 25);
                 $ch = ($e & $f) ^
-                      ($this->_not($e) & $g);
+                        ($this->_not($e) & $g);
                 $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
 
                 $h = $g;
@@ -635,16 +635,16 @@ 
             // Extend the sixteen 32-bit words into eighty 32-bit words
             for ($i = 16; $i < 80; $i++) {
                 $temp = array(
-                          $w[$i - 15]->bitwise_rightRotate(1),
-                          $w[$i - 15]->bitwise_rightRotate(8),
-                          $w[$i - 15]->bitwise_rightShift(7)
+                            $w[$i - 15]->bitwise_rightRotate(1),
+                            $w[$i - 15]->bitwise_rightRotate(8),
+                            $w[$i - 15]->bitwise_rightShift(7)
                 );
                 $s0 = $temp[0]->bitwise_xor($temp[1]);
                 $s0 = $s0->bitwise_xor($temp[2]);
                 $temp = array(
-                          $w[$i - 2]->bitwise_rightRotate(19),
-                          $w[$i - 2]->bitwise_rightRotate(61),
-                          $w[$i - 2]->bitwise_rightShift(6)
+                            $w[$i - 2]->bitwise_rightRotate(19),
+                            $w[$i - 2]->bitwise_rightRotate(61),
+                            $w[$i - 2]->bitwise_rightShift(6)
                 );
                 $s1 = $temp[0]->bitwise_xor($temp[1]);
                 $s1 = $s1->bitwise_xor($temp[2]);

Spacing +48 added lines, -48 removed lines

@@ -66,11 +66,11 @@ 
 /**
  * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
  */
-define('CRYPT_HASH_MODE_MHASH',    2);
+define('CRYPT_HASH_MODE_MHASH', 2);
 /**
  * Toggles the hash() implementation, which works on PHP 5.1.2+.
  */
-define('CRYPT_HASH_MODE_HASH',     3);
+define('CRYPT_HASH_MODE_HASH', 3);
 /**#@-*/
 
 /**
@@ -145,7 +145,7 @@ 
      */
     function Crypt_Hash($hash = 'sha1')
     {
-        if ( !defined('CRYPT_HASH_MODE') ) {
+        if (!defined('CRYPT_HASH_MODE')) {
             switch (true) {
                 case extension_loaded('hash'):
                     define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_HASH);
@@ -218,7 +218,7 @@ 
                 $mode = CRYPT_HASH_MODE;
         }
 
-        switch ( $mode ) {
+        switch ($mode) {
             case CRYPT_HASH_MODE_MHASH:
                 switch ($hash) {
                     case 'md5':
@@ -296,7 +296,7 @@ 
         $mode = is_array($this->hash) ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
 
         if (!empty($this->key) || is_string($this->key)) {
-            switch ( $mode ) {
+            switch ($mode) {
                 case CRYPT_HASH_MODE_MHASH:
                     $output = mhash($this->hash, $text, $this->key);
                     break;
@@ -310,16 +310,16 @@ 
                         -- http://tools.ietf.org/html/rfc2104#section-2 */
                     $key = strlen($this->key) > $this->b ? call_user_func($this->hash, $this->key) : $this->key;
 
-                    $key    = str_pad($key, $this->b, chr(0));      // step 1
-                    $temp   = $this->ipad ^ $key;                   // step 2
-                    $temp  .= $text;                                // step 3
-                    $temp   = call_user_func($this->hash, $temp);   // step 4
-                    $output = $this->opad ^ $key;                   // step 5
-                    $output.= $temp;                                // step 6
+                    $key    = str_pad($key, $this->b, chr(0)); // step 1
+                    $temp   = $this->ipad ^ $key; // step 2
+                    $temp  .= $text; // step 3
+                    $temp   = call_user_func($this->hash, $temp); // step 4
+                    $output = $this->opad ^ $key; // step 5
+                    $output .= $temp; // step 6
                     $output = call_user_func($this->hash, $output); // step 7
             }
         } else {
-            switch ( $mode ) {
+            switch ($mode) {
                 case CRYPT_HASH_MODE_MHASH:
                     $output = mhash($this->hash, $text);
                     break;
@@ -378,36 +378,36 @@ 
     function _md2($m)
     {
         static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
-            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
-            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
-            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
-            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
-            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
-            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
-            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
-            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
-            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
-            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+             41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
+             19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
+             76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
+            138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251,
+            245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63,
+            148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50,
+             39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165,
+            181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210,
+            150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157,
+            112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27,
+             96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15,
+             85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197,
+            234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65,
+            129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123,
+              8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233,
+            203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228,
+            166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237,
+             31, 26, 219, 153, 141, 51, 159, 17, 131, 20
         );
 
         // Step 1. Append Padding Bytes
         $pad = 16 - (strlen($m) & 0xF);
-        $m.= str_repeat(chr($pad), $pad);
+        $m .= str_repeat(chr($pad), $pad);
 
         $length = strlen($m);
 
         // Step 2. Append Checksum
         $c = str_repeat(chr(0), 16);
         $l = chr(0);
-        for ($i = 0; $i < $length; $i+= 16) {
+        for ($i = 0; $i < $length; $i += 16) {
             for ($j = 0; $j < 16; $j++) {
                 // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
                 //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
@@ -416,15 +416,15 @@ 
                 $l = $c[$j];
             }
         }
-        $m.= $c;
+        $m .= $c;
 
-        $length+= 16;
+        $length += 16;
 
         // Step 3. Initialize MD Buffer
         $x = str_repeat(chr(0), 48);
 
         // Step 4. Process Message in 16-Byte Blocks
-        for ($i = 0; $i < $length; $i+= 16) {
+        for ($i = 0; $i < $length; $i += 16) {
             for ($j = 0; $j < 16; $j++) {
                 $x[$j + 16] = $m[$i + $j];
                 $x[$j + 32] = $x[$j + 16] ^ $x[$j];
@@ -477,10 +477,10 @@ 
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
-        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
+        $m .= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m.= pack('N2', 0, $length << 3);
+        $m .= pack('N2', 0, $length << 3);
 
         // Process the message in successive 512-bit chunks
         $chunks = str_split($m, 64);
@@ -493,12 +493,12 @@ 
 
             // Extend the sixteen 32-bit words into sixty-four 32-bit words
             for ($i = 16; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
+                $s0 = $this->_rightRotate($w[$i - 15], 7) ^
                       $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
+                      $this->_rightShift($w[$i - 15], 3);
                 $s1 = $this->_rightRotate($w[$i - 2], 17) ^
                       $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
+                      $this->_rightShift($w[$i - 2], 10);
                 $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
 
             }
@@ -508,7 +508,7 @@ 
 
             // Main loop
             for ($i = 0; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($a,  2) ^
+                $s0 = $this->_rightRotate($a, 2) ^
                       $this->_rightRotate($a, 13) ^
                       $this->_rightRotate($a, 22);
                 $maj = ($a & $b) ^
@@ -516,7 +516,7 @@ 
                        ($b & $c);
                 $t2 = $this->_add($s0, $maj);
 
-                $s1 = $this->_rightRotate($e,  6) ^
+                $s1 = $this->_rightRotate($e, 6) ^
                       $this->_rightRotate($e, 11) ^
                       $this->_rightRotate($e, 25);
                 $ch = ($e & $f) ^
@@ -617,10 +617,10 @@ 
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m .= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m.= pack('N4', 0, 0, 0, $length << 3);
+        $m .= pack('N4', 0, 0, 0, $length << 3);
 
         // Process the message in successive 1024-bit chunks
         $chunks = str_split($m, 128);
@@ -724,10 +724,10 @@ 
 
         // Produce the final hash value (big-endian)
         // (Crypt_Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
-        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes();
+        $temp = $hash[0]->toBytes().$hash[1]->toBytes().$hash[2]->toBytes().$hash[3]->toBytes().
+                $hash[4]->toBytes().$hash[5]->toBytes();
         if ($this->l != 48) {
-            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
+            $temp .= $hash[6]->toBytes().$hash[7]->toBytes();
         }
 
         return $temp;
@@ -798,7 +798,7 @@ 
         $result = 0;
         $arguments = func_get_args();
         foreach ($arguments as $argument) {
-            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
+            $result += $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
         }
 
         return fmod($result, $mod);

main/inc/lib/phpseclib/Crypt/Rijndael.php

Doc Comments +2 added lines

@@ -1456,6 +1456,7 @@ 
      *
      * @see Crypt_Rijndael::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {
@@ -1483,6 +1484,7 @@ 
      *
      * @see Crypt_Rijndael::_pad()
      * @access private
+     * @param string $text
      */
     function _unpad($text)
     {

Indentation +12 added lines, -12 removed lines

@@ -917,7 +917,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1058,7 +1058,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1137,7 +1137,7 @@ 
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
-                         $w[$Nr][$i];
+                            $w[$Nr][$i];
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -1223,9 +1223,9 @@ 
         while ($i < $Nb) {
             $temp[$i] = $dw[0][$i] ^ 
                         $this->_invSubWord(($state[$i] & 0xFF000000) | 
-                                           ($state[$j] & 0x00FF0000) | 
-                                           ($state[$k] & 0x0000FF00) | 
-                                           ($state[$l] & 0x000000FF));
+                                            ($state[$j] & 0x00FF0000) | 
+                                            ($state[$k] & 0x0000FF00) | 
+                                            ($state[$l] & 0x000000FF));
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -1393,9 +1393,9 @@ 
         $sbox = $this->sbox;
 
         return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
-               ($sbox[$word >> 16 & 0x000000FF] << 16) |
-               ($sbox[$word >> 24 & 0x000000FF] << 24);
+                ($sbox[$word >>  8 & 0x000000FF] <<  8) |
+                ($sbox[$word >> 16 & 0x000000FF] << 16) |
+                ($sbox[$word >> 24 & 0x000000FF] << 24);
     }
 
     /**
@@ -1408,9 +1408,9 @@ 
         $isbox = $this->isbox;
 
         return  $isbox[$word       & 0x000000FF]        |
-               ($isbox[$word >>  8 & 0x000000FF] <<  8) |
-               ($isbox[$word >> 16 & 0x000000FF] << 16) |
-               ($isbox[$word >> 24 & 0x000000FF] << 24);
+                ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+                ($isbox[$word >> 16 & 0x000000FF] << 16) |
+                ($isbox[$word >> 24 & 0x000000FF] << 24);
     }
 
     /**

Spacing +88 added lines, -88 removed lines

@@ -550,13 +550,13 @@ 
         );
 
         for ($i = 0; $i < 256; $i++) {
-            $t2[] = (($t3[$i] <<  8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
+            $t2[] = (($t3[$i] << 8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
             $t1[] = (($t3[$i] << 16) & 0xFFFF0000) | (($t3[$i] >> 16) & 0x0000FFFF);
-            $t0[] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >>  8) & 0x00FFFFFF);
+            $t0[] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >> 8) & 0x00FFFFFF);
 
-            $dt2[] = (($dt3[$i] <<  8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
+            $dt2[] = (($dt3[$i] << 8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
             $dt1[] = (($dt3[$i] << 16) & 0xFFFF0000) | (($dt3[$i] >> 16) & 0x0000FFFF);
-            $dt0[] = (($dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >>  8) & 0x00FFFFFF);
+            $dt0[] = (($dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >> 8) & 0x00FFFFFF);
         }
 
         // sbox for the S-Box substitution
@@ -679,7 +679,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -703,12 +703,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -755,8 +755,8 @@ 
         $block_size = $this->block_size;
         $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
         for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= $block_size; $j+=4) {
+            $xor .= $iv;
+            for ($j = 4; $j <= $block_size; $j += 4) {
                 $temp = substr($iv, -$j, 4);
                 switch ($temp) {
                     case "\xFF\xFF\xFF\xFF":
@@ -812,17 +812,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
+                    $ciphertext .= $this->_encryptBlock(substr($plaintext, $i, $block_size));
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                     $block = substr($plaintext, $i, $block_size);
                     $block = $this->_encryptBlock($block ^ $xor);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -831,25 +831,25 @@ 
             case CRYPT_RIJNDAEL_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
+                            $buffer['encrypted'] .= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
                         }
                         $key = $this->_string_shift($buffer['encrypted'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
@@ -870,11 +870,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -883,41 +883,41 @@ 
                 }
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $ciphertext .= $iv;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -955,15 +955,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_RIJNDAEL_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
+                    $plaintext .= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
                 }
                 break;
             case CRYPT_RIJNDAEL_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                     $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
+                    $plaintext .= $this->_decryptBlock($block) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -973,25 +973,25 @@ 
             case CRYPT_RIJNDAEL_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
+                            $buffer['ciphertext'] .= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
                         }
                         $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1010,11 +1010,11 @@ 
                     $max = $block_size - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
@@ -1024,14 +1024,14 @@ 
                 while ($len >= $block_size) {
                     $iv = $this->_encryptBlock($iv);
                     $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
+                    $len -= $block_size;
+                    $i += $block_size;
                 }
                 if ($len) {
                     $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1039,26 +1039,26 @@ 
             case CRYPT_RIJNDAEL_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
                         $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, $block_size) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % $block_size) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -1111,8 +1111,8 @@ 
             while ($i < $Nb) {
                 $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
                             $t1[$state[$j] >> 16 & 0x000000FF] ^
-                            $t2[$state[$k] >>  8 & 0x000000FF] ^
-                            $t3[$state[$l]       & 0x000000FF] ^
+                            $t2[$state[$k] >> 8 & 0x000000FF] ^
+                            $t3[$state[$l] & 0x000000FF] ^
                             $w[$round][$i];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -1203,8 +1203,8 @@ 
             while ($i < $Nb) {
                 $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
                             $dt1[$state[$j] >> 16 & 0x000000FF] ^
-                            $dt2[$state[$k] >>  8 & 0x000000FF] ^
-                            $dt3[$state[$l]       & 0x000000FF] ^
+                            $dt2[$state[$k] >> 8 & 0x000000FF] ^
+                            $dt3[$state[$l] & 0x000000FF] ^
                             $dw[$round][$i];
                 ++$i;
                 $j = ($j + 1) % $Nb;
@@ -1348,8 +1348,8 @@ 
                         $dw = $this->_subWord($this->w[$row][$j]);
                         $temp[$j] = $this->dt0[$dw >> 24 & 0x000000FF] ^ 
                                     $this->dt1[$dw >> 16 & 0x000000FF] ^ 
-                                    $this->dt2[$dw >>  8 & 0x000000FF] ^ 
-                                    $this->dt3[$dw       & 0x000000FF];
+                                    $this->dt2[$dw >> 8 & 0x000000FF] ^ 
+                                    $this->dt3[$dw & 0x000000FF];
                         $j++;
                     }
                     $this->dw[$row] = $temp;
@@ -1392,8 +1392,8 @@ 
     {
         $sbox = $this->sbox;
 
-        return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
+        return  $sbox[$word & 0x000000FF] |
+               ($sbox[$word >> 8 & 0x000000FF] << 8) |
                ($sbox[$word >> 16 & 0x000000FF] << 16) |
                ($sbox[$word >> 24 & 0x000000FF] << 24);
     }
@@ -1407,8 +1407,8 @@ 
     {
         $isbox = $this->isbox;
 
-        return  $isbox[$word       & 0x000000FF]        |
-               ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+        return  $isbox[$word & 0x000000FF] |
+               ($isbox[$word >> 8 & 0x000000FF] << 8) |
                ($isbox[$word >> 16 & 0x000000FF] << 16) |
                ($isbox[$word >> 24 & 0x000000FF] << 24);
     }
@@ -1588,7 +1588,7 @@ 
         // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
         // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
 
-        $lambda_functions =& Crypt_Rijndael::get_lambda_functions();
+        $lambda_functions = & Crypt_Rijndael::get_lambda_functions();
         $block_size = $this->block_size;
         $mode = $this->mode;
 
@@ -1609,7 +1609,7 @@ 
             $init_decryptBlock = 'extract($self->dw, EXTR_PREFIX_ALL, "dw");';
         }
 
-        $code_hash = md5("$mode, $block_size, " . implode(',', $w));
+        $code_hash = md5("$mode, $block_size, ".implode(',', $w));
 
         if (!isset($lambda_functions[$code_hash])) {
             $Nr = $this->Nr;
@@ -1617,7 +1617,7 @@ 
             $c  = $this->c;
 
             // Generating encrypt code:
-            $init_encryptBlock.= '
+            $init_encryptBlock .= '
                 $t0 = $self->t0;
                 $t1 = $self->t1;
                 $t2 = $self->t2;
@@ -1638,9 +1638,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $_encryptBlock.=
+                    $_encryptBlock .=
                         '$'.$e.$i.' =
-                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
+                        $t0[($'.$s.$i.' >> 24) & 0xff] ^
                         $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
                         $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
                         $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
@@ -1650,7 +1650,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $_encryptBlock.=
+                $_encryptBlock .=
                     '$'.$e.$i.' =
                      $sbox[ $'.$e.$i.'        & 0xff]        |
                     ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -1659,8 +1659,8 @@ 
             }
             $_encryptBlock .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $_encryptBlock.= ',
-                    ($'.$e.$i                  .' & 0xFF000000) ^
+                $_encryptBlock .= ',
+                    ($'.$e.$i.' & 0xFF000000) ^
                     ($'.$e.(($i + $c[1]) % $Nb).' & 0x00FF0000) ^
                     ($'.$e.(($i + $c[2]) % $Nb).' & 0x0000FF00) ^
                     ($'.$e.(($i + $c[3]) % $Nb).' & 0x000000FF) ^
@@ -1669,7 +1669,7 @@ 
             $_encryptBlock .= ');';
 
             // Generating decrypt code:
-            $init_decryptBlock.= '
+            $init_decryptBlock .= '
                 $dt0 = $self->dt0;
                 $dt1 = $self->dt1;
                 $dt2 = $self->dt2;
@@ -1690,9 +1690,9 @@ 
             for ($round = 1; $round < $Nr; ++$round) {
                 list($s, $e) = array($e, $s);
                 for ($i = 0; $i < $Nb; ++$i) {
-                    $_decryptBlock.=
+                    $_decryptBlock .=
                         '$'.$e.$i.' =
-                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
+                        $dt0[($'.$s.$i.' >> 24) & 0xff] ^
                         $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
                         $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
                         $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
@@ -1702,7 +1702,7 @@ 
 
             // Finalround: subWord + shiftRows + addRoundKey
             for ($i = 0; $i < $Nb; ++$i) {
-                $_decryptBlock.=
+                $_decryptBlock .=
                     '$'.$e.$i.' =
                      $isbox[ $'.$e.$i.'        & 0xff]        |
                     ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
@@ -1711,8 +1711,8 @@ 
             }
             $_decryptBlock .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
-                $_decryptBlock.= ',
-                    ($'.$e.$i.                        ' & 0xFF000000) ^
+                $_decryptBlock .= ',
+                    ($'.$e.$i.' & 0xFF000000) ^
                     ($'.$e.(($Nb + $i - $c[1]) % $Nb).' & 0x00FF0000) ^
                     ($'.$e.(($Nb + $i - $c[2]) % $Nb).' & 0x0000FF00) ^
                     ($'.$e.(($Nb + $i - $c[3]) % $Nb).' & 0x000000FF) ^
@@ -1723,7 +1723,7 @@ 
             // Generating mode of operation code:
             switch ($mode) {
                 case CRYPT_RIJNDAEL_MODE_ECB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $text = $self->_pad($text);
                         $plaintext_len = strlen($text);
@@ -1737,7 +1737,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_decryptBlock . '
+                    $decrypt = $init_decryptBlock.'
                         $plaintext = "";
                         $text = str_pad($text, strlen($text) + ('.$block_size.' - strlen($text) % '.$block_size.') % '.$block_size.', chr(0));
                         $ciphertext_len = strlen($text);
@@ -1752,7 +1752,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CBC:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $text = $self->_pad($text);
                         $plaintext_len = strlen($text);
@@ -1772,7 +1772,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_decryptBlock . '
+                    $decrypt = $init_decryptBlock.'
                         $plaintext = "";
                         $text = str_pad($text, strlen($text) + ('.$block_size.' - strlen($text) % '.$block_size.') % '.$block_size.', chr(0));
                         $ciphertext_len = strlen($text);
@@ -1794,7 +1794,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CTR:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
                         $xor = $self->encryptIV;
@@ -1830,7 +1830,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
                         $xor = $self->decryptIV;
@@ -1867,7 +1867,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_CFB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $buffer = &$self->enbuffer;
 
@@ -1915,7 +1915,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $buffer = &$self->debuffer;
 
@@ -1966,7 +1966,7 @@ 
                         ';
                     break;
                 case CRYPT_RIJNDAEL_MODE_OFB:
-                    $encrypt = $init_encryptBlock . '
+                    $encrypt = $init_encryptBlock.'
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
                         $xor = $self->encryptIV;
@@ -2002,7 +2002,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_encryptBlock . '
+                    $decrypt = $init_encryptBlock.'
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
                         $xor = $self->decryptIV;