chamilo / chamilo-lms

main/inc/lib/image.lib.php

Braces +57 added lines, -19 removed lines

@@ -154,7 +154,9 @@ 
 
     public function set_image_wrapper()
     {
-        if ($this->debug) error_log('Image::set_image_wrapper loaded');
+        if ($this->debug) {
+            error_log('Image::set_image_wrapper loaded');
+        }
         try {
             if (file_exists($this->path)) {
                 $this->image     = new Imagick($this->path);
@@ -163,10 +165,14 @@ 
                     $this->fill_image_info(); //Fills height, width and type
                 }
             } else {
-                if ($this->debug) error_log('Image::image does not exist');
+                if ($this->debug) {
+                    error_log('Image::image does not exist');
+                }
             }
         } catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
     }
 
@@ -180,7 +186,9 @@ 
 
         if (in_array($this->type, $this->allowed_extensions)) {
             $this->image_validated = true;
-            if ($this->debug) error_log('image_validated true');
+            if ($this->debug) {
+                error_log('image_validated true');
+            }
         }
     }
 
@@ -196,7 +204,9 @@ 
 	//@todo implement border logic case for Imagick
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
 
         if ($specific_size) {
             $width = $thumbw;
@@ -222,7 +232,9 @@ 
      */
     
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->image->cropimage($width, $height, $x, $y);
 		$this->width  = $width;
 		$this->height = $height;
@@ -230,7 +242,9 @@ 
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -238,20 +252,28 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				break;
 		}
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
 		} catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
 
 		if (!$file) {
@@ -334,7 +356,9 @@ 
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 		if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
@@ -387,7 +411,9 @@ 
      * @param int $src_height the source height of the original image
      */
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->width = $width;
 		$this->height = $height;
         $src = null;
@@ -418,7 +444,9 @@ 
 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
@@ -427,19 +455,27 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
+				if ($compress == -1) {
+				    $compress = 100;
+				}
 				return imagejpeg($this->bg, $file, $compress);
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
 				return imagepng($this->bg, $file, $compress);
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
@@ -456,7 +492,9 @@ 
      */
     function convert2bw()
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 
         $dest_img = imagecreatetruecolor(imagesx($this->bg), imagesy($this->bg));
         /* copy ignore the transparent color

main/inc/lib/urlmanager.lib.php

Braces +3 added lines, -2 removed lines

@@ -262,8 +262,9 @@
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 
-        if (!empty($access_url_id))
-            $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        if (!empty($access_url_id)) {
+                    $where ="WHERE $table_url_rel_session.access_url_id = ".intval($access_url_id);
+        }
 
         $sql = "SELECT id, name, access_url_id
                 FROM $tbl_session u

main/inc/lib/tracking.lib.php

Braces +74 added lines, -31 removed lines

@@ -2259,7 +2259,9 @@ 
             $debug = false;
         }
 
-        if ($debug) echo '<h1>Tracking::get_avg_student_score</h1>';
+        if ($debug) {
+            echo '<h1>Tracking::get_avg_student_score</h1>';
+        }
         $tbl_stats_exercices = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
         $tbl_stats_attempts = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 
@@ -2336,7 +2338,9 @@ 
                             $condition_user1 AND
                             session_id = $session_id
                         GROUP BY lp_id, user_id";
-                if ($debug) echo $sql;
+                if ($debug) {
+                    echo $sql;
+                }
 
                 $rs_last_lp_view_id = Database::query($sql);
 
@@ -2352,7 +2356,9 @@ 
                         $lp_view_id = $row_lp_view['id'];
                         $lp_id      = $row_lp_view['lp_id'];
                         $user_id    = $row_lp_view['user_id'];
-                        if ($debug) echo '<h2>LP id '.$lp_id.'</h2>';
+                        if ($debug) {
+                            echo '<h2>LP id '.$lp_id.'</h2>';
+                        }
 
                         if ($get_only_latest_attempt_results) {
                             //Getting lp_items done by the user
@@ -2409,7 +2415,9 @@ 
                                          lp_i.c_id  = $course_id AND
                                          (lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."')
                                       WHERE lp_view_id = $lp_view_id ";
-                            if ($debug) echo $sql.'<br />';
+                            if ($debug) {
+                                echo $sql.'<br />';
+                            }
                             $res_max_score = Database::query($sql);
 
                             while ($row_max_score = Database::fetch_array($res_max_score,'ASSOC')) {
@@ -2428,7 +2436,9 @@ 
                             $max_score_item_view = $row_max_score['max_score_item_view'];
                             $score = $row_max_score['score'];
 
-                            if ($debug) echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>';
+                            if ($debug) {
+                                echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>';
+                            }
 
                             if ($row_max_score['item_type'] == 'sco') {
                                 /* Check if it is sco (easier to get max_score)
@@ -2448,7 +2458,9 @@ 
                                 if (!empty($max_score)) {
                                     $lp_partial_total += $score/$max_score;
                                 }
-                                if ($debug) echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                if ($debug) {
+                                    echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                }
                             } else {
                                 // Case of a TOOL_QUIZ element
                                 $item_id = $row_max_score['iid'];
@@ -2470,12 +2482,16 @@ 
                                         ORDER BY exe_date DESC
                                         LIMIT 1";
 
-                                if ($debug) echo $sql .'<br />';
+                                if ($debug) {
+                                    echo $sql .'<br />';
+                                }
                                 $result_last_attempt = Database::query($sql);
                                 $num = Database :: num_rows($result_last_attempt);
                                 if ($num > 0 ) {
                                     $id_last_attempt = Database :: result($result_last_attempt, 0, 0);
-                                    if ($debug) echo $id_last_attempt.'<br />';
+                                    if ($debug) {
+                                        echo $id_last_attempt.'<br />';
+                                    }
 
                                     // Within the last attempt number tracking, get the sum of
                                     // the max_scores of all questions that it was
@@ -2494,7 +2510,9 @@ 
                                                     q.c_id = $course_id
                                             )
                                             AS t";
-                                    if ($debug) echo '$sql: '.$sql.' <br />';
+                                    if ($debug) {
+                                        echo '$sql: '.$sql.' <br />';
+                                    }
                                     $res_max_score_bis = Database::query($sql);
                                     $row_max_score_bis = Database::fetch_array($res_max_score_bis);
 
@@ -2504,7 +2522,9 @@ 
                                     if (!empty($max_score) && floatval($max_score) > 0) {
                                         $lp_partial_total += $score/$max_score;
                                     }
-                                    if ($debug) echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                    if ($debug) {
+                                        echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
+                                    }
                                 }
                             }
 
@@ -2517,17 +2537,25 @@ 
                                         $count_items++;
                                     }
                                 }
-                                if ($debug) echo '$count_items: '.$count_items;
+                                if ($debug) {
+                                    echo '$count_items: '.$count_items;
+                                }
                             }
                         } //end for
 
                         $score_of_scorm_calculate += $count_items ? (($lp_partial_total / $count_items) * 100) : 0;
 
-                        if ($debug) echo '<h3>$count_items '.$count_items.'</h3>';
-                        if ($debug) echo '<h3>$score_of_scorm_calculate '.$score_of_scorm_calculate.'</h3>';
+                        if ($debug) {
+                            echo '<h3>$count_items '.$count_items.'</h3>';
+                        }
+                        if ($debug) {
+                            echo '<h3>$score_of_scorm_calculate '.$score_of_scorm_calculate.'</h3>';
+                        }
 
                         $global_result += $score_of_scorm_calculate;
-                        if ($debug) echo '<h3>$global_result '.$global_result.'</h3>';
+                        if ($debug) {
+                            echo '<h3>$global_result '.$global_result.'</h3>';
+                        }
                     } // end while
                 }
 
@@ -2540,7 +2568,9 @@ 
                                 c_id = $course_id AND
                                 (item_type = 'quiz' OR item_type = 'sco') AND
                                 lp_id = ".$lp_id;
-                    if ($debug) echo $sql;
+                    if ($debug) {
+                        echo $sql;
+                    }
                     $result_have_quiz = Database::query($sql);
 
                     if (Database::num_rows($result_have_quiz) > 0 ) {
@@ -2551,19 +2581,29 @@ 
                     }
                 }
 
-                if ($debug) echo '<h3>$lp_with_quiz '.$lp_with_quiz.' </h3>';
-                if ($debug) echo '<h3>Final return</h3>';
+                if ($debug) {
+                    echo '<h3>$lp_with_quiz '.$lp_with_quiz.' </h3>';
+                }
+                if ($debug) {
+                    echo '<h3>Final return</h3>';
+                }
 
                 if ($lp_with_quiz != 0) {
                     if (!$return_array) {
                         $score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2);
-                        if ($debug) var_dump($score_of_scorm_calculate);
+                        if ($debug) {
+                            var_dump($score_of_scorm_calculate);
+                        }
                         if (empty($lp_ids)) {
-                            if ($debug) echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>';
+                            if ($debug) {
+                                echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>';
+                            }
                         }
                         return $score_of_scorm_calculate;
                     } else {
-                        if ($debug) var_dump($global_result, $lp_with_quiz);
+                        if ($debug) {
+                            var_dump($global_result, $lp_with_quiz);
+                        }
                         return array($global_result, $lp_with_quiz);
                     }
                 } else {
@@ -3050,11 +3090,13 @@ 
 
         if (!empty ($id_session)) {
             $sql .= ' WHERE session_course.session_id=' . $id_session;
-            if (api_is_multiple_url_enabled())
-            $sql .=  ' AND access_url_id = '.$access_url_id;
-        }  else {
-            if (api_is_multiple_url_enabled())
-            $sql .=  ' WHERE access_url_id = '.$access_url_id;
+            if (api_is_multiple_url_enabled()) {
+                        $sql .=  ' AND access_url_id = '.$access_url_id;
+            }
+        } else {
+            if (api_is_multiple_url_enabled()) {
+                        $sql .=  ' WHERE access_url_id = '.$access_url_id;
+            }
         }
 
         $result = Database::query($sql);
@@ -3162,8 +3204,7 @@ 
                 if ($session['access_start_date'] == '0000-00-00 00:00:00' || empty($session['access_start_date'])
                 ) {
                     $session['status'] = get_lang('SessionActive');
-                }
-                else {
+                } else {
                     $time_start = api_strtotime($session['access_start_date'], 'UTC');
                     $time_end = api_strtotime($session['access_end_date'], 'UTC');
                     if ($time_start < time() && time() < $time_end) {
@@ -6599,8 +6640,9 @@ 
     		if (is_array($hpresults)) {
     			for($i = 0; $i < sizeof($hpresults); $i++) {
     				$title = GetQuizName($hpresults[$i][0],'');
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
+    				if ($title == '') {
+    				    				$title = basename($hpresults[$i][0]);
+    				}
     				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
     				?>
                     <tr>
@@ -6972,8 +7014,9 @@ 
     			for($i = 0; $i < sizeof($hpresults); $i++) {
     				$title = GetQuizName($hpresults[$i][0],'');
 
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
+    				if ($title == '') {
+    				    				$title = basename($hpresults[$i][0]);
+    				}
 
     				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
 

main/inc/lib/fileDisplay.lib.php

Braces +11 added lines, -8 removed lines

@@ -213,16 +213,19 @@
     if (is_dir($dir)) {
         while(($entry = $dir->read()) !== false)
         {
-            if ($entry != '.' && $entry != '..')
-                continue;
+            if ($entry != '.' && $entry != '..') {
+                            continue;
+            }
 
-            if (!is_dir($dir_name.'/'.$entry))
-                $current_modified = filemtime($dir_name.'/'.$entry);
-            elseif ($do_recursive)
-                $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            if (!is_dir($dir_name.'/'.$entry)) {
+                            $current_modified = filemtime($dir_name.'/'.$entry);
+            } elseif ($do_recursive) {
+                            $current_modified = recent_modified_file_time($dir_name.'/'.$entry, true);
+            }
 
-            if ($current_modified > $last_modified)
-                $last_modified = $current_modified;
+            if ($current_modified > $last_modified) {
+                            $last_modified = $current_modified;
+            }
         }
 
         $dir->close();

main/inc/lib/fileUpload.lib.php

Braces +3 added lines, -1 removed lines

@@ -993,7 +993,9 @@
                     if ($file != '.' && $file != '..') {
 
                         $filetype = 'file';
-                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) $filetype = 'folder';
+                        if (is_dir($base_work_dir.$upload_path.'/'.$file)) {
+                            $filetype = 'folder';
+                        }
 
                         $safe_file = api_replace_dangerous_char($file, 'strict');
                         @rename($base_work_dir.$upload_path.'/'.$file,$base_work_dir.$upload_path.'/'.$safe_file);

main/inc/lib/usergroup.lib.php

Braces +3 added lines, -2 removed lines

@@ -1906,8 +1906,9 @@
                 $new_relation_type[] ="'$rel'";
             }
             $relation_type = implode(',', $new_relation_type);
-            if (!empty($relation_type))
-                $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            if (!empty($relation_type)) {
+                            $where_relation_condition = "AND gu.relation_type IN ($relation_type) ";
+            }
         }
 
         $sql = "SELECT picture_uri as image, u.id, u.firstname, u.lastname, relation_type

main/inc/lib/agenda.lib.php

Braces +3 added lines, -2 removed lines

@@ -3122,8 +3122,9 @@
         global $DaysShort, $course_path;
         //Handle leap year
         $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-            $numberofdays[2] = 29;
+        if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) {
+                    $numberofdays[2] = 29;
+        }
         //Get the first day of the month
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
         //Start the week on monday

main/inc/lib/userportal.lib.php

Braces +1 added lines, -1 removed lines

@@ -338,7 +338,7 @@
 
         if (empty($certificatesItem) && empty($searchItem)) {
             return null;
-        }else{
+        } else{
             $content.= $certificatesItem;
             $content.= $searchItem;
         }

main/inc/lib/text.lib.php

Braces +31 added lines, -20 removed lines

@@ -351,8 +351,9 @@ 
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
-        return $matches[0];
+    if ( empty($url) ) {
+            return $matches[0];
+    }
 
     return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -377,8 +378,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
     //$original_url = $url;
 
-    if ( '' == $url )
-        return $url;
+    if ( '' == $url ) {
+            return $url;
+    }
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
     $url = _deep_replace($strip, $url);
@@ -388,8 +390,9 @@ 
      * link starting with /, # or ? or a php file).
      */
     if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+            $url = 'http://' . $url;
+    }
 
     return Security::remove_XSS($url);
 
@@ -466,8 +469,9 @@ 
     $dest = $matches[2];
     $dest = 'http://' . $dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
-        return $matches[0];
+    if ( empty($dest) ) {
+            return $matches[0];
+    }
 
     // removed trailing [.,;:)] from URL
     if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -511,10 +515,11 @@ 
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
     foreach ( $textarr as $piece ) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
-            $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
-            $nested_code_pre--;
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
+                    $nested_code_pre++;
+        } elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
+                    $nested_code_pre--;
+        }
 
         if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
             $r .= $piece;
@@ -723,15 +728,13 @@ 
 			if($length>$maxchar)
 			{
 				break;
-			}
-			else
+			} else
 			{
 				$output = $output." ".$words[$i];
 				$i++;
 			};
 		};
-	}
-	else
+	} else
 	{
 		$output = $text;
 		return $output;
@@ -782,13 +785,21 @@ 
     if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
         $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        if (intval($month) < 10 ) {
+            $month = '0'.$month;
+        }
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10 ) {
+            $day = '0'.$day;
+        }
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10 ) {
+            $hours = '0'.$hours;
+        }
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10 ) {
+            $minutes = '0'.$minutes;
+        }
     }
     if (checkdate($month,$day,$year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;