chamilo / chamilo-lms

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

Braces +15 added lines, -10 removed lines

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

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

Braces +51 added lines, -29 removed lines

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

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

Braces +125 added lines, -95 removed lines

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

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

Braces +9 added lines, -6 removed lines

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

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

Braces +63 added lines, -42 removed lines

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

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

Braces +50 added lines, -34 removed lines

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

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

Braces +132 added lines, -92 removed lines

@@ -398,20 +398,24 @@ 
    */
   function length_in_pt($length, $ref_size = null) {
 
-    if ( !is_array($length) )
-      $length = array($length);
+    if ( !is_array($length) ) {
+          $length = array($length);
+    }
 
-    if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+    if ( !isset($ref_size) ) {
+          $ref_size = self::$default_font_size;
+    }
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
-        return "auto";
+      if ( $l === "auto" ) {
+              return "auto";
+      }
       
-      if ( $l === "none" )
-        return "none";
+      if ( $l === "none" ) {
+              return "none";
+      }
 
       // Assume numeric values are already in points
       if ( is_numeric($l) ) {
@@ -567,8 +571,9 @@ 
  	  }
  	}
 
-    if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
+    if ( isset($style->_props["font_size"]) ) {
+          $this->__font_size_calculated = false;
+    }
   }
 
   
@@ -580,10 +585,11 @@ 
    * @return array
    */
   function munge_colour($colour) {
-    if ( is_array($colour) )
-      // Assume the array has the right format...
+    if ( is_array($colour) ) {
+          // Assume the array has the right format...
       // FIXME: should/could verify this.
       return $colour;
+    }
     
     $r = 0;
     $g = 0;
@@ -689,19 +695,22 @@ 
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+        if ($i === false || $j === false) {
+                  return null;
+        }
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+        if (count($triplet) != 3) {
+                  return null;
+        }
         
         foreach (array_keys($triplet) as $c) {
           $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
+          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" ) {
+                      $triplet[$c] = round($triplet[$c] * 0.255);
+          }
         }
 
         list($r, $g, $b) = $triplet;
@@ -796,10 +805,11 @@ 
     
     $method = "set_$prop";
 
-    if ( method_exists($this, $method) )
-      $this->$method($val);
-    else
-      $this->_props[$prop] = $val;
+    if ( method_exists($this, $method) ) {
+          $this->$method($val);
+    } else {
+          $this->_props[$prop] = $val;
+    }
     
   }
 
@@ -818,20 +828,24 @@ 
    */
   function __get($prop) {
     
-    if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    if ( !isset(self::$_defaults[$prop]) ) {
+          throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    }
 
-    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null) {
+          return $this->_prop_cache[$prop];
+    }
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
-    if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+    if ( !isset($this->_props[$prop]) ) {
+          $this->_props[$prop] = self::$_defaults[$prop];
+    }
 
-    if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+    if ( method_exists($this, $method) ) {
+          return $this->_prop_cache[$prop] = $this->$method();
+    }
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
@@ -859,10 +873,11 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
-        $weight = "normal";
-      else
-        $weight = "bold";
+      if ( $weight < 600 ) {
+              $weight = "normal";
+      } else {
+              $weight = "bold";
+      }
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
       $weight = "bold";
@@ -875,14 +890,15 @@ 
     // Resolve font-style
     $font_style = $this->__get("font_style");
 
-    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
-    else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
-    else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
-    else
-      $subtype = "normal";
+    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "bold_italic";
+    } else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" ) {
+          $subtype = "bold";
+    } else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "italic";
+    } else {
+          $subtype = "normal";
+    }
     
     // Resolve the font family
     if ($DEBUGCSS) {
@@ -899,21 +915,29 @@ 
       //remove leading and trailing string delimiters, e.g. on font names with spaces;
       //remove leading and trailing whitespace
       $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
+      if ($DEBUGCSS) {
+          print '('.$family.')';
+      }
       $font = Font_Metrics::get_font($family, $subtype);
 
       if ( $font ) {
-        if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
+        if ($DEBUGCSS) {
+            print '('.$font.")get_font_family]\n</pre>";
+        }
         return $font;
       }
     }
 
     $family = null;
-    if ($DEBUGCSS)  print '(default)';
+    if ($DEBUGCSS) {
+        print '(default)';
+    }
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+      if ($DEBUGCSS) {
+          print '('.$font.")get_font_family]\n</pre>";
+      }
       return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
@@ -928,16 +952,19 @@ 
    */
   function get_font_size() {
 
-    if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+    if ( $this->__font_size_calculated ) {
+          return $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
-    else
-      $fs = $this->_props["font_size"];
+    if ( !isset($this->_props["font_size"]) ) {
+          $fs = self::$_defaults["font_size"];
+    } else {
+          $fs = $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+    if ( !isset($this->_parent_font_size) ) {
+          $this->_parent_font_size = self::$default_font_size;
+    }
     
     switch ($fs) {
       
@@ -976,14 +1003,13 @@ 
     }
 
     // Ensure relative sizes resolve to something
-    if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else
-      $fs = $this->length_in_pt($fs);
+    if ( ($i = mb_strpos($fs, "em")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else if ( ($i = mb_strpos($fs, "ex")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else {
+          $fs = $this->length_in_pt($fs);
+    }
 
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache["font_size"] = null;
@@ -998,8 +1024,9 @@ 
    * @return float
    */
   function get_word_spacing() {
-    if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+    if ( $this->_props["word_spacing"] === "normal" ) {
+          return 0;
+    }
 
     return $this->_props["word_spacing"];
   }
@@ -1009,11 +1036,13 @@ 
    * @return float
    */
   function get_line_height() {
-    if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+    if ( $this->_props["line_height"] === "normal" ) {
+          return self::$default_line_height * $this->get_font_size();
+    }
 
-    if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    if ( is_numeric($this->_props["line_height"]) ) {
+          return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    }
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
   }
@@ -1104,10 +1133,11 @@ 
         break;
         
       case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
+        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" ) {
+                  $y = "50%";
+        } else {
+                  $x = "50%";
+        }
         break;
         
       default:
@@ -1119,11 +1149,13 @@ 
       $y = "50%";
     }
 
-    if ( !isset($x) )
-      $x = "0%";
+    if ( !isset($x) ) {
+          $x = "0%";
+    }
 
-    if ( !isset($y) )
-      $y = "0%";
+    if ( !isset($y) ) {
+          $y = "0%";
+    }
 
     return array( 0 => $x, "x" => $x,
                   1 => $y, "y" => $y );
@@ -1477,8 +1509,9 @@ 
   function set_color($colour) {
     $col = $this->munge_colour($colour);
 
-    if ( is_null($col) )
-      $col = self::$_defaults["color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["color"] = null;
@@ -1493,8 +1526,9 @@ 
    */
   function set_background_color($colour) {
     $col = $this->munge_colour($colour);
-    if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["background_color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_color"] = null;
@@ -1520,8 +1554,9 @@ 
    * @param string $val
    */
   function set_background_repeat($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_repeat"];
+    }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
@@ -1534,8 +1569,9 @@ 
    * @param string $val
    */
   function set_background_attachment($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_attachment"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_attachment"] = null;
@@ -1549,8 +1585,9 @@ 
    * @param string $val
    */
   function set_background_position($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_position"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_position"] = null;
@@ -1688,8 +1725,9 @@ 
    * @param string $break
    */
   function set_page_break_before($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_before"] = null;
@@ -1697,8 +1735,9 @@ 
   }
 
   function set_page_break_after($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_after"] = null;
@@ -1847,8 +1886,9 @@ 
 
     $arr = explode(" ", $val);
 
-    if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+    if ( count($arr) == 1 ) {
+          $arr[1] = $arr[0];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["border_spacing"] = null;

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

Braces +110 added lines, -81 removed lines

@@ -112,25 +112,29 @@ 
 
       $preferred_width = $style->length_in_pt($width, $cb["w"]) - $delta;
 
-      if ( $preferred_width < $min_table_width )
-        $preferred_width = $min_table_width;
+      if ( $preferred_width < $min_table_width ) {
+              $preferred_width = $min_table_width;
+      }
 
-      if ( $preferred_width > $min_width )
-        $width = $preferred_width;
-      else
-        $width = $min_width;
+      if ( $preferred_width > $min_width ) {
+              $width = $preferred_width;
+      } else {
+              $width = $min_width;
+      }
 
     } else {
 
-      if ( $max_width + $delta < $cb["w"] )
-        $width = $max_width;
-      else if ( $cb["w"] - $delta > $min_width )
-        $width = $cb["w"] - $delta;
-      else
-        $width = $min_width;
+      if ( $max_width + $delta < $cb["w"] ) {
+              $width = $max_width;
+      } else if ( $cb["w"] - $delta > $min_width ) {
+              $width = $cb["w"] - $delta;
+      } else {
+              $width = $min_width;
+      }
 
-      if ( $width < $min_table_width )
-        $width = $min_table_width;
+      if ( $width < $min_table_width ) {
+              $width = $min_table_width;
+      }
 
     }
 
@@ -142,8 +146,9 @@ 
     // If the whole table fits on the page, then assign each column it's max width
     if ( $width == $max_width ) {
 
-      foreach (array_keys($columns) as $i)
-        $cellmap->set_column_width($i, $columns[$i]["max-width"]);
+      foreach (array_keys($columns) as $i) {
+              $cellmap->set_column_width($i, $columns[$i]["max-width"]);
+      }
 
       return;
     }
@@ -171,8 +176,9 @@ 
       if ( $absolute_used == 0 && $percent_used == 0 ) {
         $increment = $width - $min_width;
 
-        foreach (array_keys($columns) as $i)
-          $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment * ($columns[$i]["max-width"] / $max_width));
+        foreach (array_keys($columns) as $i) {
+                  $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment * ($columns[$i]["max-width"] / $max_width));
+        }
         return;
       }
 
@@ -180,17 +186,18 @@ 
       // Case 2
       if ( $absolute_used > 0 && $percent_used == 0 ) {
 
-        if ( count($auto) > 0 )
-          $increment = ($width - $auto_min - $absolute_used) / count($auto);
+        if ( count($auto) > 0 ) {
+                  $increment = ($width - $auto_min - $absolute_used) / count($auto);
+        }
 
         // Use the absolutely specified width or the increment
         foreach (array_keys($columns) as $i) {
 
-          if ( $columns[$i]["absolute"] > 0 && count($auto) )
-            $cellmap->set_column_width($i, $columns[$i]["min-width"]);
-          else if ( count($auto) ) 
-            $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
-          else {
+          if ( $columns[$i]["absolute"] > 0 && count($auto) ) {
+                      $cellmap->set_column_width($i, $columns[$i]["min-width"]);
+          } else if ( count($auto) ) {
+                      $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
+          } else {
             // All absolute columns
             $increment = ($width - $absolute_used) * $columns[$i]["absolute"] / $absolute_used;
 
@@ -210,10 +217,11 @@ 
 
         // Scale percent values if the total percentage is > 100, or if all
         // values are specified as percentages.
-        if ( $percent_used > 100 || count($auto) == 0)
-          $scale = 100 / $percent_used;
-        else
-          $scale = 1;
+        if ( $percent_used > 100 || count($auto) == 0) {
+                  $scale = 100 / $percent_used;
+        } else {
+                  $scale = 1;
+        }
 
         // Account for the minimum space used by the unassigned auto columns
         $used_width = $auto_min;
@@ -225,8 +233,9 @@ 
 
           $w = min($columns[$i]["percent"] * $width/100, $slack);
 
-          if ( $w < $columns[$i]["min-width"] )
-            $w = $columns[$i]["min-width"];
+          if ( $w < $columns[$i]["min-width"] ) {
+                      $w = $columns[$i]["min-width"];
+          }
 
           $cellmap->set_column_width($i, $w);
           $used_width += $w;
@@ -238,8 +247,9 @@ 
         if ( count($auto) > 0 ) {
           $increment = ($width - $used_width) / count($auto);
 
-          foreach ($auto as $i)
-            $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
+          foreach ($auto as $i) {
+                      $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
+          }
 
         }
         return;
@@ -259,10 +269,11 @@ 
 
         // Scale percent values if the total percentage is > 100 or there
         // are no auto values to take up slack
-        if ( $percent_used > 100 || count($auto) == 0 )
-          $scale = 100 / $percent_used;
-        else
-          $scale = 1;
+        if ( $percent_used > 100 || count($auto) == 0 ) {
+                  $scale = 100 / $percent_used;
+        } else {
+                  $scale = 1;
+        }
 
         $remaining_width = $width - $used_width;
 
@@ -272,8 +283,9 @@ 
           $columns[$i]["percent"] *= $scale;
           $w = min($columns[$i]["percent"] * $remaining_width / 100, $slack);
 
-          if ( $w < $columns[$i]["min-width"] )
-            $w = $columns[$i]["min-width"];
+          if ( $w < $columns[$i]["min-width"] ) {
+                      $w = $columns[$i]["min-width"];
+          }
 
           $columns[$i]["used-width"] = $w;
           $used_width += $w;
@@ -282,8 +294,9 @@ 
         if ( count($auto) > 0 ) {
           $increment = ($width - $used_width) / count($auto);
 
-          foreach ($auto as $i)
-            $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
+          foreach ($auto as $i) {
+                      $cellmap->set_column_width($i, $columns[$i]["min-width"] + $increment);
+          }
 
         }
 
@@ -294,8 +307,9 @@ 
     } else { // we are over constrained
 
       // Each column gets its minimum width
-      foreach (array_keys($columns) as $i)
-        $cellmap->set_column_width($i, $columns[$i]["min-width"]);
+      foreach (array_keys($columns) as $i) {
+              $cellmap->set_column_width($i, $columns[$i]["min-width"]);
+      }
 
     }
   }
@@ -314,8 +328,9 @@ 
 
     // Determine our content height
     $content_height = 0;
-    foreach ( $rows as $r )
-      $content_height += $r["height"];
+    foreach ( $rows as $r ) {
+          $content_height += $r["height"];
+    }
 
     $cb = $this->_frame->get_containing_block();
 
@@ -333,26 +348,31 @@ 
 
       } else if ( isset($cb["w"]) ) {
 
-        if ( mb_strpos($min_height, "%") !== false )
-          $min_height = 0;
-        else
-          $min_height = $style->length_in_pt($min_height, $cb["w"]);
+        if ( mb_strpos($min_height, "%") !== false ) {
+                  $min_height = 0;
+        } else {
+                  $min_height = $style->length_in_pt($min_height, $cb["w"]);
+        }
 
-        if ( mb_strpos($max_height, "%") !== false )
-          $max_height = "none";
-        else
-          $max_height = $style->length_in_pt($max_height, $cb["w"]);
+        if ( mb_strpos($max_height, "%") !== false ) {
+                  $max_height = "none";
+        } else {
+                  $max_height = $style->length_in_pt($max_height, $cb["w"]);
+        }
       }
 
-      if ( $max_height !== "none" && $min_height > $max_height )
-        // Swap 'em
+      if ( $max_height !== "none" && $min_height > $max_height ) {
+              // Swap 'em
         list($max_height, $min_height) = array($min_height, $max_height);
+      }
 
-      if ( $max_height !== "none" && $height > $max_height )
-        $height = $max_height;
+      if ( $max_height !== "none" && $height > $max_height ) {
+              $height = $max_height;
+      }
 
-      if ( $height < $min_height )
-        $height = $min_height;
+      if ( $height < $min_height ) {
+              $height = $min_height;
+      }
 
     } else {
 
@@ -360,13 +380,15 @@ 
       if ( $height !== "auto" ) {
         $height = $style->length_in_pt($height, $cb["h"]);
 
-        if ( $height <= $content_height )
-          $height = $content_height;
-        else
-          $cellmap->set_frame_heights($height,$content_height);
+        if ( $height <= $content_height ) {
+                  $height = $content_height;
+        } else {
+                  $cellmap->set_frame_heights($height,$content_height);
+        }
 
-      } else
-        $height = $content_height;
+      } else {
+              $height = $content_height;
+      }
 
     }
 
@@ -382,8 +404,9 @@ 
     $page->check_forced_page_break($this->_frame);
 
     // Bail if the page is full
-    if ( $page->is_full() )
-      return;
+    if ( $page->is_full() ) {
+          return;
+    }
     
     // Let the page know that we're reflowing a table so that splits
     // are suppressed (simply setting page-break-inside: avoid won't
@@ -400,8 +423,9 @@ 
     // Table layout algorithm:
     // http://www.w3.org/TR/CSS21/tables.html#auto-table-layout
 
-    if ( is_null($this->_state) )
-      $this->get_min_max_width();
+    if ( is_null($this->_state) ) {
+          $this->get_min_max_width();
+    }
 
     $cb = $this->_frame->get_containing_block();
     $style = $this->_frame->get_style();
@@ -455,10 +479,11 @@ 
                                                  $style->border_top_width,
                                                  $style->padding_top), $cb["w"]);
 
-    if ( isset($cb["h"]) )
-      $h = $cb["h"];
-    else
-      $h = null;
+    if ( isset($cb["h"]) ) {
+          $h = $cb["h"];
+    } else {
+          $h = null;
+    }
 
 
     $cellmap = $this->_frame->get_cellmap();
@@ -474,15 +499,17 @@ 
     foreach ( $this->_frame->get_children() as $child ) {
 
       // Bail if the page is full
-      if ( !$page->in_nested_table() && $page->is_full() )
-        break;
+      if ( !$page->in_nested_table() && $page->is_full() ) {
+              break;
+      }
 
       $child->set_containing_block($content_x, $content_y, $width, $h);
       $child->reflow();
 
-      if ( !$page->in_nested_table() )
-        // Check if a split has occured
+      if ( !$page->in_nested_table() ) {
+              // Check if a split has occured
         $page->check_page_break($child);
+      }
 
     }
 
@@ -504,8 +531,9 @@ 
 
   function get_min_max_width() {
 
-    if ( !is_null($this->_min_max_cache)  )
-      return $this->_min_max_cache;
+    if ( !is_null($this->_min_max_cache)  ) {
+          return $this->_min_max_cache;
+    }
 
     $style = $this->_frame->get_style();
 
@@ -556,8 +584,9 @@ 
                   $style->margin_left,
                   $style->margin_right);
 
-    if ( $style->border_collapse !== "collapse" ) 
-      list($dims[]) = $style->border_spacing;
+    if ( $style->border_collapse !== "collapse" ) {
+          list($dims[]) = $style->border_spacing;
+    }
 
     $delta = $style->length_in_pt($dims, $this->_frame->get_containing_block("w"));
 

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

Braces +33 added lines, -22 removed lines

@@ -109,8 +109,9 @@ 
 function install_font_family($fontname, $normal, $bold = null, $italic = null, $bold_italic = null) {
 
   // Check if the base filename is readable
-  if ( !is_readable($normal) )
-    throw new DOMPDF_Exception("Unable to read '$normal'.");
+  if ( !is_readable($normal) ) {
+      throw new DOMPDF_Exception("Unable to read '$normal'.");
+  }
 
   $dir = dirname($normal);
   $basename = basename($normal);
@@ -135,14 +136,16 @@ 
 
         // Try $file . "B"
         $bold = $dir . "/" . $file . "B" . $ext;
-        if ( !is_readable($bold) )
-          $bold = null;
+        if ( !is_readable($bold) ) {
+                  $bold = null;
+        }
       }
     }
   }
 
-  if ( is_null($bold) )
-    echo ("Unable to find bold face file.\n");
+  if ( is_null($bold) ) {
+      echo ("Unable to find bold face file.\n");
+  }
 
   if ( !isset($italic) || !is_readable($italic) ) {
     $italic = $dir . "/" . $file . "_Italic" . $ext;
@@ -154,14 +157,16 @@ 
 
         // Try $file . "I"
         $italic = $dir . "/" . $file . "I" . $ext;
-        if ( !is_readable($italic) )
-          $italic = null;
+        if ( !is_readable($italic) ) {
+                  $italic = null;
+        }
       }
     }
   }
 
-  if ( is_null($italic) )
-    echo ("Unable to find italic face file.\n");
+  if ( is_null($italic) ) {
+      echo ("Unable to find italic face file.\n");
+  }
 
   if ( !isset($bold_italic) || !is_readable($bold_italic) ) {
     $bold_italic = $dir . "/" . $file . "_Bold_Italic" . $ext;
@@ -182,16 +187,18 @@ 
 
             // Try $file . "IB"
             $bold_italic = $dir . "/" . $file . "IB" . $ext;
-            if ( !is_readable($bold_italic) )
-              $bold_italic = null;
+            if ( !is_readable($bold_italic) ) {
+                          $bold_italic = null;
+            }
           }
         }
       }
     }
   }
 
-  if ( is_null($bold_italic) )
-    echo ("Unable to find bold italic face file.\n");
+  if ( is_null($bold_italic) ) {
+      echo ("Unable to find bold italic face file.\n");
+  }
 
   $fonts = compact("normal", "bold", "italic", "bold_italic");
   $entry = array();
@@ -207,23 +214,27 @@ 
       }
 
       // Verify that the fonts exist and are readable
-      if ( !is_readable($src) )
-        throw new User_DOMPDF_Exception("Requested font '$pathname' is not readable");
+      if ( !is_readable($src) ) {
+              throw new User_DOMPDF_Exception("Requested font '$pathname' is not readable");
+      }
 
       $dest = DOMPDF_FONT_DIR . basename($src);
-      if ( !is_writeable(dirname($dest)) )
-        throw new User_DOMPDF_Exception("Unable to write to destination '$dest'.");
+      if ( !is_writeable(dirname($dest)) ) {
+              throw new User_DOMPDF_Exception("Unable to write to destination '$dest'.");
+      }
 
       echo "Copying $src to $dest...\n";
 
-      if ( !copy($src, $dest) )
-        throw new DOMPDF_Exception("Unable to copy '$src' to '" . DOMPDF_FONT_DIR . "$dest'.");
+      if ( !copy($src, $dest) ) {
+              throw new DOMPDF_Exception("Unable to copy '$src' to '" . DOMPDF_FONT_DIR . "$dest'.");
+      }
 
       $entry[$var] = $dest;
     }
 
-  } else
-    throw new DOMPDF_Exception("Unable to process fonts of type '$ext'.");
+  } else {
+      throw new DOMPDF_Exception("Unable to process fonts of type '$ext'.");
+  }
 
 
   // If the extension is a ttf, try and convert the fonts to afm too