chamilo / chamilo-lms

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

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     $w = $style->length_in_pt($style->width, $cb["w"]);
     $h = $style->length_in_pt($style->height, $cb["h"]);
 
-    $this->_canvas->image( $frame->get_image_url(), $frame->get_image_ext(), $x, $y, $w, $h);
+    $this->_canvas->image($frame->get_image_url(), $frame->get_image_ext(), $x, $y, $w, $h);
 
   }
 }

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

Spacing +25 added lines, -25 removed lines

@@ -61,8 +61,8 @@ 
 
   protected function _parse_string($string) {
     $string = trim($string, "'\"");
-    $string = str_replace(array("\\\n",'\\"',"\\'"),
-                          array("",'"',"'"), $string);
+    $string = str_replace(array("\\\n", '\\"', "\\'"),
+                          array("", '"', "'"), $string);
 
     // Convert escaped hex characters into ascii characters (e.g. \A => newline)
     $string = preg_replace_callback("/\\\\([0-9a-fA-F]{0,6})(\s)?(?(2)|(?=[^0-9a-fA-F]))/",
@@ -80,8 +80,8 @@ 
       "\s(counters?\\([^)]*\\))|\n".
       "\A(counters?\\([^)]*\\))|\n".
       "\s([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\3|\n".
-      "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n" .
-      "\s([^\s\"']+)|\n" .
+      "\A([\"']) ( (?:[^\"']|\\\\[\"'])+ )(?<!\\\\)\\5|\n".
+      "\s([^\s\"']+)|\n".
       "\A([^\s\"']+)\n".
       "/xi";
 
@@ -94,16 +94,16 @@ 
     $text = "";
 
     foreach ($matches as $match) {
-      if ( isset($match[2]) && $match[2] !== "" )
+      if (isset($match[2]) && $match[2] !== "")
         $match[1] = $match[1];
 
-      if ( isset($match[6]) && $match[6] !== "" )
+      if (isset($match[6]) && $match[6] !== "")
         $match[4] = $match[6];
 
-      if ( isset($match[8]) && $match[8] !== "" )
+      if (isset($match[8]) && $match[8] !== "")
         $match[7] = $match[8];
 
-      if ( isset($match[1]) && $match[1] !== "" ) {
+      if (isset($match[1]) && $match[1] !== "") {
         // counters?(...)
         $match[1] = mb_strtolower(trim($match[1]));
 
@@ -111,16 +111,16 @@ 
         // http://www.w3.org/TR/CSS21/generate.html#content
 
         $i = mb_strpos($match[1], ")");
-        if ( $i === false )
+        if ($i === false)
           continue;
 
         $args = explode(",", mb_substr($match[1], 7, $i - 7));
         $counter_id = $args[0];
 
-        if ( $match[1]{7} === "(" ) {
+        if ($match[1]{7} === "(") {
           // counter(name [,style])
 
-          if ( isset($args[1]) )
+          if (isset($args[1]))
             $type = $args[1];
           else
             $type = null;
@@ -130,14 +130,14 @@ 
 
           $text .= $p->counter_value($counter_id, $type);
 
-        } else if ( $match[1]{7} === "s" ) {
+        } else if ($match[1]{7} === "s") {
           // counters(name, string [,style])
-          if ( isset($args[1]) )
+          if (isset($args[1]))
             $string = $this->_parse_string(trim($args[1]));
           else
             $string = "";
 
-          if ( isset($args[2]) )
+          if (isset($args[2]))
             $type = $args[2];
           else
             $type = null;
@@ -145,7 +145,7 @@ 
           $p = $this->_frame->find_block_parent();
           $tmp = "";
           while ($p) {
-            $tmp = $p->counter_value($counter_id, $type) . $string . $tmp;
+            $tmp = $p->counter_value($counter_id, $type).$string.$tmp;
             $p = $p->find_block_parent();
           }
           $text .= $tmp;
@@ -154,29 +154,29 @@ 
           // countertops?
           continue;
 
-      } else if ( isset($match[4]) && $match[4] !== "" ) {
+      } else if (isset($match[4]) && $match[4] !== "") {
         // String match
         $text .= $this->_parse_string($match[4]);
 
-      } else if ( isset($match[7]) && $match[7] !== "" ) {
+      } else if (isset($match[7]) && $match[7] !== "") {
         // Directive match
 
-        if ( $match[7] === "open-quote" ) {
+        if ($match[7] === "open-quote") {
           // FIXME: do something here
-        } else if ( $match[7] === "close-quote" ) {
+        } else if ($match[7] === "close-quote") {
           // FIXME: do something else here
-        } else if ( $match[7] === "no-open-quote" ) {
+        } else if ($match[7] === "no-open-quote") {
           // FIXME:
-        } else if ( $match[7] === "no-close-quote" ) {
+        } else if ($match[7] === "no-close-quote") {
           // FIXME:
-        } else if ( mb_strpos($match[7],"attr(") === 0 ) {
+        } else if (mb_strpos($match[7], "attr(") === 0) {
 
-          $i = mb_strpos($match[7],")");
-          if ( $i === false )
+          $i = mb_strpos($match[7], ")");
+          if ($i === false)
             continue;
 
           $attr = mb_substr($match[7], 6, $i - 6);
-          if ( $attr == "" )
+          if ($attr == "")
             continue;
 
           $text .= $this->_frame->get_node()->getAttribute($attr);

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

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
    * @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);
 
   /**
    * Add a named destination (similar to <a name="foo">...</a> in html)

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

Spacing +75 added lines, -75 removed lines

@@ -54,7 +54,7 @@ 
  * The location of the default built-in CSS file.
  * {@link Stylesheet::DEFAULT_STYLESHEET}
  */
-define('__DEFAULT_STYLESHEET', DOMPDF_LIB_DIR . DIRECTORY_SEPARATOR . "res" . DIRECTORY_SEPARATOR . "html.css");
+define('__DEFAULT_STYLESHEET', DOMPDF_LIB_DIR.DIRECTORY_SEPARATOR."res".DIRECTORY_SEPARATOR."html.css");
 
 /**
  * The master stylesheet class
@@ -213,7 +213,7 @@ 
     if (!is_string($key))
       throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
 
-    if ( isset($this->_styles[$key]) )
+    if (isset($this->_styles[$key]))
       $this->_styles[$key]->merge($style);
     else
       $this->_styles[$key] = clone $style;
@@ -230,7 +230,7 @@ 
    * @return Style
    */
   function lookup($key) {
-    if ( !isset($this->_styles[$key]) )
+    if (!isset($this->_styles[$key]))
       return null;
 
     return $this->_styles[$key];
@@ -264,7 +264,7 @@ 
     global $_dompdf_warnings;
 
     // Prevent circular references
-    if ( isset($this->_loaded_files[$file]) )
+    if (isset($this->_loaded_files[$file]))
       return;
 
     $this->_loaded_files[$file] = true;
@@ -272,15 +272,15 @@ 
 
     list($this->_protocol, $this->_base_host, $this->_base_path, $filename) = $parsed_url;
 
-    if ( !DOMPDF_ENABLE_REMOTE &&
-         ($this->_protocol != "" && $this->_protocol !== "file://") ) {
+    if (!DOMPDF_ENABLE_REMOTE &&
+         ($this->_protocol != "" && $this->_protocol !== "file://")) {
       record_warnings(E_USER_WARNING, "Remote CSS file '$file' requested, but DOMPDF_ENABLE_REMOTE is false.", __FILE__, __LINE__);
       return;
     }
 
     // Fix submitted by Nick Oostveen for aliased directory support:
-    if ( $this->_protocol == "" )
-      $file = $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);
 
@@ -288,8 +288,8 @@ 
     $css = file_get_contents($file);
     restore_error_handler();
 
-    if ( $css == "" ) {
-      record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__);;
+    if ($css == "") {
+      record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__); ;
       return;
     }
 
@@ -324,7 +324,7 @@ 
     //this can lead to a too small specificity
     //see _css_selector_to_xpath
 
-    if ( !in_array($selector[0], array(" ", ">", ".", "#", "+", ":", "[")) ) {
+    if (!in_array($selector[0], array(" ", ">", ".", "#", "+", ":", "["))) {
     	$d++;
     }
 
@@ -361,14 +361,14 @@ 
 
     // Add an implicit space at the beginning of the selector if there is no
     // delimiter there already.
-    if ( !in_array($selector[0], $delimiters) )
+    if (!in_array($selector[0], $delimiters))
       $selector = " $selector";
 
     $tok = "";
     $len = mb_strlen($selector);
     $i = 0;
 
-    while ( $i < $len ) {
+    while ($i < $len) {
 
       $s = $selector[$i];
       $i++;
@@ -377,7 +377,7 @@ 
       $tok = "";
 
       while ($i < $len) {
-        if ( in_array($selector[$i], $delimiters) )
+        if (in_array($selector[$i], $delimiters))
           break;
         $tok .= $selector[$i++];
       }
@@ -390,10 +390,10 @@ 
         // the current token
         $expr = $s === " " ? "descendant" : "child";
 
-        if ( mb_substr($query, -1, 1) !== "/" )
+        if (mb_substr($query, -1, 1) !== "/")
           $query .= "/";
 
-        if ( !$tok )
+        if (!$tok)
           $tok = "*";
 
         $query .= "$expr::$tok";
@@ -408,7 +408,7 @@ 
         $attr = $s === "." ? "class" : "id";
 
         // empty class/id == *
-        if ( mb_substr($query, -1, 1) === "/" )
+        if (mb_substr($query, -1, 1) === "/")
           $query .= "*";
 
         // Match multiple classes: $tok contains the current selected
@@ -425,7 +425,7 @@ 
 
       case "+":
         // All sibling elements that folow the current token
-        if ( mb_substr($query, -1, 1) !== "/" )
+        if (mb_substr($query, -1, 1) !== "/")
           $query .= "/";
 
         $query .= "following-sibling::$tok";
@@ -472,19 +472,19 @@ 
         $op = "";
         $value = "";
 
-        while ( $j < $tok_len ) {
-          if ( in_array($tok[$j], $attr_delimiters) )
+        while ($j < $tok_len) {
+          if (in_array($tok[$j], $attr_delimiters))
             break;
           $attr .= $tok[$j++];
         }
 
-        switch ( $tok[$j] ) {
+        switch ($tok[$j]) {
 
         case "~":
         case "|":
           $op .= $tok[$j++];
 
-          if ( $tok[$j] !== "=" )
+          if ($tok[$j] !== "=")
             throw new DOMPDF_Exception("Invalid CSS selector syntax: invalid attribute selector: $selector");
 
           $op .= $tok[$j];
@@ -497,22 +497,22 @@ 
         }
 
         // Read the attribute value, if required
-        if ( $op != "" ) {
+        if ($op != "") {
           $j++;
-          while ( $j < $tok_len ) {
-            if ( $tok[$j] === "]" )
+          while ($j < $tok_len) {
+            if ($tok[$j] === "]")
               break;
             $value .= $tok[$j++];
           }
         }
 
-        if ( $attr == "" )
+        if ($attr == "")
           throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
 
-        switch ( $op ) {
+        switch ($op) {
 
         case "":
-          $query .=  "[@$attr]";
+          $query .= "[@$attr]";
           break;
 
         case "=":
@@ -523,12 +523,12 @@ 
           // FIXME: this will break if $value contains quoted strings
           // (e.g. [type~="a b c" "d e f"])
           $values = explode(" ", $value);
-          $query .=  "[";
+          $query .= "[";
 
-          foreach ( $values as $val )
+          foreach ($values as $val)
             $query .= "@$attr=\"$val\" or ";
 
-          $query = rtrim($query, " or ") . "]";
+          $query = rtrim($query, " or ")."]";
           break;
 
         case "|=":
@@ -538,7 +538,7 @@ 
           foreach ($values as $val)
             $query .= "starts-with(@$attr, \"$val\") or ";
 
-          $query = rtrim($query, " or ") . "]";
+          $query = rtrim($query, " or ")."]";
           break;
 
         }
@@ -570,7 +570,7 @@ 
 
 
     // Trim the trailing '/' from the query
-    if ( mb_strlen($query) > 2 )
+    if (mb_strlen($query) > 2)
       $query = rtrim($query, "/");
 
     return $query;
@@ -616,7 +616,7 @@ 
       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");
@@ -632,7 +632,7 @@ 
     $root_flg = false;
     foreach ($tree->get_frames() as $frame) {
       // pre_r($frame->get_node()->nodeName . ":");
-      if ( !$root_flg && $this->_page_style ) {
+      if (!$root_flg && $this->_page_style) {
         $style = $this->_page_style;
         $root_flg = true;
       } else
@@ -640,14 +640,14 @@ 
 
       // 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 )
+      if ($frame->get_node()->nodeType != 1) {
+        if ($p)
           $style->inherit($p->get_style());
         $frame->set_style($style);
         continue;
@@ -659,15 +659,15 @@ 
       Attribute_Translator::translate_attributes($frame);
 
       // Locate any additional style attributes
-      if ( ($str = $frame->get_node()->getAttribute("style")) !== "" ) {
+      if (($str = $frame->get_node()->getAttribute("style")) !== "") {
         $spec = $this->_specificity("!style attribute");
         $styles[$id][$spec][] = $this->_parse_properties($str);
       }
 
       // Grab the applicable styles
-      if ( isset($styles[$id]) ) {
+      if (isset($styles[$id])) {
 
-        $applied_styles = $styles[ $frame->get_id() ];
+        $applied_styles = $styles[$frame->get_id()];
 
         // Sort by specificity
         ksort($applied_styles);
@@ -676,7 +676,7 @@ 
           $debug_nodename = $frame->get_node()->nodeName;
           print "<pre>\n[$debug_nodename\n";
           foreach ($applied_styles as $spec => $arr) {
-            printf("specificity: 0x%08x\n",$spec);
+            printf("specificity: 0x%08x\n", $spec);
             foreach ($arr as $s) {
               print "[\n";
               $s->debug_print();
@@ -693,7 +693,7 @@ 
       }
 
       // Inherit parent's styles if required
-      if ( $p ) {
+      if ($p) {
 
         if (DEBUGCSS) {
           print "inherit:\n";
@@ -702,7 +702,7 @@ 
           print "]\n";
         }
 
-        $style->inherit( $p->get_style() );
+        $style->inherit($p->get_style());
       }
 
       if (DEBUGCSS) {
@@ -724,7 +724,7 @@ 
 
     // We're done!  Clean out the registry of all styles since we
     // won't be needing this later.
-    foreach ( array_keys($this->_styles) as $key ) {
+    foreach (array_keys($this->_styles) as $key) {
       unset($this->_styles[$key]);
     }
 
@@ -765,7 +765,7 @@ 
       "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
       "/xs";
 
-    if ( preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false )
+    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.");
 
@@ -781,10 +781,10 @@ 
     // [7] => individual rules, outside of media rules
     //
     //pre_r($matches);
-    foreach ( $matches as $match ) {
+    foreach ($matches as $match) {
       $match[2] = trim($match[2]);
 
-      if ( $match[2] !== "" ) {
+      if ($match[2] !== "") {
         // Handle @rules
         switch ($match[2]) {
 
@@ -794,12 +794,12 @@ 
 
         case "media":
           $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-          if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+          if (defined("DOMPDF_DEFAULT_MEDIA_TYPE")) {
             $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
           } else {
             $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
           }
-          if ( in_array(mb_strtolower(trim($match[3])), $acceptedmedia ) ) {
+          if (in_array(mb_strtolower(trim($match[3])), $acceptedmedia)) {
             $this->_parse_sections($match[5]);
           }
           break;
@@ -825,7 +825,7 @@ 
           //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) )
+          if (is_null($this->_page_style))
             $this->_page_style = $this->_parse_properties($match[5]);
           else
             $this->_page_style->merge($this->_parse_properties($match[5]));
@@ -839,7 +839,7 @@ 
         continue;
       }
 
-      if ( $match[7] !== "" )
+      if ($match[7] !== "")
         $this->_parse_sections($match[7]);
 
     }
@@ -847,23 +847,23 @@ 
 
   /* See also style.cls Style::_image(), refactoring?, works also for imported css files */
   protected function _image($val) {
-    $DEBUGCSS=DEBUGCSS;
+    $DEBUGCSS = DEBUGCSS;
     
-    if ( mb_strpos($val, "url") === false ) {
+    if (mb_strpos($val, "url") === false) {
       $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     }
     else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/", "\\1", trim($val));
 
       // Resolve the url now in the context of the current stylesheet
       $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->get_protocol() == "" ) {
-        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
+      if ($parsed_url["protocol"] == "" && $this->get_protocol() == "") {
+        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\') {
           $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
           $path = $this->get_base_path();
         }
-        $path .= $parsed_url["path"] . $parsed_url["file"];
+        $path .= $parsed_url["path"].$parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
@@ -878,7 +878,7 @@ 
       print "<pre>[_image\n";
       print_r($parsed_url);
       print $this->get_protocol()."\n".$this->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+      print "_image]</pre>"; ;
     }
     return $path;
   }
@@ -889,22 +889,22 @@ 
    * @param string $url  the url of the imported CSS file
    */
   private function _parse_import($url) {
-    $arr = preg_split("/[\s\n,]/", $url,-1, PREG_SPLIT_NO_EMPTY);
+    $arr = preg_split("/[\s\n,]/", $url, -1, PREG_SPLIT_NO_EMPTY);
     $url = array_shift($arr);
     $accept = false;
 
-    if ( count($arr) > 0 ) {
+    if (count($arr) > 0) {
 
       $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-      if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+      if (defined("DOMPDF_DEFAULT_MEDIA_TYPE")) {
         $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
       } else {
         $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
       }
               
       // @import url media_type [media_type...]
-      foreach ( $arr as $type ) {
-        if ( in_array(mb_strtolower(trim($type)), $acceptedmedia) ) {
+      foreach ($arr as $type) {
+        if (in_array(mb_strtolower(trim($type)), $acceptedmedia)) {
           $accept = true;
           break;
         }
@@ -915,7 +915,7 @@ 
       $accept = true;
     }
 
-    if ( $accept ) {
+    if ($accept) {
       // Store our current base url properties in case the new url is elsewhere
       $protocol = $this->_protocol;
       $host = $this->_base_host;
@@ -975,10 +975,10 @@ 
       if (DEBUGCSS) print '(';
  	  $important = false;
       $prop = trim($prop);
-      if (substr($prop,-9) === 'important') {
-      	$prop_tmp = rtrim(substr($prop,0,-9));
-      	if (substr($prop_tmp,-1) === '!') {
-      		$prop = rtrim(substr($prop_tmp,0,-1));
+      if (substr($prop, -9) === 'important') {
+      	$prop_tmp = rtrim(substr($prop, 0, -9));
+      	if (substr($prop_tmp, -1) === '!') {
+      		$prop = rtrim(substr($prop_tmp, 0, -1));
       		$important = true;
       	}
       }
@@ -989,14 +989,14 @@ 
       }
 
       $i = mb_strpos($prop, ":");
-      if ( $i === false ) {
+      if ($i === false) {
         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':'').')';
+      $value = ltrim(mb_substr($prop, $i + 1));
+      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);
@@ -1035,7 +1035,7 @@ 
 
       $selectors = explode(",", mb_substr($sect, 0, $i));
       if (DEBUGCSS) print '[section';
-      $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
+      $style = $this->_parse_properties(trim(mb_substr($sect, $i + 1)));
       
       // Assign it to the selected elements
       foreach ($selectors as $selector) {
@@ -1066,7 +1066,7 @@ 
   function __toString() {
     $str = "";
     foreach ($this->_styles as $selector => $style)
-      $str .= "$selector => " . $style->__toString() . "\n";
+      $str .= "$selector => ".$style->__toString()."\n";
 
     return $str;
   }

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

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
     $new_height = $height - $v_space;    
     $style->height = $new_height;
 
-    if ( $new_height > $this->_content_height ) {
+    if ($new_height > $this->_content_height) {
       // Adjust our vertical alignment
       $valign = $style->vertical_align;
 
@@ -113,9 +113,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 ($this->get_lines() as $i => $line) {
+        foreach ($line["frames"] as $frame)
+          $frame->set_position(null, $frame->get_position("y") + $delta);
       }
    }
         

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

Spacing +83 added lines, -83 removed lines

@@ -170,7 +170,7 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
+    if (!isset($this->_columns[$i]))
       $this->_columns[$i] = array("x" => 0,
                                   "min-width" => 0,
                                   "max-width" => 0,
@@ -187,7 +187,7 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
+    if (!isset($this->_rows[$j]))
       $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
@@ -195,11 +195,11 @@ 
   }
 
   function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) )
+    if (!isset($this->_borders[$i][$j][$h_v]))
       $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
+    if (isset($prop))
       return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
@@ -208,9 +208,9 @@ 
   function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
-    $right = $this->get_border($i, $j+1, "vertical");
+    $right = $this->get_border($i, $j + 1, "vertical");
     $top = $this->get_border($i, $j, "horizontal");
-    $bottom = $this->get_border($i+1, $j, "horizontal");
+    $bottom = $this->get_border($i + 1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
   }
@@ -220,7 +220,7 @@ 
   function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -238,20 +238,20 @@ 
 
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
-    if ( !isset($this->_columns[$col])) {
+    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"];
 
-    if ( !isset($this->_rows[$row])) {
+    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
@@ -263,7 +263,7 @@ 
   function get_frame_width($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -279,13 +279,13 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
+    if (!isset($this->_frames[$key]))
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+      if (!isset($this->_rows[$i])) {
         throw new Exception("foo");
       }
       $h += $this->_rows[$i]["height"];
@@ -298,19 +298,19 @@ 
   //........................................................................
 
   function set_column_width($j, $width) {
-    $col =& $this->get_column($j);
+    $col = & $this->get_column($j);
     $col["used-width"] = $width;
-    $next_col =& $this->get_column($j+1);
+    $next_col = & $this->get_column($j + 1);
     $next_col["x"] = $next_col["x"] + $width;
   }
 
   function set_row_height($i, $height) {
-    $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
+    $row = & $this->get_row($i);
+    if ($height <= $row["height"])
       return;
 
     $row["height"] = $height;
-    $next_row =& $this->get_row($i+1);
+    $next_row = & $this->get_row($i + 1);
     $next_row["y"] = $row["y"] + $height;
 
   }
@@ -323,7 +323,7 @@ 
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
-    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+    if (!isset($this->_borders[$i][$j][$h_v])) {
       $this->_borders[$i][$j][$h_v] = $border_spec;
       return $this->_borders[$i][$j][$h_v]["width"];
     }
@@ -332,15 +332,15 @@ 
     $o_style = $this->_borders[$i][$j][$h_v]["style"];
     $o_color = $this->_borders[$i][$j][$h_v]["color"];
 
-    if ( ($n_style === "hidden" ||
-          $n_width  >  $o_width ||
+    if (($n_style === "hidden" ||
+          $n_width > $o_width ||
           $o_style === "none")
 
          or
 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
+          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"];
@@ -356,37 +356,37 @@ 
     $collapse = $this->_table->get_style()->border_collapse == "collapse";
 
     // Recursively add the frames within tables, table-row-groups and table-rows
-    if ( $display == "table-row" ||
+    if ($display == "table-row" ||
          $display == "table" ||
          $display == "inline-table" ||
-         in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+         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" )
+      if ($display == "table-row")
         $this->add_row();
 
       $num_rows = $this->__row - $start_row - 1;
       $key = $frame->get_id();
 
       // Row groups always span across the entire table
-      $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
-      $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
-      $this->_frames[ $key ]["frame"] = $frame;
+      $this->_frames[$key]["columns"] = range(0, max(0, $this->_num_cols - 1));
+      $this->_frames[$key]["rows"] = range($start_row, max(0, $this->__row - 1));
+      $this->_frames[$key]["frame"] = $frame;
 
-      if ( $display != "table-row" && $collapse ) {
+      if ($display != "table-row" && $collapse) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
-        for ( $i = 0; $i < $num_rows+1; $i++) {
+        for ($i = 0; $i < $num_rows + 1; $i++) {
           $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
           $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
-        for ( $j = 0; $j < $this->_num_cols; $j++) {
+        for ($j = 0; $j < $this->_num_cols; $j++) {
           $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
           $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
         }
@@ -400,14 +400,14 @@ 
     $colspan = $frame->get_node()->getAttribute("colspan");
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
-    if ( !$colspan ) {
+    if (!$colspan) {
       $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+      $frame->get_node()->setAttribute("colspan", 1);
     }
 
-    if ( !$rowspan ) {
+    if (!$rowspan) {
       $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+      $frame->get_node()->setAttribute("rowspan", 1);
     }
     $key = $frame->get_id();
 
@@ -419,20 +419,20 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
+    while (isset($this->_cells[$this->__row][$ac]))
        $ac++;
     $this->__col = $ac;
 
     // Rows:
-    for ( $i = 0; $i < $rowspan; $i++ ) {
+    for ($i = 0; $i < $rowspan; $i++) {
       $row = $this->__row + $i;
 
-      $this->_frames[ $key ]["rows"][] = $row;
+      $this->_frames[$key]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
+      for ($j = 0; $j < $colspan; $j++)
         $this->_cells[$row][$this->__col + $j] = $frame;
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
@@ -442,21 +442,21 @@ 
     $max_top = $max_bottom = 0;
 
     // Columns:
-    for ( $j = 0; $j < $colspan; $j++ ) {
+    for ($j = 0; $j < $colspan; $j++) {
       $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+      $this->_frames[$key]["columns"][] = $col;
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
       }
     }
 
-    $this->_frames[ $key ]["frame"] = $frame;
+    $this->_frames[$key]["frame"] = $frame;
 
     // Handle seperated border model
-    if ( !$collapse ) {
+    if (!$collapse) {
       list($h, $v) = $this->_table->get_style()->border_spacing;
 
       // Border spacing is effectively a margin between cells
@@ -481,26 +481,26 @@ 
 
     $width = $style->width;
 
-    if ( is_percent($width) ) {
+    if (is_percent($width)) {
       $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+      $val = (float) rtrim($width, "% ") / $colspan;
 
-    } else if ( $width !== "auto" ) {
+    } else if ($width !== "auto") {
       $var = "absolute";
       $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
-    for ( $cs = 0; $cs < $colspan; $cs++ ) {
+    for ($cs = 0; $cs < $colspan; $cs++) {
 
       // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+      $col = & $this->get_column($this->__col + $cs);
 
       // Note: $var is either 'percent' or 'absolute'.  We compare the
       // requested percentage or absolute values with the existing widths
       // and adjust accordingly.
-      if ( isset($var) && $val > $col[$var] ) {
+      if (isset($var) && $val > $col[$var]) {
         $col[$var] = $val;
         $col["auto"] = false;
       }
@@ -510,25 +510,25 @@ 
     }
 
 
-    if ( $frame_min > $min ) {
+    if ($frame_min > $min) {
       // The frame needs more space.  Expand each sub-column
       $inc = ($frame_min - $min) / $colspan;
       for ($c = 0; $c < $colspan; $c++) {
-        $col =& $this->get_column($this->__col + $c);
+        $col = & $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
       }
     }
 
-    if ( $frame_max > $max ) {
+    if ($frame_max > $max) {
       $inc = ($frame_max - $max) / $colspan;
       for ($c = 0; $c < $colspan; $c++) {
-        $col =& $this->get_column($this->__col + $c);
+        $col = & $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
       }
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
+    if ($this->__col > $this->_num_cols)
       $this->_num_cols = $this->__col;
 
   }
@@ -542,7 +542,7 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
+    while (isset($this->_cells[$this->__row][$i]))
       $i++;
 
     $this->__col = $i;
@@ -559,8 +559,8 @@ 
   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--;
 
@@ -568,11 +568,11 @@ 
     $columns = $this->_frames[$key]["columns"];
 
     // Remove all frames from this row
-    foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
-        if ( isset($this->_cells[$r][$c]) ) {
+    foreach ($rows as $r) {
+      foreach ($columns as $c) {
+        if (isset($this->_cells[$r][$c])) {
           $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
+          unset($this->_frames[$frame->get_id()]);
           unset($this->_cells[$r][$c]);
         }
       }
@@ -591,8 +591,8 @@ 
   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) {
@@ -615,7 +615,7 @@ 
     $r_key = $last_row->get_id();
 
     $r_rows = $this->_frames[$r_key]["rows"];
-    $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
+    $this->_frames[$g_key]["rows"] = range($this->_frames[$g_key]["rows"][0], end($r_rows));
 
   }
 
@@ -626,7 +626,7 @@ 
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
-    foreach ( array_keys($this->_columns) as $j ) {
+    foreach (array_keys($this->_columns) as $j) {
       $this->_columns[$j]["x"] = $x;
       $x += $this->_columns[$j]["used-width"];
 
@@ -638,18 +638,18 @@ 
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        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 )
+      if ($frame instanceof Table_Cell_Frame_Decorator)
         $frame->set_cell_height($h);
       else
         $frame->get_style()->height = $h;
@@ -666,12 +666,12 @@ 
 
 
     // Distribute the increased height proportionally amongst each row
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row]))
           continue;
 
         $h += $this->_rows[$row]["height"];
@@ -679,7 +679,7 @@ 
 
       $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+      if ($frame instanceof Table_Cell_Frame_Decorator)
         $frame->set_cell_height($new_height);
       else
         $frame->get_style()->height = $new_height;
@@ -694,19 +694,19 @@ 
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
-    $str .=  "Rows:<br/>";
+    $str .= "Rows:<br/>";
     $str .= pre_r($this->_rows, true);
 
-    $str .=  "Frames:<br/>";
+    $str .= "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
+    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>"),
-                                    array("\n",chr(27)."[01;33m", chr(27)."[0m"),
+    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

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
   function reflow() {
     $page = $this->_frame->get_root();
 
-    if ( $page->is_full() )
+    if ($page->is_full())
       return;
 
     $this->_frame->position();
@@ -66,7 +66,7 @@ 
 
     foreach ($this->_frame->get_children() as $child) {
 
-      if ( $page->is_full() )
+      if ($page->is_full())
         return;
 
       $child->set_containing_block($cb);
@@ -74,7 +74,7 @@ 
 
     }
 
-    if ( $page->is_full() )
+    if ($page->is_full())
       return;
 
     $table = Table_Frame_Decorator::find_parent_table($this->_frame);

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

Spacing +9 added lines, -9 removed lines

@@ -55,9 +55,9 @@ 
 
   const BULLET_PADDING = 1; // Distance from bullet to text in pt
   // As fraction of font size (including descent). See also DECO_THICKNESS.
-  const BULLET_THICKNESS = 0.04;   // Thickness of bullet outline. Screen: 0.08, print: better less, e.g. 0.04
-  const BULLET_DESCENT = 0.3;  //descent of font below baseline. Todo: Guessed for now.
-  const BULLET_SIZE = 0.35;   // bullet diameter. For now 0.5 of font_size without descent.
+  const BULLET_THICKNESS = 0.04; // Thickness of bullet outline. Screen: 0.08, print: better less, e.g. 0.04
+  const BULLET_DESCENT = 0.3; //descent of font below baseline. Todo: Guessed for now.
+  const BULLET_SIZE = 0.35; // bullet diameter. For now 0.5 of font_size without descent.
   
   static $BULLET_TYPES = array("disc", "circle", "square");
   
@@ -71,23 +71,23 @@ 
     $style = $this->_frame->get_style();
     // 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" )
+    if ($style->list_style_position === "outside" ||
+         $style->list_style_type === "none")
       return 0;
-    return $style->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
+    return $style->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING;
   }
 
   //hits only on "inset" lists items, to increase height of box
   function get_margin_height() {
-    return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
+    return $this->_frame->get_style()->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING;
   }
 
   function get_width() {
-    return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
+    return $this->_frame->get_style()->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING;
   }
   
   function get_height() {
-    return $this->_frame->get_style()->get_font_size()*self::BULLET_SIZE + 2 * self::BULLET_PADDING;
+    return $this->_frame->get_style()->get_font_size() * self::BULLET_SIZE + 2 * self::BULLET_PADDING;
   }
   
   //........................................................................

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

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
     $p = $this->_frame->find_block_parent();
     
-    if ( $p ) {
+    if ($p) {
       $p->add_line();
       $y = $p->get_current_line("y");