chamilo / chamilo-lms

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;
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     $cb = $this->_frame->get_containing_block();    
     $p = $this->_frame->get_prev_sibling();
 
-    if ( $p ) 
+    if ($p) 
       $y = $p->get_position("y") + $p->get_margin_height();
 
     else

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

Spacing +55 added lines, -55 removed lines

@@ -117,9 +117,9 @@ 
    * @param float $h
    */
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    parent::set_containing_block($x,$y,$w,$h);
+    parent::set_containing_block($x, $y, $w, $h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
+    if (isset($h))
       $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
@@ -176,7 +176,7 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return;
 
     $block_types = array("block", "list-item", "table");
@@ -184,15 +184,15 @@ 
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
+    if (!in_array($style->display, $block_types))
       return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+    while ($prev && !in_array($prev->get_style()->display, $block_types))
       $prev = $prev->get_prev_sibling();
 
-    if ( in_array($style->page_break_before, $page_breaks) ) {
+    if (in_array($style->page_break_before, $page_breaks)) {
 
       // Prevent cascading splits
       $frame->split();
@@ -203,7 +203,7 @@ 
       return true;
     }
 
-    if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
+    if (($prev && in_array($prev->get_style()->page_break_after, $page_breaks))) {
       // Prevent cascading splits
       $frame->split();
       $prev->get_style()->page_break_after = "auto";
@@ -270,32 +270,32 @@ 
      */
 
     $block_types = array("block", "list-item", "table");
-    dompdf_debug("page-break", "_page_break_allowed(" . $frame->get_node()->nodeName. ")");
+    dompdf_debug("page-break", "_page_break_allowed(".$frame->get_node()->nodeName.")");
     $display = $frame->get_style()->display;
 
     // Block Frames (1):
-    if ( in_array($display, $block_types) ) {
+    if (in_array($display, $block_types)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-        dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+        dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+      if ($frame->get_style()->page_break_before === "avoid") {
         dompdf_debug("page-break", "before: avoid");
         return false;
       }
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+      while ($prev && !in_array($prev->get_style()->display, $block_types))
         $prev = $prev->get_prev_sibling();
 
       // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+      if ($prev && $prev->get_style()->page_break_after === "avoid") {
         dompdf_debug("page-break", "after: avoid");
         return false;
       }
@@ -303,7 +303,7 @@ 
       // If both $prev & $frame have the same parent, check the parent's
       // page_break_inside property.
       $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+      if ($prev && $parent && $parent->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent inside: avoid");
         return false;
       }
@@ -311,7 +311,7 @@ 
       // To prevent cascading page breaks when a top-level element has
       // page-break-inside: avoid, ensure that at least one frame is
       // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
@@ -319,8 +319,8 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if (!$prev && $parent)
+        return $this->_page_break_allowed($parent);
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -328,17 +328,17 @@ 
     }
 
     // Inline frames (2):
-    else if ( in_array($display, Style::$INLINE_TYPES) ) {
+    else if (in_array($display, Style::$INLINE_TYPES)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+          dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rule C
       $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+      if (count($block_parent->get_lines()) < $frame->get_style()->orphans) {
           dompdf_debug("page-break", "orphans");
         return false;
       }
@@ -349,7 +349,7 @@ 
       // Rule D
       $p = $block_parent;
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -360,32 +360,32 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+      while ($prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == ""))
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($block_parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
       }
 
       // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
+      if ($frame->get_node()->nodeName === "#text" &&
+           $frame->get_node()->nodeValue == "")
         return false;
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
 
     // Table-rows
-    } else if ( $display === "table-row" ) {
+    } else if ($display === "table-row") {
 
       // Simply check if the parent table's page_break_inside property is
       // not 'avoid'
       $p = Table_Frame_Decorator::find_parent_table($frame);
 
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -393,28 +393,28 @@ 
       }
 
       // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
+      if ($p && $p->get_first_child() === $frame) {
          dompdf_debug("page-break", "table: first-row");
         return false;
       }
 
       // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+      if ($this->_in_table > 1) {
         dompdf_debug("page-break", "table: nested table");
         return false;
       }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
+      dompdf_debug("page-break", "table-row/row-groups: break allowed");
       return true;
 
-    } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+    } else if (in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       // Disallow breaks at row-groups: only split at row boundaries
       return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+      dompdf_debug("page-break", "? ".$frame->get_style()->display."");
       return false;
     }
 
@@ -430,7 +430,7 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return false;
 
     // Determine the frame's maximum y value
@@ -439,7 +439,7 @@ 
     // If a split is to occur here, then the bottom margins & paddings of all
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
-    while ( $p ) {
+    while ($p) {
       $style = $p->get_style();
       $max_y += $style->length_in_pt(array($style->margin_bottom,
                                            $style->padding_bottom,
@@ -449,12 +449,12 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
+    if ($max_y <= $this->_bottom_page_margin)
       // no: do nothing
       return false;
 
     dompdf_debug("page-break", "check_page_break");
-    dompdf_debug("page-break", "in_table: " . $this->_in_table);
+    dompdf_debug("page-break", "in_table: ".$this->_in_table);
 
 
     // yes: determine page break location
@@ -463,42 +463,42 @@ 
 
     $in_table = $this->_in_table;
 
-    dompdf_debug("page-break","Starting search");
-    while ( $iter ) {
+    dompdf_debug("page-break", "Starting search");
+    while ($iter) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
+      if ($iter === $this) {
          dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
       }
 
-      if ( $this->_page_break_allowed($iter) ) {
-        dompdf_debug("page-break","break allowed, splitting.");
+      if ($this->_page_break_allowed($iter)) {
+        dompdf_debug("page-break", "break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
       }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
+      if (!$flg && $next = $iter->get_last_child()) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
         $iter = $next;
         continue;
       }
 
-      if ( $next = $iter->get_prev_sibling() ) {
+      if ($next = $iter->get_prev_sibling()) {
          dompdf_debug("page-break", "following prev sibling.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        else if (!in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -506,10 +506,10 @@ 
         continue;
       }
 
-      if ( $next = $iter->get_parent() ) {
+      if ($next = $iter->get_parent()) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -527,17 +527,17 @@ 
     dompdf_debug("page-break", "no valid break found, just splitting.");
 
     // If we are in a table, backtrack to the nearest top-level table row
-    if ( $this->_in_table ) {
+    if ($this->_in_table) {
       $num_tables = $this->_in_table - 1;
 
       $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+      while ($iter && $num_tables && $iter->get_style->display !== "table") {
         $iter = $iter->get_parent();
         $num_tables--;
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+      while ($iter && $iter->get_style()->display !== "table-row")
         $iter = $iter->get_parent();
 
       $iter->split();

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

Spacing +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@ 
     $style = $this->_frame->get_style();
 
     $top = $style->length_in_pt($style->top, $cb["w"]);
-    $left =   $style->length_in_pt($style->left, $cb["w"]);
-    $right =  $style->length_in_pt($style->right, $cb["w"]);
+    $left = $style->length_in_pt($style->left, $cb["w"]);
+    $right = $style->length_in_pt($style->right, $cb["w"]);
     $bottom = $style->length_in_pt($style->bottom, $cb["w"]);
     
     $p = $this->_frame->find_block_parent();
 
-    if ( $p ) {
+    if ($p) {
 
       // Get the parent's padding box (see http://www.w3.org/TR/CSS21/visuren.html#propdef-top)
 
@@ -72,9 +72,9 @@ 
 
     }
 
-    if ( isset($top) ) {
+    if (isset($top)) {
       $y += $top;
-    } else if ( isset($bottom) ) {
+    } else if (isset($bottom)) {
       // FIXME: need to know this frame's height before we can do this correctly
     }
 

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

Spacing +3 added lines, -3 removed lines

@@ -58,13 +58,13 @@ 
     $cb = $this->_frame->get_containing_block();
 
     // Add our margin, padding & border to the first and last children
-    if ( ($f = $this->_frame->get_first_child()) && $f instanceof Text_Frame_Decorator ) {
+    if (($f = $this->_frame->get_first_child()) && $f instanceof Text_Frame_Decorator) {
       $f->get_style()->margin_left = $style->margin_left;
       $f->get_style()->padding_left = $style->padding_left;
       $f->get_style()->border_left = $style->border_left;
     }
 
-    if ( ($l = $this->_frame->get_last_child()) && $l instanceof Text_Frame_Decorator ) {
+    if (($l = $this->_frame->get_last_child()) && $l instanceof Text_Frame_Decorator) {
       $f->get_style()->margin_right = $style->margin_right;
       $f->get_style()->padding_right = $style->padding_right;
       $f->get_style()->border_right = $style->border_right;
@@ -72,7 +72,7 @@ 
 
     // Set the containing blocks and reflow each child.  The containing
     // block is not changed by line boxes.
-    foreach ( $this->_frame->get_children() as $child ) {
+    foreach ($this->_frame->get_children() as $child) {
       
       $child->set_containing_block($cb);
       $child->reflow();

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

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
   protected $_pdf;
   protected $_cache_id;
   protected $_current_page_id;
-  protected $_fonts;  // fonts used in this document
+  protected $_fonts; // fonts used in this document
   
   function __construct($cache_id, CPDF_Adapter $pdf) {
     $this->_pdf = $pdf;
@@ -115,12 +115,12 @@ 
     $this->_pdf->image($img_url, $x, $y, $w, $h);
   }
   
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
     $this->_fonts[$font] = true;
     $this->_pdf->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
   }
 
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
     
     // We want to remove this from cached pages since it may not be correct
     $this->_pdf->close_object();
@@ -153,7 +153,7 @@ 
   
   function stream($filename) {
     // Store the last page in the page cache
-    if ( !is_null($this->_current_page_id) ) {
+    if (!is_null($this->_current_page_id)) {
       $this->_pdf->close_object();
       $this->_pdf->add_object($this->_current_page_id, "add");
       Page_Cache::store_page($this->_cache_id,
@@ -169,7 +169,7 @@ 
   
   function &output() {
     // Store the last page in the page cache
-    if ( !is_null($this->_current_page_id) ) {
+    if (!is_null($this->_current_page_id)) {
       $this->_pdf->close_object();
       $this->_pdf->add_object($this->_current_page_id, "add");
       Page_Cache::store_page($this->_cache_id,

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

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,7 @@ 
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . '/tcpdf/tcpdf.php');
+require_once(DOMPDF_LIB_DIR.'/tcpdf/tcpdf.php');
 
 /**
  * TCPDF PDF Rendering interface
@@ -138,14 +138,14 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
    
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZE[$paper];
     else
       $size = self::$PAPER_SIZE["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -186,8 +186,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_stroke_color = $color;
     }
 
@@ -203,8 +203,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_fill_color) || $color != $this->_last_fill_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_fill_color = $color;
     }
 
@@ -241,7 +241,7 @@ 
    * @param int $count
    */
   function set_page_count($count) {
-    $this->_page_count = (int)$count;
+    $this->_page_count = (int) $count;
   }
 
   /**
@@ -261,7 +261,7 @@ 
    */
   function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -289,7 +289,7 @@ 
    */   
   function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -363,7 +363,7 @@ 
    * @param array $style
    * @param bool $fill Fills the circle if true   
    */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {}
 
   /**
    * Add an image to the pdf.
@@ -378,7 +378,7 @@ 
    * @param int $w width (in pixels)
    * @param int $h height (in pixels)
    */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
+  function image($img_url, $img_type, $x, $y, $w, $h) {}
 
   /**
    * Writes text at the specified x and y coordinates
@@ -393,16 +393,16 @@ 
    * @param array $color
    * @param float $adjust word spacing adjustment
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0) {}
 
-  function javascript($code){}
+  function javascript($code) {}
   
   /**
    * Add a named destination (similar to <a name="foo">...</a> in html)
    *
    * @param string $anchorname The name of the named destination
    */
-  function add_named_dest($anchorname){}
+  function add_named_dest($anchorname) {}
 
   /**
    * Add a link to the pdf
@@ -413,7 +413,7 @@ 
    * @param float  $width   The width of the link
    * @param float  $height   The height of the link
    */
-  function add_link($url, $x, $y, $width, $height){}
+  function add_link($url, $x, $y, $width, $height) {}
   
   /**
    * Calculates text size, in points
@@ -424,7 +424,7 @@ 
    * @param float  $spacing word spacing, if any
    * @return float
    */
-  function get_text_width($text, $font, $size, $spacing = 0){}
+  function get_text_width($text, $font, $size, $spacing = 0) {}
 
   /**
    * Calculates font height, in points
@@ -433,7 +433,7 @@ 
    * @param float $size
    * @return float
    */
-  function get_font_height($font, $size){}
+  function get_font_height($font, $size) {}
 
   
   /**
@@ -441,7 +441,7 @@ 
    *
    * Subsequent drawing operations will appear on the new page.
    */
-  function new_page(){}
+  function new_page() {}
 
   /**
    * Streams the PDF directly to the browser
@@ -449,7 +449,7 @@ 
    * @param string $filename the name of the PDF file
    * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
    */
-  function stream($filename, $options = null){}
+  function stream($filename, $options = null) {}
 
   /**
    * Returns the PDF as a string
@@ -457,7 +457,7 @@ 
    * @param array  $options associative array: 'compress' => 1 or 0
    * @return string
    */
-  function output($options = null){}
+  function output($options = null) {}
   
 }
     

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

Spacing +34 added lines, -34 removed lines

@@ -99,22 +99,22 @@ 
    * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
    * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
    */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1, 1, 1, 0)) {
 
-    if ( !is_array($size) ) {
+    if (!is_array($size)) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+      if (isset(CPDF_Adapter::$PAPER_SIZES[strtolower($size)])) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
       else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
-    if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+    if (strtolower($orientation) === "landscape") {
+      list($size[2], $size[3]) = array($size[3], $size[2]);
     }
 
-    if ( $aa_factor < 1 )
+    if ($aa_factor < 1)
       $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
@@ -127,9 +127,9 @@ 
 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
-    if ( is_null($bg_color) || !is_array($bg_color) ) {
+    if (is_null($bg_color) || !is_array($bg_color)) {
       // Pure white bg
-      $bg_color = array(1,1,1,0);
+      $bg_color = array(1, 1, 1, 0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -197,10 +197,10 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
+    if (!isset($color[3])) 
       $color[3] = 0;
     
-    list($r,$g,$b,$a) = $color;
+    list($r, $g, $b, $a) = $color;
     
     $r *= 255;
     $g *= 255;
@@ -220,10 +220,10 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
+    if (isset($this->_colors[$key]))
       return $this->_colors[$key];
 
-    if ( $a != 0 ) 
+    if ($a != 0) 
       $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
       $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
@@ -259,10 +259,10 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
-      if ( count($style) == 1 ) {
+      if (count($style) == 1) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
           $gd_style[] = $c;
         }
@@ -276,7 +276,7 @@ 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+          if ($i % 2 == 0) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
               $gd_style[] = $c;
@@ -327,7 +327,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -404,7 +404,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -419,7 +419,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
+    if ($fill) 
       imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
       imagepolygon($this->_img, $points, count($points) / 2, $c);
@@ -451,7 +451,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -466,7 +466,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
+    if ($fill)
       imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
       imageellipse($this->_img, $x, $y, $r, $r, $c);
@@ -507,7 +507,7 @@ 
       
     }
 
-    if ( !$src )
+    if (!$src)
       return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
@@ -539,7 +539,7 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle Text angle
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,7 +550,7 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -595,7 +595,7 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -611,11 +611,11 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
-    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
+    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl"); // Test string with ascenders, descenders and caps
     return $y2 - $y1;
   }
 
@@ -638,7 +638,7 @@ 
   function stream($filename, $options = null) {
 
     // Perform any antialiasing
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -649,7 +649,7 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = strtolower($options["type"]);
@@ -660,7 +660,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       header("Content-type: image/jpeg");
@@ -674,7 +674,7 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
+    if ($this->_aa_factor != 1) 
       imagedestroy($dst);
   }
 
@@ -686,7 +686,7 @@ 
    */
   function output($options = null) {
 
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -697,7 +697,7 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = $options["type"];
@@ -708,7 +708,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       imagejpeg($dst, '', $options["quality"]);
@@ -723,7 +723,7 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
+    if ($this->_aa_factor != 1)
       imagedestroy($dst);
     
     return $image;

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

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
   protected $_text_spacing;
   
   function __construct(Frame $frame, DOMPDF $dompdf) {
-    if ( $frame->get_node()->nodeName !== "#text" )
+    if ($frame->get_node()->nodeName !== "#text")
       throw new DOMPDF_Exception("Text_Decorator can only be applied to #text nodes.");
     
     parent::__construct($frame, $dompdf);
@@ -72,7 +72,7 @@ 
       
   function get_text() {
     // FIXME: this should be in a child class (and is incorrect)
-    if ( $this->_frame->get_style()->content !== "normal" ) {
+    if ($this->_frame->get_style()->content !== "normal") {
       $this->_frame->get_node()->data = $this->_frame->get_style()->content;
       $this->_frame->get_style()->content = "normal";
     }
@@ -154,7 +154,7 @@ 
   // split the text in this frame at the offset specified.  The remaining
   // text is added a sibling frame following this one and is returned.
   function split_text($offset) {
-    if ( $offset == 0 )
+    if ($offset == 0)
       return;
 
     $split = $this->_frame->get_node()->splitText($offset);
@@ -163,7 +163,7 @@ 
     $p = $this->get_parent();
     $p->insert_child_after($deco, $this, false);
 
-    if ( $p instanceof Inline_Frame_Decorator )
+    if ($p instanceof Inline_Frame_Decorator)
       $p->split($deco);
 
   }