chamilo / chamilo-lms

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

Indentation +5 added lines, -5 removed lines

@@ -234,8 +234,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                           . $this->_spacesBefore
-                           . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                            . $this->_spacesBefore
+                            . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -268,8 +268,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                      . $this->_spacesBefore
-                      . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                        . $this->_spacesBefore
+                        . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -285,7 +285,7 @@ 
                     $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
                 }
                 $links .= $this->_spacesBefore
-                       . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
+                        . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
             }
         }
         return $links;

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

Indentation +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
                 $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
             }
             $links .= $this->_spacesBefore
-                   . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
+                    . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
         }
         return $links;
     }

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