chamilo / chamilo-lms

main/inc/lib/event_email_template.class.php

Indentation +11 added lines, -11 removed lines

@@ -12,10 +12,10 @@ 
     /**
      * Constructor
      */
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_main_table(TABLE_EVENT_EMAIL_TEMPLATE);
-	}
+    }
 
     public function get_all($where_conditions = array())
     {
@@ -29,19 +29,19 @@ 
     /**
      * Displays the title + grid
      */
-	public function display()
+    public function display()
     {
-		// action links
-		$content = Display::actions(array(
+        // action links
+        $content = Display::actions(array(
                 array(
                     'url' => 'event_type.php' ,
                     'content' => Display::return_icon('new_document.png', get_lang('Add'), array(), ICON_SIZE_MEDIUM)
-                 )
+                    )
             )
         );
         $content .= Display::grid_html('event_email_template');
         return $content;
-	}
+    }
 
     public function get_status_list()
     {
@@ -82,7 +82,7 @@ 
                 'Height' => '250',
             )
         );
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             $form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -99,17 +99,17 @@ 
         $defaults = $this->get($id);
 
         if (!empty($defaults['created_at'])) {
-        	$defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+            $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
         }
         if (!empty($defaults['updated_at'])) {
-        	$defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+            $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
         }
         $form->setDefaults($defaults);
 
         // Setting the rules
         $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
 
-		return $form;
+        return $form;
     }
 
     public function get_count()

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

Indentation +107 added lines, -107 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: dompdf_config.inc.php,v $
- * Created on: 2004-08-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>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - Allow overriding of configuration settings by calling php script.
- *   This allows replacing of dompdf by a new version in an application
- *   without any modification,
- * - Optionally separate font cache folder from font folder.
- *   This allows write protecting the entire installation
- * - Add settings to enable/disable additional debug output categories
- * - Change some defaults to more practical values
- * - Add comments about configuration parameter implications
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: dompdf_config.inc.php,v $
+     * Created on: 2004-08-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>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - Allow overriding of configuration settings by calling php script.
+     *   This allows replacing of dompdf by a new version in an application
+     *   without any modification,
+     * - Optionally separate font cache folder from font folder.
+     *   This allows write protecting the entire installation
+     * - Add settings to enable/disable additional debug output categories
+     * - Change some defaults to more practical values
+     * - Add comments about configuration parameter implications
+     */
 
 /* $Id: dompdf_config.inc.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -113,7 +113,7 @@ 
  */
 
 if (!defined("DOMPDF_FONT_CACHE")) {
-  define("DOMPDF_FONT_CACHE", DOMPDF_FONT_DIR);
+    define("DOMPDF_FONT_CACHE", DOMPDF_FONT_DIR);
 }
 
 /**
@@ -124,7 +124,7 @@ 
  * using the PFDLib back end.
  */
 if (!defined('DOMPDF_TEMP_DIR')) {
-  define("DOMPDF_TEMP_DIR", sys_get_temp_dir());
+    define("DOMPDF_TEMP_DIR", sys_get_temp_dir());
 }
 
 /**
@@ -140,7 +140,7 @@ 
  * $dompdf = new DOMPDF();	$dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
  */
 if (!defined("DOMPDF_CHROOT")) {
-  define("DOMPDF_CHROOT", realpath(DOMPDF_DIR));
+    define("DOMPDF_CHROOT", realpath(DOMPDF_DIR));
 }
 
 /**
@@ -157,7 +157,7 @@ 
  *
  */
 if (!defined("DOMPDF_UNICODE_ENABLED")) {
-  define("DOMPDF_UNICODE_ENABLED", false);
+    define("DOMPDF_UNICODE_ENABLED", false);
 }
 
 /**
@@ -172,8 +172,8 @@ 
  * @link http://ttf2pt1.sourceforge.net/
  */
 if (!defined("TTF2AFM")) {
-  define("TTF2AFM", DOMPDF_LIB_DIR ."/ttf2ufm/ttf2ufm-src/ttf2pt1");
-  //define("TTF2AFM", "/usr/bin/ttf2pt1");
+    define("TTF2AFM", DOMPDF_LIB_DIR ."/ttf2ufm/ttf2ufm-src/ttf2pt1");
+    //define("TTF2AFM", "/usr/bin/ttf2pt1");
 }
 
 /**
@@ -205,7 +205,7 @@ 
  * @link http://www.php.net/image
  */
 if (!defined("DOMPDF_PDF_BACKEND")) {
-  define("DOMPDF_PDF_BACKEND", "CPDF");
+    define("DOMPDF_PDF_BACKEND", "CPDF");
 }
 
 /**
@@ -221,7 +221,7 @@ 
  * a real license code must exist!
  */
 if (!defined("DOMPDF_PDFLIB_LICENSE")) {
-  #define("DOMPDF_PDFLIB_LICENSE", "your license key here");
+    #define("DOMPDF_PDFLIB_LICENSE", "your license key here");
 }
 
 /**
@@ -235,7 +235,7 @@ 
  * Therefore allow specification of content here.
  */
 if (!defined("DOMPDF_DEFAULT_MEDIA_TYPE")) {
-  define("DOMPDF_DEFAULT_MEDIA_TYPE", "screen");
+    define("DOMPDF_DEFAULT_MEDIA_TYPE", "screen");
 }
 
 /**
@@ -246,7 +246,7 @@ 
  * @see CPDF_Adapter::PAPER_SIZES for valid sizes
  */
 if (!defined("DOMPDF_DEFAULT_PAPER_SIZE")) {
-  define("DOMPDF_DEFAULT_PAPER_SIZE", "letter");
+    define("DOMPDF_DEFAULT_PAPER_SIZE", "letter");
 }
 
 
@@ -257,43 +257,43 @@ 
  * @var string
  */
 if (!defined("DOMPDF_DEFAULT_FONT")) {
-  define("DOMPDF_DEFAULT_FONT", "serif");
+    define("DOMPDF_DEFAULT_FONT", "serif");
 }
 /**
- * Image DPI setting
- *
- * This setting determines the default DPI setting for images and fonts.  The
- * DPI may be overridden for inline images by explictly setting the
- * image's width & height style attributes (i.e. if the image's native
- * width is 600 pixels and you specify the image's width as 72 points,
- * the image will have a DPI of 600 in the rendered PDF.  The DPI of
- * background images can not be overridden and is controlled entirely
- * via this parameter.
- *
- * For the purposes of DOMPDF, pixels per inch (PPI) = dots per inch (DPI).
- * If a size in html is given as px (or without unit as image size),
- * this tells the corresponding size in pt.
- * This adjusts the relative sizes to be similar to the rendering of the
- * html page in a reference browser.
- *
- * In pdf, always 1 pt = 1/72 inch
- *
- * Rendering resolution of various browsers in px per inch:
- * Windows Firefox and Internet Explorer:
- *   SystemControl->Display properties->FontResolution: Default:96, largefonts:120, custom:?
- * Linux Firefox:
- *   about:config *resolution: Default:96
- *   (xorg screen dimension in mm and Desktop font dpi settings are ignored)
- *
- * Take care about extra font/image zoom factor of browser.
- *
- * In images, <img> size in pixel attribute, img css style, are overriding
- * the real image dimension in px for rendering.
- *
- * @var int
- */
+     * Image DPI setting
+     *
+     * This setting determines the default DPI setting for images and fonts.  The
+     * DPI may be overridden for inline images by explictly setting the
+     * image's width & height style attributes (i.e. if the image's native
+     * width is 600 pixels and you specify the image's width as 72 points,
+     * the image will have a DPI of 600 in the rendered PDF.  The DPI of
+     * background images can not be overridden and is controlled entirely
+     * via this parameter.
+     *
+     * For the purposes of DOMPDF, pixels per inch (PPI) = dots per inch (DPI).
+     * If a size in html is given as px (or without unit as image size),
+     * this tells the corresponding size in pt.
+     * This adjusts the relative sizes to be similar to the rendering of the
+     * html page in a reference browser.
+     *
+     * In pdf, always 1 pt = 1/72 inch
+     *
+     * Rendering resolution of various browsers in px per inch:
+     * Windows Firefox and Internet Explorer:
+     *   SystemControl->Display properties->FontResolution: Default:96, largefonts:120, custom:?
+     * Linux Firefox:
+     *   about:config *resolution: Default:96
+     *   (xorg screen dimension in mm and Desktop font dpi settings are ignored)
+     *
+     * Take care about extra font/image zoom factor of browser.
+     *
+     * In images, <img> size in pixel attribute, img css style, are overriding
+     * the real image dimension in px for rendering.
+     *
+     * @var int
+     */
 if (!defined("DOMPDF_DPI")) {
-  define("DOMPDF_DPI", "96");
+    define("DOMPDF_DPI", "96");
 }
 
 /**
@@ -309,7 +309,7 @@ 
  * @var bool
  */
 if (!defined("DOMPDF_ENABLE_PHP")) {
-  define("DOMPDF_ENABLE_PHP", true);
+    define("DOMPDF_ENABLE_PHP", true);
 }
 
 /**
@@ -330,7 +330,7 @@ 
  * @var bool
  */
 if (!defined("DOMPDF_ENABLE_REMOTE")) {
-  define("DOMPDF_ENABLE_REMOTE", false);
+    define("DOMPDF_ENABLE_REMOTE", false);
 }
  
 /**
@@ -344,25 +344,25 @@ 
  * @param string $class
  */
 function DOMPDF_autoload($class) {
-  $filename = DOMPDF_INC_DIR . "/" . mb_strtolower($class) . ".cls.php";
+    $filename = DOMPDF_INC_DIR . "/" . mb_strtolower($class) . ".cls.php";
   
-  if ( is_file($filename) )
+    if ( is_file($filename) )
     require_once($filename);
 }
 
 if ( function_exists("spl_autoload_register") ) {
 
-   spl_autoload_register("DOMPDF_autoload");
+    spl_autoload_register("DOMPDF_autoload");
 
 } else if ( !function_exists("__autoload") ) {
-  /**
-   * Default __autoload() function
-   *
-   * @param string $class
-   */
-  function __autoload($class) {
+    /**
+     * Default __autoload() function
+     *
+     * @param string $class
+     */
+    function __autoload($class) {
     DOMPDF_autoload($class);
-  }
+    }
 }
 
 // ### End of user-configurable options ###
@@ -416,11 +416,11 @@ 
  * the browser cache and the premature output prevents setting of the mime type.
  */
 if (!defined('DEBUGPNG')) {
-  define('DEBUGPNG',0);
+    define('DEBUGPNG',0);
 }
 if (!defined('DEBUGKEEPTEMP')) {
-  define('DEBUGKEEPTEMP',0);
+    define('DEBUGKEEPTEMP',0);
 }
 if (!defined('DEBUGCSS')) {
-  define('DEBUGCSS',0);
+    define('DEBUGCSS',0);
 }

main/inc/lib/phpdocx/pdf/www/examples.php

Indentation +15 added lines, -15 removed lines

@@ -3,17 +3,17 @@ 
 require_once("../dompdf_config.inc.php");
 if ( isset( $_POST["html"] ) ) {
 
-  if ( get_magic_quotes_gpc() )
+    if ( get_magic_quotes_gpc() )
     $_POST["html"] = stripslashes($_POST["html"]);
   
-  $dompdf = new DOMPDF();
-  $dompdf->load_html($_POST["html"]);
-  $dompdf->set_paper($_POST["paper"], $_POST["orientation"]);
-  $dompdf->render();
+    $dompdf = new DOMPDF();
+    $dompdf->load_html($_POST["html"]);
+    $dompdf->set_paper($_POST["paper"], $_POST["orientation"]);
+    $dompdf->render();
 
-  $dompdf->stream("dompdf_out.pdf");
+    $dompdf->stream("dompdf_out.pdf");
 
-  exit(0);
+    exit(0);
 }
 
 ?>
@@ -42,18 +42,18 @@ 
 $dompdf = dirname(dirname($_SERVER["PHP_SELF"]));
 //echo '<li>['.$dompdf.']</li>';
 if ( $dompdf == '/' || $dompdf == '\\') {
-  $dompdf = '';
+    $dompdf = '';
 }
 //echo '<li>['.$dompdf.']</li>';
 $dompdf .= "/dompdf.php?base_path=" . rawurlencode("www/test/");
 //echo '<li>['.$dompdf.']</li>';
 foreach ( $test_files as $file ) {
-  $file = basename($file);
-  $arrow = "images/arrow_0" . rand(1, 6) . ".gif";  
-  echo "<li style=\"list-style-image: url('$arrow');\">\n";
-  echo $file;
-  echo " [<a class=\"button\" target=\"blank\" href=\"test/$file\">HTML</a>] [<a class=\"button\" href=\"$dompdf&input_file=" . rawurlencode("$file") .  "\">PDF</a>]\n";
-  echo "</li>\n";
+    $file = basename($file);
+    $arrow = "images/arrow_0" . rand(1, 6) . ".gif";  
+    echo "<li style=\"list-style-image: url('$arrow');\">\n";
+    echo $file;
+    echo " [<a class=\"button\" target=\"blank\" href=\"test/$file\">HTML</a>] [<a class=\"button\" href=\"$dompdf&input_file=" . rawurlencode("$file") .  "\">PDF</a>]\n";
+    echo "</li>\n";
 }
 ?>
 </ul>
@@ -69,7 +69,7 @@ 
 <select name="paper">
 <?php
 foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size )
-  echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
+    echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
 ?>
 </select>
 <select name="orientation">

main/inc/lib/phpdocx/pdf/www/head.inc

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php
 function li_arrow() {
-  return '<li style="list-style-image: url(\'images/arrow_0' . rand(1,6) . '.gif\');">';  
+    return '<li style="list-style-image: url(\'images/arrow_0' . rand(1,6) . '.gif\');">';  
 }
 function li_star() {
-  return '<li style="list-style-image: url(\'images/star_0' . rand(1,5) . '.gif\');">';  
+    return '<li style="list-style-image: url(\'images/star_0' . rand(1,5) . '.gif\');">';  
 }
 ?>
 <?php echo '<?' . 'xml version="1.0" encoding="iso-8859-1"?' . '>'; ?>

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

Indentation +40 added lines, -41 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: inline_positioner.cls.php,v $
- * Created on: 2004-06-08
- *
- * 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: inline_positioner.cls.php,v $
+     * Created on: 2004-06-08
+     *
+     * 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: inline_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 /**
@@ -46,11 +45,11 @@ 
  */
 class Inline_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
 
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
     $cb = $this->_frame->get_containing_block();
 
     // Find our nearest block level parent and access its lines property.
@@ -65,11 +64,11 @@ 
     // End debugging
 
     if ( !$p )
-      throw new DOMPDF_Exception("No block-level parent found.  Not good.");
+        throw new DOMPDF_Exception("No block-level parent found.  Not good.");
 
     $line = $p->get_current_line();
     
     $this->_frame->set_position($cb["x"] + $line["w"], $line["y"]);
 
-  }
+    }
 }

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

Indentation +38 added lines, -38 removed lines

@@ -52,28 +52,28 @@ 
  */
 class Image_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * The path to the image file (note that remote images are
-   * downloaded locally to DOMPDF_TEMP_DIR).
-   *
-   * @var string
-   */
-  protected $_image_url;
+    /**
+     * The path to the image file (note that remote images are
+     * downloaded locally to DOMPDF_TEMP_DIR).
+     *
+     * @var string
+     */
+    protected $_image_url;
 
-  /**
-   * The image's file extension (i.e. png, jpeg, gif)
-   *
-   * @var string
-   */
-  protected $_image_ext;
+    /**
+     * The image's file extension (i.e. png, jpeg, gif)
+     *
+     * @var string
+     */
+    protected $_image_ext;
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   * @param DOMPDF $dompdf the document's dompdf object (required to resolve relative & remote urls)
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     * @param DOMPDF $dompdf the document's dompdf object (required to resolve relative & remote urls)
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     global $_dompdf_warnings;
     
     parent::__construct($frame, $dompdf);
@@ -83,28 +83,28 @@ 
     if (DEBUGPNG) print '[__construct '.$url.']';
 
     list($this->_image_url, $this->_image_ext) = Image_Cache::resolve_url($url,
-                                                                          $dompdf->get_protocol(),
-                                                                          $dompdf->get_host(),
-                                                                          $dompdf->get_base_path());
+                                                                            $dompdf->get_protocol(),
+                                                                            $dompdf->get_host(),
+                                                                            $dompdf->get_base_path());
     
-  }
+    }
 
-  /**
-   * Return the image's url
-   *
-   * @return string The url of this image
-   */
-  function get_image_url() {
+    /**
+     * Return the image's url
+     *
+     * @return string The url of this image
+     */
+    function get_image_url() {
     return $this->_image_url;
-  }
+    }
 
-  /**
-   * Return the image's file extension
-   *
-   * @return string The image's file extension
-   */
-  function get_image_ext() {
+    /**
+     * Return the image's file extension
+     *
+     * @return string The image's file extension
+     */
+    function get_image_ext() {
     return $this->_image_ext;
-  }
+    }
   
 }

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

Indentation +343 added lines, -344 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -53,105 +52,105 @@ 
  */
 class Frame {
   
-  /**
-   * The DOMNode object this frame represents
-   *
-   * @var DOMNode
-   */
-  protected $_node;
-
-  /**
-   * Unique identifier for this frame.  Used to reference this frame
-   * via the node.
-   *
-   * @var string
-   */
-  protected $_id;
-
-  /**
-   * Unique id counter
-   */
-  static protected $ID_COUNTER = 0;
+    /**
+     * The DOMNode object this frame represents
+     *
+     * @var DOMNode
+     */
+    protected $_node;
+
+    /**
+     * Unique identifier for this frame.  Used to reference this frame
+     * via the node.
+     *
+     * @var string
+     */
+    protected $_id;
+
+    /**
+     * Unique id counter
+     */
+    static protected $ID_COUNTER = 0;
   
-  /**
-   * This frame's calculated style
-   *
-   * @var Style
-   */
-  protected $_style;
-
-  /**
-   * This frame's original style.  Needed for cases where frames are
-   * split across pages.
-   *
-   * @var Style
-   */
-  protected $_original_style;
+    /**
+     * This frame's calculated style
+     *
+     * @var Style
+     */
+    protected $_style;
+
+    /**
+     * This frame's original style.  Needed for cases where frames are
+     * split across pages.
+     *
+     * @var Style
+     */
+    protected $_original_style;
   
-  /**
-   * This frame's parent in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_parent;
-
-  /**
-   * This frame's first child.  All children are handled as a
-   * doubly-linked list.
-   *
-   * @var Frame
-   */
-  protected $_first_child;
-
-  /**
-   * This frame's last child.
-   *
-   * @var Frame
-   */
-  protected $_last_child;
-
-  /**
-   * This frame's previous sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_prev_sibling;
-
-  /**
-   * This frame's next sibling in the document tree.
-   *
-   * @var Frame
-   */
-  protected $_next_sibling;
+    /**
+     * This frame's parent in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_parent;
+
+    /**
+     * This frame's first child.  All children are handled as a
+     * doubly-linked list.
+     *
+     * @var Frame
+     */
+    protected $_first_child;
+
+    /**
+     * This frame's last child.
+     *
+     * @var Frame
+     */
+    protected $_last_child;
+
+    /**
+     * This frame's previous sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_prev_sibling;
+
+    /**
+     * This frame's next sibling in the document tree.
+     *
+     * @var Frame
+     */
+    protected $_next_sibling;
   
-  /**
-   * This frame's containing block (used in layout): array(x, y, w, h)
-   *
-   * @var array
-   */
-  protected $_containing_block;
-
-  /**
-   * Position on the page of the top-left corner of the margin box of
-   * this frame: array(x,y)
-   *
-   * @var array
-   */
-  protected $_position;
-
-  /**
-   * This frame's decorator
-   *
-   * @var Frame_Decorator
-   */
-  protected $_decorator;
-    
-  /**
-   * Class constructor
-   *
-   * @param DOMNode $node the DOMNode this frame represents
-   */
-  function __construct(DomNode $node) {
+    /**
+     * This frame's containing block (used in layout): array(x, y, w, h)
+     *
+     * @var array
+     */
+    protected $_containing_block;
+
+    /**
+     * Position on the page of the top-left corner of the margin box of
+     * this frame: array(x,y)
+     *
+     * @var array
+     */
+    protected $_position;
+
+    /**
+     * This frame's decorator
+     *
+     * @var Frame_Decorator
+     */
+    protected $_decorator;
+    
+    /**
+     * Class constructor
+     *
+     * @param DOMNode $node the DOMNode this frame represents
+     */
+    function __construct(DomNode $node) {
     $this->_node = $node;
       
     $this->_parent = null;
@@ -163,48 +162,48 @@ 
     $this->_original_style = null;
     
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
 
     $this->_decorator = null;
 
     $this->set_id( self::$ID_COUNTER++ );
-  }
+    }
 
-  /**
-   * "Destructor": forcibly free all references held by this frame
-   *
-   * @param bool $recursive if true, call dispose on all children
-   */
-  function dispose($recursive = false) {
+    /**
+     * "Destructor": forcibly free all references held by this frame
+     *
+     * @param bool $recursive if true, call dispose on all children
+     */
+    function dispose($recursive = false) {
 
     if ( $recursive ) {
-      while ( $child = $this->_first_child )
+        while ( $child = $this->_first_child )
         $child->dispose(true);
     }
 
     // Remove this frame from the tree
     if ( $this->_prev_sibling ) {
-      $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
+        $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
     }
 
     if ( $this->_next_sibling ) {
-      $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
+        $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_first_child === $this ) {
-      $this->_parent->_first_child = $this->_next_sibling;
+        $this->_parent->_first_child = $this->_next_sibling;
     }
 
     if ( $this->_parent && $this->_parent->_last_child === $this ) {
-      $this->_parent->_last_child = $this->_prev_sibling;
+        $this->_parent->_last_child = $this->_prev_sibling;
     }
 
     if ( $this->_parent ) {
-      $this->_parent->get_node()->removeChild($this->_node);
+        $this->_parent->get_node()->removeChild($this->_node);
     }
 
     $this->_style->dispose();
@@ -212,369 +211,369 @@ 
     $this->_original_style->dispose();
     unset($this->_original_style);
     
-  }
+    }
 
-  // Re-initialize the frame
-  function reset() {
+    // Re-initialize the frame
+    function reset() {
     $this->_position = array("x" => null,
-                             "y" => null);
+                                "y" => null);
     $this->_containing_block = array("x" => null,
-                                     "y" => null,
-                                     "w" => null,
-                                     "h" => null);
+                                        "y" => null,
+                                        "w" => null,
+                                        "h" => null);
 
     unset($this->_style);    
     $this->_style = clone $this->_original_style;
     
-  }
+    }
   
-  //........................................................................
-
-  // Accessor methods
-  function get_node() { return $this->_node; }
-  function get_id() { return $this->_id; }
-  function get_style() { return $this->_style; }
-  function get_original_style() { return $this->_original_style; }
-  function get_parent() { return $this->_parent; }
-  function get_decorator() { return $this->_decorator; }
-  function get_first_child() { return $this->_first_child; }
-  function get_last_child() { return $this->_last_child; }
-  function get_prev_sibling() { return $this->_prev_sibling; }
-  function get_next_sibling() { return $this->_next_sibling; }
-
-  function get_children() { return new FrameList($this); }
+    //........................................................................
+
+    // Accessor methods
+    function get_node() { return $this->_node; }
+    function get_id() { return $this->_id; }
+    function get_style() { return $this->_style; }
+    function get_original_style() { return $this->_original_style; }
+    function get_parent() { return $this->_parent; }
+    function get_decorator() { return $this->_decorator; }
+    function get_first_child() { return $this->_first_child; }
+    function get_last_child() { return $this->_last_child; }
+    function get_prev_sibling() { return $this->_prev_sibling; }
+    function get_next_sibling() { return $this->_next_sibling; }
+
+    function get_children() { return new FrameList($this); }
   
-  // Layout property accessors
-  function get_containing_block($i = null) {
+    // Layout property accessors
+    function get_containing_block($i = null) {
     if ( isset($i) )
-      return $this->_containing_block[$i];    
+        return $this->_containing_block[$i];    
     return $this->_containing_block;
-  }
+    }
   
-  function get_position($i = null) {
+    function get_position($i = null) {
     if ( isset($i) )
-      return $this->_position[$i];
+        return $this->_position[$i];
     return array($this->_position["x"],
-                 $this->_position["y"],
-                 "x"=>$this->_position["x"],
-                 "y"=>$this->_position["y"]);
-  }
+                    $this->_position["y"],
+                    "x"=>$this->_position["x"],
+                    "y"=>$this->_position["y"]);
+    }
     
-  //........................................................................
+    //........................................................................
 
-  // Return the height of the margin box of the frame, in pt.  Meaningless
-  // unless the height has been calculated properly.
-  function get_margin_height() {      
+    // Return the height of the margin box of the frame, in pt.  Meaningless
+    // unless the height has been calculated properly.
+    function get_margin_height() {      
     return $this->_style->length_in_pt(array($this->_style->height,
-                                             $this->_style->margin_top,
-                                             $this->_style->margin_bottom,
-                                             $this->_style->border_top_width,
-                                             $this->_style->border_bottom_width,
-                                             $this->_style->padding_top,
-                                             $this->_style->padding_bottom),
-                                       $this->_containing_block["w"]);
-  }
-
-  // Return the width of the margin box of the frame, in pt.  Meaningless
-  // unless the width has been calculted properly.
-  function get_margin_width() {
+                                                $this->_style->margin_top,
+                                                $this->_style->margin_bottom,
+                                                $this->_style->border_top_width,
+                                                $this->_style->border_bottom_width,
+                                                $this->_style->padding_top,
+                                                $this->_style->padding_bottom),
+                                        $this->_containing_block["w"]);
+    }
+
+    // Return the width of the margin box of the frame, in pt.  Meaningless
+    // unless the width has been calculted properly.
+    function get_margin_width() {
     return $this->_style->length_in_pt(array($this->_style->width,
-                                     $this->_style->margin_left,
-                                     $this->_style->margin_right,
-                                     $this->_style->border_left_width,
-                                     $this->_style->border_right_width,
-                                     $this->_style->padding_left,
-                                     $this->_style->padding_right),
-                               $this->_containing_block["w"]);
-  }
-
-  // Return the padding box (x,y,w,h) of the frame
-  function get_padding_box() {
+                                        $this->_style->margin_left,
+                                        $this->_style->margin_right,
+                                        $this->_style->border_left_width,
+                                        $this->_style->border_right_width,
+                                        $this->_style->padding_left,
+                                        $this->_style->padding_right),
+                                $this->_containing_block["w"]);
+    }
+
+    // Return the padding box (x,y,w,h) of the frame
+    function get_padding_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt(array($this->_style->margin_left,
                                         $this->_style->border_left_width),
-                                  $this->_containing_block["w"]);
+                                    $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt(array($this->_style->margin_top,
                                 $this->_style->border_top_width),
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     
     $w = $this->_style->length_in_pt(array($this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right),
-                             $this->_containing_block["w"]);
+                                    $this->_style->width,
+                                    $this->_style->padding_right),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom),
-                             $this->_containing_block["w"]);
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
-  }
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
+    }
 
-  // Return the border box of the frame
-  function get_border_box() {
+    // Return the border box of the frame
+    function get_border_box() {
     $x = $this->_position["x"] +
       $this->_style->length_in_pt($this->_style->margin_left,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt($this->_style->margin_top,
-                          $this->_containing_block["w"]);
+                            $this->_containing_block["w"]);
 
     $w = $this->_style->length_in_pt(array($this->_style->border_left_width,
-                                   $this->_style->padding_left,
-                                   $this->_style->width,
-                                   $this->_style->padding_right,
-                                   $this->_style->border_right_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_left,
+                                    $this->_style->width,
+                                    $this->_style->padding_right,
+                                    $this->_style->border_right_width),
+                                $this->_containing_block["w"]);
 
     $h = $this->_style->length_in_pt(array($this->_style->border_top_width,
-                                   $this->_style->padding_top,
-                                   $this->_style->height,
-                                   $this->_style->padding_bottom,
-                                   $this->_style->border_bottom_width),
-                             $this->_containing_block["w"]);
+                                    $this->_style->padding_top,
+                                    $this->_style->height,
+                                    $this->_style->padding_bottom,
+                                    $this->_style->border_bottom_width),
+                                $this->_containing_block["w"]);
 
     return array(0 => $x, "x" => $x,
-                 1 => $y, "y" => $y,
-                 2 => $w, "w" => $w,
-                 3 => $h, "h" => $h);
+                    1 => $y, "y" => $y,
+                    2 => $w, "w" => $w,
+                    3 => $h, "h" => $h);
     
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_id($id) {
+    // Set methods
+    function set_id($id) {
     $this->_id = $id;
 
     // We can only set attributes of DOMElement objects (nodeType == 1).
     // Since these are the only objects that we can assign CSS rules to,
     // this shortcoming is okay.
     if ( $this->_node->nodeType == 1)
-      $this->_node->setAttribute("frame_id", $id);
-  }
+        $this->_node->setAttribute("frame_id", $id);
+    }
 
-  function set_style(Style $style) {
+    function set_style(Style $style) {
     if ( is_null($this->_style) )
-      $this->_original_style = clone $style;
+        $this->_original_style = clone $style;
     
     $this->_style = $style;
-  }
+    }
   
-  function set_decorator(Frame_Decorator $decorator) {
+    function set_decorator(Frame_Decorator $decorator) {
     $this->_decorator = $decorator;
-  }
+    }
   
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     if ( is_array($x) ){
-  		foreach($x AS $key => $val){
-			$$key = $val;
-		}
+            foreach($x AS $key => $val){
+            $$key = $val;
+        }
     }
     
     if (is_numeric($x)) {
-      $this->_containing_block[0] = $x;
-      $this->_containing_block["x"] = $x;
+        $this->_containing_block[0] = $x;
+        $this->_containing_block["x"] = $x;
     }
     
     if (is_numeric($y)) {
-      $this->_containing_block[1] = $y;
-      $this->_containing_block["y"] = $y;
+        $this->_containing_block[1] = $y;
+        $this->_containing_block["y"] = $y;
     }
     
     if (is_numeric($w)) {
-      $this->_containing_block[2] = $w;
-      $this->_containing_block["w"] = $w;
+        $this->_containing_block[2] = $w;
+        $this->_containing_block["w"] = $w;
     }
     
     if (is_numeric($h)) {
-      $this->_containing_block[3] = $h;
-      $this->_containing_block["h"] = $h;
+        $this->_containing_block[3] = $h;
+        $this->_containing_block["h"] = $h;
     }
     
-  }
+    }
 
-  function set_position($x = null, $y = null) {
+    function set_position($x = null, $y = null) {
     if ( is_array($x) )
-      extract($x);
+        extract($x);
     
     if ( is_numeric($x) ) {
-      $this->_position[0] = $x;
-      $this->_position["x"] = $x;
+        $this->_position[0] = $x;
+        $this->_position["x"] = $x;
     }
 
     if ( is_numeric($y) ) {
-      $this->_position[1] = $y;
-      $this->_position["y"] = $y;
+        $this->_position[1] = $y;
+        $this->_position["y"] = $y;
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function prepend_child(Frame $child, $update_node = true) {
+    function prepend_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+        $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
     
     // Handle the first child
     if ( !$this->_first_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_next_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_next_sibling = null;
       
     } else {
 
-      $this->_first_child->_prev_sibling = $child;
-      $child->_next_sibling = $this->_first_child;      
-      $this->_first_child = $child;
+        $this->_first_child->_prev_sibling = $child;
+        $child->_next_sibling = $this->_first_child;      
+        $this->_first_child = $child;
       
     }
-  }
+    }
   
-  function append_child(Frame $child, $update_node = true) {
+    function append_child(Frame $child, $update_node = true) {
 
     if ( $update_node ) 
-      $this->_node->appendChild($child->_node);
+        $this->_node->appendChild($child->_node);
 
     // Remove the child from its parent
     if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+        $child->_parent->remove_child($child, false);
 
     $child->_parent = $this;
     $child->_next_sibling = null;
     
     // Handle the first child
     if ( !$this->_last_child ) {
-      $this->_first_child = $child;
-      $this->_last_child = $child;
-      $child->_prev_sibling = null;
+        $this->_first_child = $child;
+        $this->_last_child = $child;
+        $child->_prev_sibling = null;
       
     } else {
 
-      $this->_last_child->_next_sibling = $child;
-      $child->_prev_sibling = $this->_last_child;
-      $this->_last_child = $child;
+        $this->_last_child->_next_sibling = $child;
+        $child->_prev_sibling = $this->_last_child;
+        $this->_last_child = $child;
 
     }
-  }  
+    }  
 
-  // Inserts a new child immediately before the specified frame
-  function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
+    // Inserts a new child immediately before the specified frame
+    function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
 
     if ( $ref === $this->_first_child ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node    
     if ( $update_node )
-      $this->_node->insertBefore($new_child->_node, $ref->_node);
+        $this->_node->insertBefore($new_child->_node, $ref->_node);
 
     // Remove the child from its parent
     if ( $new_child->_parent )
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_next_sibling = $ref;
     $new_child->_prev_sibling = $ref->_prev_sibling;
 
     if ( $ref->_prev_sibling )
-      $ref->_prev_sibling->_next_sibling = $new_child;
+        $ref->_prev_sibling->_next_sibling = $new_child;
     
     $ref->_prev_sibling = $new_child;
-  }
+    }
   
-  // Inserts a new child immediately after the specified frame
-  function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
+    // Inserts a new child immediately after the specified frame
+    function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {    
 
     if ( $ref === $this->_last_child ) {
-      $this->append_child($new_child, $update_node);
-      return;
+        $this->append_child($new_child, $update_node);
+        return;
     }
 
     if ( is_null($ref) ) {
-      $this->prepend_child($new_child, $update_node);
-      return;
+        $this->prepend_child($new_child, $update_node);
+        return;
     }
     
     if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+        throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node
     if ( $update_node ) {
-      if ( $ref->_next_sibling ) {
+        if ( $ref->_next_sibling ) {
         $next_node = $ref->_next_sibling->_node;
         $this->_node->insertBefore($new_child->_node, $next_node);
-      } else {
+        } else {
         $new_child->_node = $this->_node->appendChild($new_child);
-      }
+        }
     }
     
     // Remove the child from its parent
     if ( $new_child->_parent)
-      $new_child->_parent->remove_child($new_child, false);
+        $new_child->_parent->remove_child($new_child, false);
     
     $new_child->_parent = $this;
     $new_child->_prev_sibling = $ref;
     $new_child->_next_sibling = $ref->_next_sibling;
 
     if ( $ref->_next_sibling ) 
-      $ref->_next_sibling->_prev_sibling = $new_child;
+        $ref->_next_sibling->_prev_sibling = $new_child;
 
     $ref->_next_sibling = $new_child;
-  }
+    }
 
 
-  function remove_child(Frame $child, $update_node = true) {
+    function remove_child(Frame $child, $update_node = true) {
 
     if ( $child->_parent !== $this )
-      throw new DOMPDF_Exception("Child not found in this frame");
+        throw new DOMPDF_Exception("Child not found in this frame");
 
     if ( $update_node )
-      $this->_node->removeChild($child->_node);
+        $this->_node->removeChild($child->_node);
     
     if ( $child === $this->_first_child )
-      $this->_first_child = $child->_next_sibling;
+        $this->_first_child = $child->_next_sibling;
 
     if ( $child === $this->_last_child )
-      $this->_last_child = $child->_prev_sibling;
+        $this->_last_child = $child->_prev_sibling;
 
     if ( $child->_prev_sibling )
-      $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+        $child->_prev_sibling->_next_sibling = $child->_next_sibling;
 
     if ( $child->_next_sibling )
-      $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
+        $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
 
     $child->_next_sibling = null;
     $child->_prev_sibling = null;
     $child->_parent = null;
     return $child;
         
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Debugging function:
-  function __toString() {
+    // Debugging function:
+    function __toString() {
 
     // Skip empty text frames
 //     if ( $this->_node->nodeName === "#text" &&
@@ -588,29 +587,29 @@ 
     $str .= "Class: " .get_class($this) . "<br/>";
     
     if ( $this->_node->nodeName === "#text" ) {
-      $tmp = htmlspecialchars($this->_node->nodeValue);
-      $str .= "<pre>'" .  mb_substr($tmp,0,70) .
+        $tmp = htmlspecialchars($this->_node->nodeValue);
+        $str .= "<pre>'" .  mb_substr($tmp,0,70) .
         (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
     }
     if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
+        $str .= "\nParent:" . $this->_parent->_node->nodeName .
         " (" . spl_object_hash($this->_parent->_node) . ") " .
         "<br/>";
 
     if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
+        $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
         "<br/>";
 
     if ( $this->_next_sibling )
-      $str .= "Next: " . $this->_next_sibling->_node->nodeName .
+        $str .= "Next: " . $this->_next_sibling->_node->nodeName .
         " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
         "<br/>";
 
     $d = $this->get_decorator();
     while ($d && $d != $d->get_decorator()) {
-      $str .= "Decorator: " . get_class($d) . "<br/>";
-      $d = $d->get_decorator();
+        $str .= "Decorator: " . get_class($d) . "<br/>";
+        $d = $d->get_decorator();
     }
 
     $str .= "Position: " . pre_r($this->_position, true);
@@ -621,33 +620,33 @@ 
     $str .= "\nStyle: <pre>". $this->_style->__toString() . "</pre>";
 
     if ( $this->_decorator instanceof Block_Frame_Decorator ) {
-      $str .= "Lines:<pre>";
-      foreach ($this->_decorator->get_lines() as $line) {
+        $str .= "Lines:<pre>";
+        foreach ($this->_decorator->get_lines() as $line) {
         foreach ($line["frames"] as $frame) {
-          if ($frame instanceof Text_Frame_Decorator) {
+            if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
             $str .= "'". htmlspecialchars($frame->get_text()) ."'";
-          } else {
+            } else {
             $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
-          }
+            }
         }
         
         $str .=
-          //"\ncount => " . $line["count"] . "\n".
-          "\ny => " . $line["y"] . "\n" .
-          "w => " . $line["w"] . "\n" .
-          "h => " . $line["h"] . "\n";
-      }
-      $str .= "</pre>";
+            //"\ncount => " . $line["count"] . "\n".
+            "\ny => " . $line["y"] . "\n" .
+            "w => " . $line["w"] . "\n" .
+            "h => " . $line["h"] . "\n";
+        }
+        $str .= "</pre>";
     }
     $str .= "\n";
     if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+        $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n","",""),
                                     $str));
     
     return $str;
-  }
+    }
         
 }
 
@@ -660,10 +659,10 @@ 
  * @package dompdf
  */
 class FrameList implements IteratorAggregate {
-  protected $_frame;
+    protected $_frame;
 
-  function __construct($frame) { $this->_frame = $frame; }
-  function getIterator() { return new FrameListIterator($this->_frame); }
+    function __construct($frame) { $this->_frame = $frame; }
+    function getIterator() { return new FrameListIterator($this->_frame); }
 }
   
 /**
@@ -677,37 +676,37 @@ 
  */
 class FrameListIterator implements Iterator {
 
-  protected $_parent;
-  protected $_cur;
-  protected $_num;
+    protected $_parent;
+    protected $_cur;
+    protected $_num;
 
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     $this->_parent = $frame;
     $this->_cur = $frame->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function rewind() { 
+    function rewind() { 
     $this->_cur = $this->_parent->get_first_child();
     $this->_num = 0;
-  }
+    }
 
-  function valid() {
+    function valid() {
     return isset($this->_cur);// && ($this->_cur->get_prev_sibling() === $this->_prev);
-  }
-  function key() { return $this->_num; }
-  function current() { return $this->_cur; }
+    }
+    function key() { return $this->_num; }
+    function current() { return $this->_cur; }
 
-  function next() {
+    function next() {
 
     $ret = $this->_cur;
     if ( !$ret )
-      return null;
+        return null;
     
     $this->_cur = $this->_cur->get_next_sibling();
     $this->_num++;
     return $ret;
-  }
+    }
 }
 
 //------------------------------------------------------------------------
@@ -720,9 +719,9 @@ 
  */
 class FrameTreeList implements IteratorAggregate {
 
-  protected $_root;
-  function __construct(Frame $root) { $this->_root = $root; }
-  function getIterator() { return new FrameTreeIterator($this->_root); }
+    protected $_root;
+    function __construct(Frame $root) { $this->_root = $root; }
+    function getIterator() { return new FrameTreeIterator($this->_root); }
 
 }
 
@@ -736,25 +735,25 @@ 
  */
 class FrameTreeIterator implements Iterator {
 
-  protected $_root;
-  protected $_stack = array();
-  protected $_num;
+    protected $_root;
+    protected $_stack = array();
+    protected $_num;
   
-  function __construct(Frame $root) {
+    function __construct(Frame $root) {
     $this->_stack[] = $this->_root = $root;
     $this->_num = 0;
-  }
+    }
 
-  function rewind() {
+    function rewind() {
     $this->_stack = array($this->_root);
     $this->_num = 0;
-  }
+    }
     
-  function valid() { return count($this->_stack) > 0; }
-  function key() { return $this->_num; }
-  function current() { return end($this->_stack); }
+    function valid() { return count($this->_stack) > 0; }
+    function key() { return $this->_num; }
+    function current() { return end($this->_stack); }
 
-  function next() {
+    function next() {
     $b = end($this->_stack);
     
     // Pop last element
@@ -763,10 +762,10 @@ 
     
     // Push all children onto the stack in reverse order
     if ( $c = $b->get_last_child() ) {
-      $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
+        $this->_stack[] = $c;
+        while ( $c = $c->get_prev_sibling() )
         $this->_stack[] = $c;
     }
     return $b;
-  }
+    }
 }

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

Indentation +6 added lines, -7 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,22 +46,22 @@ 
  */
 class Table_Row_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
 
     $cb = $this->_frame->get_containing_block();    
     $p = $this->_frame->get_prev_sibling();
 
     if ( $p ) 
-      $y = $p->get_position("y") + $p->get_margin_height();
+        $y = $p->get_position("y") + $p->get_margin_height();
 
     else
-      $y = $cb["y"];
+        $y = $cb["y"];
 
     $this->_frame->set_position($cb["x"], $y);
 
-  }
+    }
 }

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

Indentation +12 added lines, -13 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: inline_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,11 +46,11 @@ 
  */
 class Inline_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame $frame) { parent::__construct($frame); }
+    function __construct(Frame $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
     $this->_frame->position();
 
@@ -59,23 +58,23 @@ 
 
     // Add our margin, padding & border to the first and last children
     if ( ($f = $this->_frame->get_first_child()) && $f instanceof Text_Frame_Decorator ) {
-      $f->get_style()->margin_left = $style->margin_left;
-      $f->get_style()->padding_left = $style->padding_left;
-      $f->get_style()->border_left = $style->border_left;
+        $f->get_style()->margin_left = $style->margin_left;
+        $f->get_style()->padding_left = $style->padding_left;
+        $f->get_style()->border_left = $style->border_left;
     }
 
     if ( ($l = $this->_frame->get_last_child()) && $l instanceof Text_Frame_Decorator ) {
-      $f->get_style()->margin_right = $style->margin_right;
-      $f->get_style()->padding_right = $style->padding_right;
-      $f->get_style()->border_right = $style->border_right;
+        $f->get_style()->margin_right = $style->margin_right;
+        $f->get_style()->padding_right = $style->padding_right;
+        $f->get_style()->border_right = $style->border_right;
     }
 
     // Set the containing blocks and reflow each child.  The containing
     // block is not changed by line boxes.
     foreach ( $this->_frame->get_children() as $child ) {
       
-      $child->set_containing_block($cb);
-      $child->reflow();
+        $child->set_containing_block($cb);
+        $child->reflow();
+    }
     }
-  }
 }