chamilo / chamilo-lms

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

Braces +4 added lines, -3 removed lines

@@ -346,9 +346,10 @@
 function DOMPDF_autoload($class) {
   $filename = DOMPDF_INC_DIR . "/" . mb_strtolower($class) . ".cls.php";
   
-  if ( is_file($filename) )
-    require_once($filename);
-}
+  if ( is_file($filename) ) {
+      require_once($filename);
+  }
+  }
 
 if ( function_exists("spl_autoload_register") ) {
 

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

Braces +91 added lines, -65 removed lines

@@ -96,8 +96,9 @@ 
 
   $opts = array();
 
-  if ( $_SERVER["argc"] == 1 )
-    return $opts;
+  if ( $_SERVER["argc"] == 1 ) {
+      return $opts;
+  }
 
   $i = 1;
   while ($i < $_SERVER["argc"]) {
@@ -116,29 +117,33 @@ 
       break;
 
     case "-p":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-p switch requires a size parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-p switch requires a size parameter\n");
+      }
       $opts["p"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-o":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-o switch requires an orientation parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-o switch requires an orientation parameter\n");
+      }
       $opts["o"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-b":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-b switch requires a path parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-b switch requires a path parameter\n");
+      }
       $opts["b"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-f":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-f switch requires a filename parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-f switch requires a filename parameter\n");
+      }
       $opts["f"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
@@ -154,8 +159,9 @@ 
       break;
 
     case "-t":
-      if ( !isset($_SERVER['argv'][$i + 1]) )
-        die("-t switch requires a comma separated list of types\n");
+      if ( !isset($_SERVER['argv'][$i + 1]) ) {
+              die("-t switch requires a comma separated list of types\n");
+      }
       $opts["t"] = $_SERVER['argv'][$i+1];
       $i += 2;
       break;
@@ -191,36 +197,42 @@ 
   if ( isset($opts["l"]) ) {
     echo "\nUnderstood paper sizes:\n";
 
-    foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size)
-      echo "  " . mb_strtoupper($size) . "\n";
+    foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size) {
+          echo "  " . mb_strtoupper($size) . "\n";
+    }
     exit;
   }
   $file = $opts["filename"];
 
-  if ( isset($opts["p"]) )
-    $paper = $opts["p"];
-  else
-    $paper = DOMPDF_DEFAULT_PAPER_SIZE;
-
-  if ( isset($opts["o"]) )
-    $orientation = $opts["o"];
-  else
-    $orientation = "portrait";
-
-  if ( isset($opts["b"]) )
-    $base_path = $opts["b"];
-
-  if ( isset($opts["f"]) )
-    $outfile = $opts["f"];
-  else {
-    if ( $file === "-" )
-      $outfile = "dompdf_out.pdf";
-    else
-      $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file) . ".pdf";
+  if ( isset($opts["p"]) ) {
+      $paper = $opts["p"];
+  } else {
+      $paper = DOMPDF_DEFAULT_PAPER_SIZE;
   }
 
-  if ( isset($opts["v"]) )
-    $_dompdf_show_warnings = true;
+  if ( isset($opts["o"]) ) {
+      $orientation = $opts["o"];
+  } else {
+      $orientation = "portrait";
+  }
+
+  if ( isset($opts["b"]) ) {
+      $base_path = $opts["b"];
+  }
+
+  if ( isset($opts["f"]) ) {
+      $outfile = $opts["f"];
+  } else {
+    if ( $file === "-" ) {
+          $outfile = "dompdf_out.pdf";
+    } else {
+          $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file) . ".pdf";
+    }
+  }
+
+  if ( isset($opts["v"]) ) {
+      $_dompdf_show_warnings = true;
+  }
 
   if ( isset($opts["d"]) ) {
     $_dompdf_show_warnings = true;
@@ -230,8 +242,9 @@ 
   if ( isset($opts['t']) ) {
     $arr = split(',',$opts['t']);
     $types = array();
-    foreach ($arr as $type)
-      $types[ trim($type) ] = 1;
+    foreach ($arr as $type) {
+          $types[ trim($type) ] = 1;
+    }
     $_DOMPDF_DEBUG_TYPES = $types;
   }
   
@@ -241,23 +254,27 @@ 
 
  default:
 
- 	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["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"]) )
- 		$paper = rawurldecode($_GET["paper"]);
- 	else
- 		$paper = DOMPDF_DEFAULT_PAPER_SIZE;
+ 	if ( isset($_GET["paper"]) ) {
+ 	 		$paper = rawurldecode($_GET["paper"]);
+ 	} else {
+ 	 		$paper = DOMPDF_DEFAULT_PAPER_SIZE;
+ 	}
  		
- 	if ( isset($_GET["orientation"]) )
- 		$orientation = rawurldecode($_GET["orientation"]);
- 	else
- 		$orientation = "portrait";
+ 	if ( isset($_GET["orientation"]) ) {
+ 	 		$orientation = rawurldecode($_GET["orientation"]);
+ 	} else {
+ 	 		$orientation = "portrait";
+ 	}
  		
- 	if ( isset($_GET["base_path"]) )
- 		$base_path = rawurldecode($_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
@@ -265,8 +282,9 @@ 
  		$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/")
- 			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.");
+ 		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;
 }
@@ -275,13 +293,15 @@ 
 
 if ( $file === "-" ) {
   $str = "";
-  while ( !feof(STDIN) )
-    $str .= fread(STDIN, 4096);
+  while ( !feof(STDIN) ) {
+      $str .= fread(STDIN, 4096);
+  }
 
   $dompdf->load_html($str);
 
-} else
+} else {
   $dompdf->load_html_file($file);
+}
 
 if ( isset($base_path) ) {
   $dompdf->set_base_path($base_path);
@@ -293,8 +313,9 @@ 
 
 if ( $_dompdf_show_warnings ) {
   global $_dompdf_warnings;
-  foreach ($_dompdf_warnings as $msg)
-    echo $msg . "\n";
+  foreach ($_dompdf_warnings as $msg) {
+      echo $msg . "\n";
+  }
   echo $dompdf->get_canvas()->get_cpdf()->messages;
   flush();
 }
@@ -302,17 +323,22 @@ 
 if ( $save_file ) {
 //   if ( !is_writable($outfile) )
 //     throw new DOMPDF_Exception("'$outfile' is not writable.");
-  if ( strtolower(DOMPDF_PDF_BACKEND) === "gd" )
-    $outfile = str_replace(".pdf", ".png", $outfile);
+  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://
-    $outfile = $file; // just save it locally, FIXME? could save it like wget: ./host/basepath/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);
 
-  if ( strpos($outfile, DOMPDF_CHROOT) !== 0 )
-    throw new DOMPDF_Exception("Permission denied.");
+  if ( strpos($outfile, DOMPDF_CHROOT) !== 0 ) {
+      throw new DOMPDF_Exception("Permission denied.");
+  }
 
   file_put_contents($outfile, $dompdf->output( array("compress" => 0) ));
   exit(0);

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

Braces +5 added lines, -3 removed lines

@@ -3,8 +3,9 @@ 
 require_once("../dompdf_config.inc.php");
 if ( isset( $_POST["html"] ) ) {
 
-  if ( get_magic_quotes_gpc() )
-    $_POST["html"] = stripslashes($_POST["html"]);
+  if ( get_magic_quotes_gpc() ) {
+      $_POST["html"] = stripslashes($_POST["html"]);
+  }
   
   $dompdf = new DOMPDF();
   $dompdf->load_html($_POST["html"]);
@@ -68,8 +69,9 @@ 
 <p>Paper size and orientaion:
 <select name="paper">
 <?php
-foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size )
+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/include/inline_positioner.cls.php

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
 
     // End debugging
 
-    if ( !$p )
-      throw new DOMPDF_Exception("No block-level parent found.  Not good.");
+    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

Braces +36 added lines, -13 removed lines

@@ -88,7 +88,9 @@ 
     $full_url_dbg = '';
     
     //debugpng
-    if ($DEBUGPNG) print 'resolve_url('.$url.','.$proto.','.$host.','.$base_path.')('.$parsed_url['protocol'].')';
+    if ($DEBUGPNG) {
+        print 'resolve_url('.$url.','.$proto.','.$host.','.$base_path.')('.$parsed_url['protocol'].')';
+    }
 
     $remote = ($proto != "" && $proto !== "file://");
     $remote = $remote || ($parsed_url['protocol'] != "");
@@ -98,7 +100,9 @@ 
       $ext = "png";
 
       //debugpng
-      if ($DEBUGPNG) $full_url_dbg = '(blockedremote)';
+      if ($DEBUGPNG) {
+          $full_url_dbg = '(blockedremote)';
+      }
 
     } else if ( DOMPDF_ENABLE_REMOTE && $remote ) {
       // Download remote files to a temporary directory
@@ -108,13 +112,17 @@ 
         list($resolved_url,$ext) = self::$_cache[$full_url];
 
         //debugpng
-        if ($DEBUGPNG) $full_url_dbg = $full_url.'(cache)';
+        if ($DEBUGPNG) {
+            $full_url_dbg = $full_url.'(cache)';
+        }
 
       } else {
 
         $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);
@@ -126,7 +134,9 @@ 
           $ext = "png";
 
           //debugpng
-          if ($DEBUGPNG) $full_url_dbg = $full_url.'(missing)';
+          if ($DEBUGPNG) {
+              $full_url_dbg = $full_url.'(missing)';
+          }
 
         } else {
 
@@ -167,25 +177,33 @@ 
     } else {
 
       $resolved_url = build_url($proto, $host, $base_path, $url);
-      if ($DEBUGPNG) print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
+      if ($DEBUGPNG) {
+          print 'build_url('.$proto.','.$host.','.$base_path.','.$url.')('.$resolved_url.')';
+      }
 
       if ( !preg_match("/.*\.(\w+)/",$url,$match) ) {
         //debugpng
-        if ($DEBUGPNG) print '[resolve_url exception '.$url.']';
+        if ($DEBUGPNG) {
+            print '[resolve_url exception '.$url.']';
+        }
           throw new DOMPDF_Exception("Unknown image type: $url.");
         }
 
         $ext = $match[1];
 
         //debugpng
-        if ($DEBUGPNG) $full_url_dbg = '(local)';
+        if ($DEBUGPNG) {
+            $full_url_dbg = '(local)';
+        }
 
     }
 
     if ( !is_readable($resolved_url) || !filesize($resolved_url) ) {
 
       //debugpng
-      if ($DEBUGPNG) $full_url_dbg .= '(nocache'.$resolved_url.')';
+      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";
@@ -193,7 +211,9 @@ 
     }
 
     //debugpng
-    if ($DEBUGPNG) print '[resolve_url '.$url.'|'.$full_url_dbg.'|'.$resolved_url.'|'.$ext.']';
+    if ($DEBUGPNG) {
+        print '[resolve_url '.$url.'|'.$full_url_dbg.'|'.$resolved_url.'|'.$ext.']';
+    }
 
     return array($resolved_url, $ext);
   }
@@ -207,10 +227,13 @@ 
       while ($entry = array_shift(self::$_cache)) {
         list($file, $ext) = $entry;
         //debugpng
-        if (DEBUGPNG) print '[clear unlink '.$file.']';
-        if (!DEBUGKEEPTEMP)
-          //XXX: Should we have some kind of fallback or warning if unlink() fails?
+        if (DEBUGPNG) {
+            print '[clear unlink '.$file.']';
+        }
+        if (!DEBUGKEEPTEMP) {
+                  //XXX: Should we have some kind of fallback or warning if unlink() fails?
           unlink($file);
+        }
       }
     }
   }

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

Braces +3 added lines, -1 removed lines

@@ -80,7 +80,9 @@
     $url = $frame->get_node()->getAttribute("src");
       
     //debugpng
-    if (DEBUGPNG) print '[__construct '.$url.']';
+    if (DEBUGPNG) {
+        print '[__construct '.$url.']';
+    }
 
     list($this->_image_url, $this->_image_ext) = Image_Cache::resolve_url($url,
                                                                           $dompdf->get_protocol(),

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

Braces +87 added lines, -58 removed lines

@@ -182,8 +182,9 @@ 
   function dispose($recursive = false) {
 
     if ( $recursive ) {
-      while ( $child = $this->_first_child )
-        $child->dispose(true);
+      while ( $child = $this->_first_child ) {
+              $child->dispose(true);
+      }
     }
 
     // Remove this frame from the tree
@@ -246,14 +247,16 @@ 
   
   // Layout property accessors
   function get_containing_block($i = null) {
-    if ( isset($i) )
-      return $this->_containing_block[$i];    
+    if ( isset($i) ) {
+          return $this->_containing_block[$i];
+    }
     return $this->_containing_block;
   }
   
   function get_position($i = null) {
-    if ( isset($i) )
-      return $this->_position[$i];
+    if ( isset($i) ) {
+          return $this->_position[$i];
+    }
     return array($this->_position["x"],
                  $this->_position["y"],
                  "x"=>$this->_position["x"],
@@ -354,13 +357,15 @@ 
     // 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);
+    if ( $this->_node->nodeType == 1) {
+          $this->_node->setAttribute("frame_id", $id);
+    }
   }
 
   function set_style(Style $style) {
-    if ( is_null($this->_style) )
-      $this->_original_style = clone $style;
+    if ( is_null($this->_style) ) {
+          $this->_original_style = clone $style;
+    }
     
     $this->_style = $style;
   }
@@ -399,8 +404,9 @@ 
   }
 
   function set_position($x = null, $y = null) {
-    if ( is_array($x) )
-      extract($x);
+    if ( is_array($x) ) {
+          extract($x);
+    }
     
     if ( is_numeric($x) ) {
       $this->_position[0] = $x;
@@ -417,12 +423,14 @@ 
 
   function prepend_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
-      $this->_node->insertBefore($child->_node, $this->_first_child ? $this->_first_child->_node : null);
+    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 )
-      $child->_parent->remove_child($child, false);
+    if ( $child->_parent ) {
+          $child->_parent->remove_child($child, false);
+    }
     
     $child->_parent = $this;
     $child->_prev_sibling = null;
@@ -444,12 +452,14 @@ 
   
   function append_child(Frame $child, $update_node = true) {
 
-    if ( $update_node ) 
-      $this->_node->appendChild($child->_node);
+    if ( $update_node ) {
+          $this->_node->appendChild($child->_node);
+    }
 
     // Remove the child from its parent
-    if ( $child->_parent )
-      $child->_parent->remove_child($child, false);
+    if ( $child->_parent ) {
+          $child->_parent->remove_child($child, false);
+    }
 
     $child->_parent = $this;
     $child->_next_sibling = null;
@@ -482,23 +492,27 @@ 
       return;
     }
     
-    if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    if ( $ref->_parent !== $this ) {
+          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);
+    if ( $update_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);
+    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 )
-      $ref->_prev_sibling->_next_sibling = $new_child;
+    if ( $ref->_prev_sibling ) {
+          $ref->_prev_sibling->_next_sibling = $new_child;
+    }
     
     $ref->_prev_sibling = $new_child;
   }
@@ -516,8 +530,9 @@ 
       return;
     }
     
-    if ( $ref->_parent !== $this )
-      throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    if ( $ref->_parent !== $this ) {
+          throw new DOMPDF_Exception("Reference child is not a child of this node.");
+    }
 
     // Update the node
     if ( $update_node ) {
@@ -530,15 +545,17 @@ 
     }
     
     // Remove the child from its parent
-    if ( $new_child->_parent)
-      $new_child->_parent->remove_child($new_child, false);
+    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 ) 
-      $ref->_next_sibling->_prev_sibling = $new_child;
+    if ( $ref->_next_sibling ) {
+          $ref->_next_sibling->_prev_sibling = $new_child;
+    }
 
     $ref->_next_sibling = $new_child;
   }
@@ -546,23 +563,29 @@ 
 
   function remove_child(Frame $child, $update_node = true) {
 
-    if ( $child->_parent !== $this )
-      throw new DOMPDF_Exception("Child not found in this frame");
+    if ( $child->_parent !== $this ) {
+          throw new DOMPDF_Exception("Child not found in this frame");
+    }
 
-    if ( $update_node )
-      $this->_node->removeChild($child->_node);
+    if ( $update_node ) {
+          $this->_node->removeChild($child->_node);
+    }
     
-    if ( $child === $this->_first_child )
-      $this->_first_child = $child->_next_sibling;
+    if ( $child === $this->_first_child ) {
+          $this->_first_child = $child->_next_sibling;
+    }
 
-    if ( $child === $this->_last_child )
-      $this->_last_child = $child->_prev_sibling;
+    if ( $child === $this->_last_child ) {
+          $this->_last_child = $child->_prev_sibling;
+    }
 
-    if ( $child->_prev_sibling )
-      $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+    if ( $child->_prev_sibling ) {
+          $child->_prev_sibling->_next_sibling = $child->_next_sibling;
+    }
 
-    if ( $child->_next_sibling )
-      $child->_next_sibling->_prev_sibling = $child->_prev_sibling;    
+    if ( $child->_next_sibling ) {
+          $child->_next_sibling->_prev_sibling = $child->_prev_sibling;
+    }
 
     $child->_next_sibling = null;
     $child->_prev_sibling = null;
@@ -592,20 +615,23 @@ 
       $str .= "<pre>'" .  mb_substr($tmp,0,70) .
         (mb_strlen($tmp) > 70 ? "..." : "") . "'</pre>";
     }
-    if ( $this->_parent )
-      $str .= "\nParent:" . $this->_parent->_node->nodeName .
+    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 .
+    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 .
+    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()) {
@@ -641,10 +667,11 @@ 
       $str .= "</pre>";
     }
     $str .= "\n";
-    if ( php_sapi_name() === "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+    if ( php_sapi_name() === "cli" ) {
+          $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n","",""),
                                     $str));
+    }
     
     return $str;
   }
@@ -701,8 +728,9 @@ 
   function next() {
 
     $ret = $this->_cur;
-    if ( !$ret )
-      return null;
+    if ( !$ret ) {
+          return null;
+    }
     
     $this->_cur = $this->_cur->get_next_sibling();
     $this->_num++;
@@ -764,8 +792,9 @@ 
     // 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/page_cache.cls.php

Braces +25 added lines, -18 removed lines

@@ -63,16 +63,18 @@ 
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
-        throw new Exception("Database connection failed.");
+      if ( !self::$__connection = pg_connect($con_str) ) {
+              throw new Exception("Database connection failed.");
+      }
     }
   }
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+    if ( !($res = pg_query(self::$__connection, $sql)) ) {
+          throw new Exception(pg_last_error(self::$__connection));
+    }
     return $res;
   }
   
@@ -84,12 +86,13 @@ 
 
     $row = pg_fetch_assoc($res);
     
-    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) . "', ".
+    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) . "')");
+    }
 
   }
 
@@ -98,9 +101,10 @@ 
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
-    foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+    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("COMMIT");
   }
   
@@ -131,21 +135,24 @@ 
 
     // 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"]);
+    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) . "'");
 
-    if ( $new_page )
-      $pdf->new_page();
+    if ( $new_page ) {
+          $pdf->new_page();
+    }
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
-        $pdf->new_page();
-      else 
-        $first = false;        
+      if ( !$first ) {
+              $pdf->new_page();
+      } else {
+              $first = false;
+      }
       
       $page = $pdf->reopen_serialized_object($row["data"]);
       //$pdf->close_object();

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

Braces +29 added lines, -20 removed lines

@@ -93,8 +93,9 @@ 
 
     // 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();
+    while ( $n && !in_array($n->get_style()->display, Style::$BLOCK_TYPES) ) {
+          $n = $n->get_next_sibling();
+    }
 
     if ( $n ) { // && !$n instanceof Page_Frame_Decorator ) {
 
@@ -107,8 +108,9 @@ 
 
     // 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();
+    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"]));
@@ -123,8 +125,9 @@ 
     $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;
+    if ( $y + $h >= $this->_frame->get_root()->get_page_height() ) {
+          return true;
+    }
 
   }
 
@@ -157,8 +160,9 @@ 
     $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();
@@ -177,21 +181,24 @@ 
 
         $minmax = $child->get_min_max_width();
 
-        if ( in_array( $iter->current()->get_style()->white_space, array("pre", "nowrap") ) )
-          $inline_min += $minmax["min"];
-        else
-          $low[] = $minmax["min"];
+        if ( in_array( $iter->current()->get_style()->white_space, array("pre", "nowrap") ) ) {
+                  $inline_min += $minmax["min"];
+        } else {
+                  $low[] = $minmax["min"];
+        }
 
         $inline_max += $minmax["max"];
         $iter->next();
 
       }
 
-      if ( $inline_max > 0 )
-        $high[] = $inline_max;
+      if ( $inline_max > 0 ) {
+              $high[] = $inline_max;
+      }
 
-      if ( $inline_min > 0 )
-        $low[] = $inline_min;
+      if ( $inline_min > 0 ) {
+              $low[] = $inline_min;
+      }
 
       if ( $iter->valid() ) {
         list($low[], $high[]) = $iter->current()->get_min_max_width();
@@ -207,10 +214,12 @@ 
     $width = $style->width;
     if ( $width !== "auto" && !is_percent($width) ) {
       $width = $style->length_in_pt($width, $cb_w);
-      if ( $min < $width )
-        $min = $width;
-      if ( $max < $width )
-        $max = $width;
+      if ( $min < $width ) {
+              $min = $width;
+      }
+      if ( $max < $width ) {
+              $max = $width;
+      }
     }
 
     $min += $delta;