chamilo / chamilo-lms

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

Braces +69 added lines, -48 removed lines

@@ -103,10 +103,11 @@ 
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
-        $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
-        $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) {
+              $size = CPDF_Adapter::$PAPER_SIZES[$size];
+      } else {
+              $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      }
     
     }
 
@@ -114,8 +115,9 @@ 
       list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
-    if ( $aa_factor < 1 )
-      $aa_factor = 1;
+    if ( $aa_factor < 1 ) {
+          $aa_factor = 1;
+    }
 
     $this->_aa_factor = $aa_factor;
     
@@ -197,8 +199,9 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
-      $color[3] = 0;
+    if ( !isset($color[3]) ) {
+          $color[3] = 0;
+    }
     
     list($r,$g,$b,$a) = $color;
     
@@ -220,13 +223,15 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+    if ( isset($this->_colors[$key]) ) {
+          return $this->_colors[$key];
+    }
 
-    if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
-    else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    if ( $a != 0 ) {
+          $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+    } else {
+          $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    }
       
     return $this->_colors[$key];
     
@@ -278,13 +283,15 @@ 
 
           if ( $i % 2 == 0 ) {
             // 'On' pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $c;
+            }
             
           } else {
             // Off pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $this->_bg_color;
+            }
             
           }
           $i++;
@@ -398,8 +405,9 @@ 
   function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
-    foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+    foreach (array_keys($points) as $i) {
+          $points[$i] *= $this->_aa_factor;
+    }
 
     $c = $this->_allocate_color($color);
 
@@ -419,10 +427,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
-    else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+    if ( $fill ) {
+          imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+    } else {
+          imagepolygon($this->_img, $points, count($points) / 2, $c);
+    }
         
   }
 
@@ -466,10 +475,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
-    else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+    if ( $fill ) {
+          imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+    } else {
+          imageellipse($this->_img, $x, $y, $r, $r, $c);
+    }
         
   }
 
@@ -507,8 +517,10 @@ 
       
     }
 
-    if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+    if ( !$src ) {
+          return;
+    }
+    // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,8 +562,9 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
@@ -595,8 +608,9 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
@@ -611,8 +625,9 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    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
@@ -649,8 +664,9 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = strtolower($options["type"]);
     
@@ -660,8 +676,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       header("Content-type: image/jpeg");
       imagejpeg($dst, '', $options["quality"]);
@@ -674,8 +691,9 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
   }
 
   /**
@@ -697,8 +715,9 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = $options["type"];
     
@@ -708,8 +727,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       imagejpeg($dst, '', $options["quality"]);
       break;
@@ -723,8 +743,9 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
     
     return $image;
   }

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

Braces +9 added lines, -6 removed lines

@@ -51,8 +51,9 @@ 
   protected $_text_spacing;
   
   function __construct(Frame $frame, DOMPDF $dompdf) {
-    if ( $frame->get_node()->nodeName !== "#text" )
-      throw new DOMPDF_Exception("Text_Decorator can only be applied to #text nodes.");
+    if ( $frame->get_node()->nodeName !== "#text" ) {
+          throw new DOMPDF_Exception("Text_Decorator can only be applied to #text nodes.");
+    }
     
     parent::__construct($frame, $dompdf);
     $this->_text_spacing = null;
@@ -154,8 +155,9 @@ 
   // 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 )
-      return;
+    if ( $offset == 0 ) {
+          return;
+    }
 
     $split = $this->_frame->get_node()->splitText($offset);
     $deco = $this->copy($split);
@@ -163,8 +165,9 @@ 
     $p = $this->get_parent();
     $p->insert_child_after($deco, $this, false);
 
-    if ( $p instanceof Inline_Frame_Decorator )
-      $p->split($deco);
+    if ( $p instanceof Inline_Frame_Decorator ) {
+          $p->split($deco);
+    }
 
   }
 

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

Braces +34 added lines, -25 removed lines

@@ -246,18 +246,21 @@ 
     $node = $frame->get_node();
     $tag = $node->tagName;
 
-    if ( !isset(self::$__ATTRIBUTE_LOOKUP[$tag]) )
-      return;
+    if ( !isset(self::$__ATTRIBUTE_LOOKUP[$tag]) ) {
+          return;
+    }
 
     $valid_attrs = self::$__ATTRIBUTE_LOOKUP[$tag];
     $attrs = $node->attributes;
     $style = rtrim($node->getAttribute("style"), "; ");
-    if ( $style != "" )
-      $style .= ";";
+    if ( $style != "" ) {
+          $style .= ";";
+    }
 
     foreach ($attrs as $attr => $attr_node ) {
-      if ( !isset($valid_attrs[$attr]) )
-        continue;
+      if ( !isset($valid_attrs[$attr]) ) {
+              continue;
+      }
 
       $value = $attr_node->value;
 
@@ -266,8 +269,9 @@ 
       // Look up $value in $target, if $target is an array:
       if ( is_array($target) ) {
 
-        if ( isset($target[$value]) )
-          $style .= " " . self::_resolve_target($node, $target[$value], $value);
+        if ( isset($target[$value]) ) {
+                  $style .= " " . self::_resolve_target($node, $target[$value], $value);
+        }
 
       } else {
         // otherwise use target directly
@@ -309,8 +313,9 @@ 
     $td_list = $node->getElementsByTagName("td");
     foreach ($td_list as $td) {
       $style = $td->getAttribute("style");
-      if ( strpos($style, "border") !== false )
-        continue;
+      if ( strpos($style, "border") !== false ) {
+              continue;
+      }
       $style = rtrim($style, ";");
       $style .= "; border-width: $value" . "px; border-style: ridge;";
       $style = ltrim($style, ";");
@@ -319,8 +324,9 @@ 
     $th_list = $node->getElementsByTagName("th");
     foreach ($th_list as $th) {
       $style = $th->getAttribute("style");
-      if ( strpos($style, "border") !== false )
-        continue;
+      if ( strpos($style, "border") !== false ) {
+              continue;
+      }
       $style = rtrim($style, ";");
       $style .= "; border-width: $value" . "px; border-style: ridge;";
       $style = ltrim($style, ";");
@@ -333,11 +339,11 @@ 
   static protected function _set_table_cellspacing($node, $value) {
     $style = rtrim($td->getAttribute($style), ";");
 
-    if ( $value == 0 )
-      $style .= "; border-collapse: collapse;";
-      
-    else
-      $style = "; border-collapse: separate;";
+    if ( $value == 0 ) {
+          $style .= "; border-collapse: collapse;";
+    } else {
+          $style = "; border-collapse: separate;";
+    }
       
     return ltrim($style, ";");
   }
@@ -384,8 +390,9 @@ 
 
     $style = rtrim($node->getAttribute("style"),";");
     $width = $node->getAttribute("width");
-    if ( $width == "" )
-      $width = "100%";
+    if ( $width == "" ) {
+          $width = "100%";
+    }
 
     $remainder = 100 - (double)rtrim($width, "% ");
     
@@ -475,13 +482,15 @@ 
   static protected function _set_font_size($node, $value) {
     $style = $node->getAttribute("style");
 
-    if ( $value[0] === "-" || $value[0] === "+" )
-      $value = self::$_last_basefont_size + (int)$value;
+    if ( $value[0] === "-" || $value[0] === "+" ) {
+          $value = self::$_last_basefont_size + (int)$value;
+    }
 
-    if ( isset(self::$_font_size_lookup[$value]) )
-      $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
-    else
-      $style .= "; font-size: $value;";
+    if ( isset(self::$_font_size_lookup[$value]) ) {
+          $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
+    } else {
+          $style .= "; font-size: $value;";
+    }
 
     return ltrim($style, "; ");
     

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

Braces +42 added lines, -30 removed lines

@@ -88,20 +88,24 @@ 
     $content = $style->content;
 
     // split on spaces, except within quotes
-    if (!preg_match_all($re, $content, $matches, PREG_SET_ORDER))
-      return;
+    if (!preg_match_all($re, $content, $matches, PREG_SET_ORDER)) {
+          return;
+    }
 
     $text = "";
 
     foreach ($matches as $match) {
-      if ( isset($match[2]) && $match[2] !== "" )
-        $match[1] = $match[1];
+      if ( isset($match[2]) && $match[2] !== "" ) {
+              $match[1] = $match[1];
+      }
 
-      if ( isset($match[6]) && $match[6] !== "" )
-        $match[4] = $match[6];
+      if ( isset($match[6]) && $match[6] !== "" ) {
+              $match[4] = $match[6];
+      }
 
-      if ( isset($match[8]) && $match[8] !== "" )
-        $match[7] = $match[8];
+      if ( isset($match[8]) && $match[8] !== "" ) {
+              $match[7] = $match[8];
+      }
 
       if ( isset($match[1]) && $match[1] !== "" ) {
         // counters?(...)
@@ -111,8 +115,9 @@ 
         // http://www.w3.org/TR/CSS21/generate.html#content
 
         $i = mb_strpos($match[1], ")");
-        if ( $i === false )
-          continue;
+        if ( $i === false ) {
+                  continue;
+        }
 
         $args = explode(",", mb_substr($match[1], 7, $i - 7));
         $counter_id = $args[0];
@@ -120,10 +125,11 @@ 
         if ( $match[1]{7} === "(" ) {
           // counter(name [,style])
 
-          if ( isset($args[1]) )
-            $type = $args[1];
-          else
-            $type = null;
+          if ( isset($args[1]) ) {
+                      $type = $args[1];
+          } else {
+                      $type = null;
+          }
 
 
           $p = $this->_frame->find_block_parent();
@@ -132,15 +138,17 @@ 
 
         } else if ( $match[1]{7} === "s" ) {
           // counters(name, string [,style])
-          if ( isset($args[1]) )
-            $string = $this->_parse_string(trim($args[1]));
-          else
-            $string = "";
+          if ( isset($args[1]) ) {
+                      $string = $this->_parse_string(trim($args[1]));
+          } else {
+                      $string = "";
+          }
 
-          if ( isset($args[2]) )
-            $type = $args[2];
-          else
-            $type = null;
+          if ( isset($args[2]) ) {
+                      $type = $args[2];
+          } else {
+                      $type = null;
+          }
 
           $p = $this->_frame->find_block_parent();
           $tmp = "";
@@ -150,9 +158,10 @@ 
           }
           $text .= $tmp;
 
-        } else
-          // countertops?
+        } else {
+                  // countertops?
           continue;
+        }
 
       } else if ( isset($match[4]) && $match[4] !== "" ) {
         // String match
@@ -172,16 +181,19 @@ 
         } else if ( mb_strpos($match[7],"attr(") === 0 ) {
 
           $i = mb_strpos($match[7],")");
-          if ( $i === false )
-            continue;
+          if ( $i === false ) {
+                      continue;
+          }
 
           $attr = mb_substr($match[7], 6, $i - 6);
-          if ( $attr == "" )
-            continue;
+          if ( $attr == "" ) {
+                      continue;
+          }
 
           $text .= $this->_frame->get_node()->getAttribute($attr);
-        } else
-          continue;
+        } else {
+                  continue;
+        }
 
       }
     }

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

Braces +124 added lines, -73 removed lines

@@ -210,13 +210,15 @@ 
    * @param Style $style  the Style to be added
    */
   function add_style($key, Style $style) {
-    if (!is_string($key))
-      throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
+    if (!is_string($key)) {
+          throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
+    }
 
-    if ( isset($this->_styles[$key]) )
-      $this->_styles[$key]->merge($style);
-    else
-      $this->_styles[$key] = clone $style;
+    if ( isset($this->_styles[$key]) ) {
+          $this->_styles[$key]->merge($style);
+    } else {
+          $this->_styles[$key] = clone $style;
+    }
   }
 
 
@@ -230,8 +232,9 @@ 
    * @return Style
    */
   function lookup($key) {
-    if ( !isset($this->_styles[$key]) )
-      return null;
+    if ( !isset($this->_styles[$key]) ) {
+          return null;
+    }
 
     return $this->_styles[$key];
   }
@@ -264,8 +267,9 @@ 
     global $_dompdf_warnings;
 
     // Prevent circular references
-    if ( isset($this->_loaded_files[$file]) )
-      return;
+    if ( isset($this->_loaded_files[$file]) ) {
+          return;
+    }
 
     $this->_loaded_files[$file] = true;
     $parsed_url = explode_url($file);
@@ -279,10 +283,11 @@ 
     }
 
     // Fix submitted by Nick Oostveen for aliased directory support:
-    if ( $this->_protocol == "" )
-      $file = $this->_base_path . $filename;
-    else
-      $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
+    if ( $this->_protocol == "" ) {
+          $file = $this->_base_path . $filename;
+    } else {
+          $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
+    }
 
     set_error_handler("record_warnings");
     $css = file_get_contents($file);
@@ -361,8 +366,9 @@ 
 
     // Add an implicit space at the beginning of the selector if there is no
     // delimiter there already.
-    if ( !in_array($selector[0], $delimiters) )
-      $selector = " $selector";
+    if ( !in_array($selector[0], $delimiters) ) {
+          $selector = " $selector";
+    }
 
     $tok = "";
     $len = mb_strlen($selector);
@@ -377,8 +383,9 @@ 
       $tok = "";
 
       while ($i < $len) {
-        if ( in_array($selector[$i], $delimiters) )
-          break;
+        if ( in_array($selector[$i], $delimiters) ) {
+                  break;
+        }
         $tok .= $selector[$i++];
       }
 
@@ -390,11 +397,13 @@ 
         // the current token
         $expr = $s === " " ? "descendant" : "child";
 
-        if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+        if ( mb_substr($query, -1, 1) !== "/" ) {
+                  $query .= "/";
+        }
 
-        if ( !$tok )
-          $tok = "*";
+        if ( !$tok ) {
+                  $tok = "*";
+        }
 
         $query .= "$expr::$tok";
         $tok = "";
@@ -408,8 +417,9 @@ 
         $attr = $s === "." ? "class" : "id";
 
         // empty class/id == *
-        if ( mb_substr($query, -1, 1) === "/" )
-          $query .= "*";
+        if ( mb_substr($query, -1, 1) === "/" ) {
+                  $query .= "*";
+        }
 
         // Match multiple classes: $tok contains the current selected
         // class.  Search for class attributes with class="$tok",
@@ -425,8 +435,9 @@ 
 
       case "+":
         // All sibling elements that folow the current token
-        if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+        if ( mb_substr($query, -1, 1) !== "/" ) {
+                  $query .= "/";
+        }
 
         $query .= "following-sibling::$tok";
         $tok = "";
@@ -473,8 +484,9 @@ 
         $value = "";
 
         while ( $j < $tok_len ) {
-          if ( in_array($tok[$j], $attr_delimiters) )
-            break;
+          if ( in_array($tok[$j], $attr_delimiters) ) {
+                      break;
+          }
           $attr .= $tok[$j++];
         }
 
@@ -484,8 +496,9 @@ 
         case "|":
           $op .= $tok[$j++];
 
-          if ( $tok[$j] !== "=" )
-            throw new DOMPDF_Exception("Invalid CSS selector syntax: invalid attribute selector: $selector");
+          if ( $tok[$j] !== "=" ) {
+                      throw new DOMPDF_Exception("Invalid CSS selector syntax: invalid attribute selector: $selector");
+          }
 
           $op .= $tok[$j];
           break;
@@ -500,14 +513,16 @@ 
         if ( $op != "" ) {
           $j++;
           while ( $j < $tok_len ) {
-            if ( $tok[$j] === "]" )
-              break;
+            if ( $tok[$j] === "]" ) {
+                          break;
+            }
             $value .= $tok[$j++];
           }
         }
 
-        if ( $attr == "" )
-          throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
+        if ( $attr == "" ) {
+                  throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
+        }
 
         switch ( $op ) {
 
@@ -525,8 +540,9 @@ 
           $values = explode(" ", $value);
           $query .=  "[";
 
-          foreach ( $values as $val )
-            $query .= "@$attr=\"$val\" or ";
+          foreach ( $values as $val ) {
+                      $query .= "@$attr=\"$val\" or ";
+          }
 
           $query = rtrim($query, " or ") . "]";
           break;
@@ -535,8 +551,9 @@ 
           $values = explode("-", $value);
           $query .= "[";
 
-          foreach ($values as $val)
-            $query .= "starts-with(@$attr, \"$val\") or ";
+          foreach ($values as $val) {
+                      $query .= "starts-with(@$attr, \"$val\") or ";
+          }
 
           $query = rtrim($query, " or ") . "]";
           break;
@@ -570,8 +587,9 @@ 
 
 
     // Trim the trailing '/' from the query
-    if ( mb_strlen($query) > 2 )
-      $query = rtrim($query, "/");
+    if ( mb_strlen($query) > 2 ) {
+          $query = rtrim($query, "/");
+    }
 
     return $query;
   }
@@ -616,8 +634,10 @@ 
       foreach ($nodes as $node) {
         //echo $node->nodeName . "\n";
         // Retrieve the node id
-        if ( $node->nodeType != 1 ) // Only DOMElements get styles
+        if ( $node->nodeType != 1 ) {
+            // Only DOMElements get styles
           continue;
+        }
 
         $id = $node->getAttribute("frame_id");
 
@@ -635,20 +655,23 @@ 
       if ( !$root_flg && $this->_page_style ) {
         $style = $this->_page_style;
         $root_flg = true;
-      } else
-        $style = $this->create_style();
+      } else {
+              $style = $this->create_style();
+      }
 
       // Find nearest DOMElement parent
       $p = $frame;
-      while ( $p = $p->get_parent() )
-        if ($p->get_node()->nodeType == 1 )
+      while ( $p = $p->get_parent() ) {
+              if ($p->get_node()->nodeType == 1 )
           break;
+      }
 
       // Styles can only be applied directly to DOMElements; anonymous
       // frames inherit from their parent
       if ( $frame->get_node()->nodeType != 1 ) {
-        if ( $p )
-          $style->inherit($p->get_style());
+        if ( $p ) {
+                  $style->inherit($p->get_style());
+        }
         $frame->set_style($style);
         continue;
       }
@@ -687,8 +710,9 @@ 
         
         // Merge the new styles with the inherited styles
         foreach ($applied_styles as $arr) {
-          foreach ($arr as $s)
-            $style->merge($s);
+          foreach ($arr as $s) {
+                      $style->merge($s);
+          }
         }
       }
 
@@ -765,9 +789,10 @@ 
       "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
       "/xs";
 
-    if ( preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false )
-      // An error occured
+    if ( preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false ) {
+          // An error occured
       throw new DOMPDF_Exception("Error parsing css file: preg_match_all() failed.");
+    }
 
     // After matching, the array indicies are set as follows:
     //
@@ -825,10 +850,11 @@ 
           //assign it to the <body> tag, possibly only for the css of the correct media type.
 
           // Store the style for later...
-          if ( is_null($this->_page_style) )
-            $this->_page_style = $this->_parse_properties($match[5]);
-          else
-            $this->_page_style->merge($this->_parse_properties($match[5]));
+          if ( is_null($this->_page_style) ) {
+                      $this->_page_style = $this->_parse_properties($match[5]);
+          } else {
+                      $this->_page_style->merge($this->_parse_properties($match[5]));
+          }
           break;
 
         default:
@@ -839,8 +865,9 @@ 
         continue;
       }
 
-      if ( $match[7] !== "" )
-        $this->_parse_sections($match[7]);
+      if ( $match[7] !== "" ) {
+              $this->_parse_sections($match[7]);
+      }
 
     }
   }
@@ -851,8 +878,7 @@ 
     
     if ( mb_strpos($val, "url") === false ) {
       $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
-    }
-    else {
+    } else {
       $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
 
       // Resolve the url now in the context of the current stylesheet
@@ -951,7 +977,9 @@ 
   private function _parse_properties($str) {
     $properties = explode(";", $str);
 
-    if (DEBUGCSS) print '[_parse_properties';
+    if (DEBUGCSS) {
+        print '[_parse_properties';
+    }
 
     // Create the style
     $style = new Style($this);
@@ -972,7 +1000,9 @@ 
       }
       $prop = trim($prop);
       */
-      if (DEBUGCSS) print '(';
+      if (DEBUGCSS) {
+          print '(';
+      }
  	  $important = false;
       $prop = trim($prop);
       if (substr($prop,-9) === 'important') {
@@ -984,19 +1014,25 @@ 
       }
 
       if ($prop == "") {
-        if (DEBUGCSS) print 'empty)';
+        if (DEBUGCSS) {
+            print 'empty)';
+        }
         continue;
       }
 
       $i = mb_strpos($prop, ":");
       if ( $i === false ) {
-        if (DEBUGCSS) print 'novalue'.$prop.')';
+        if (DEBUGCSS) {
+            print 'novalue'.$prop.')';
+        }
         continue;
       }
 
       $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i)));
       $value = ltrim(mb_substr($prop, $i+1));
-      if (DEBUGCSS) print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
+      if (DEBUGCSS) {
+          print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
+      }
       //New style, anyway empty
       //if ($important || !$style->important_get($prop_name) ) {
       //$style->$prop_name = array($value,$important);
@@ -1010,7 +1046,9 @@ 
       $style->$prop_name = $value;
       //$style->props_set($prop_name, $value);
     }
-    if (DEBUGCSS) print '_parse_properties]';
+    if (DEBUGCSS) {
+        print '_parse_properties]';
+    }
 
     return $style;
   }
@@ -1029,12 +1067,16 @@ 
     $str = preg_replace($patterns, $replacements, $str);
 
     $sections = explode("}", $str);
-    if (DEBUGCSS) print '[_parse_sections';
+    if (DEBUGCSS) {
+        print '[_parse_sections';
+    }
     foreach ($sections as $sect) {
       $i = mb_strpos($sect, "{");
 
       $selectors = explode(",", mb_substr($sect, 0, $i));
-      if (DEBUGCSS) print '[section';
+      if (DEBUGCSS) {
+          print '[section';
+      }
       $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
       
       // Assign it to the selected elements
@@ -1042,17 +1084,25 @@ 
         $selector = trim($selector);
 
         if ($selector == "") {
-          if (DEBUGCSS) print '#empty#';
+          if (DEBUGCSS) {
+              print '#empty#';
+          }
           continue;
         }
-        if (DEBUGCSS) print '#'.$selector.'#';
+        if (DEBUGCSS) {
+            print '#'.$selector.'#';
+        }
         //if (DEBUGCSS) { if (strpos($selector,'p') !== false) print '!!!p!!!#'; }
 
         $this->add_style($selector, $style);
       }
-      if (DEBUGCSS) print 'section]';
+      if (DEBUGCSS) {
+          print 'section]';
+      }
+    }
+    if (DEBUGCSS) {
+        print '_parse_sections]';
     }
-    if (DEBUGCSS) print '_parse_sections]';
   }
 
   /**
@@ -1065,8 +1115,9 @@ 
    */
   function __toString() {
     $str = "";
-    foreach ($this->_styles as $selector => $style)
-      $str .= "$selector => " . $style->__toString() . "\n";
+    foreach ($this->_styles as $selector => $style) {
+          $str .= "$selector => " . $style->__toString() . "\n";
+    }
 
     return $str;
   }

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

Braces +3 added lines, -2 removed lines

@@ -114,8 +114,9 @@
    
       // Move our children
       foreach ( $this->get_lines() as $i => $line ) {
-        foreach ( $line["frames"] as $frame )
-          $frame->set_position( null, $frame->get_position("y") + $delta );
+        foreach ( $line["frames"] as $frame ) {
+                  $frame->set_position( null, $frame->get_position("y") + $delta );
+        }
       }
    }
         

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

Braces +78 added lines, -52 removed lines

@@ -170,14 +170,15 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
+    if ( !isset($this->_columns[$i]) ) {
+          $this->_columns[$i] = array("x" => 0,
                                   "min-width" => 0,
                                   "max-width" => 0,
                                   "used-width" => null,
                                   "absolute" => 0,
                                   "percent" => 0,
                                   "auto" => true);
+    }
 
     return $this->_columns[$i];
   }
@@ -187,20 +188,23 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
+    if ( !isset($this->_rows[$j]) ) {
+          $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
+    }
     return $this->_rows[$j];
   }
 
   function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) )
-      $this->_borders[$i][$j][$h_v] = array("width" => 0,
+    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+          $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+    }
+    if ( isset($prop) ) {
+          return $this->_borders[$i][$j][$h_v][$prop];
+    }
 
     return $this->_borders[$i][$j][$h_v];
   }
@@ -248,14 +252,16 @@ 
     if ( !isset($this->_columns[$col])) {
       $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
       $x = 0;
-    } else
-      $x = $this->_columns[$col]["x"];
+    } else {
+          $x = $this->_columns[$col]["x"];
+    }
 
     if ( !isset($this->_rows[$row])) {
       $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
       $y = 0;
-    } else
-      $y = $this->_rows[$row]["y"];
+    } else {
+          $y = $this->_rows[$row]["y"];
+    }
 
     return array($x, $y, "x" => $x, "y" => $y);
   }
@@ -269,8 +275,9 @@ 
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
-    foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+    foreach ($cols as $i) {
+          $w += $this->_columns[$i]["used-width"];
+    }
 
     return $w;
 
@@ -279,8 +286,9 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    if ( !isset($this->_frames[$key]) ) {
+          throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    }
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
@@ -306,8 +314,9 @@ 
 
   function set_row_height($i, $height) {
     $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
-      return;
+    if ( $height <= $row["height"] ) {
+          return;
+    }
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
@@ -340,8 +349,9 @@ 
 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
-      $this->_borders[$i][$j][$h_v] = $border_spec;
+          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) ) {
+          $this->_borders[$i][$j][$h_v] = $border_spec;
+    }
 
     return $this->_borders[$i][$j][$h_v]["width"];
   }
@@ -362,11 +372,13 @@ 
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
-        $this->add_frame( $child );
+      foreach ( $frame->get_children() as $child ) {
+              $this->add_frame( $child );
+      }
 
-      if ( $display == "table-row" )
-        $this->add_row();
+      if ( $display == "table-row" ) {
+              $this->add_row();
+      }
 
       $num_rows = $this->__row - $start_row - 1;
       $key = $frame->get_id();
@@ -419,8 +431,9 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+    while ( isset($this->_cells[$this->__row][$ac]) ) {
+           $ac++;
+    }
     $this->__col = $ac;
 
     // Rows:
@@ -429,8 +442,9 @@ 
 
       $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
-        $this->_cells[$row][$this->__col + $j] = $frame;
+      for ( $j = 0; $j < $colspan; $j++) {
+              $this->_cells[$row][$this->__col + $j] = $frame;
+      }
 
       if ( $collapse ) {
         // Resolve vertical borders
@@ -528,8 +542,9 @@ 
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+    if ( $this->__col > $this->_num_cols ) {
+          $this->_num_cols = $this->__col;
+    }
 
   }
 
@@ -542,8 +557,9 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+    while ( isset($this->_cells[$this->__row][$i]) ) {
+          $i++;
+    }
 
     $this->__col = $i;
 
@@ -559,8 +575,10 @@ 
   function remove_row(Frame $row) {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -591,8 +609,10 @@ 
   function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
@@ -643,16 +663,18 @@ 
 
       $h = 0;
       foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
-          // The row has been removed because of a page split, so skip it.
+        if ( !isset($this->_rows[$row]) ) {
+                  // The row has been removed because of a page split, so skip it.
           continue;
+        }
         $h += $this->_rows[$row]["height"];
       }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
-        $frame->set_cell_height($h);
-      else
-        $frame->get_style()->height = $h;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($h);
+      } else {
+              $frame->get_style()->height = $h;
+      }
     }
 
   }
@@ -671,18 +693,20 @@ 
 
       $h = 0;
       foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
-          continue;
+        if ( !isset($this->_rows[$row]) ) {
+                  continue;
+        }
 
         $h += $this->_rows[$row]["height"];
       }
 
       $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
-        $frame->set_cell_height($new_height);
-      else
-        $frame->get_style()->height = $new_height;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($new_height);
+      } else {
+              $frame->get_style()->height = $new_height;
+      }
     }
 
   }
@@ -699,15 +723,17 @@ 
 
     $str .=  "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+    foreach ( $this->_frames as $key => $val ) {
+          $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+    }
 
     $str .= pre_r($arr, true);
 
-    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",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
+    }
     return $str;
   }
 }

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

Braces +9 added lines, -6 removed lines

@@ -57,8 +57,9 @@ 
   function reflow() {
     $page = $this->_frame->get_root();
 
-    if ( $page->is_full() )
-      return;
+    if ( $page->is_full() ) {
+          return;
+    }
 
     $this->_frame->position();
     $style = $this->_frame->get_style();
@@ -66,16 +67,18 @@ 
 
     foreach ($this->_frame->get_children() as $child) {
 
-      if ( $page->is_full() )
-        return;
+      if ( $page->is_full() ) {
+              return;
+      }
 
       $child->set_containing_block($cb);
       $child->reflow();
 
     }
 
-    if ( $page->is_full() )
-      return;
+    if ( $page->is_full() ) {
+          return;
+    }
 
     $table = Table_Frame_Decorator::find_parent_table($this->_frame);
     $cellmap = $table->get_cellmap();

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

Braces +3 added lines, -2 removed lines

@@ -72,8 +72,9 @@
     // Small hack to prevent extra indenting of list text on list_style_position === "inside"
     // and on suppressed bullet
     if ( $style->list_style_position === "outside" ||
-         $style->list_style_type === "none" )
-      return 0;
+         $style->list_style_type === "none" ) {
+          return 0;
+    }
     return $style->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
   }