chamilo / chamilo-lms

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

Braces +3 added lines, -2 removed lines

@@ -146,8 +146,9 @@
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
-         $this->_width == 0) 
-      return 0;
+         $this->_width == 0) {
+          return 0;
+    }
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.

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

Braces +17 added lines, -13 removed lines

@@ -61,8 +61,9 @@ 
 
   // FIXME: this is admittedly a little smelly...
   static function decorate_frame(Frame $frame, $dompdf) {
-    if ( is_null($dompdf) )
-      throw new Exception("foo");
+    if ( is_null($dompdf) ) {
+          throw new Exception("foo");
+    }
     switch ($frame->get_style()->display) {
       
     case "block":
@@ -127,15 +128,17 @@ 
       break;
 
     case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
-        $positioner = "Inline";
-      else        
-        $positioner = "List_Bullet";
-
-      if ( $frame->get_style()->list_style_image !== "none" )
-        $decorator = "List_Bullet_Image";
-      else
-        $decorator = "List_Bullet";
+      if ( $frame->get_style()->list_style_position === "inside" ) {
+              $positioner = "Inline";
+      } else {
+              $positioner = "List_Bullet";
+      }
+
+      if ( $frame->get_style()->list_style_image !== "none" ) {
+              $decorator = "List_Bullet_Image";
+      } else {
+              $decorator = "List_Bullet";
+      }
       
       $reflower = "List_Bullet";
       break;
@@ -163,8 +166,9 @@ 
     }
 
     if ( $frame->get_style()->position === "absolute" ||
-         $frame->get_style()->position === "fixed" )
-      $positioner = "Absolute";
+         $frame->get_style()->position === "fixed" ) {
+          $positioner = "Absolute";
+    }
     
     $positioner .= "_Positioner";
     $decorator .= "_Frame_Decorator";

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

Braces +85 added lines, -60 removed lines

@@ -102,8 +102,9 @@ 
   function dispose($recursive = false) {
     
     if ( $recursive ) {
-      while ( $child = $this->get_first_child() )
-        $child->dispose(true);
+      while ( $child = $this->get_first_child() ) {
+              $child->dispose(true);
+      }
     }
     
     unset($this->_root);
@@ -134,8 +135,9 @@ 
     $deco = Frame_Factory::decorate_frame($frame, $this->_dompdf);
     $deco->set_root($this->_root);
 
-    foreach ($this->get_children() as $child)
-      $deco->append_child($child->deep_copy());
+    foreach ($this->get_children() as $child) {
+          $deco->append_child($child->deep_copy());
+    }
 
     return $deco;
   }
@@ -146,8 +148,9 @@ 
     $this->_frame->reset();
 
     // Reset all children
-    foreach ($this->get_children() as $child)
-      $child->reset();
+    foreach ($this->get_children() as $child) {
+          $child->reset();
+    }
 
   }
   
@@ -183,42 +186,49 @@ 
   function __toString() { return $this->_frame->__toString(); }
   
   function prepend_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+    while ( $child instanceof Frame_Decorator ) {
+          $child = $child->_frame;
+    }
     
     $this->_frame->prepend_child($child, $update_node);
   }
 
   function append_child(Frame $child, $update_node = true) {
-    while ( $child instanceof Frame_Decorator )
-      $child = $child->_frame;
+    while ( $child instanceof Frame_Decorator ) {
+          $child = $child->_frame;
+    }
 
     $this->_frame->append_child($child, $update_node);
   }
 
   function insert_child_before(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+    while ( $new_child instanceof Frame_Decorator ) {
+          $new_child = $new_child->_frame;
+    }
 
-    if ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+    if ( $ref instanceof Frame_Decorator ) {
+          $ref = $ref->_frame;
+    }
 
     $this->_frame->insert_child_before($new_child, $ref, $update_node);
   }
 
   function insert_child_after(Frame $new_child, Frame $ref, $update_node = true) {
-    while ( $new_child instanceof Frame_Decorator )
-      $new_child = $new_child->_frame;
+    while ( $new_child instanceof Frame_Decorator ) {
+          $new_child = $new_child->_frame;
+    }
 
-    while ( $ref instanceof Frame_Decorator )
-      $ref = $ref->_frame;
+    while ( $ref instanceof Frame_Decorator ) {
+          $ref = $ref->_frame;
+    }
     
     $this->_frame->insert_child_after($new_child, $ref, $update_node);
   }
 
   function remove_child(Frame $child, $update_node = true) {
-    while  ( $child instanceof Frame_Decorator )
-      $child = $new_child->_frame;
+    while  ( $child instanceof Frame_Decorator ) {
+          $child = $new_child->_frame;
+    }
 
     $this->_frame->remove_child($child, $update_node);
   }
@@ -230,61 +240,71 @@ 
     $p = $this->_frame->get_parent();
     
     if ( $p && $deco = $p->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $p )
-      return $p;
-    else
-      return null;
+    } else if ( $p ) {
+          return $p;
+    } else {
+          return null;
+    }
   }
 
   function get_first_child() {
     $c = $this->_frame->get_first_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $c )
-      return $c;
-    else
-      return null;
+    } else if ( $c ) {
+          return $c;
+    } else {
+          return null;
+    }
   }
 
   function get_last_child() {
     $c = $this->_frame->get_last_child();
     if ( $c && $deco = $c->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $c )
-      return $c;
-    else
-      return null;
+    } else if ( $c ) {
+          return $c;
+    } else {
+          return null;
+    }
   }
 
   function get_prev_sibling() {
     $s = $this->_frame->get_prev_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $s )
-      return $s;
-    else
-      return null;
+    } else if ( $s ) {
+          return $s;
+    } else {
+          return null;
+    }
   }
   
   function get_next_sibling() {
     $s = $this->_frame->get_next_sibling();
     if ( $s && $deco = $s->get_decorator() ) {
-      while ( $tmp = $deco->get_decorator() )
-        $deco = $tmp;      
+      while ( $tmp = $deco->get_decorator() ) {
+              $deco = $tmp;
+      }
       return $deco;
-    } else if ( $s )
-      return $s;
-    else
-      return null;
+    } else if ( $s ) {
+          return $s;
+    } else {
+          return null;
+    }
   }
 
   function get_children() {
@@ -299,16 +319,18 @@ 
 
   function set_positioner(Positioner $posn) {
     $this->_positioner = $posn;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_positioner($posn);
+    if ( $this->_frame instanceof Frame_Decorator ) {
+          $this->_frame->set_positioner($posn);
+    }
   }
   
   //........................................................................
 
   function set_reflower(Frame_Reflower $reflower) {
     $this->_reflower = $reflower;
-    if ( $this->_frame instanceof Frame_Decorator )
-      $this->_frame->set_reflower( $reflower );
+    if ( $this->_frame instanceof Frame_Decorator ) {
+          $this->_frame->set_reflower( $reflower );
+    }
   }
   
   function get_reflower() { return $this->_reflower; }
@@ -317,8 +339,9 @@ 
   
   function set_root(Frame $root) {
     $this->_root = $root;
-      if ( $this->_frame instanceof Frame_Decorator )
-        $this->_frame->set_root($root);
+      if ( $this->_frame instanceof Frame_Decorator ) {
+              $this->_frame->set_root($root);
+      }
   }
   
   function get_root() { return $this->_root; }
@@ -331,8 +354,9 @@ 
     $p = $this->get_parent();
     
     while ( $p ) {
-      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) )
-        break;
+      if ( in_array($p->get_style()->display, Style::$BLOCK_TYPES) ) {
+              break;
+      }
 
       $p = $p->get_parent();
     }
@@ -358,8 +382,9 @@ 
       return;
     }
     
-    if ( $child->get_parent() !== $this )
-      throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+    if ( $child->get_parent() !== $this ) {
+          throw new DOMPDF_Exception("Unable to split: frame is not a child of this one.");
+    }
 
     $split = $this->copy( $this->_frame->get_node()->cloneNode() );
     $split->reset();

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

Braces +15 added lines, -10 removed lines

@@ -74,14 +74,17 @@ 
     list($x, $y) = $frame->get_position();
     $cb = $frame->get_containing_block();
 
-    if ( ($ml = $style->margin_left) === "auto" || $ml === "none" )
-      $ml = 0;
+    if ( ($ml = $style->margin_left) === "auto" || $ml === "none" ) {
+          $ml = 0;
+    }
 
-    if ( ($pl = $style->padding_left) === "auto" || $pl === "none" )
-      $pl = 0;
+    if ( ($pl = $style->padding_left) === "auto" || $pl === "none" ) {
+          $pl = 0;
+    }
 
-    if ( ($bl = $style->border_left_width) === "auto" || $bl === "none" )
-      $bl = 0;
+    if ( ($bl = $style->border_left_width) === "auto" || $bl === "none" ) {
+          $bl = 0;
+    }
 
     $x += $style->length_in_pt( array($ml, $pl, $bl), $cb["w"] );
 
@@ -118,15 +121,17 @@ 
     // our way down.
     $p = $frame;
     $stack = array();
-    while ( $p = $p->get_parent() )
-      $stack[] = $p;
+    while ( $p = $p->get_parent() ) {
+          $stack[] = $p;
+    }
     
     while ( count($stack) > 0 ) {
       $f = array_pop($stack);
 
       $deco_y = $y;
-      if ( ($text_deco = $f->get_style()->text_decoration) === "none" )
-        continue;
+      if ( ($text_deco = $f->get_style()->text_decoration) === "none" ) {
+              continue;
+      }
 
       $color = $f->get_style()->color;
 

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

Braces +51 added lines, -29 removed lines

@@ -201,12 +201,13 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
 
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
-    else
-      $size = self::$PAPER_SIZES["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+    } else {
+          $size = self::$PAPER_SIZES["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];
@@ -243,9 +244,12 @@ 
   function __destruct() {
     foreach ($this->_image_cache as $img) {
       //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
-        unlink($img);
+      if (DEBUGPNG) {
+          print '[__destruct unlink '.$img.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+              unlink($img);
+      }
     }
   }
   
@@ -559,12 +563,14 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
     
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
     
     // Adjust y values
-    for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+    for ( $i = 1; $i < count($points); $i += 2) {
+          $points[$i] = $this->y($points[$i]);
+    }
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
   }
@@ -580,8 +586,9 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
   }
@@ -590,7 +597,9 @@ 
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
-    if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
+    if (DEBUGPNG) {
+        print '[image:'.$img_url.'|'.$img_type.']';
+    }
 
     $img_type = mb_strtolower($img_type);
 
@@ -598,14 +607,18 @@ 
     case "jpeg":
     case "jpg":
       //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+      if (DEBUGPNG) {
+          print '!!!jpg!!!';
+      }
 
       $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
 
     case "png":
       //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
+      if (DEBUGPNG) {
+          print '!!!png!!!';
+      }
 
       $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
@@ -616,7 +629,9 @@ 
       //if (0) {
       if ( method_exists( $this->_pdf, "addImagePng" ) ) {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addImagePng!!!';
+        }
 
       	//If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
@@ -635,7 +650,9 @@ 
     	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
       } else {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addPngFromFile!!!';
+        }
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       }
@@ -643,7 +660,9 @@ 
 
     default:
       //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
+      if (DEBUGPNG) {
+          print '!!!unknown!!!';
+      }
       break;
     }
     
@@ -733,8 +752,9 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      if ( $name ) {
+              $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      }
 
     } else {
       $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
@@ -819,8 +839,9 @@ 
    */
   protected function _add_page_text() {
     
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $page_number = 1;
     $eval = null;
@@ -878,10 +899,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
-    else
-      $debug = 0;
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $debug = 1;
+    } else {
+          $debug = 0;
+    }
     
     return $this->_pdf->output($debug);
     

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

Braces +125 added lines, -95 removed lines

@@ -185,12 +185,13 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   function __construct($paper = "letter", $orientation = "portrait") {
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
-    else
-      $size = self::$PAPER_SIZES["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+    } else {
+          $size = self::$PAPER_SIZES["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];
@@ -202,8 +203,9 @@ 
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+	      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	}
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -220,9 +222,9 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
-    else {
+    if ( self::$IN_MEMORY ) {
+          $this->_pdf->begin_document("","");
+    } else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
       $this->_pdf->begin_document($this->_file,"");
     }
@@ -254,19 +256,23 @@ 
         } else if ( file_exists($file . ".pfb") ) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
-            $afm = "$file.afm";
+          if ( file_exists($file . ".afm") ) {
+                      $afm = "$file.afm";
+          }
 
         } else if ( file_exists($file . ".PFB") ) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
-            $afm = "$file.AFM";
-        } else
-          continue;
+          if ( file_exists($file . ".AFM") ) {
+                      $afm = "$file.AFM";
+          }
+        } else {
+                  continue;
+        }
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        if ( !is_null($afm) ) {
+                  $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
       }
     }
   }
@@ -369,8 +375,9 @@ 
     if ( mb_strpos($where, "next") !== false ) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
-        $where = "add";
+      if ( $where == "" ) {
+              $where = "add";
+      }
     }
 
     $this->_objs[$object]["where"] = $where;
@@ -386,8 +393,9 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
-      return;
+    if ( !isset($this->_objs[$object]) ) {
+          return;
+    }
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -396,8 +404,9 @@ 
     if ( $this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")) ) {
+          $this->_pdf->fit_image($object,0,0,"");
+    }
 
     unset($this->_objs[$object]);
   }
@@ -445,13 +454,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+    if ( count($dash) == 1 ) {
+          $dash[] = $dash[0];
+    }
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
-    else
-      $this->_pdf->setdash(0,0);
+    if ( count($dash) > 1 ) {
+          $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    } else {
+          $this->_pdf->setdash(0,0);
+    }
 
     switch ( $join ) {
     case "miter":
@@ -497,8 +508,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
-    	return;
+    if($this->_last_stroke_color == $color) {
+        	return;
+    }
 
     $this->_last_stroke_color = $color;
 
@@ -512,8 +524,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
-    	return;
+    if($this->_last_fill_color == $color) {
+        	return;
+    }
 
     $this->_last_fill_color = $color;
 
@@ -549,19 +562,19 @@ 
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
-        $encoding = "unicode";
-      else
-        $encoding = "auto";
+      if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+              $encoding = "unicode";
+      } else {
+              $encoding = "auto";
+      }
 
     }
 
     $key = $font .":". $encoding .":". $options;
 
-    if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
-
-    else {
+    if ( isset($this->_fonts[$key]) ) {
+          return $this->_fonts[$key];
+    } else {
 
       $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
       return $this->_fonts[$key];
@@ -622,8 +635,9 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
@@ -635,10 +649,11 @@ 
       $this->_pdf->lineto($x,$y);
     }
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->closepath_stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->closepath_stroke();
+    }
   }
 
   //........................................................................
@@ -648,17 +663,19 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->stroke();
+    }
 
   }
 
@@ -670,13 +687,13 @@ 
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
-      $img_type = "jpeg";
-
-    if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+    if ( $img_type === "jpg" ) {
+          $img_type = "jpeg";
+    }
 
-    else {
+    if ( isset($this->_imgs[$img_url]) ) {
+          $img = $this->_imgs[$img_url];
+    } else {
 
       $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
@@ -737,14 +754,17 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      if ( $name ) {
+              $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      }
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
-        return; // Local links are not allowed
+      if ( $proto == "" || $proto === "file://" ) {
+              return;
+      }
+      // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
       $url = '{' . rawurldecode($url) . '}';
       
@@ -842,8 +862,9 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $this->_pdf->suspend_page("");
 
@@ -883,10 +904,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
@@ -894,8 +916,9 @@ 
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
-    } else
-      $size = filesize($this->_file);
+    } else {
+          $size = filesize($this->_file);
+    }
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -907,26 +930,30 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
-      echo $data;
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          echo $data;
+    } else {
 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if ( !$fh ) {
+              throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      }
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while ( !feof($fh) ) {
+              echo fread($fh,$chunk);
+      }
       fclose($fh);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib stream unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 
@@ -942,24 +969,27 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          $data = $this->_pdf->get_buffer();
+    } else {
       $data = file_get_contents($this->_file);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib output unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 

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

Braces +9 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     // Set the containing blocks and reflow each child
     foreach ( $this->_frame->get_children() as $child ) {
       
-      if ( $page->is_full() )
-        break;
+      if ( $page->is_full() ) {
+              break;
+      }
     
       $child->set_containing_block($content_x, $content_y, $cb_w, $h);
       $child->reflow();
@@ -132,11 +133,13 @@ 
     // Let the cellmap know our height
     $cell_height = $height / count($cells["rows"]);
 
-    if ($style_height < $height)
-      $cell_height += $top_space + $bottom_space;
+    if ($style_height < $height) {
+          $cell_height += $top_space + $bottom_space;
+    }
 
-    foreach ($cells["rows"] as $i)
-      $cellmap->set_row_height($i, $cell_height);
+    foreach ($cells["rows"] as $i) {
+          $cellmap->set_row_height($i, $cell_height);
+    }
 
     $style->height = $height;
 

main/inc/lib/phpdocx/pdf/include/functions.inc.php

Braces +63 added lines, -42 removed lines

@@ -63,17 +63,20 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
-    return "<pre>" . print_r($mixed, true) . "</pre>";
+  if ($return) {
+      return "<pre>" . print_r($mixed, true) . "</pre>";
+  }
 
-  if ( php_sapi_name() !== "cli")
-    echo ("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo ("<pre>");
+  }
   print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-  else
-    echo ("\n");
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  } else {
+      echo ("\n");
+  }
   flush();
 
 }
@@ -89,12 +92,14 @@ 
  */
 if ( !function_exists("pre_var_dump") ) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
-    echo("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo("<pre>");
+  }
   var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-}
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  }
+  }
 }
 
 /**
@@ -121,8 +126,9 @@ 
   }
 
   // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
-    return $url;
+  if ( mb_strpos($url, "://") !== false ) {
+      return $url;
+  }
 
   $ret = $protocol;
 
@@ -170,24 +176,29 @@ 
 
   if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
-       mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
+       mb_strlen($arr["scheme"]) > 1 ) {
+      // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
+  }
 
     if ( isset($arr["user"]) ) {
       $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
-        $host .= "@" . $arr["pass"];
+      if ( isset($arr["pass"]) ) {
+              $host .= "@" . $arr["pass"];
+      }
 
       $host .= ":";
     }
 
-    if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+    if ( isset($arr["host"]) ) {
+          $host .= $arr["host"];
+    }
 
-    if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+    if ( isset($arr["port"]) ) {
+          $host .= ":" . $arr["port"];
+    }
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
       // Do we have a trailing slash?
@@ -200,17 +211,20 @@ 
       }
     }
 
-    if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+    if ( isset($arr["query"]) ) {
+          $file .= "?" . $arr["query"];
+    }
 
-    if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+    if ( isset($arr["fragment"]) ) {
+          $file .= "#" . $arr["fragment"];
+    }
 
   } else {
 
     $i = mb_strpos($url, "file://");
-    if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+    if ( $i !== false) {
+          $url = mb_substr($url, $i + 7);
+    }
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -262,11 +276,13 @@ 
                        "dc", "dcc", "dccc", "cm");
   static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
-    throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  if ( !is_numeric($num) ) {
+      throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  }
 
-  if ( $num > 4000 || $num < 0 )
-    return "(out of range)";
+  if ( $num > 4000 || $num < 0 ) {
+      return "(out of range)";
+  }
 
   $num = strrev((string)$num);
 
@@ -372,10 +388,11 @@ 
 
 if ( !function_exists("mb_substr") ) {
   function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
-    if ( is_null($length) )
-      return substr($str, $start);
-    else
-      return substr($str, $start, $length);
+    if ( is_null($length) ) {
+          return substr($str, $start);
+    } else {
+          return substr($str, $start, $length);
+    }
   }
 }
 
@@ -402,14 +419,17 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) {
+      // Not a warning or notice
     throw new DOMPDF_Exception($errstr . " $errno");
+  }
 
   global $_dompdf_warnings;
   global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
-    echo $errstr . "\n";
+  if ( $_dompdf_show_warnings ) {
+      echo $errstr . "\n";
+  }
 
   $_dompdf_warnings[] = $errstr;
 }
@@ -496,9 +516,10 @@ 
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
   global $memusage;
-  if ( isset($memusage) )
-    $memusage[$location] = memory_get_usage();
-}
+  if ( isset($memusage) ) {
+      $memusage[$location] = memory_get_usage();
+  }
+  }
 }
 
 /**

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

Braces +50 added lines, -34 removed lines

@@ -87,8 +87,9 @@ 
 
   function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
-    if ( isset($i) )
-      return $cl[$i];
+    if ( isset($i) ) {
+          return $cl[$i];
+    }
     return $cl;
   }
 
@@ -102,23 +103,28 @@ 
   }
 
   function clear_line($i) {
-    if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
+    if ( isset($this->_lines[$i]) ) {
+          unset($this->_lines[$i]);
+    }
   }
 
   function set_line($lineno, $y = null, $w = null, $h = null) {
 
-    if ( is_array($y) )
-      extract($y);
+    if ( is_array($y) ) {
+          extract($y);
+    }
 
-    if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+    if (is_numeric($y)) {
+          $this->_lines[$lineno]["y"] = $y;
+    }
 
-    if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+    if (is_numeric($w)) {
+          $this->_lines[$lineno]["w"] = $w;
+    }
 
-    if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+    if (is_numeric($h)) {
+          $this->_lines[$lineno]["h"] = $h;
+    }
 
   }
 
@@ -136,8 +142,9 @@ 
       }
 
       // Add each child of the inline frame to the line individually
-      foreach ($frame->get_children() as $child)
-        $this->add_frame_to_line( $child );
+      foreach ($frame->get_children() as $child) {
+              $this->add_frame_to_line( $child );
+      }
 
       return;
     }
@@ -156,8 +163,9 @@ 
 
     $w = $frame->get_margin_width();
 
-    if ( $w == 0 )
-      return;
+    if ( $w == 0 ) {
+          return;
+    }
 
     // Debugging code:
     /*
@@ -176,16 +184,18 @@ 
     */
     // End debugging
 
-    if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+    if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w")) {
+          $this->add_line();
+    }
 
     $frame->position();
 
 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
-    if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+    if ( $frame->get_node()->nodeName === "#text") {
+          $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+    }
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
@@ -197,13 +207,15 @@ 
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
-        break;
+      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false ) {
+              break;
+      }
       $i--;
     }
 
-    if ( $j === false )
-      return;
+    if ( $j === false ) {
+          return;
+    }
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
@@ -214,14 +226,16 @@ 
 
     // Recalculate the height of the line
     $h = 0;
-    foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+    foreach ($this->_lines[$i]["frames"] as $f) {
+          $h = max( $h, $f->get_margin_height() );
+    }
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
-    while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+    while ($this->_cl > $i) {
+          unset($this->_lines[ $this->_cl-- ]);
+    }
 
   }
 
@@ -252,17 +266,19 @@ 
   }
 
   function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
-    if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
-    else
-      $this->_counters[$id] += $increment;
+    if ( !isset($this->_counters[$id]) ) {
+          $this->_counters[$id] = $increment;
+    } else {
+          $this->_counters[$id] += $increment;
+    }
 
   }
 
   function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
-    if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+    if ( !isset($this->_counters[$id]) ) {
+          $this->_counters[$id] = 0;
+    }
 
     switch ($type) {