chamilo / chamilo-lms

main/inc/lib/pdf.lib.php

Braces +3 added lines, -2 removed lines

@@ -536,8 +536,9 @@
             }
         } else {
             $store_path = api_get_path(SYS_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';   // course path
-            if (file_exists($store_path))
-                $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+            if (file_exists($store_path)) {
+                            $web_path   = api_get_path(WEB_CODE_PATH).'default_course_document/images/'.api_get_current_access_url_id().'_pdf_watermark.png';
+            }
         }
         return $web_path;
     }

main/inc/lib/pear/excelreader/OLERead.inc

Braces +4 added lines, -2 removed lines

@@ -240,14 +240,16 @@
 		    return $streamData;

     		

 

-    	}else{

+    	} else{

     	

 	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

 	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

 	            $numBlocks++;

 	        }

 	        

-	        if ($numBlocks == 0) return '';

+	        if ($numBlocks == 0) {
+	            return '';
+	        }
 	        

 	        //echo "numBlocks = $numBlocks\n";

 	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

main/inc/lib/pear/excelreader/reader.php

Braces +37 added lines, -27 removed lines

@@ -505,7 +505,7 @@ 
                                                 if ($spos + $len < $limitpos) {
                                                                 $retstr = substr($this->data, $spos, $len);
                                                                 $spos += $len;
-                                                }else{
+                                                } else{
                                                         // found countinue
                                                         $retstr = substr($this->data, $spos, $limitpos - $spos);
                                                         $bytesRead = $limitpos - $spos;
@@ -527,12 +527,12 @@ 
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len;
                                                                     $asciiEncoding = true;
-                                                                  }elseif (!$asciiEncoding && ($option != 0)){
+                                                                  } elseif (!$asciiEncoding && ($option != 0)){
                                                                                 $len = min($charsLeft * 2, $limitpos - $spos); // min($charsLeft, $conlength);
                                                                     $retstr .= substr($this->data, $spos, $len);
                                                                     $charsLeft -= $len/2;
                                                                     $asciiEncoding = false;
-                                                                  }elseif (!$asciiEncoding && ($option == 0)) {
+                                                                  } elseif (!$asciiEncoding && ($option == 0)) {
                                                                 // Bummer - the string starts off as Unicode, but after the
                                                                 // continuation it is in straightforward ASCII encoding
                                                                                 $len = min($charsLeft, $limitpos - $spos); // min($charsLeft, $conlength);
@@ -541,7 +541,7 @@ 
                                                                 }
                                                             $charsLeft -= $len;
                                                                 $asciiEncoding = false;
-                                                                  }else{
+                                                                  } else{
                                                             $newstr = '';
                                                                     for ($j = 0; $j < strlen($retstr); $j++) {
                                                                       $newstr = $retstr[$j].chr(0);
@@ -619,22 +619,24 @@ 
                                     'type' => 'date',
                                     'format' => $this->dateFormats[$indexCode]
                                     );
-                        }elseif (array_key_exists($indexCode, $this->numberFormats)) {
+                        } elseif (array_key_exists($indexCode, $this->numberFormats)) {
                         //echo "isnumber ".$this->numberFormats[$indexCode];
                             $this->formatRecords['xfrecords'][] = array(
                                     'type' => 'number',
                                     'format' => $this->numberFormats[$indexCode]
                                     );
-                        }else{
+                        } else{
                             $isdate = FALSE;
                             if ($indexCode > 0){
-                                if (isset($this->formatRecords[$indexCode]))
-                                    $formatstr = $this->formatRecords[$indexCode];
+                                if (isset($this->formatRecords[$indexCode])) {
+                                                                    $formatstr = $this->formatRecords[$indexCode];
+                                }
                                 //echo '.other.';
                                 //echo "\ndate-time=$formatstr=\n";
-                                if ($formatstr)
-                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
+                                if ($formatstr) {
+                                                                if (preg_match("/[^hmsday\/\-:\s]/i", $formatstr) == 0) { // found day and time format
                                     $isdate = TRUE;
+                                }
                                     $formatstr = str_replace('mm', 'i', $formatstr);
                                     $formatstr = str_replace('h', 'H', $formatstr);
                                     //echo "\ndate-time $formatstr \n";
@@ -646,7 +648,7 @@ 
                                         'type' => 'date',
                                         'format' => $formatstr,
                                         );
-                            }else{
+                            } else{
                                 $this->formatRecords['xfrecords'][] = array(
                                         'type' => 'other',
                                         'format' => '',
@@ -674,7 +676,7 @@ 
                             } else {
                                 $rec_name    = $this->_encodeUTF16(substr($this->data, $pos+12, $rec_length*2));
                             }
-                        }elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
+                        } elseif ($version == SPREADSHEET_EXCEL_READER_BIFF7){
                                 $rec_name    = substr($this->data, $pos+11, $rec_length);
                         }
                     $this->boundsheets[] = array('name'=>$rec_name,
@@ -733,7 +735,9 @@ 
             //echo "mem= ".memory_get_usage()."\n";
 //            $r = &$this->file->nextRecord();
             $lowcode = ord($this->data[$spos]);
-            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) break;
+            if ($lowcode == SPREADSHEET_EXCEL_READER_TYPE_EOF) {
+                break;
+            }
             $code = $lowcode | ord($this->data[$spos+1])<<8;
             $length = ord($this->data[$spos+2]) | ord($this->data[$spos+3])<<8;
             $spos += 4;
@@ -783,7 +787,7 @@ 
                     //echo $numValue." ";
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($numValue);
-                    }else{
+                    } else{
                         $raw = $numValue;
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -813,7 +817,7 @@ 
                         $numValue = $this->_GetIEEE754($this->_GetInt4d($this->data, $tmppos + 2));
                         if ($this->isDate($tmppos-4)) {
                             list($string, $raw) = $this->createDate($numValue);
-                        }else{
+                        } else{
                             $raw = $numValue;
                             if (isset($this->_columnsFormat[$colFirst + $i + 1])){
                                         $this->curformat = $this->_columnsFormat[$colFirst + $i + 1];
@@ -837,7 +841,7 @@ 
                     if ($this->isDate($spos)) {
                         list($string, $raw) = $this->createDate($tmp['double']);
                      //   $this->addcell(DateRecord($r, 1));
-                    }else{
+                    } else{
                         //$raw = $tmp[''];
                         if (isset($this->_columnsFormat[$column + 1])){
                                 $this->curformat = $this->_columnsFormat[$column + 1];
@@ -869,7 +873,7 @@ 
                         if ($this->isDate($spos)) {
                             list($string, $raw) = $this->createDate($tmp['double']);
                          //   $this->addcell(DateRecord($r, 1));
-                        }else{
+                        } else{
                             //$raw = $tmp[''];
                             if (isset($this->_columnsFormat[$column + 1])){
                                     $this->curformat = $this->_columnsFormat[$column + 1];
@@ -913,10 +917,12 @@ 
             $spos += $length;
         }
 
-        if (!isset($this->sheets[$this->sn]['numRows']))
-             $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
-        if (!isset($this->sheets[$this->sn]['numCols']))
-             $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        if (!isset($this->sheets[$this->sn]['numRows'])) {
+                     $this->sheets[$this->sn]['numRows'] = $this->sheets[$this->sn]['maxrow'];
+        }
+        if (!isset($this->sheets[$this->sn]['numCols'])) {
+                     $this->sheets[$this->sn]['numCols'] = $this->sheets[$this->sn]['maxcol'];
+        }
 
     }
 
@@ -943,7 +949,7 @@ 
                 if (($xfindex == 0x9) || ($xfindex == 0xa)){
                     $this->multiplier = 100;
                 }
-            }else{
+            } else{
                 $this->curformat = $this->_defaultFormat;
                 $this->rectype = 'unknown';
             }
@@ -993,7 +999,9 @@ 
         $mantissalow1 = ($rknumlow & 0x80000000) >> 31;
         $mantissalow2 = ($rknumlow & 0x7fffffff);
         $value = $mantissa / pow( 2 , (20- ($exp - 1023)));
-        if ($mantissalow1 != 0) $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        if ($mantissalow1 != 0) {
+            $value += 1 / pow (2 , (21 - ($exp - 1023)));
+        }
         $value += $mantissalow2 / pow (2 , (52 - ($exp - 1023)));
         //echo "Sign = $sign, Exp = $exp, mantissahighx = $mantissa, mantissalow1 = $mantissalow1, mantissalow2 = $mantissalow2<br>\n";
         if ($sign) {$value = -1 * $value;}
@@ -1006,10 +1014,12 @@ 
         $this->sheets[$this->sn]['maxrow'] = max($this->sheets[$this->sn]['maxrow'], $row + $this->_rowoffset);
         $this->sheets[$this->sn]['maxcol'] = max($this->sheets[$this->sn]['maxcol'], $col + $this->_coloffset);
         $this->sheets[$this->sn]['cells'][$row + $this->_rowoffset][$col + $this->_coloffset] = $string;
-        if ($raw)
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
-        if (isset($this->rectype))
-            $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        if ($raw) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['raw'] = $raw;
+        }
+        if (isset($this->rectype)) {
+                    $this->sheets[$this->sn]['cellsInfo'][$row + $this->_rowoffset][$col + $this->_coloffset]['type'] = $this->rectype;
+        }
 
     }
 

main/inc/lib/pear/Exception.php

Braces +14 added lines, -7 removed lines

@@ -347,15 +347,22 @@
             $args = array();
             if (!empty($v['args'])) {
                 foreach ($v['args'] as $arg) {
-                    if (is_null($arg)) $args[] = 'null';
-                    elseif (is_array($arg)) $args[] = 'Array';
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
-                    else {
+                    if (is_null($arg)) {
+                        $args[] = 'null';
+                    } elseif (is_array($arg)) {
+                        $args[] = 'Array';
+                    } elseif (is_object($arg)) {
+                        $args[] = 'Object('.get_class($arg).')';
+                    } elseif (is_bool($arg)) {
+                        $args[] = $arg ? 'true' : 'false';
+                    } elseif (is_int($arg) || is_double($arg)) {
+                        $args[] = $arg;
+                    } else {
                         $arg = (string)$arg;
                         $str = htmlspecialchars(substr($arg, 0, 16));
-                        if (strlen($arg) > 16) $str .= '…';
+                        if (strlen($arg) > 16) {
+                            $str .= '…';
+                        }
                         $args[] = "'" . $str . "'";
                     }
                 }

main/inc/lib/dashboard.lib.php

Braces +3 added lines, -1 removed lines

@@ -380,7 +380,9 @@
 					// check if user is allowed to see the block
 					if (method_exists($obj_block, 'is_block_visible_for_user')) {
 						$is_block_visible_for_user = $obj_block->is_block_visible_for_user($user_id);
-						if (!$is_block_visible_for_user) continue;
+						if (!$is_block_visible_for_user) {
+						    continue;
+						}
 					}
 
 					echo '<tr>';

main/inc/lib/myspace.lib.php

Braces +3 added lines, -1 removed lines

@@ -2097,7 +2097,9 @@
                 FROM $tbl_course course
                 WHERE course.code IN (".implode(',',$courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
         $column = intval($column);
         $from = intval($from);

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

Braces +4 added lines, -3 removed lines

@@ -346,9 +346,10 @@
 function DOMPDF_autoload($class) {
   $filename = DOMPDF_INC_DIR . "/" . mb_strtolower($class) . ".cls.php";
   
-  if ( is_file($filename) )
-    require_once($filename);
-}
+  if ( is_file($filename) ) {
+      require_once($filename);
+  }
+  }
 
 if ( function_exists("spl_autoload_register") ) {
 

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

Braces +91 added lines, -65 removed lines

@@ -96,8 +96,9 @@ 
 
   $opts = array();
 
-  if ( $_SERVER["argc"] == 1 )
-    return $opts;
+  if ( $_SERVER["argc"] == 1 ) {
+      return $opts;
+  }
 
   $i = 1;
   while ($i < $_SERVER["argc"]) {
@@ -116,29 +117,33 @@ 
       break;
 
     case "-p":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-p switch requires a size parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-p switch requires a size parameter\n");
+      }
       $opts["p"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-o":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-o switch requires an orientation parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-o switch requires an orientation parameter\n");
+      }
       $opts["o"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-b":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-b switch requires a path parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-b switch requires a path parameter\n");
+      }
       $opts["b"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
 
     case "-f":
-      if ( !isset($_SERVER["argv"][$i+1]) )
-        die("-f switch requires a filename parameter\n");
+      if ( !isset($_SERVER["argv"][$i+1]) ) {
+              die("-f switch requires a filename parameter\n");
+      }
       $opts["f"] = $_SERVER["argv"][$i+1];
       $i += 2;
       break;
@@ -154,8 +159,9 @@ 
       break;
 
     case "-t":
-      if ( !isset($_SERVER['argv'][$i + 1]) )
-        die("-t switch requires a comma separated list of types\n");
+      if ( !isset($_SERVER['argv'][$i + 1]) ) {
+              die("-t switch requires a comma separated list of types\n");
+      }
       $opts["t"] = $_SERVER['argv'][$i+1];
       $i += 2;
       break;
@@ -191,36 +197,42 @@ 
   if ( isset($opts["l"]) ) {
     echo "\nUnderstood paper sizes:\n";
 
-    foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size)
-      echo "  " . mb_strtoupper($size) . "\n";
+    foreach (array_keys(CPDF_Adapter::$PAPER_SIZES) as $size) {
+          echo "  " . mb_strtoupper($size) . "\n";
+    }
     exit;
   }
   $file = $opts["filename"];
 
-  if ( isset($opts["p"]) )
-    $paper = $opts["p"];
-  else
-    $paper = DOMPDF_DEFAULT_PAPER_SIZE;
-
-  if ( isset($opts["o"]) )
-    $orientation = $opts["o"];
-  else
-    $orientation = "portrait";
-
-  if ( isset($opts["b"]) )
-    $base_path = $opts["b"];
-
-  if ( isset($opts["f"]) )
-    $outfile = $opts["f"];
-  else {
-    if ( $file === "-" )
-      $outfile = "dompdf_out.pdf";
-    else
-      $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file) . ".pdf";
+  if ( isset($opts["p"]) ) {
+      $paper = $opts["p"];
+  } else {
+      $paper = DOMPDF_DEFAULT_PAPER_SIZE;
   }
 
-  if ( isset($opts["v"]) )
-    $_dompdf_show_warnings = true;
+  if ( isset($opts["o"]) ) {
+      $orientation = $opts["o"];
+  } else {
+      $orientation = "portrait";
+  }
+
+  if ( isset($opts["b"]) ) {
+      $base_path = $opts["b"];
+  }
+
+  if ( isset($opts["f"]) ) {
+      $outfile = $opts["f"];
+  } else {
+    if ( $file === "-" ) {
+          $outfile = "dompdf_out.pdf";
+    } else {
+          $outfile = str_ireplace(array(".html", ".htm", ".php"), "", $file) . ".pdf";
+    }
+  }
+
+  if ( isset($opts["v"]) ) {
+      $_dompdf_show_warnings = true;
+  }
 
   if ( isset($opts["d"]) ) {
     $_dompdf_show_warnings = true;
@@ -230,8 +242,9 @@ 
   if ( isset($opts['t']) ) {
     $arr = split(',',$opts['t']);
     $types = array();
-    foreach ($arr as $type)
-      $types[ trim($type) ] = 1;
+    foreach ($arr as $type) {
+          $types[ trim($type) ] = 1;
+    }
     $_DOMPDF_DEBUG_TYPES = $types;
   }
   
@@ -241,23 +254,27 @@ 
 
  default:
 
- 	if ( isset($_GET["input_file"]) )
- 		$file = basename(rawurldecode($_GET["input_file"]));
- 	else
- 		throw new DOMPDF_Exception("An input file is required (i.e. input_file _GET variable).");
+ 	if ( isset($_GET["input_file"]) ) {
+ 	 		$file = basename(rawurldecode($_GET["input_file"]));
+ 	} else {
+ 	 		throw new DOMPDF_Exception("An input file is required (i.e. input_file _GET variable).");
+ 	}
  		
- 	if ( isset($_GET["paper"]) )
- 		$paper = rawurldecode($_GET["paper"]);
- 	else
- 		$paper = DOMPDF_DEFAULT_PAPER_SIZE;
+ 	if ( isset($_GET["paper"]) ) {
+ 	 		$paper = rawurldecode($_GET["paper"]);
+ 	} else {
+ 	 		$paper = DOMPDF_DEFAULT_PAPER_SIZE;
+ 	}
  		
- 	if ( isset($_GET["orientation"]) )
- 		$orientation = rawurldecode($_GET["orientation"]);
- 	else
- 		$orientation = "portrait";
+ 	if ( isset($_GET["orientation"]) ) {
+ 	 		$orientation = rawurldecode($_GET["orientation"]);
+ 	} else {
+ 	 		$orientation = "portrait";
+ 	}
  		
- 	if ( isset($_GET["base_path"]) )
- 		$base_path = rawurldecode($_GET["base_path"]);
+ 	if ( isset($_GET["base_path"]) ) {
+ 	 		$base_path = rawurldecode($_GET["base_path"]);
+ 	}
  		
  		
  		$outfile = "dompdf_out.pdf"; # Don't allow them to set the output file
@@ -265,8 +282,9 @@ 
  		$file = $base_path . $file; # Set the input file
 
  		/* Check to see if the input file and base path = www/test */
- 		if($base_path !== "www/test/")
- 			throw new DOMPDF_Exception("Access to dompdf.php via non-cli SAPI has been deprecated due to security concerns.  Please use the dompdf class directly.");
+ 		if($base_path !== "www/test/") {
+ 		 			throw new DOMPDF_Exception("Access to dompdf.php via non-cli SAPI has been deprecated due to security concerns.  Please use the dompdf class directly.");
+ 		}
 
    break;
 }
@@ -275,13 +293,15 @@ 
 
 if ( $file === "-" ) {
   $str = "";
-  while ( !feof(STDIN) )
-    $str .= fread(STDIN, 4096);
+  while ( !feof(STDIN) ) {
+      $str .= fread(STDIN, 4096);
+  }
 
   $dompdf->load_html($str);
 
-} else
+} else {
   $dompdf->load_html_file($file);
+}
 
 if ( isset($base_path) ) {
   $dompdf->set_base_path($base_path);
@@ -293,8 +313,9 @@ 
 
 if ( $_dompdf_show_warnings ) {
   global $_dompdf_warnings;
-  foreach ($_dompdf_warnings as $msg)
-    echo $msg . "\n";
+  foreach ($_dompdf_warnings as $msg) {
+      echo $msg . "\n";
+  }
   echo $dompdf->get_canvas()->get_cpdf()->messages;
   flush();
 }
@@ -302,17 +323,22 @@ 
 if ( $save_file ) {
 //   if ( !is_writable($outfile) )
 //     throw new DOMPDF_Exception("'$outfile' is not writable.");
-  if ( strtolower(DOMPDF_PDF_BACKEND) === "gd" )
-    $outfile = str_replace(".pdf", ".png", $outfile);
+  if ( strtolower(DOMPDF_PDF_BACKEND) === "gd" ) {
+      $outfile = str_replace(".pdf", ".png", $outfile);
+  }
 
   list($proto, $host, $path, $file) = explode_url($outfile);
-  if ( $proto != "" ) // i.e. not file://
-    $outfile = $file; // just save it locally, FIXME? could save it like wget: ./host/basepath/file
+  if ( $proto != "" ) {
+      // i.e. not file://
+    $outfile = $file;
+  }
+  // just save it locally, FIXME? could save it like wget: ./host/basepath/file
 
   $outfile = realpath(dirname($outfile)) . DIRECTORY_SEPARATOR . basename($outfile);
 
-  if ( strpos($outfile, DOMPDF_CHROOT) !== 0 )
-    throw new DOMPDF_Exception("Permission denied.");
+  if ( strpos($outfile, DOMPDF_CHROOT) !== 0 ) {
+      throw new DOMPDF_Exception("Permission denied.");
+  }
 
   file_put_contents($outfile, $dompdf->output( array("compress" => 0) ));
   exit(0);

main/inc/lib/phpdocx/pdf/www/examples.php

Braces +5 added lines, -3 removed lines

@@ -3,8 +3,9 @@ 
 require_once("../dompdf_config.inc.php");
 if ( isset( $_POST["html"] ) ) {
 
-  if ( get_magic_quotes_gpc() )
-    $_POST["html"] = stripslashes($_POST["html"]);
+  if ( get_magic_quotes_gpc() ) {
+      $_POST["html"] = stripslashes($_POST["html"]);
+  }
   
   $dompdf = new DOMPDF();
   $dompdf->load_html($_POST["html"]);
@@ -68,8 +69,9 @@ 
 <p>Paper size and orientaion:
 <select name="paper">
 <?php
-foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size )
+foreach ( array_keys(CPDF_Adapter::$PAPER_SIZES) as $size ) {
   echo "<option ". ($size == "letter" ? "selected " : "" ) . "value=\"$size\">$size</option>\n";
+}
 ?>
 </select>
 <select name="orientation">