chamilo / chamilo-lms

main/inc/lib/pear/Pager/Pager.php

Indentation +2 added lines, -2 removed lines

@@ -148,8 +148,8 @@
             eval('$this = Pager::factory($options);');
         } else { //php5 is case sensitive
             $msg = 'Pager constructor is deprecated.'
-                  .' You must use the "Pager::factory($params)" method'
-                  .' instead of "new Pager($params)"';
+                    .' You must use the "Pager::factory($params)" method'
+                    .' instead of "new Pager($params)"';
             trigger_error($msg, E_USER_ERROR);
         }
     }

main/inc/lib/pear/Image/Text/Exception.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * Exception for Image_Text
- *
- * PHP version 5
- *
- * @category Image
- * @package  Image_Text
- * @author   Daniel O'Connor <daniel.oconnor@gmail.com>
- * @license  http://www.php.net/license/3_01.txt PHP License
- * @link     http://pear.php.net/package/Image_Text
- */
+     * Exception for Image_Text
+     *
+     * PHP version 5
+     *
+     * @category Image
+     * @package  Image_Text
+     * @author   Daniel O'Connor <daniel.oconnor@gmail.com>
+     * @license  http://www.php.net/license/3_01.txt PHP License
+     * @link     http://pear.php.net/package/Image_Text
+     */
 
 /**
  * Exception for Image_Text

main/inc/lib/dashboard.lib.php

Indentation +255 added lines, -255 removed lines

@@ -249,282 +249,282 @@
         return $affected_rows;
     }
 
-	/**
-	 * Get all plugins path inside dashboard directory
-	 * @return array name plugins directories
-	 */
-	public static function getPossibleDashboardPluginsPath()
+    /**
+     * Get all plugins path inside dashboard directory
+     * @return array name plugins directories
+     */
+    public static function getPossibleDashboardPluginsPath()
     {
-		// get all plugins path inside plugin directory
-		/* We scan the plugin directory. Each folder is a potential plugin. */
-		$possiblePlugins = array();
-		$dashboard_pluginpath = api_get_path(SYS_PLUGIN_PATH).'dashboard/';
-		$handle = @opendir($dashboard_pluginpath);
-		while (false !== ($file = readdir($handle))) {
-			if ($file <> '.' AND $file <> '..' AND is_dir($dashboard_pluginpath.$file)) {
-				$possiblePlugins[] = $file;
-			}
-		}
-		@closedir($handle);
-
-		return $possiblePlugins;
-	}
-
-	/**
-	 * Get all blocks data without plugin directory
-	 * @return array Block data
-	 */
-	public static function get_block_data_without_plugin()
+        // get all plugins path inside plugin directory
+        /* We scan the plugin directory. Each folder is a potential plugin. */
+        $possiblePlugins = array();
+        $dashboard_pluginpath = api_get_path(SYS_PLUGIN_PATH).'dashboard/';
+        $handle = @opendir($dashboard_pluginpath);
+        while (false !== ($file = readdir($handle))) {
+            if ($file <> '.' AND $file <> '..' AND is_dir($dashboard_pluginpath.$file)) {
+                $possiblePlugins[] = $file;
+            }
+        }
+        @closedir($handle);
+
+        return $possiblePlugins;
+    }
+
+    /**
+     * Get all blocks data without plugin directory
+     * @return array Block data
+     */
+    public static function get_block_data_without_plugin()
     {
-		$tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
-		$possibleplugins = self::getPossibleDashboardPluginsPath();
-
-		// We check if plugin exists inside directory for updating active field
-		$sql = "SELECT * FROM $tbl_block";
-		$rs = Database::query($sql);
-		if (Database::num_rows($rs) > 0){
-			while ($row = Database::fetch_array($rs)) {
-				$path = $row['path'];
-				if (!in_array($row['path'],$possibleplugins)) {
-					$active = 0;
-				} else {
-					$active = 1;
-				}
-				// update active
-				$upd = "UPDATE $tbl_block SET active = '$active'
+        $tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
+        $possibleplugins = self::getPossibleDashboardPluginsPath();
+
+        // We check if plugin exists inside directory for updating active field
+        $sql = "SELECT * FROM $tbl_block";
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0){
+            while ($row = Database::fetch_array($rs)) {
+                $path = $row['path'];
+                if (!in_array($row['path'],$possibleplugins)) {
+                    $active = 0;
+                } else {
+                    $active = 1;
+                }
+                // update active
+                $upd = "UPDATE $tbl_block SET active = '$active'
 				        WHERE path = '".$row['path']."'";
-				Database::query($upd);
-			}
-		}
-
-		// get disabled block data
-		$block_data = array();
-		$sql = "SELECT * FROM $tbl_block WHERE active = 0";
-		$rs_block = Database::query($sql);
-		if (Database::num_rows($rs_block) > 0) {
-			while ($row_block = Database::fetch_array($rs_block)) {
-				$block_data[] = $row_block;
-			}
-		}
-
-		return $block_data;
-
-	}
-
-	/**
-	 * get data about enabled dashboard block (stored insise block table)
-	 * @param  string	plugin path
-	 * @return array 	data
-	 */
-	public static function get_enabled_dashboard_blocks($path = '')
+                Database::query($upd);
+            }
+        }
+
+        // get disabled block data
+        $block_data = array();
+        $sql = "SELECT * FROM $tbl_block WHERE active = 0";
+        $rs_block = Database::query($sql);
+        if (Database::num_rows($rs_block) > 0) {
+            while ($row_block = Database::fetch_array($rs_block)) {
+                $block_data[] = $row_block;
+            }
+        }
+
+        return $block_data;
+
+    }
+
+    /**
+     * get data about enabled dashboard block (stored insise block table)
+     * @param  string	plugin path
+     * @return array 	data
+     */
+    public static function get_enabled_dashboard_blocks($path = '')
     {
-		$tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
-		$condition_path = '';
-		if (!empty($path)) {
-			$path = Database::escape_string($path);
-			$condition_path = ' AND path = "'.$path.'" ';
-		}
-
-		$sql = "SELECT * FROM $tbl_block WHERE active = 1 $condition_path ";
-		$rs  = Database::query($sql);
-		$block_data = array();
-		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs)) {
-				$block_data[$row['path']] = $row;
-			}
-		}
-		return $block_data;
-	}
-
-	/**
-	 * display user dashboard list
-	 * @param int  User id
-	 * @return void
-	 */
-	public static function display_user_dashboard_list($user_id)
+        $tbl_block = Database :: get_main_table(TABLE_MAIN_BLOCK);
+        $condition_path = '';
+        if (!empty($path)) {
+            $path = Database::escape_string($path);
+            $condition_path = ' AND path = "'.$path.'" ';
+        }
+
+        $sql = "SELECT * FROM $tbl_block WHERE active = 1 $condition_path ";
+        $rs  = Database::query($sql);
+        $block_data = array();
+        if (Database::num_rows($rs) > 0) {
+            while ($row = Database::fetch_array($rs)) {
+                $block_data[$row['path']] = $row;
+            }
+        }
+        return $block_data;
+    }
+
+    /**
+     * display user dashboard list
+     * @param int  User id
+     * @return void
+     */
+    public static function display_user_dashboard_list($user_id)
     {
-		$enabled_dashboard_plugins = self::get_enabled_dashboard_blocks();
-		$user_block_data = self::get_user_block_data($user_id);
-
-		if (count($enabled_dashboard_plugins) > 0) {
-			echo '<div style="margin-top:20px">';
-			echo '<div><strong>'.get_lang('SelectBlockForDisplayingInsideBlocksDashboardView').'</strong></div><br />';
-			echo '<form name="dashboard_list" method="post" action="index.php?action=store_user_block">';
-			echo '<table class="data_table">';
-			echo '<tr>';
-			echo '<th width="5%">';
-			echo get_lang('Enabled');
-			echo '</th>';
-			echo '<th width="30%">';
-			echo get_lang('Name');
-			echo '</th>';
-			echo '<th width="40%">';
-			echo get_lang('Description');
-			echo '</th>';
-			echo '<th>';
-			echo get_lang('ColumnPosition');
-			echo '</th>';
-			echo '</tr>';
-
-			// We display all enabled plugins and the checkboxes
-			foreach ($enabled_dashboard_plugins as $block) {
-
-				$path = $block['path'];
-				$controller_class = $block['controller'];
-				$filename_controller = $path.'.class.php';
-				$dashboard_plugin_path = api_get_path(SYS_PLUGIN_PATH).'dashboard/'.$path.'/';
-				require_once $dashboard_plugin_path.$filename_controller;
-				if (class_exists($controller_class)) {
-					$obj_block = new $controller_class($user_id);
-
-					// check if user is allowed to see the block
-					if (method_exists($obj_block, 'is_block_visible_for_user')) {
-						$is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
-						if (!$is_block_visible_for_user) continue;
-					}
-
-					echo '<tr>';
-					// checkboxes
-					self::display_user_dashboard_list_checkboxes($user_id, $block['id']);
-					echo '<td>'.$block['name'].'</td>';
-					echo '<td>'.$block['description'].'</td>';
-					echo '<td>
+        $enabled_dashboard_plugins = self::get_enabled_dashboard_blocks();
+        $user_block_data = self::get_user_block_data($user_id);
+
+        if (count($enabled_dashboard_plugins) > 0) {
+            echo '<div style="margin-top:20px">';
+            echo '<div><strong>'.get_lang('SelectBlockForDisplayingInsideBlocksDashboardView').'</strong></div><br />';
+            echo '<form name="dashboard_list" method="post" action="index.php?action=store_user_block">';
+            echo '<table class="data_table">';
+            echo '<tr>';
+            echo '<th width="5%">';
+            echo get_lang('Enabled');
+            echo '</th>';
+            echo '<th width="30%">';
+            echo get_lang('Name');
+            echo '</th>';
+            echo '<th width="40%">';
+            echo get_lang('Description');
+            echo '</th>';
+            echo '<th>';
+            echo get_lang('ColumnPosition');
+            echo '</th>';
+            echo '</tr>';
+
+            // We display all enabled plugins and the checkboxes
+            foreach ($enabled_dashboard_plugins as $block) {
+
+                $path = $block['path'];
+                $controller_class = $block['controller'];
+                $filename_controller = $path.'.class.php';
+                $dashboard_plugin_path = api_get_path(SYS_PLUGIN_PATH).'dashboard/'.$path.'/';
+                require_once $dashboard_plugin_path.$filename_controller;
+                if (class_exists($controller_class)) {
+                    $obj_block = new $controller_class($user_id);
+
+                    // check if user is allowed to see the block
+                    if (method_exists($obj_block, 'is_block_visible_for_user')) {
+                        $is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
+                        if (!$is_block_visible_for_user) continue;
+                    }
+
+                    echo '<tr>';
+                    // checkboxes
+                    self::display_user_dashboard_list_checkboxes($user_id, $block['id']);
+                    echo '<td>'.$block['name'].'</td>';
+                    echo '<td>'.$block['description'].'</td>';
+                    echo '<td>
                             <select class="selectpicker show-tick form-control" name="columns['.$block['id'].']">
                             <option value="1" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==1?'selected':'').' >1</option>
                             <option value="2" '.(isset($user_block_data[$block['id']]) && $user_block_data[$block['id']]['column']==2?'selected':'').' >2</option>
                             </select>
                           </td>';
-					echo '</tr>';
-				} else {
-					echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
-				}
-			}
-
-			echo '</table>';
-			echo '<div class="row"><div class="col-md-12">';
-			echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><em class="fa fa-check-square"></em> '.
+                    echo '</tr>';
+                } else {
+                    echo Display::tag('tr',  Display::tag('td', get_lang('Error').' '.$controller_class, array('colspan'=>'3')));
+                }
+            }
+
+            echo '</table>';
+            echo '<div class="row"><div class="col-md-12">';
+            echo '<button class="btn btn-default" type="submit" name="submit_dashboard_list" value="'.get_lang('EnableDashboardBlock').'"><em class="fa fa-check-square"></em> '.
                 get_lang('EnableDashboardBlock').'</button></form>';
-			echo '</div></div>';
-		} else {
-			echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
-			if (api_is_platform_admin()) {
-				echo '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.
+            echo '</div></div>';
+        } else {
+            echo '<div style="margin-top:20px">'.get_lang('ThereAreNoEnabledDashboardPlugins').'</div>';
+            if (api_is_platform_admin()) {
+                echo '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins">'.
                     get_lang('ConfigureDashboardPlugin').'</a>';
-			}
-		}
-	}
-
-	/**
-	 * display checkboxes for user dashboard list
-	 * @param int 	User id
-	 * @param int	Block id
-	 * @return void
-	 */
-	public static function display_user_dashboard_list_checkboxes($user_id, $block_id) {
-
-		$user_id = intval($user_id);
-		$user_block_data = self::get_user_block_data($user_id);
-		$enabled_blocks_id = array_keys($user_block_data);
-
-		$checked = '';
-		if (in_array($block_id, $enabled_blocks_id)) {
-			$checked = "checked";
-		}
-
-		echo "<td align=\"center\">";
-		echo '<input type="checkbox" name="enabled_blocks['.$block_id.']" value="true" '.$checked.'/>';
-		echo "</td>";
-	}
-
-	/**
-	 * This function store enabled blocks id with its column position (block_id1:colum;block_id2:colum; ...) inside extra user fields
-	 * @param int User id
-	 * @param array selected blocks
-	 * @param array columns position
-	 * @return bool
-	 */
-	public static function store_user_blocks($user_id, $enabled_blocks, $columns) {
-		$selected_blocks_id  = array();
-		if (is_array($enabled_blocks) && count($enabled_blocks) > 0) {
-			$selected_blocks_id = array_keys($enabled_blocks);
-		}
-
-		// build data for storing inside extra user field
-		$fname = 'dashboard';
-		$fvalue = array();
-		foreach ($selected_blocks_id as $block_id) {
-			$fvalue[] = $block_id.':'.$columns[$block_id];
-		}
+            }
+        }
+    }
+
+    /**
+     * display checkboxes for user dashboard list
+     * @param int 	User id
+     * @param int	Block id
+     * @return void
+     */
+    public static function display_user_dashboard_list_checkboxes($user_id, $block_id) {
+
+        $user_id = intval($user_id);
+        $user_block_data = self::get_user_block_data($user_id);
+        $enabled_blocks_id = array_keys($user_block_data);
+
+        $checked = '';
+        if (in_array($block_id, $enabled_blocks_id)) {
+            $checked = "checked";
+        }
+
+        echo "<td align=\"center\">";
+        echo '<input type="checkbox" name="enabled_blocks['.$block_id.']" value="true" '.$checked.'/>';
+        echo "</td>";
+    }
+
+    /**
+     * This function store enabled blocks id with its column position (block_id1:colum;block_id2:colum; ...) inside extra user fields
+     * @param int User id
+     * @param array selected blocks
+     * @param array columns position
+     * @return bool
+     */
+    public static function store_user_blocks($user_id, $enabled_blocks, $columns) {
+        $selected_blocks_id  = array();
+        if (is_array($enabled_blocks) && count($enabled_blocks) > 0) {
+            $selected_blocks_id = array_keys($enabled_blocks);
+        }
+
+        // build data for storing inside extra user field
+        $fname = 'dashboard';
+        $fvalue = array();
+        foreach ($selected_blocks_id as $block_id) {
+            $fvalue[] = $block_id.':'.$columns[$block_id];
+        }
         $upd_extra_field = UserManager::update_extra_field_value(
             $user_id,
             $fname,
             $fvalue
         );
 
-		return $upd_extra_field;
+        return $upd_extra_field;
 
-	}
+    }
 
-	/**
-	 * This function get user block data (block id with its number of column) from extra user data
-	 * @param int  		User id
-	 * @return array  	data (block_id,column)
-	 */
-	public static function get_user_block_data($user_id)
+    /**
+     * This function get user block data (block id with its number of column) from extra user data
+     * @param int  		User id
+     * @return array  	data (block_id,column)
+     */
+    public static function get_user_block_data($user_id)
     {
-		$user_id = intval($user_id);
-		$field_variable = 'dashboard';
-		$extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
-		$extra_user_data = explode(';',$extra_user_data[$field_variable]);
-		$data = array();
-		foreach ($extra_user_data as $extra) {
-			$split_extra = explode(':',$extra);
-			if (!empty($split_extra)) {
-				$block_id = $split_extra[0];
-				$column = isset($split_extra[1]) ? $split_extra[1] : null;
-				$data[$block_id] = array('block_id' => $block_id, 'column' => $column);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * This function update extra user blocks data after closing a dashboard block
-	 * @param int 		User id
-	 * @param string	plugin path
-	 * @return bool
-	 */
-	public static function close_user_block($user_id, $path)
+        $user_id = intval($user_id);
+        $field_variable = 'dashboard';
+        $extra_user_data = UserManager::get_extra_user_data_by_field($user_id, $field_variable);
+        $extra_user_data = explode(';',$extra_user_data[$field_variable]);
+        $data = array();
+        foreach ($extra_user_data as $extra) {
+            $split_extra = explode(':',$extra);
+            if (!empty($split_extra)) {
+                $block_id = $split_extra[0];
+                $column = isset($split_extra[1]) ? $split_extra[1] : null;
+                $data[$block_id] = array('block_id' => $block_id, 'column' => $column);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * This function update extra user blocks data after closing a dashboard block
+     * @param int 		User id
+     * @param string	plugin path
+     * @return bool
+     */
+    public static function close_user_block($user_id, $path)
     {
-		$enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
-		$user_block_data = self::get_user_block_data($user_id);
-
-		foreach ($enabled_dashboard_blocks as $enabled_block) {
-			unset($user_block_data[$enabled_block['id']]);
-		}
-
-		// get columns and blocks id for updating extra user data
-		$columns = array();
-		$user_blocks_id = array();
-		foreach ($user_block_data as $data) {
-			$user_blocks_id[$data['block_id']] = true;
-			$columns[$data['block_id']] = $data['column'];
-		}
-
-		// update extra user blocks data
-		$upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
-
-		return $upd_extra_field;
-	}
-
-	/**
-	 * get links for styles from dashboard plugins
-	 * @return string   links
-	 */
-	public static function get_links_for_styles_from_dashboard_plugins() {
-
-		return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
-	}
+        $enabled_dashboard_blocks = self::get_enabled_dashboard_blocks($path);
+        $user_block_data = self::get_user_block_data($user_id);
+
+        foreach ($enabled_dashboard_blocks as $enabled_block) {
+            unset($user_block_data[$enabled_block['id']]);
+        }
+
+        // get columns and blocks id for updating extra user data
+        $columns = array();
+        $user_blocks_id = array();
+        foreach ($user_block_data as $data) {
+            $user_blocks_id[$data['block_id']] = true;
+            $columns[$data['block_id']] = $data['column'];
+        }
+
+        // update extra user blocks data
+        $upd_extra_field = self::store_user_blocks($user_id, $user_blocks_id, $columns);
+
+        return $upd_extra_field;
+    }
+
+    /**
+     * get links for styles from dashboard plugins
+     * @return string   links
+     */
+    public static function get_links_for_styles_from_dashboard_plugins() {
+
+        return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
+    }
 
 }

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/page_cache.cls.php

Indentation +70 added lines, -71 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_cache.cls.php,v $
- * Created on: 2004-07-23
- *
- * 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: page_cache.cls.php,v $
+     * Created on: 2004-07-23
+     *
+     * 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: page_cache.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -50,59 +49,59 @@ 
  */
 class Page_Cache {
 
-  const DB_USER = "dompdf_page_cache";
-  const DB_PASS = "some meaningful password";
-  const DB_NAME = "dompdf_page_cache";
+    const DB_USER = "dompdf_page_cache";
+    const DB_PASS = "some meaningful password";
+    const DB_NAME = "dompdf_page_cache";
   
-  static private $__connection = null;
+    static private $__connection = null;
   
-  function init() {
+    function init() {
     if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
+        $con_str = "host=" . DB_HOST .
         " dbname=" . self::DB_NAME .
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+        if ( !self::$__connection = pg_connect($con_str) )
         throw new Exception("Database connection failed.");
     }
-  }
+    }
   
-  function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
+    function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
-  private static function __query($sql) {
+    private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+        throw new Exception(pg_last_error(self::$__connection));
     return $res;
-  }
+    }
   
-  static function store_page($id, $page_num, $data) {
+    static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+        "page_num=". pg_escape_string($page_num);
 
     $res = self::__query("SELECT timestamp FROM page_cache ". $where);
 
     $row = pg_fetch_assoc($res);
     
     if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+        self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+        self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+                        pg_escape_string($page_num) . ", ".
+                        "'". pg_escape_string($data) . "')");
 
-  }
+    }
 
-  static function store_fonts($id, $fonts) {
+    static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+        self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
     self::__query("COMMIT");
-  }
+    }
   
 //   static function retrieve_page($id, $page_num) {
 
@@ -115,45 +114,45 @@ 
     
 //   }
 
-  static function get_page_timestamp($id, $page_num) {
+    static function get_page_timestamp($id, $page_num) {
     $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+                            "page_num=". pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
     return $row["timestamp"];
     
-  }
+    }
 
-  // Adds the cached document referenced by $id to the provided pdf
-  static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
+    // Adds the cached document referenced by $id to the provided pdf
+    static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
     $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+        $pdf->get_cpdf()->selectFont($row["font_name"]);
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
     if ( $new_page )
-      $pdf->new_page();
+        $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+        if ( !$first ) 
         $pdf->new_page();
-      else 
+        else 
         $first = false;        
       
-      $page = $pdf->reopen_serialized_object($row["data"]);
-      //$pdf->close_object();
-      $pdf->add_object($page, "add");
+        $page = $pdf->reopen_serialized_object($row["data"]);
+        //$pdf->close_object();
+        $pdf->add_object($page, "add");
 
     }
       
-  }
+    }
 }
 
 Page_Cache::init();

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

Indentation +67 added lines, -68 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -50,30 +49,30 @@ 
  */
 abstract class Frame_Reflower {
 
-  /**
-   * Frame for this reflower
-   *
-   * @var Frame
-   */
-  protected $_frame;
-
-  /**
-   * Cached min/max size
-   *
-   * @var array
-   */
-  protected $_min_max_cache;
+    /**
+     * Frame for this reflower
+     *
+     * @var Frame
+     */
+    protected $_frame;
+
+    /**
+     * Cached min/max size
+     *
+     * @var array
+     */
+    protected $_min_max_cache;
   
-  function __construct(Frame $frame) {
+    function __construct(Frame $frame) {
     $this->_frame = $frame;
     $this->_min_max_cache = null;
-  }
+    }
 
-  function dispose() {
+    function dispose() {
     unset($this->_frame);
-  }
+    }
 
-  protected function _collapse_margins() {
+    protected function _collapse_margins() {
     $cb = $this->_frame->get_containing_block();
     $style = $this->_frame->get_style();
 
@@ -82,121 +81,121 @@ 
 
     // Handle 'auto' values
     if ( $t === "auto" ) {
-      $style->margin_top = "0pt";
-      $t = 0;
+        $style->margin_top = "0pt";
+        $t = 0;
     }
 
     if ( $b === "auto" ) {
-      $style->margin_bottom = "0pt";
-      $b = 0;
+        $style->margin_bottom = "0pt";
+        $b = 0;
     }
 
     // Collapse vertical margins:
     $n = $this->_frame->get_next_sibling();
     while ( $n && !in_array($n->get_style()->display, Style::$BLOCK_TYPES) )
-      $n = $n->get_next_sibling();
+        $n = $n->get_next_sibling();
 
     if ( $n ) { // && !$n instanceof Page_Frame_Decorator ) {
 
-      $b = max($b, $style->length_in_pt($n->get_style()->margin_top, $cb["w"]));
+        $b = max($b, $style->length_in_pt($n->get_style()->margin_top, $cb["w"]));
 
-      $n->get_style()->margin_top = "$b pt";
-      $style->margin_bottom = "0 pt";
+        $n->get_style()->margin_top = "$b pt";
+        $style->margin_bottom = "0 pt";
 
     }
 
     // Collapse our first child's margin
     $f = $this->_frame->get_first_child();
     while ( $f && !in_array($f->get_style()->display, Style::$BLOCK_TYPES) )
-      $f = $f->get_next_sibling();
+        $f = $f->get_next_sibling();
 
     if ( $f ) {
-      $t = max( $t, $style->length_in_pt($f->get_style()->margin_top, $cb["w"]));
-      $style->margin_top = "$t pt";
-      $f->get_style()->margin_top = "0 pt";
+        $t = max( $t, $style->length_in_pt($f->get_style()->margin_top, $cb["w"]));
+        $style->margin_top = "$t pt";
+        $f->get_style()->margin_top = "0 pt";
     }
 
-  }
+    }
 
-  // Returns true if a new page is required
-  protected function _check_new_page() {
+    // Returns true if a new page is required
+    protected function _check_new_page() {
     $y = $this->_frame->get_position("y");
     $h = $style->length_in_pt($style->height);
     // Check if we need to move to a new page
     if ( $y + $h >= $this->_frame->get_root()->get_page_height() )
-      return true;
+        return true;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  abstract function reflow();
+    abstract function reflow();
 
-  //........................................................................
+    //........................................................................
 
-  // Required for table layout: Returns an array(0 => min, 1 => max, "min"
-  // => min, "max" => max) of the minimum and maximum widths of this frame.
-  // This provides a basic implementation.  Child classes should override
-  // this if necessary.
-  function get_min_max_width() {
+    // Required for table layout: Returns an array(0 => min, 1 => max, "min"
+    // => min, "max" => max) of the minimum and maximum widths of this frame.
+    // This provides a basic implementation.  Child classes should override
+    // this if necessary.
+    function get_min_max_width() {
     if ( !is_null($this->_min_max_cache) ) {
-      return $this->_min_max_cache;
+        return $this->_min_max_cache;
     }
     
     $style = $this->_frame->get_style();
 
     // Account for margins & padding
     $dims = array($style->padding_left,
-                  $style->padding_right,
-                  $style->border_left_width,
-                  $style->border_right_width,
-                  $style->margin_left,
-                  $style->margin_right);
+                    $style->padding_right,
+                    $style->border_left_width,
+                    $style->border_right_width,
+                    $style->margin_left,
+                    $style->margin_right);
 
     $cb_w = $this->_frame->get_containing_block("w");
     $delta = $style->length_in_pt($dims, $cb_w);
 
     // Handle degenerate case
     if ( !$this->_frame->get_first_child() )
-      return $this->_min_max_cache = array($delta, $delta,"min" => $delta, "max" => $delta);
+        return $this->_min_max_cache = array($delta, $delta,"min" => $delta, "max" => $delta);
 
     $low = array();
     $high = array();
 
     for ( $iter = $this->_frame->get_children()->getIterator();
-          $iter->valid();
-          $iter->next() ) {
+            $iter->valid();
+            $iter->next() ) {
 
-      $inline_min = 0;
-      $inline_max = 0;
+        $inline_min = 0;
+        $inline_max = 0;
 
-      // Add all adjacent inline widths together to calculate max width
-      while ( $iter->valid() && in_array( $iter->current()->get_style()->display, Style::$INLINE_TYPES ) ) {
+        // Add all adjacent inline widths together to calculate max width
+        while ( $iter->valid() && in_array( $iter->current()->get_style()->display, Style::$INLINE_TYPES ) ) {
 
         $child = $iter->current();
 
         $minmax = $child->get_min_max_width();
 
         if ( in_array( $iter->current()->get_style()->white_space, array("pre", "nowrap") ) )
-          $inline_min += $minmax["min"];
+            $inline_min += $minmax["min"];
         else
-          $low[] = $minmax["min"];
+            $low[] = $minmax["min"];
 
         $inline_max += $minmax["max"];
         $iter->next();
 
-      }
+        }
 
-      if ( $inline_max > 0 )
+        if ( $inline_max > 0 )
         $high[] = $inline_max;
 
-      if ( $inline_min > 0 )
+        if ( $inline_min > 0 )
         $low[] = $inline_min;
 
-      if ( $iter->valid() ) {
+        if ( $iter->valid() ) {
         list($low[], $high[]) = $iter->current()->get_min_max_width();
         continue;
-      }
+        }
 
     }
     $min = count($low) ? max($low) : 0;
@@ -206,16 +205,16 @@ 
     // content.  If the width is a percentage ignore it for now.
     $width = $style->width;
     if ( $width !== "auto" && !is_percent($width) ) {
-      $width = $style->length_in_pt($width, $cb_w);
-      if ( $min < $width )
+        $width = $style->length_in_pt($width, $cb_w);
+        if ( $min < $width )
         $min = $width;
-      if ( $max < $width )
+        if ( $max < $width )
         $max = $width;
     }
 
     $min += $delta;
     $max += $delta;
     return $this->_min_max_cache = array($min, $max, "min"=>$min, "max"=>$max);
-  }
+    }
 
 }