chamilo / chamilo-lms

main/ticket/tickets.php

Braces +3 added lines, -2 removed lines

@@ -138,8 +138,8 @@ 
 $isAdmin = api_is_platform_admin();
 
 Display::display_header(get_lang('MyTickets'));
-if (!empty($projectId))
-if ($isAdmin ) {
+if (!empty($projectId)) {
+    if ($isAdmin ) {
     $getParameters = [
         'keyword',
         'keyword_status',
@@ -151,6 +151,7 @@ 
         'Tickets_per_page',
         'Tickets_column'
     ];
+}
     $get_parameter = '';
     foreach ($getParameters as $getParameter) {
         if (isset($_GET[$getParameter])) {

main/webservices/registration.soap.php

Braces +186 added lines, -64 removed lines

@@ -63,14 +63,16 @@ 
         list($ip1) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
@@ -556,7 +558,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1049,9 +1053,15 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) {
+        error_log('$userId found: '. $userId);
+    }
+    if ($debug) {
+        error_log('$courseId found: '. $courseId);
+    }
+    if ($debug) {
+        error_log('$sessionId found: '. $sessionId);
+    }
 
     return [
         'user_id' => $userId,
@@ -1081,13 +1091,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1100,13 +1114,17 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  '. print_r($coaches, 1));
+        }
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) {
+        error_log('Result:  '. $result);
+    }
 
     return $result;
 }
@@ -1132,13 +1150,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1152,7 +1174,9 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  ' . print_r($coaches, 1));
+        }
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1160,7 +1184,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1212,8 +1238,12 @@ 
 {
     global $_user, $_configuration, $debug;
     $debug = 1;
-    if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) {
+        error_log('WSCreateUserPasswordCrypted');
+    }
+    if ($debug) {
+        error_log(print_r($params,1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1245,22 +1275,30 @@ 
         if ($_configuration['password_encryption'] === $encrypt_method ) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
 
             } else if ($encrypt_method == 'sha1' && !preg_match('/^[A-Fa-f0-9]{40}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
             }
         } else {
             $msg = "This encryption $encrypt_method is not configured";
-            if ($debug) error_log($msg);
+            if ($debug) {
+                error_log($msg);
+            }
             return $msg;
         }
     } else {
         $msg = 'The chamilo setting $_configuration["password_encryption"] is not configured';
-        if ($debug) error_log($msg);
+        if ($debug) {
+            error_log($msg);
+        }
         return $msg;
     }
 
@@ -1280,10 +1318,14 @@ 
         $original_user_id_name
     );
 
-    if ($debug) error_log('Ready to create user');
+    if ($debug) {
+        error_log('Ready to create user');
+    }
 
     if ($user_id > 0) {
-        if ($debug) error_log('User found with id: '.$user_id);
+        if ($debug) {
+            error_log('User found with id: '.$user_id);
+        }
 
         // Check whether user is not active
         //@todo why this condition exists??
@@ -1294,7 +1336,9 @@ 
         $count_check_user = Database::num_rows($resu);
         if ($count_check_user > 0) {
 
-            if ($debug) error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            if ($debug) {
+                error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            }
 
             $sql = "UPDATE $table_user SET
                     lastname='".Database::escape_string($lastName)."',
@@ -1315,7 +1359,9 @@ 
                     hr_dept_id=".intval($hr_dept_id)." 
                 WHERE user_id='".$r_check_user[0]."'";
 
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
 
             if (is_array($extra_list) && count($extra_list) > 0) {
@@ -1332,11 +1378,15 @@ 
             }
             return $r_check_user[0];
         } else {
-            if ($debug) error_log('User exists but is active. Cant be updated');
+            if ($debug) {
+                error_log('User exists but is active. Cant be updated');
+            }
             return 0;
         }
     } else {
-        if ($debug) error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        if ($debug) {
+            error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        }
     }
 
     // Default language.
@@ -1352,7 +1402,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1374,7 +1426,9 @@ 
             expiration_date     = '".Database::escape_string($expiration_date)."',
             hr_dept_id          = '".Database::escape_string($hr_dept_id)."',
             active              = '".Database::escape_string($active)."'";
-    if ($debug) error_log($sql);
+    if ($debug) {
+        error_log($sql);
+    }
 
     Database::query($sql);
     $return = Database::insert_id();
@@ -1386,7 +1440,9 @@ 
 
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
-        if ($debug) error_log("Adding user_id = $return to URL id $url_id ");
+        if ($debug) {
+            error_log("Adding user_id = $return to URL id $url_id ");
+        }
 
         // Create extra field for the original_user_id_name
         UserManager::create_extra_field(
@@ -1423,7 +1479,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
 
         return 0;
     }
@@ -4194,7 +4252,9 @@ 
             continue;
         }
 
-        if (empty($nolimit) && $duration) $nolimit = 1;
+        if (empty($nolimit) && $duration) {
+            $nolimit = 1;
+        }
 
         if (empty($nolimit)) {
             $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start).' 00:00:00';
@@ -4507,7 +4567,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4526,7 +4588,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        if ($debug) {
+            error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        }
 
         if ($user_id == 0) {
             // If user was not found, there was a problem
@@ -4544,13 +4608,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                }
                 $result = CourseManager::add_user_to_course($user_id, $courseCode, $status, false);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSSubscribeUserToCourse subscribed');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse subscribed');
+                    }
                 } else {
-                    if ($debug) error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    }
                 }
             }
         }
@@ -4609,8 +4679,12 @@ 
 function WSSubscribeUserToCourseSimple($params) {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourseSimple');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4628,7 +4702,9 @@ 
     if (empty($user_data)) {
         // If user was not found, there was a problem
         $result = "User $user_id does not exist";
-        if ($debug) error_log($result);
+        if ($debug) {
+            error_log($result);
+        }
         return $result;
     }
     if (!empty($course_code)) {
@@ -4636,14 +4712,22 @@ 
         if (empty($course_data)) {
             // Course was not found
             $result = "Course $course_code does not exist in the platform ";
-            if ($debug) error_log($result);
+            if ($debug) {
+                error_log($result);
+            }
         } else {
-            if ($debug) error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            if ($debug) {
+                error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            }
             if (!CourseManager::add_user_to_course($user_id, $course_data['code'], $status)) {
                 $result = 'User was not registered possible reasons: User already registered to the course, Course visibility doesnt allow user subscriptions ';
-                if ($debug) error_log($result);
+                if ($debug) {
+                    error_log($result);
+                }
             } else {
-                if ($debug) error_log('User registered to the course: '.$course_data['code']);
+                if ($debug) {
+                    error_log('User registered to the course: '.$course_data['code']);
+                }
                 $result = 1;
             }
         }
@@ -4696,8 +4780,12 @@ 
 function WSGetUser($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUser');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUser');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -4751,8 +4839,12 @@ 
 function WSGetUserFromUsername($params)
 {
     global $debug;
-    if ($debug) error_log('WSGetUserFromUsername');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUserFromUsername');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -5219,7 +5311,9 @@ 
                 SessionManager::suscribe_users_to_session($sessionId, array($user_id), SESSION_VISIBLE_READ_ONLY, false);
                 $results[] = 1;
 
-                if ($debug) error_log("subscribe user:$user_id to session $sessionId");
+                if ($debug) {
+                    error_log("subscribe user:$user_id to session $sessionId");
+                }
             }
         }
     } // end principal foreach
@@ -5303,7 +5397,9 @@ 
                 SESSION_VISIBLE_READ_ONLY,
                 false
             );
-            if ($debug) error_log('User registered to the course: '.$session_id);
+            if ($debug) {
+                error_log('User registered to the course: '.$session_id);
+            }
             $result = 1;
         }
     }
@@ -5451,7 +5547,9 @@ 
 
                 $results[] = 1;
 
-                if ($debug) error_log("Unsubscribe user:$user_id to session:$id_session");
+                if ($debug) {
+                    error_log("Unsubscribe user:$user_id to session:$id_session");
+                }
             }
         }
     } // end principal foreach
@@ -5598,7 +5696,9 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    }
 
     $coursessessions_params = $params['coursessessions'];
     $results = array();
@@ -5644,7 +5744,9 @@ 
                     array($courseInfo['real_id']),
                     false
                 );
-                if ($debug) error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                if ($debug) {
+                    error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                }
 
                 $results[] = 1;
             }
@@ -6917,7 +7019,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSAddUserVisibilityToCourseCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -6933,7 +7037,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        if ($debug) {
+            error_log('WSAddUserVisibilityToCourseCatalogue userId: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -6950,13 +7056,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSAddUserVisibilityToCourseCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::addUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue registered');
+                    }
                 } else {
-                    if ($debug) error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    if ($debug) {
+                        error_log('WSAddUserVisibilityToCourseCatalogue NOT registered: ');
+                    }
                 }
             }
         }
@@ -6989,7 +7101,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSRemoveUserVisibilityToCourseInCatalogue params: '.print_r($params, 1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -7005,7 +7119,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        if ($debug) {
+            error_log('WSRemoveUserVisibilityToCourseInCatalogue user_id: '.$userId);
+        }
 
         if ($userId == 0) {
             // If user was not found, there was a problem
@@ -7023,13 +7139,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSRemoveUserVisibilityToCourseInCatalogue courseCode: '.$courseCode);
+                }
                 $result = CourseManager::removeUserVisibilityToCourseInCatalogue($userId, $courseCode, $visible);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue removed');
+                    }
                 } else {
-                    if ($debug) error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    if ($debug) {
+                        error_log('WSRemoveUserVisibilityToCourseInCatalogue NOT removed: ');
+                    }
                 }
             }
         }

src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php

Braces +6 added lines, -3 removed lines

@@ -532,7 +532,9 @@ 
 
                                 if (in_array($file_info['extension'], array('html', 'htm'))) {
                                     $content = file_get_contents($path.$document->path);
-                                    if (UTF8_CONVERT) $content = utf8_encode($content);
+                                    if (UTF8_CONVERT) {
+                                        $content = utf8_encode($content);
+                                    }
                                     $content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                                         $content,
                                         $this->course->code,
@@ -2788,8 +2790,9 @@ 
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
                     } elseif(is_dir($path)) {
-                        if (!is_dir($dest . '/' . $file))
-                        mkdir($dest . '/' . $file);
+                        if (!is_dir($dest . '/' . $file)) {
+                                                mkdir($dest . '/' . $file);
+                        }
                         self:: allow_create_all_directory($path, $dest . '/' . $file, $overwrite);
                     }
                 }

main/upload/upload.document.php

Braces +3 added lines, -2 removed lines

@@ -64,9 +64,10 @@
     	$new_comment = isset($_POST['comment']) ? Database::escape_string(trim($_POST['comment'])) : '';
     	$new_title = isset($_POST['title']) ? Database::escape_string(trim($_POST['title'])) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+    	if ($new_path && ($new_comment || $new_title)) {
+    	    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
         	$table_document = Database::get_course_table(TABLE_DOCUMENT);
+    	}
         	$ct = '';
             if ($new_comment) {
                 $ct .= ", comment='$new_comment'";

main/exercise/hotspot_admin.inc.php

Braces +29 added lines, -11 removed lines

@@ -679,12 +679,15 @@ 
                                     $option1 = $option2 = $option3 = '';
                                     for ($k = 1; $k <= 100; $k++) {
                                         $selected1 = $selected2 = $selected3 = '';
-                                        if ($k == $threadhold1[$i])
-                                            $selected1 = 'selected="selected"';
-                                        if ($k == $threadhold2[$i])
-                                            $selected2 = 'selected="selected"';
-                                        if ($k == $threadhold3[$i])
-                                            $selected3 = 'selected="selected"';
+                                        if ($k == $threadhold1[$i]) {
+                                                                                    $selected1 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold2[$i]) {
+                                                                                    $selected2 = 'selected="selected"';
+                                        }
+                                        if ($k == $threadhold3[$i]) {
+                                                                                    $selected3 = 'selected="selected"';
+                                        }
                                         $option1.='<option ' . $selected1 . ' >' . $k . ' % </option>';
                                         $option2.='<option ' . $selected2 . ' >' . $k . ' % </option>';
                                         $option3.='<option ' . $selected3 . '>' . $k . ' %</option>';
@@ -731,7 +734,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]"  <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -784,7 +790,10 @@ 
                                                             <div class="checkbox">
                                                                 <p>
                                                                     <label>
-                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) echo'checked'; ?> />
+                                                                        <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if ($try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                                         <?php echo get_lang('TryAgain'); ?>
                                                                     </label>
                                                                 </p>
@@ -823,7 +832,10 @@ 
                                             <th ><?php echo get_lang('OAR'); ?>*</th>
                                             <?php if ($objExercise->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) { ?>
                                                 <th colspan="2" ><?php echo get_lang('Comment'); ?></th>
-                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) echo get_lang('Scenario'); ?></th>
+                                                <th ><?php if ($answerType == HOT_SPOT_DELINEATION) {
+    echo get_lang('Scenario');
+}
+?></th>
                                             <?php } else { ?>
                                                 <th colspan="3" ><?php echo get_lang('Comment'); ?></th>
                                             <?php } ?>
@@ -849,7 +861,10 @@ 
                                                 <div class="checkbox">
                                                     <p>
                                                         <label>
-                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) echo'checked'; ?> />
+                                                            <input type="checkbox" class="checkbox" name="<?php echo 'try[' . $i; ?>]" <?php if (isset($try[$i]) && $try[$i] == 1) {
+    echo'checked';
+}
+?> />
                                                             <?php echo get_lang('TryAgain'); ?>
                                                         </label>
                                                     </p>
@@ -998,7 +1013,10 @@ 
                                         <div class="checkbox">
                                             <p>
                                                 <label>
-                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) echo'checked'; ?> />
+                                                    <input type="checkbox" class="checkbox" name="try_noerror" <?php if ($try_noerror == 1) {
+    echo'checked';
+}
+?> />
                                                     <?php echo get_lang('TryAgain'); ?>
                                                 </label>
                                             </p>

main/inc/lib/blog.lib.php

Braces +26 added lines, -18 removed lines

@@ -1007,8 +1007,9 @@ 
             $blog_post_actions .= '</a>';
         }
 
-        if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-            $rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) {
+                    $rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+        }
 
         $blog_post_text=stripslashes($blog_post_text);
 
@@ -1652,8 +1653,9 @@ 
 
                         $arrPermissions = array();
 
-                        while ($row = Database::fetch_array($result))
-                            $arrPermissions[] = $row['action'];
+                        while ($row = Database::fetch_array($result)) {
+                                                    $arrPermissions[] = $row['action'];
+                        }
 
                             echo '<tr>';
                             echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
@@ -2329,8 +2331,9 @@ 
         //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));
@@ -2360,8 +2363,9 @@ 
         if( Database::num_rows($result) > 0) {
             while($blog_post = Database::fetch_array($result)) {
                 // If the day of this post is not yet in the array, add it.
-                if (!in_array($blog_post['post_day'], $posts))
-                    $posts[] = $blog_post['post_day'];
+                if (!in_array($blog_post['post_day'], $posts)) {
+                                    $posts[] = $blog_post['post_day'];
+                }
             }
         }
 
@@ -2400,8 +2404,9 @@ 
 
         echo "<tr>";
 
-        for($ii = 1; $ii < 8; $ii ++)
-            echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+        for($ii = 1; $ii < 8; $ii ++) {
+                    echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+        }
 
         echo "</tr>";
 
@@ -2411,8 +2416,9 @@ 
         while ($curday <= $numberofdays[$month]) {
             echo "<tr>";
             for ($ii = 0; $ii < 7; $ii ++) {
-                if (($curday == -1) && ($ii == $startdayofweek))
-                    $curday = 1;
+                if (($curday == -1) && ($ii == $startdayofweek)) {
+                                    $curday = 1;
+                }
 
                 if (($curday > 0) && ($curday <= $numberofdays[$month])) {
                     $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
@@ -2426,10 +2432,11 @@ 
                     echo "<td " . $class.">";
 
                     // If there are posts on this day, create a filter link.
-                    if(in_array($curday, $posts))
-                        echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
-                    else
-                        echo $dayheader;
+                    if(in_array($curday, $posts)) {
+                                            echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+                    } else {
+                                            echo $dayheader;
+                    }
 
                     if (count($tasks) > 0) {
                         if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
@@ -2444,8 +2451,9 @@ 
 
                     echo "</td>";
                     $curday ++;
-                } else
-                    echo "<td>&nbsp;</td>";
+                } else {
+                                    echo "<td>&nbsp;</td>";
+                }
             }
             echo "</tr>";
         }

main/inc/lib/message.lib.php

Braces +15 added lines, -10 removed lines

@@ -143,8 +143,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
 
         $keyword = Session::read('message_search_keyword');
@@ -697,8 +698,9 @@ 
      */
     public static function update_message($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
 
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $sql = "UPDATE $table_message SET msg_status = '0'
@@ -738,8 +740,9 @@ 
      */
     public static function get_message_by_user($user_id, $message_id)
     {
-        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT * FROM $table_message
                   WHERE user_receiver_id=" . intval($user_id) . " AND id='" . intval($message_id) . "'";
@@ -864,8 +867,9 @@ 
      */
     public static function exist_message($user_id, $id)
     {
-        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id)))
-            return false;
+        if ($id != strval(intval($id)) || $user_id != strval(intval($user_id))) {
+                    return false;
+        }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "SELECT id FROM $table_message
                   WHERE
@@ -896,8 +900,9 @@ 
             $direction = 'DESC';
         } else {
             $column = intval($column);
-            if (!in_array($direction, array('ASC', 'DESC')))
-                $direction = 'ASC';
+            if (!in_array($direction, array('ASC', 'DESC'))) {
+                            $direction = 'ASC';
+            }
         }
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $request = api_is_xml_http_request();

main/admin/user_move_stats.php

Braces +99 added lines, -43 removed lines

@@ -107,7 +107,9 @@ 
                 //Check if the user is registered in the session otherwise we will add it
                 $result = SessionManager::get_users_by_session($new_session_id);
                 if (empty($result) || !in_array($user_id, array_keys($result))) {
-                    if ($debug) echo 'User added to the session';
+                    if ($debug) {
+                        echo 'User added to the session';
+                    }
                     //Registering user to the new session
                     SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false);
                 }
@@ -142,10 +144,11 @@ 
                     $list[$row['exe_id']]= $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $exe_id =>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $exe_id =>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                }
                             $res = Database::query($sql);
                             $result_message[$TABLETRACK_EXERCICES]++;
                         } else {
@@ -169,10 +172,11 @@ 
                         $list[$row['exe_id']]= $row;
                     }
 
-                    if (!empty($list))
-                        foreach ($list as $exe_id =>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $exe_id =>$data) {
                             if ($update_database) {
                                 $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id";
+                    }
                                 $res = Database::query($sql);
                                 $result_message[$TABLETRACK_EXERCICES]++;
                             } else {
@@ -197,10 +201,11 @@ 
                     $list[$row['course_access_id']] = $row;
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id => $data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id => $data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = $new_session_id WHERE course_access_id = $id";
+                }
                             if ($debug) {
                                 echo $sql;
                             }
@@ -219,13 +224,18 @@ 
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $list[] = $row['access_id'];
                 }
-                if (!empty($list))
-                    foreach ($list as $id) {
+                if (!empty($list)) {
+                                    foreach ($list as $id) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = $new_session_id WHERE access_id = $id";
-                            if ($debug) echo $sql;
+                }
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $res = Database::query($sql);
-                            if ($debug) error_log(__FILE__ . ' +' . __LINE__ . ': ' . print_r($res, 1));
+                            if ($debug) {
+                                error_log(__FILE__ . ' +' . __LINE__ . ': ' . print_r($res, 1));
+                            }
                             $result_message[$TBL_TRACK_E_LAST_ACCESS]++;
                         }
                     }
@@ -249,13 +259,18 @@ 
                     }
                 }
 
-                if (!empty($list))
-                    foreach ($list as $id=>$data) {
+                if (!empty($list)) {
+                                    foreach ($list as $id=>$data) {
                         if ($update_database) {
                             $sql = "UPDATE $TBL_LP_VIEW SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                            if ($debug) var_dump($sql);
+                }
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $res = Database::query($sql);
-                            if ($debug) var_dump($res);
+                            if ($debug) {
+                                var_dump($res);
+                            }
                             $result_message[$TBL_LP_VIEW]++;
                         } else {
                             //Getting all information of that lp_item_id
@@ -282,10 +297,11 @@ 
                             $list[$row['id']] = $row;
                         }
                     }
-                    if (!empty($list))
-                        foreach ($list as $id=>$data) {
+                    if (!empty($list)) {
+                                            foreach ($list as $id=>$data) {
                             //Getting all information of that lp_item_id
                             $score    = Tracking::get_avg_student_score($user_id, $origin_course_code,        array($data['lp_id']), $new_session_id);
+                    }
                             $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code,     array($data['lp_id']), $new_session_id);
                             $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress);
                         }
@@ -301,9 +317,13 @@ 
                     $id = $row['ref'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id ";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res_update = Database::query($sql);
-                        if ($debug) var_dump($res_update);
+                        if ($debug) {
+                            var_dump($res_update);
+                        }
                         $result_message['agenda']++;
                     }
                 }
@@ -315,22 +335,30 @@ 
                 //echo '<h1>Student publication</h1>';
 
                 $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id";
-                if ($debug) echo $sql;
+                if ($debug) {
+                    echo $sql;
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['ref'];
                     $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id";
-                    if ($debug) var_dump($sql);
+                    if ($debug) {
+                        var_dump($sql);
+                    }
                     $sub_res = Database::query($sql);
                     if (Database::num_rows($sub_res) > 0 ) {
                         $data = Database::fetch_array($sub_res,'ASSOC');
-                        if ($debug) var_dump($data);
+                        if ($debug) {
+                            var_dump($data);
+                        }
                         $parent_id = $data['parent_id'];
                         if (isset($data['parent_id']) && !empty($data['parent_id'])) {
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id";
                             $select_res     = Database::query($sql);
                             $parent_data    = Database::fetch_array($select_res,'ASSOC');
-                            if ($debug)     var_dump($parent_data);
+                            if ($debug) {
+                                var_dump($parent_data);
+                            }
 
                             $sys_course_path = api_get_path(SYS_COURSE_PATH);
                             $course_dir = $sys_course_path . $course_info['path'];
@@ -345,7 +373,9 @@ 
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION
                             		WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id
                             		ORDER BY id desc  LIMIT 1";
-                            if ($debug) echo $sql;
+                            if ($debug) {
+                                echo $sql;
+                            }
                             $sub_res = Database::query($sql);
                             $num_rows = Database::num_rows($sub_res);
 
@@ -389,7 +419,9 @@ 
 
                             //Creating student_publication_assignment if exists
                             $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id";
-                            if ($debug) var_dump($sql);
+                            if ($debug) {
+                                var_dump($sql);
+                            }
                             $rest_select     = Database::query($sql);
                             if (Database::num_rows($rest_select) > 0 ) {
                                 if ($update_database) {
@@ -401,7 +433,9 @@ 
                                        add_to_calendar      = '".$assignment_data['add_to_calendar']."',
                                        enable_qualification = '".$assignment_data['enable_qualification']."',
                                        publication_id       = '".$new_parent_id."'";
-                                    if ($debug) echo $sql_add_publication;
+                                    if ($debug) {
+                                        echo $sql_add_publication;
+                                    }
                                     $rest_select     = Database::query($sql_add_publication);
                                     $id = Database::insert_id();
 
@@ -409,11 +443,15 @@ 
                                         "has_properties         = '".$id."',
                                        view_properties    = '1'
                                        WHERE id   = ".$new_parent_id;
-                                    if ($debug) echo $sql_update;
+                                    if ($debug) {
+                                        echo $sql_update;
+                                    }
                                     $rest_update     = Database::query($sql_update);
 
 
-                                    if ($debug) var_dump($sql_update);
+                                    if ($debug) {
+                                        var_dump($sql_update);
+                                    }
                                     $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++;
                                 }
                             }
@@ -454,7 +492,9 @@ 
                                     if ($result) {
                                         unlink($full_file_name);
                                         $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id'];
-                                        if ($debug) var_dump($sql);
+                                        if ($debug) {
+                                            var_dump($sql);
+                                        }
                                         $result_delete     = Database::query($sql);
                                         api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id());
                                     }
@@ -470,22 +510,30 @@ 
                 //10. Dropbox - not neccesary to move categories (no presence of session_id)
 
                 $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
 
                         $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = $new_session_id WHERE file_id = $id";
-                        if ($debug)
-                            var_dump($sql);
+                        if ($debug) {
+                                                    var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug)
-                            var_dump($res);
+                        if ($debug) {
+                                                    var_dump($res);
+                        }
                         $result_message[$TBL_DROPBOX_FILE]++;
                     }
                 }
@@ -494,23 +542,30 @@ 
 
                 $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK
                         WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id";
-                if ($debug) var_dump($sql);
+                if ($debug) {
+                    var_dump($sql);
+                }
                 $res = Database::query($sql);
                 while($row = Database::fetch_array($res,'ASSOC')) {
                     $id = $row['notebook_id'];
                     if ($update_database) {
                         $sql = "UPDATE $TBL_NOTEBOOK SET session_id = $new_session_id WHERE c_id = $course_id AND notebook_id = $id";
-                        if ($debug) var_dump($sql);
+                        if ($debug) {
+                            var_dump($sql);
+                        }
                         $res = Database::query($sql);
-                        if ($debug) var_dump($res);
+                        if ($debug) {
+                            var_dump($res);
+                        }
                     }
                 }
 
                 if ($update_database) {
                     echo '<h2>'.get_lang('StatsMoved').'</h2>';
-                    if (is_array($result_message))
-                        foreach ($result_message as $table=>$times) {
+                    if (is_array($result_message)) {
+                                            foreach ($result_message as $table=>$times) {
                             echo 'Table '.$table.' - '.$times.' records updated <br />';
+                    }
                         }
                 } else {
                     echo '<h2>'.get_lang('UserInformationOfThisCourse').'</h2>';
@@ -626,10 +681,11 @@ 
 }
 $navigation .= '&nbsp;';
 $page ++;
-if ($page < $nro_pages)
+if ($page < $nro_pages) {
     $navigation .= '<a href="'.api_get_self().'?page='.$page.'">'.get_lang('Next').'</a>';
-else
+} else {
     $navigation .= get_lang('Next');
+}
 
 echo $navigation;
 $user_list      = UserManager::get_user_list(array(), array(), $begin, $default);

main/install/install.lib.php

Braces +12 added lines, -7 removed lines

@@ -972,8 +972,7 @@ 
                 <?php echo get_lang('Error'); ?>!<br />
                 Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
             </div>
-        <?php }
-        else {
+        <?php } else {
             echo '<br />';
         }
         ?>
@@ -1088,7 +1087,10 @@ 
         <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
             <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
         </button>
-        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> >
+        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
+    echo 'disabled="disabled"';
+}
+?> >
             <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
         </button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
@@ -1374,7 +1376,7 @@ 
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1388,7 +1390,7 @@ 
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1470,9 +1472,12 @@ 
             Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/>
             Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/>
         </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <div id="db_status" class="alert alert-danger">
-            <p><?php echo get_lang('FailedConectionDatabase'); ?></strong></p>
+            <p><?php echo get_lang('FailedConectionDatabase');
+}
+?></strong></p>
             <code><?php echo $database_exists_text ?></code>
         </div>
     <?php endif; ?>