chamilo / chamilo-lms

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

Spacing +12 added lines, -12 removed lines

@@ -61,15 +61,15 @@ 
 /**
  * The location of the DOMPDF include directory
  */
-define("DOMPDF_INC_DIR", DOMPDF_DIR . "/include");
+define("DOMPDF_INC_DIR", DOMPDF_DIR."/include");
 
 /**
  * The location of the DOMPDF lib directory
  */
-define("DOMPDF_LIB_DIR", DOMPDF_DIR . "/lib");
+define("DOMPDF_LIB_DIR", DOMPDF_DIR."/lib");
 
 //FIXME: Some function definitions rely on the constants defined by DOMPDF. However, might this location prove problematic?
-require_once(DOMPDF_INC_DIR . "/functions.inc.php");
+require_once(DOMPDF_INC_DIR."/functions.inc.php");
 
 /**
  * The location of the DOMPDF font directory
@@ -99,7 +99,7 @@ 
  *
  * *Please note the trailing slash.*
  */
-define("DOMPDF_FONT_DIR", DOMPDF_DIR . "/lib/fonts/");
+define("DOMPDF_FONT_DIR", DOMPDF_DIR."/lib/fonts/");
 
 /**
  * The location of the DOMPDF font cache directory
@@ -172,7 +172,7 @@ 
  * @link http://ttf2pt1.sourceforge.net/
  */
 if (!defined("TTF2AFM")) {
-  define("TTF2AFM", DOMPDF_LIB_DIR ."/ttf2ufm/ttf2ufm-src/ttf2pt1");
+  define("TTF2AFM", DOMPDF_LIB_DIR."/ttf2ufm/ttf2ufm-src/ttf2pt1");
   //define("TTF2AFM", "/usr/bin/ttf2pt1");
 }
 
@@ -344,17 +344,17 @@ 
  * @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") ) {
+if (function_exists("spl_autoload_register")) {
 
    spl_autoload_register("DOMPDF_autoload");
 
-} else if ( !function_exists("__autoload") ) {
+} else if (!function_exists("__autoload")) {
   /**
    * Default __autoload() function
    *
@@ -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/dompdf.php

Spacing +45 added lines, -45 removed lines

@@ -78,7 +78,7 @@ 
     " -h\t\tShow this message\n".
     " -l\t\tlist available paper sizes\n".
     " -p size\tpaper size; something like 'letter', 'A4', 'legal', etc.  The default is\n".
-    "   \t\t'" . DOMPDF_DEFAULT_PAPER_SIZE . "'\n".
+    "   \t\t'".DOMPDF_DEFAULT_PAPER_SIZE."'\n".
     " -o orientation\teither 'portrait' or 'landscape'.  Default is 'portrait'.\n".
     " -b path\tset the 'document root' of the html_file.  Relative urls (for \n".
     "        \tstylesheets) are resolved using this directory.  Default is the \n".
@@ -96,7 +96,7 @@ 
 
   $opts = array();
 
-  if ( $_SERVER["argc"] == 1 )
+  if ($_SERVER["argc"] == 1)
     return $opts;
 
   $i = 1;
@@ -116,30 +116,30 @@ 
       break;
 
     case "-p":
-      if ( !isset($_SERVER["argv"][$i+1]) )
+      if (!isset($_SERVER["argv"][$i + 1]))
         die("-p switch requires a size parameter\n");
-      $opts["p"] = $_SERVER["argv"][$i+1];
+      $opts["p"] = $_SERVER["argv"][$i + 1];
       $i += 2;
       break;
 
     case "-o":
-      if ( !isset($_SERVER["argv"][$i+1]) )
+      if (!isset($_SERVER["argv"][$i + 1]))
         die("-o switch requires an orientation parameter\n");
-      $opts["o"] = $_SERVER["argv"][$i+1];
+      $opts["o"] = $_SERVER["argv"][$i + 1];
       $i += 2;
       break;
 
     case "-b":
-      if ( !isset($_SERVER["argv"][$i+1]) )
+      if (!isset($_SERVER["argv"][$i + 1]))
         die("-b switch requires a path parameter\n");
-      $opts["b"] = $_SERVER["argv"][$i+1];
+      $opts["b"] = $_SERVER["argv"][$i + 1];
       $i += 2;
       break;
 
     case "-f":
-      if ( !isset($_SERVER["argv"][$i+1]) )
+      if (!isset($_SERVER["argv"][$i + 1]))
         die("-f switch requires a filename parameter\n");
-      $opts["f"] = $_SERVER["argv"][$i+1];
+      $opts["f"] = $_SERVER["argv"][$i + 1];
       $i += 2;
       break;
 
@@ -154,9 +154,9 @@ 
       break;
 
     case "-t":
-      if ( !isset($_SERVER['argv'][$i + 1]) )
+      if (!isset($_SERVER['argv'][$i + 1]))
         die("-t switch requires a comma separated list of types\n");
-      $opts["t"] = $_SERVER['argv'][$i+1];
+      $opts["t"] = $_SERVER['argv'][$i + 1];
       $i += 2;
       break;
 
@@ -177,61 +177,61 @@ 
 
 $sapi = php_sapi_name();
 
-switch ( $sapi ) {
+switch ($sapi) {
 
  case "cli":
 
   $opts = getoptions();
 
-  if ( isset($opts["h"]) || (!isset($opts["filename"]) && !isset($opts["l"])) ) {
+  if (isset($opts["h"]) || (!isset($opts["filename"]) && !isset($opts["l"]))) {
     dompdf_usage();
     exit;
   }
 
-  if ( isset($opts["l"]) ) {
+  if (isset($opts["l"])) {
     echo "\nUnderstood paper sizes:\n";
 
     foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size)
-      echo "  " . mb_strtoupper($size) . "\n";
+      echo "  ".mb_strtoupper($size)."\n";
     exit;
   }
   $file = $opts["filename"];
 
-  if ( isset($opts["p"]) )
+  if (isset($opts["p"]))
     $paper = $opts["p"];
   else
     $paper = DOMPDF_DEFAULT_PAPER_SIZE;
 
-  if ( isset($opts["o"]) )
+  if (isset($opts["o"]))
     $orientation = $opts["o"];
   else
     $orientation = "portrait";
 
-  if ( isset($opts["b"]) )
+  if (isset($opts["b"]))
     $base_path = $opts["b"];
 
-  if ( isset($opts["f"]) )
+  if (isset($opts["f"]))
     $outfile = $opts["f"];
   else {
-    if ( $file === "-" )
+    if ($file === "-")
       $outfile = "dompdf_out.pdf";
     else
-      $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file) . ".pdf";
+      $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file).".pdf";
   }
 
-  if ( isset($opts["v"]) )
+  if (isset($opts["v"]))
     $_dompdf_show_warnings = true;
 
-  if ( isset($opts["d"]) ) {
+  if (isset($opts["d"])) {
     $_dompdf_show_warnings = true;
     $_dompdf_debug = true;
   }
 
-  if ( isset($opts['t']) ) {
-    $arr = split(',',$opts['t']);
+  if (isset($opts['t'])) {
+    $arr = split(',', $opts['t']);
     $types = array();
     foreach ($arr as $type)
-      $types[ trim($type) ] = 1;
+      $types[trim($type)] = 1;
     $_DOMPDF_DEBUG_TYPES = $types;
   }
   
@@ -241,31 +241,31 @@ 
 
  default:
 
- 	if ( isset($_GET["input_file"]) )
+ 	if (isset($_GET["input_file"]))
  		$file = basename(rawurldecode($_GET["input_file"]));
  	else
  		throw new DOMPDF_Exception("An input file is required (i.e. input_file _GET variable).");
  		
- 	if ( isset($_GET["paper"]) )
+ 	if (isset($_GET["paper"]))
  		$paper = rawurldecode($_GET["paper"]);
  	else
  		$paper = DOMPDF_DEFAULT_PAPER_SIZE;
  		
- 	if ( isset($_GET["orientation"]) )
+ 	if (isset($_GET["orientation"]))
  		$orientation = rawurldecode($_GET["orientation"]);
  	else
  		$orientation = "portrait";
  		
- 	if ( isset($_GET["base_path"]) )
+ 	if (isset($_GET["base_path"]))
  		$base_path = rawurldecode($_GET["base_path"]);
  		
  		
  		$outfile = "dompdf_out.pdf"; # Don't allow them to set the output file
  		$save_file = false; # Don't save the file
- 		$file = $base_path . $file; # Set the input file
+ 		$file = $base_path.$file; # Set the input file
 
  		/* Check to see if the input file and base path = www/test */
- 		if($base_path !== "www/test/")
+ 		if ($base_path !== "www/test/")
  			throw new DOMPDF_Exception("Access to dompdf.php via non-cli SAPI has been deprecated due to security concerns.  Please use the dompdf class directly.");
 
    break;
@@ -273,9 +273,9 @@ 
 
 $dompdf = new DOMPDF();
 
-if ( $file === "-" ) {
+if ($file === "-") {
   $str = "";
-  while ( !feof(STDIN) )
+  while (!feof(STDIN))
     $str .= fread(STDIN, 4096);
 
   $dompdf->load_html($str);
@@ -283,7 +283,7 @@ 
 } else
   $dompdf->load_html_file($file);
 
-if ( isset($base_path) ) {
+if (isset($base_path)) {
   $dompdf->set_base_path($base_path);
 }
 
@@ -291,33 +291,33 @@ 
 
 $dompdf->render();
 
-if ( $_dompdf_show_warnings ) {
+if ($_dompdf_show_warnings) {
   global $_dompdf_warnings;
   foreach ($_dompdf_warnings as $msg)
-    echo $msg . "\n";
+    echo $msg."\n";
   echo $dompdf->get_canvas()->get_cpdf()->messages;
   flush();
 }
 
-if ( $save_file ) {
+if ($save_file) {
 //   if ( !is_writable($outfile) )
 //     throw new DOMPDF_Exception("'$outfile' is not writable.");
-  if ( strtolower(DOMPDF_PDF_BACKEND) === "gd" )
+  if (strtolower(DOMPDF_PDF_BACKEND) === "gd")
     $outfile = str_replace(".pdf", ".png", $outfile);
 
   list($proto, $host, $path, $file) = explode_url($outfile);
-  if ( $proto != "" ) // i.e. not file://
+  if ($proto != "") // i.e. not file://
     $outfile = $file; // just save it locally, FIXME? could save it like wget: ./host/basepath/file
 
-  $outfile = realpath(dirname($outfile)) . DIRECTORY_SEPARATOR . basename($outfile);
+  $outfile = realpath(dirname($outfile)).DIRECTORY_SEPARATOR.basename($outfile);
 
-  if ( strpos($outfile, DOMPDF_CHROOT) !== 0 )
+  if (strpos($outfile, DOMPDF_CHROOT) !== 0)
     throw new DOMPDF_Exception("Permission denied.");
 
-  file_put_contents($outfile, $dompdf->output( array("compress" => 0) ));
+  file_put_contents($outfile, $dompdf->output(array("compress" => 0)));
   exit(0);
 }
 
-if ( !headers_sent() ) {
+if (!headers_sent()) {
   $dompdf->stream($outfile);
 }

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

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 exit;
 require_once("../dompdf_config.inc.php");
-if ( isset( $_POST["html"] ) ) {
+if (isset($_POST["html"])) {
 
-  if ( get_magic_quotes_gpc() )
+  if (get_magic_quotes_gpc())
     $_POST["html"] = stripslashes($_POST["html"]);
   
   $dompdf = new DOMPDF();
@@ -41,18 +41,18 @@ 
 //echo '<li>['.$_SERVER["PHP_SELF"].']</li>';
 $dompdf = dirname(dirname($_SERVER["PHP_SELF"]));
 //echo '<li>['.$dompdf.']</li>';
-if ( $dompdf == '/' || $dompdf == '\\') {
+if ($dompdf == '/' || $dompdf == '\\') {
   $dompdf = '';
 }
 //echo '<li>['.$dompdf.']</li>';
-$dompdf .= "/dompdf.php?base_path=" . rawurlencode("www/test/");
+$dompdf .= "/dompdf.php?base_path=".rawurlencode("www/test/");
 //echo '<li>['.$dompdf.']</li>';
-foreach ( $test_files as $file ) {
+foreach ($test_files as $file) {
   $file = basename($file);
-  $arrow = "images/arrow_0" . rand(1, 6) . ".gif";  
+  $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 " [<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";
 }
 ?>
@@ -63,13 +63,13 @@ 
 <p>Enter your html snippet in the text box below to see it rendered as a
 PDF: (Note by default, remote stylesheets, images &amp; are disabled.)</p>
 
-<form action="<?php echo $_SERVER["PHP_SELF"];?>" method="post">
+<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
 <div>
 <p>Paper size and orientaion:
 <select name="paper">
 <?php
-foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size )
-  echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
+foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size)
+  echo "<option ".($size == "letter" ? "selected " : "")."value=\"$size\">$size</option>\n";
 ?>
 </select>
 <select name="orientation">

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

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?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"?' . '>'; ?>
+<?php echo '<?'.'xml version="1.0" encoding="iso-8859-1"?'.'>'; ?>
 <!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -14,7 +14,7 @@ 
 <head>
 <title>dompdf - The PHP 5 HTML to PDF Converter</title>
 <link rel="stylesheet" href="style.css" type="text/css"/>
-<link rel="SHORTCUT ICON" href="http://<?php echo $_SERVER["HTTP_HOST"] . dirname($_SERVER["PHP_SELF"]);?>/images/favicon.ico"/>
+<link rel="SHORTCUT ICON" href="http://<?php echo $_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"]); ?>/images/favicon.ico"/>
 </head>
 
 <body>

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

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
     // End debugging
 
-    if ( !$p )
+    if (!$p)
       throw new DOMPDF_Exception("No block-level parent found.  Not good.");
 
     $line = $p->get_current_line();

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

Spacing +19 added lines, -19 removed lines

@@ -84,7 +84,7 @@ 
 
     $parsed_url = explode_url($url);
 
-    $DEBUGPNG=DEBUGPNG; //=DEBUGPNG; Allow override of global setting for ad hoc debug
+    $DEBUGPNG = DEBUGPNG; //=DEBUGPNG; Allow override of global setting for ad hoc debug
     $full_url_dbg = '';
     
     //debugpng
@@ -93,19 +93,19 @@ 
     $remote = ($proto != "" && $proto !== "file://");
     $remote = $remote || ($parsed_url['protocol'] != "");
 
-    if ( !DOMPDF_ENABLE_REMOTE && $remote ) {
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+    if (!DOMPDF_ENABLE_REMOTE && $remote) {
+      $resolved_url = DOMPDF_LIB_DIR."/res/broken_image.png";
       $ext = "png";
 
       //debugpng
       if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
 
-    } else if ( DOMPDF_ENABLE_REMOTE && $remote ) {
+    } else if (DOMPDF_ENABLE_REMOTE && $remote) {
       // Download remote files to a temporary directory
       $full_url = build_url($proto, $host, $base_path, $url);
 
-      if ( isset(self::$_cache[$full_url]) ) {
-        list($resolved_url,$ext) = self::$_cache[$full_url];
+      if (isset(self::$_cache[$full_url])) {
+        list($resolved_url, $ext) = self::$_cache[$full_url];
 
         //debugpng
         if ($DEBUGPNG) $full_url_dbg = $full_url.'(cache)';
@@ -114,15 +114,15 @@ 
 
         $resolved_url = tempnam(DOMPDF_TEMP_DIR, "ca_dompdf_img_");
         //debugpng
-        if ($DEBUGPNG) echo $resolved_url . "\n";
+        if ($DEBUGPNG) echo $resolved_url."\n";
 
         $old_err = set_error_handler("record_warnings");
         $image = file_get_contents($full_url);
         restore_error_handler();
 
-        if ( strlen($image) == 0 ) {
+        if (strlen($image) == 0) {
           //target image not found
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+          $resolved_url = DOMPDF_LIB_DIR."/res/broken_image.png";
           $ext = "png";
 
           //debugpng
@@ -140,24 +140,24 @@ 
         //Therefore get image type from the content
 
         $imagedim = getimagesize($resolved_url);
-        if( $imagedim[2] >= 1 && $imagedim[2] <=3 && $imagedim[0] && $imagedim[1] ) {
+        if ($imagedim[2] >= 1 && $imagedim[2] <= 3 && $imagedim[0] && $imagedim[1]) {
         //target image is valid
 
-        $imagetypes = array('','gif','jpeg','png','swf');
+        $imagetypes = array('', 'gif', 'jpeg', 'png', 'swf');
         $ext = $imagetypes[$imagedim[2]];
-        if ( rename($resolved_url,$resolved_url.'.'.$ext) ) {
+        if (rename($resolved_url, $resolved_url.'.'.$ext)) {
           $resolved_url .= '.'.$ext;
         }
  
  		//Don't put replacement image into cache - otherwise it will be deleted on cache cleanup.
  		//Only execute on successfull caching of remote image.
-        self::$_cache[$full_url] = array($resolved_url,$ext);
+        self::$_cache[$full_url] = array($resolved_url, $ext);
 
         } else {
           //target image is not valid.
           unlink($resolved_url);
           
-          $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+          $resolved_url = DOMPDF_LIB_DIR."/res/broken_image.png";
           $ext = "png";
         }
         }
@@ -169,7 +169,7 @@ 
       $resolved_url = build_url($proto, $host, $base_path, $url);
       if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
 
-      if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
+      if (!preg_match("/.*\.(\w+)/", $url, $match)) {
         //debugpng
         if ($DEBUGPNG) print '[resolve_url exception '.$url.']';
           throw new DOMPDF_Exception("Unknown image type: $url.");
@@ -182,13 +182,13 @@ 
 
     }
 
-    if ( !is_readable($resolved_url) || !filesize($resolved_url) ) {
+    if (!is_readable($resolved_url) || !filesize($resolved_url)) {
 
       //debugpng
       if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
 
-      $_dompdf_warnings[] = "File " .$resolved_url . " is not readable or is an empty file.\n";
-      $resolved_url = DOMPDF_LIB_DIR . "/res/broken_image.png";
+      $_dompdf_warnings[] = "File ".$resolved_url." is not readable or is an empty file.\n";
+      $resolved_url = DOMPDF_LIB_DIR."/res/broken_image.png";
       $ext = "png";
     }
 
@@ -203,7 +203,7 @@ 
    * or converted)
    */
   static function clear() {
-    if ( count(self::$_cache) ) {
+    if (count(self::$_cache)) {
       while ($entry = array_shift(self::$_cache)) {
         list($file, $ext) = $entry;
         //debugpng

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

Spacing +77 added lines, -77 removed lines

@@ -171,7 +171,7 @@ 
 
     $this->_decorator = null;
 
-    $this->set_id( self::$ID_COUNTER++ );
+    $this->set_id(self::$ID_COUNTER++);
   }
 
   /**
@@ -181,29 +181,29 @@ 
    */
   function dispose($recursive = false) {
 
-    if ( $recursive ) {
-      while ( $child = $this->_first_child )
+    if ($recursive) {
+      while ($child = $this->_first_child)
         $child->dispose(true);
     }
 
     // Remove this frame from the tree
-    if ( $this->_prev_sibling ) {
+    if ($this->_prev_sibling) {
       $this->_prev_sibling->_next_sibling = $this->_next_sibling;      
     }
 
-    if ( $this->_next_sibling ) {
+    if ($this->_next_sibling) {
       $this->_next_sibling->_prev_sibling = $this->_prev_sibling;
     }
 
-    if ( $this->_parent && $this->_parent->_first_child === $this ) {
+    if ($this->_parent && $this->_parent->_first_child === $this) {
       $this->_parent->_first_child = $this->_next_sibling;
     }
 
-    if ( $this->_parent && $this->_parent->_last_child === $this ) {
+    if ($this->_parent && $this->_parent->_last_child === $this) {
       $this->_parent->_last_child = $this->_prev_sibling;
     }
 
-    if ( $this->_parent ) {
+    if ($this->_parent) {
       $this->_parent->get_node()->removeChild($this->_node);
     }
 
@@ -246,13 +246,13 @@ 
   
   // Layout property accessors
   function get_containing_block($i = null) {
-    if ( isset($i) )
+    if (isset($i))
       return $this->_containing_block[$i];    
     return $this->_containing_block;
   }
   
   function get_position($i = null) {
-    if ( isset($i) )
+    if (isset($i))
       return $this->_position[$i];
     return array($this->_position["x"],
                  $this->_position["y"],
@@ -354,12 +354,12 @@ 
     // 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)
+    if ($this->_node->nodeType == 1)
       $this->_node->setAttribute("frame_id", $id);
   }
 
   function set_style(Style $style) {
-    if ( is_null($this->_style) )
+    if (is_null($this->_style))
       $this->_original_style = clone $style;
     
     $this->_style = $style;
@@ -370,8 +370,8 @@ 
   }
   
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    if ( is_array($x) ){
-  		foreach($x AS $key => $val){
+    if (is_array($x)) {
+  		foreach ($x AS $key => $val) {
 			$$key = $val;
 		}
     }
@@ -399,15 +399,15 @@ 
   }
 
   function set_position($x = null, $y = null) {
-    if ( is_array($x) )
+    if (is_array($x))
       extract($x);
     
-    if ( is_numeric($x) ) {
+    if (is_numeric($x)) {
       $this->_position[0] = $x;
       $this->_position["x"] = $x;
     }
 
-    if ( is_numeric($y) ) {
+    if (is_numeric($y)) {
       $this->_position[1] = $y;
       $this->_position["y"] = $y;
     }
@@ -417,18 +417,18 @@ 
 
   function prepend_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
+    if ($update_node) 
       $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
 
     // Remove the child from its parent
-    if ( $child->_parent )
+    if ($child->_parent)
       $child->_parent->remove_child($child, false);
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
     
     // Handle the first child
-    if ( !$this->_first_child ) {
+    if (!$this->_first_child) {
       $this->_first_child = $child;
       $this->_last_child = $child;
       $child->_next_sibling = null;
@@ -444,18 +444,18 @@ 
   
   function append_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
+    if ($update_node) 
       $this->_node->appendChild($child->_node);
 
     // Remove the child from its parent
-    if ( $child->_parent )
+    if ($child->_parent)
       $child->_parent->remove_child($child, false);
 
     $child->_parent = $this;
     $child->_next_sibling = null;
     
     // Handle the first child
-    if ( !$this->_last_child ) {
+    if (!$this->_last_child) {
       $this->_first_child = $child;
       $this->_last_child = $child;
       $child->_prev_sibling = null;
@@ -472,32 +472,32 @@ 
   // 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 ) {
+    if ($ref === $this->_first_child) {
       $this->prepend_child($new_child, $update_node);
       return;
     }
 
-    if ( is_null($ref) ) {
+    if (is_null($ref)) {
       $this->append_child($new_child, $update_node);
       return;
     }
     
-    if ( $ref->_parent !== $this )
+    if ($ref->_parent !== $this)
       throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node    
-    if ( $update_node )
+    if ($update_node)
       $this->_node->insertBefore($new_child->_node, $ref->_node);
 
     // Remove the child from its parent
-    if ( $new_child->_parent )
+    if ($new_child->_parent)
       $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 )
+    if ($ref->_prev_sibling)
       $ref->_prev_sibling->_next_sibling = $new_child;
     
     $ref->_prev_sibling = $new_child;
@@ -506,22 +506,22 @@ 
   // 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 ) {
+    if ($ref === $this->_last_child) {
       $this->append_child($new_child, $update_node);
       return;
     }
 
-    if ( is_null($ref) ) {
+    if (is_null($ref)) {
       $this->prepend_child($new_child, $update_node);
       return;
     }
     
-    if ( $ref->_parent !== $this )
+    if ($ref->_parent !== $this)
       throw new DOMPDF_Exception("Reference child is not a child of this node.");
 
     // Update the node
-    if ( $update_node ) {
-      if ( $ref->_next_sibling ) {
+    if ($update_node) {
+      if ($ref->_next_sibling) {
         $next_node = $ref->_next_sibling->_node;
         $this->_node->insertBefore($new_child->_node, $next_node);
       } else {
@@ -530,14 +530,14 @@ 
     }
     
     // Remove the child from its parent
-    if ( $new_child->_parent)
+    if ($new_child->_parent)
       $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 ) 
+    if ($ref->_next_sibling) 
       $ref->_next_sibling->_prev_sibling = $new_child;
 
     $ref->_next_sibling = $new_child;
@@ -546,22 +546,22 @@ 
 
   function remove_child(Frame $child, $update_node = true) {
 
-    if ( $child->_parent !== $this )
+    if ($child->_parent !== $this)
       throw new DOMPDF_Exception("Child not found in this frame");
 
-    if ( $update_node )
+    if ($update_node)
       $this->_node->removeChild($child->_node);
     
-    if ( $child === $this->_first_child )
+    if ($child === $this->_first_child)
       $this->_first_child = $child->_next_sibling;
 
-    if ( $child === $this->_last_child )
+    if ($child === $this->_last_child)
       $this->_last_child = $child->_prev_sibling;
 
-    if ( $child->_prev_sibling )
+    if ($child->_prev_sibling)
       $child->_prev_sibling->_next_sibling = $child->_next_sibling;
 
-    if ( $child->_next_sibling )
+    if ($child->_next_sibling)
       $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
 
     $child->_next_sibling = null;
@@ -582,68 +582,68 @@ 
 //       return "";
     
     
-    $str = "<b>" . $this->_node->nodeName . ":</b><br/>";
+    $str = "<b>".$this->_node->nodeName.":</b><br/>";
     //$str .= spl_object_hash($this->_node) . "<br/>";
-    $str .= "Id: " .$this->get_id() . "<br/>";
-    $str .= "Class: " .get_class($this) . "<br/>";
+    $str .= "Id: ".$this->get_id()."<br/>";
+    $str .= "Class: ".get_class($this)."<br/>";
     
-    if ( $this->_node->nodeName === "#text" ) {
+    if ($this->_node->nodeName === "#text") {
       $tmp = htmlspecialchars($this->_node->nodeValue);
-      $str .= "<pre>'" .  mb_substr($tmp,0,70) .
-        (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
+      $str .= "<pre>'".mb_substr($tmp, 0, 70).
+        (mb_strlen($tmp) > 70 ? "..." : "")."'</pre>";
     }
-    if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
-        " (" . spl_object_hash($this->_parent->_node) . ") " .
+    if ($this->_parent)
+      $str .= "\nParent:".$this->_parent->_node->nodeName.
+        " (".spl_object_hash($this->_parent->_node).") ".
         "<br/>";
 
-    if ( $this->_prev_sibling )
-      $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
-        " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
+    if ($this->_prev_sibling)
+      $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 .
-        " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
+    if ($this->_next_sibling)
+      $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/>";
+      $str .= "Decorator: ".get_class($d)."<br/>";
       $d = $d->get_decorator();
     }
 
-    $str .= "Position: " . pre_r($this->_position, true);
-    $str .= "\nContaining block: " . pre_r($this->_containing_block, true);
-    $str .= "\nMargin width: " . pre_r($this->get_margin_width(), true);
-    $str .= "\nMargin height: " . pre_r($this->get_margin_height(), true);
+    $str .= "Position: ".pre_r($this->_position, true);
+    $str .= "\nContaining block: ".pre_r($this->_containing_block, true);
+    $str .= "\nMargin width: ".pre_r($this->get_margin_width(), true);
+    $str .= "\nMargin height: ".pre_r($this->get_margin_height(), true);
     
-    $str .= "\nStyle: <pre>". $this->_style->__toString() . "</pre>";
+    $str .= "\nStyle: <pre>".$this->_style->__toString()."</pre>";
 
-    if ( $this->_decorator instanceof Block_Frame_Decorator ) {
+    if ($this->_decorator instanceof Block_Frame_Decorator) {
       $str .= "Lines:<pre>";
       foreach ($this->_decorator->get_lines() as $line) {
         foreach ($line["frames"] as $frame) {
           if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
-            $str .= "'". htmlspecialchars($frame->get_text()) ."'";
+            $str .= "'".htmlspecialchars($frame->get_text())."'";
           } else {
-            $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
+            $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";
+          "\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>"),
-                                    array("\n","",""),
+    if (php_sapi_name() === "cli")
+      $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"),
+                                    array("\n", "", ""),
                                     $str));
     
     return $str;
@@ -693,7 +693,7 @@ 
   }
 
   function valid() {
-    return isset($this->_cur);// && ($this->_cur->get_prev_sibling() === $this->_prev);
+    return isset($this->_cur); // && ($this->_cur->get_prev_sibling() === $this->_prev);
   }
   function key() { return $this->_num; }
   function current() { return $this->_cur; }
@@ -701,7 +701,7 @@ 
   function next() {
 
     $ret = $this->_cur;
-    if ( !$ret )
+    if (!$ret)
       return null;
     
     $this->_cur = $this->_cur->get_next_sibling();
@@ -758,13 +758,13 @@ 
     $b = end($this->_stack);
     
     // Pop last element
-    unset($this->_stack[ key($this->_stack) ]);
+    unset($this->_stack[key($this->_stack)]);
     $this->_num++;
     
     // Push all children onto the stack in reverse order
-    if ( $c = $b->get_last_child() ) {
+    if ($c = $b->get_last_child()) {
       $this->_stack[] = $c;
-      while ( $c = $c->get_prev_sibling() )
+      while ($c = $c->get_prev_sibling())
         $this->_stack[] = $c;
     }
     return $b;

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

Spacing +24 added lines, -24 removed lines

@@ -57,13 +57,13 @@ 
   static private $__connection = null;
   
   function init() {
-    if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
-        " dbname=" . self::DB_NAME .
-        " user=" . self::DB_USER .
-        " password=" . self::DB_PASS;
+    if (is_null(self::$__connection)) {
+      $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.");
     }
   }
@@ -71,36 +71,36 @@ 
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
+    if (!($res = pg_query(self::$__connection, $sql)))
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
   static function store_page($id, $page_num, $data) {
-    $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+    $where = "WHERE id='".pg_escape_string($id)."' AND ".
+      "page_num=".pg_escape_string($page_num);
 
-    $res = self::__query("SELECT timestamp FROM page_cache ". $where);
+    $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);
+    if ($row) 
+      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) {
     self::__query("BEGIN");
     // Update the font information
-    self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    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 ('" .
-                    pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('".
+                    pg_escape_string($id)."', '".pg_escape_string($font)."')");
     self::__query("COMMIT");
   }
   
@@ -116,8 +116,8 @@ 
 //   }
 
   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));
+    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='".pg_escape_string($id)."' AND ".
+                          "page_num=".pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
@@ -127,22 +127,22 @@ 
 
   // 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) . "'");
+    $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"]);
     
-    $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT data FROM page_cache WHERE id='".pg_escape_string($id)."'");
 
-    if ( $new_page )
+    if ($new_page)
       $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+      if (!$first) 
         $pdf->new_page();
       else 
         $first = false;        

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

Spacing +21 added lines, -21 removed lines

@@ -81,22 +81,22 @@ 
     $b = $style->length_in_pt($style->margin_bottom, $cb["w"]);
 
     // Handle 'auto' values
-    if ( $t === "auto" ) {
+    if ($t === "auto") {
       $style->margin_top = "0pt";
       $t = 0;
     }
 
-    if ( $b === "auto" ) {
+    if ($b === "auto") {
       $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) )
+    while ($n && !in_array($n->get_style()->display, Style::$BLOCK_TYPES))
       $n = $n->get_next_sibling();
 
-    if ( $n ) { // && !$n instanceof Page_Frame_Decorator ) {
+    if ($n) { // && !$n instanceof Page_Frame_Decorator ) {
 
       $b = max($b, $style->length_in_pt($n->get_style()->margin_top, $cb["w"]));
 
@@ -107,11 +107,11 @@ 
 
     // Collapse our first child's margin
     $f = $this->_frame->get_first_child();
-    while ( $f && !in_array($f->get_style()->display, Style::$BLOCK_TYPES) )
+    while ($f && !in_array($f->get_style()->display, Style::$BLOCK_TYPES))
       $f = $f->get_next_sibling();
 
-    if ( $f ) {
-      $t = max( $t, $style->length_in_pt($f->get_style()->margin_top, $cb["w"]));
+    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";
     }
@@ -123,7 +123,7 @@ 
     $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() )
+    if ($y + $h >= $this->_frame->get_root()->get_page_height())
       return true;
 
   }
@@ -139,7 +139,7 @@ 
   // This provides a basic implementation.  Child classes should override
   // this if necessary.
   function get_min_max_width() {
-    if ( !is_null($this->_min_max_cache) ) {
+    if (!is_null($this->_min_max_cache)) {
       return $this->_min_max_cache;
     }
     
@@ -157,27 +157,27 @@ 
     $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);
+    if (!$this->_frame->get_first_child())
+      return $this->_min_max_cache = array($delta, $delta, "min" => $delta, "max" => $delta);
 
     $low = array();
     $high = array();
 
-    for ( $iter = $this->_frame->get_children()->getIterator();
+    for ($iter = $this->_frame->get_children()->getIterator();
           $iter->valid();
-          $iter->next() ) {
+          $iter->next()) {
 
       $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 ) ) {
+      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") ) )
+        if (in_array($iter->current()->get_style()->white_space, array("pre", "nowrap")))
           $inline_min += $minmax["min"];
         else
           $low[] = $minmax["min"];
@@ -187,13 +187,13 @@ 
 
       }
 
-      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;
       }
@@ -205,11 +205,11 @@ 
     // Use specified width if it is greater than the minimum defined by the
     // content.  If the width is a percentage ignore it for now.
     $width = $style->width;
-    if ( $width !== "auto" && !is_percent($width) ) {
+    if ($width !== "auto" && !is_percent($width)) {
       $width = $style->length_in_pt($width, $cb_w);
-      if ( $min < $width )
+      if ($min < $width)
         $min = $width;
-      if ( $max < $width )
+      if ($max < $width)
         $max = $width;
     }