chamilo / chamilo-lms

main/inc/lib/dashboard.lib.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -210,7 +210,7 @@ 
                     $rs = Database::query($sql);
                     if (Database::num_rows($rs) > 0) {
                         // update
-                        $upd = "UPDATE $tbl_block SET active = 1 WHERE path = '$selected_path'";
+                        $upd = "update $tbl_block SET active = 1 WHERE path = '$selected_path'";
                         $result = Database::query($upd);
                         $affected_rows = Database::affected_rows($result);
                     } else {
@@ -293,7 +293,7 @@ 
                     $active = 1;
                 }
                 // update active
-                $upd = "UPDATE $tbl_block SET active = '$active'
+                $upd = "update $tbl_block SET active = '$active'
                         WHERE path = '".$row['path']."'";
                 Database::query($upd);
             }

Doc Comments +1 added lines, -1 removed lines

@@ -496,7 +496,7 @@
      * @param int        User id
      * @param string    plugin path
      * @param integer $user_id
-     * @return bool
+     * @return false|string
      */
     public static function close_user_block($user_id, $path)
     {

Braces +4 added lines, -2 removed lines

@@ -113,7 +113,8 @@ 
      *
      * @return void
      */
-    public static function display_dashboard_plugin_checkboxes($plugin_path) {
+    public static function display_dashboard_plugin_checkboxes($plugin_path)
+    {
 
         $tbl_block = Database::get_main_table(TABLE_MAIN_BLOCK);
 
@@ -525,7 +526,8 @@ 
      * get links for styles from dashboard plugins
      * @return string   links
      */
-    public static function get_links_for_styles_from_dashboard_plugins() {
+    public static function get_links_for_styles_from_dashboard_plugins()
+    {
 
         return '<link rel="stylesheet" href="'.api_get_path(WEB_PLUGIN_PATH).'dashboard/css/default.css" type="text/css" />'.PHP_EOL;
     }

main/social/home.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             )) {
                 $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-                $sql = "UPDATE $table_user
+                $sql = "update $table_user
                         SET 
                             picture_uri = '$new_picture' 
                         WHERE user_id =  ".api_get_user_id();

main/auth/ldap/authldap.php

Indentation +20 added lines, -21 removed lines

@@ -46,10 +46,9 @@ 
     - Universite Jean Monet (J Dubois / Michel Courbon)
     - Michel Panckoucke for reporting and fixing a bug
     - Patrick Cool: fixing security hole
-
-    *    @author Roan Embrechts
-    *    @version 3.0
-    *    @package chamilo.auth.ldap
+ *    @author Roan Embrechts
+ *    @version 3.0
+ *    @package chamilo.auth.ldap
  * Note:
  * If you are using a firewall, you might need to check port 389 is open in
  * order for Chamilo to communicate with the LDAP server.
@@ -207,8 +206,8 @@ 
     $language = api_get_setting('platformLanguage');
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
-                     $email, $uname, $password, $official_code,
-                     $language, '', '', 'ldap');
+                        $email, $uname, $password, $official_code,
+                        $language, '', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -265,7 +264,7 @@ 
         // Open anonymous LDAP connection
         $result = false;
         $ldap_bind_res = ldap_handle_bind($ds, $result);
-	// Executing the search with the $filter parametr
+    // Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
         $sr = ldap_search($ds, $ldap_basedn, $filter);
         $info = ldap_get_entries($ds, $sr);
@@ -557,35 +556,35 @@ 
         foreach ($UserList as $enreg_user) {
             $enreg_user = (int) $enreg_user;
             Database::query("INSERT IGNORE ".
-              " INTO $tbl_session_rel_course_rel_user ".
-              "(session_id,c_id,user_id) VALUES ".
-              "('$id_session','$enreg_course','$enreg_user')");
+                " INTO $tbl_session_rel_course_rel_user ".
+                "(session_id,c_id,user_id) VALUES ".
+                "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user ".
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'";
+                " FROM $tbl_session_rel_course_rel_user ".
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users ".
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'");
+                " SET nbr_users=$nbr_users ".
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) ".
-               " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
+                " (session_id, user_id, registered_at) ".
+                " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
-           " WHERE session_id='$id_session' ".
-           " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
+            " WHERE session_id='$id_session' ".
+            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
     Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
-           " WHERE id='$id_session'");
+            " WHERE id='$id_session'");
 }
 
 function syncro_users() {

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -567,7 +567,7 @@ 
                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
-        Database::query("UPDATE $tbl_session_rel_course  ".
+        Database::query("update $tbl_session_rel_course  ".
                " SET nbr_users=$nbr_users ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'");
@@ -584,7 +584,7 @@ 
            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
-    Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
+    Database::query("update $tbl_session SET nbr_users=$nbr_users ".
            " WHERE id='$id_session'");
 }
 

Braces +45 added lines, -21 removed lines

@@ -71,23 +71,32 @@ 
  *    @author Roan Embrechts (based on code from Universit� Jean Monet)
  */
 
-function ldap_login($login, $password) {
+function ldap_login($login, $password)
+{
     //error_log('Entering ldap_login('.$login.','.$password.')',0);
     $res = ldap_authentication_check($login, $password);
 
     // res=-1 -> the user does not exist in the ldap database
     // res=1 -> invalid password (user does exist)
 
-    if ($res == 1) { //WRONG PASSWORD
+    if ($res == 1) {
+//WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
-        if (isset($log)) unset($log); if (isset($uid)) unset($uid);
+        if (isset($log)) {
+            unset($log);
+        }
+        if (isset($uid)) {
+            unset($uid);
+        }
         $loginLdapSucces = false;
     }
-    if ($res == -1) { //WRONG USERNAME
+    if ($res == -1) {
+//WRONG USERNAME
         //$errorMessage =  "LDAP User or password incorrect, try again.<br />";
         $login_ldap_success = false;
     }
-    if ($res == 0) { //LOGIN & PASSWORD OK - SUCCES
+    if ($res == 0) {
+//LOGIN & PASSWORD OK - SUCCES
         //$errorMessage = "Successful login w/ LDAP.<br>";
         $login_ldap_success = true;
     }
@@ -103,7 +112,8 @@ 
  *    @author Stefan De Wannemacker
  *    @author Roan Embrechts
  */
-function ldap_find_user_info($login) {
+function ldap_find_user_info($login)
+{
     //error_log('Entering ldap_find_user_info('.$login.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     // basic sequence with LDAP is connect, bind, search,
@@ -154,7 +164,8 @@ 
 *    "firstname", "name", "email", "isEmployee"
 *    @author Roan Embrechts
 */
-function ldap_put_user_info_locally($login, $info_array) {
+function ldap_put_user_info_locally($login, $info_array)
+{
     //error_log('Entering ldap_put_user_info_locally('.$login.',info_array)',0);
     global $ldap_pass_placeholder;
     global $submitRegistration, $submit, $uname, $email,
@@ -242,7 +253,8 @@ 
  * @param string password given by user
  * @return int 0 if authentication succeeded, 1 if password was incorrect, -1 if it didn't belong to LDAP
  */
-function ldap_authentication_check($uname, $passwd) {
+function ldap_authentication_check($uname, $passwd)
+{
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2, $ldap_rdn, $ldap_pass;
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
@@ -293,7 +305,8 @@ 
     // return in case of wrong password connection error
     if (@ldap_bind($ds, $dn, $passwd) === false) {
         return (1); // invalid password
-    } else {// connection successfull
+    } else {
+// connection successfull
         return (0);
     }
 } // end of check
@@ -302,7 +315,8 @@ 
  * @param    resource    resource LDAP connexion resource, passed by reference.
  * @return    void
  */
-function ldap_set_version(&$resource) {
+function ldap_set_version(&$resource)
+{
     //error_log('Entering ldap_set_version(&$resource)',0);
     global $ldap_version;
     if ($ldap_version > 2) {
@@ -318,7 +332,8 @@ 
  * @param boolean $ldap_bind
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
-function ldap_handle_bind(&$ldap_handler, &$ldap_bind) {
+function ldap_handle_bind(&$ldap_handler, &$ldap_bind)
+{
     //error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
     global $ldap_rdn, $ldap_pass, $extldap_config;
     $ldap_rdn = $extldap_config['admin_dn'];
@@ -347,7 +362,8 @@ 
  * @see SortableTable#get_total_number_of_items()
  * @author    Mustapha Alouani
  */
-function ldap_get_users() {
+function ldap_get_users()
+{
 
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
 
@@ -394,8 +410,9 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query) != 0)
-            echo Display::return_message(get_lang('LDAPConnectionError'), 'error');
+        if (count($ldap_query) != 0) {
+                    echo Display::return_message(get_lang('LDAPConnectionError'), 'error');
+        }
         return array();
     }
 }
@@ -405,7 +422,8 @@ 
  * @see SortableTable#get_total_number_of_items()
  * @author    Mustapha Alouani
  */
-function ldap_get_number_of_users() {
+function ldap_get_number_of_users()
+{
     $info = ldap_get_users();
     if (count($info) > 0) {
         return $info['count'];
@@ -419,7 +437,8 @@ 
  * @see SortableTable#get_table_data($from)
  * @author    Mustapha Alouani
  */
-function ldap_get_user_data($from, $number_of_items, $column, $direction) {
+function ldap_get_user_data($from, $number_of_items, $column, $direction)
+{
 
     global $extldap_user_correspondance;
 
@@ -463,7 +482,8 @@ 
  * @return string Some HTML-code with modify-buttons
  * @author    Mustapha Alouani
  */
-function modify_filter($user_id, $url_params, $row) {
+function modify_filter($user_id, $url_params, $row)
+{
     $query_string = "id[]=".$row[0];
     if (!empty($_GET['id_session'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
@@ -478,13 +498,15 @@ 
  * @param    string    username (and uid inside LDAP)
  * @author    Mustapha Alouani
  */
-function ldap_add_user($login) {
+function ldap_add_user($login)
+{
     if ($ldap_user = extldap_authenticate($login, 'nopass', true)) {
         return extldap_add_user_by_array($ldap_user);
     }
 }
 
-function ldap_add_user_by_array($data, $update_if_exists = true) {
+function ldap_add_user_by_array($data, $update_if_exists = true)
+{
 
     $lastname = api_convert_encoding($data['sn'][0], api_get_system_encoding(), 'UTF-8');
     $firstname = api_convert_encoding($data['cn'][0], api_get_system_encoding(), 'UTF-8');
@@ -533,7 +555,8 @@ 
  * @param    string    Course code
  * @return    void
  */
-function ldap_add_user_to_session($UserList, $id_session) {
+function ldap_add_user_to_session($UserList, $id_session)
+{
 
     // Database Table Definitions
     $tbl_session                        = Database::get_main_table(TABLE_MAIN_SESSION);
@@ -588,7 +611,8 @@ 
            " WHERE id='$id_session'");
 }
 
-function syncro_users() {
+function syncro_users()
+{
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     echo "Connecting ...";
     $ldap_connect = ldap_connect($ldap_host, $ldap_port);

main/inc/lib/link.lib.php

Braces +2 added lines, -1 removed lines

@@ -1449,7 +1449,8 @@
                         $value,
                         $regs
                     )
-                ) { // possibly in <...>
+                ) {
+// possibly in <...>
                     if (($kwlist = trim($regs[1])) != '') {
                         $kw = '<i kw="'.htmlspecialchars($kwlist).'">';
                     } else {

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
         }
         $sessionId = intval($sessionId);
         if ($linkUrl != '') {
-            $sql = "UPDATE $tblLink SET 
+            $sql = "update $tblLink SET 
                     url = '$linkUrl'
                     WHERE id = $linkId AND c_id = $courseId AND session_id = $sessionId";
             $resLink = Database::query($sql);
@@ -351,7 +351,7 @@ 
 
                 if ($linkId) {
                     // iid
-                    $sql = "UPDATE $tbl_categories SET id = iid WHERE iid = $linkId";
+                    $sql = "update $tbl_categories SET id = iid WHERE iid = $linkId";
                     Database:: query($sql);
 
                     // add link_category visibility
@@ -393,7 +393,7 @@ 
                 // -> Items are no longer physically deleted,
                 // but the visibility is set to 2 (in item_property).
                 // This will make a restore function possible for the platform administrator.
-                $sql = "UPDATE $tbl_link SET on_homepage='0'
+                $sql = "update $tbl_link SET on_homepage='0'
                         WHERE c_id = $course_id AND id='".$id."'";
                 Database:: query($sql);
 
@@ -1351,7 +1351,7 @@ 
         );
 
         if (Database:: num_rows($result) >= 1 && ($row = Database:: fetch_array($result))) {
-            $sql = "UPDATE $tbl_link SET 
+            $sql = "update $tbl_link SET 
                         title = '".Database:: escape_string($title)."', 
                         description = '" . Database:: escape_string($description)."'
                     WHERE c_id = $course_id AND  id='".Database:: escape_string($row['id'])."'";

Doc Comments +4 added lines, -2 removed lines

@@ -856,8 +856,8 @@ 
 
     /**
      * @param integer $categoryId
-     * @param $courseId
-     * @param $sessionId
+     * @param integer $courseId
+     * @param integer $sessionId
      * @param bool $withBaseContent
      *
      * @return array
@@ -1485,6 +1485,7 @@ 
      * This function checks if the url is a vimeo link
      * @author Julio Montoya
      * @version 1.0
+     * @param string $url
      */
     public static function isVimeoLink($url)
     {
@@ -1519,6 +1520,7 @@ 
      * @author Jorge Frisancho
      * @author Julio Montoya - Fixing code
      * @version 1.0
+     * @param string $url
      */
     public static function is_youtube_link($url)
     {

Indentation +2 added lines, -2 removed lines

@@ -1971,8 +1971,8 @@
         if (!empty($proxySettings) &&
             isset($proxySettings['curl_setopt_array'])
         ) {
-             $defaults[CURLOPT_PROXY] = $proxySettings['curl_setopt_array']['CURLOPT_PROXY'];
-             $defaults[CURLOPT_PROXYPORT] = $proxySettings['curl_setopt_array']['CURLOPT_PROXYPORT'];
+                $defaults[CURLOPT_PROXY] = $proxySettings['curl_setopt_array']['CURLOPT_PROXY'];
+                $defaults[CURLOPT_PROXYPORT] = $proxySettings['curl_setopt_array']['CURLOPT_PROXYPORT'];
         }
 
         // Create a new cURL resource

main/inc/lib/api.lib.php

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -3725,7 +3725,7 @@ 
                             session_id = $session_id";
                 $rs = Database::query($sql);
                 if (Database::num_rows($rs) > 0) {
-                    $sql = "UPDATE $tableItemProperty
+                    $sql = "update $tableItemProperty
                             SET lastedit_type       = '".str_replace('_', '', ucwords($tool))."Deleted',
                                 lastedit_date       = '$time',
                                 lastedit_user_id    = $user_id,
@@ -3739,12 +3739,12 @@ 
                     $result = Database::query($sql);
                     $id = Database::insert_id();
                     if ($id) {
-                        $sql = "UPDATE $tableItemProperty SET id = iid WHERE iid = $id";
+                        $sql = "update $tableItemProperty SET id = iid WHERE iid = $id";
                         Database::query($sql);
                     }
                 }
             } else {
-                $sql = "UPDATE $tableItemProperty
+                $sql = "update $tableItemProperty
                         SET
                             lastedit_type='".str_replace('_', '', ucwords($tool))."Deleted',
                             lastedit_date='$time',
@@ -3766,7 +3766,7 @@ 
                             session_id = $session_id";
                 $rs = Database::query($sql);
                 if (Database::num_rows($rs) > 0) {
-                    $sql = "UPDATE $tableItemProperty
+                    $sql = "update $tableItemProperty
                             SET
                                 lastedit_type='".str_replace('_', '', ucwords($tool))."Visible',
                                 lastedit_date='$time',
@@ -3781,12 +3781,12 @@ 
                     $result = Database::query($sql);
                     $id = Database::insert_id();
                     if ($id) {
-                        $sql = "UPDATE $tableItemProperty SET id = iid WHERE iid = $id";
+                        $sql = "update $tableItemProperty SET id = iid WHERE iid = $id";
                         Database::query($sql);
                     }
                 }
             } else {
-                $sql = "UPDATE $tableItemProperty
+                $sql = "update $tableItemProperty
                         SET
                             lastedit_type='".str_replace('_', '', ucwords($tool))."Visible',
                             lastedit_date='$time',
@@ -3808,7 +3808,7 @@ 
                             session_id = $session_id";
                 $rs = Database::query($sql);
                 if (Database::num_rows($rs) > 0) {
-                    $sql = "UPDATE $tableItemProperty
+                    $sql = "update $tableItemProperty
                             SET
                                 lastedit_type = '".str_replace('_', '', ucwords($tool))."Invisible',
                                 lastedit_date = '$time',
@@ -3823,12 +3823,12 @@ 
                     $result = Database::query($sql);
                     $id = Database::insert_id();
                     if ($id) {
-                        $sql = "UPDATE $tableItemProperty SET id = iid WHERE iid = $id";
+                        $sql = "update $tableItemProperty SET id = iid WHERE iid = $id";
                         Database::query($sql);
                     }
                 }
             } else {
-                $sql = "UPDATE $tableItemProperty
+                $sql = "update $tableItemProperty
                         SET
                             lastedit_type = '".str_replace('_', '', ucwords($tool))."Invisible',
                             lastedit_date = '$time',
@@ -3842,7 +3842,7 @@ 
             $set_type = ", lastedit_type = '$last_edit_type' ";
             $visibility = '1';
             //$filter .= $to_filter; already added
-            $sql = "UPDATE $tableItemProperty
+            $sql = "update $tableItemProperty
                     SET
                       lastedit_date = '$time',
                       lastedit_user_id = $user_id $set_type
@@ -4775,7 +4775,7 @@ 
                 $document_id = Database::insert($table, $params);
                 if ($document_id) {
 
-                    $sql = "UPDATE $table SET id = iid WHERE iid = $document_id";
+                    $sql = "update $table SET id = iid WHERE iid = $document_id";
                     Database::query($sql);
 
                     api_item_property_update(
@@ -5107,7 +5107,7 @@ 
     if (Database::num_rows($res) > 0) {
         // Found item for this access_url.
         $row = Database::fetch_array($res);
-        $sql = "UPDATE $t_settings SET selected_value = '$value'
+        $sql = "update $t_settings SET selected_value = '$value'
                 WHERE id = ".$row['id'];
         Database::query($sql);
     } else {
@@ -5190,7 +5190,7 @@ 
     if (empty($access_url)) { $access_url = 1; }
     if (isset($value)) {
         $value = Database::escape_string($value);
-        $sql = "UPDATE $t_s SET selected_value = '$value'
+        $sql = "update $t_s SET selected_value = '$value'
                 WHERE category = '$category' AND access_url = $access_url";
         if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
@@ -5208,7 +5208,7 @@ 
         $res = Database::query($sql);
         return $res !== false;
     } else {
-        $sql = "UPDATE $t_s SET selected_value = NULL
+        $sql = "update $t_s SET selected_value = NULL
                 WHERE category = '$category' AND access_url = $access_url";
         if (is_array($fieldtype) && count($fieldtype) > 0) {
             $sql .= " AND ( ";
@@ -5477,7 +5477,7 @@ 
     $course_table = Database::get_main_table(TABLE_MAIN_COURSE);
     $course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
 
-    $sql = "SELECT
+    $sql = "select
                 $course_table.category_code,
                 $course_table.visibility,
                 $course_table.code,
@@ -7663,11 +7663,11 @@ 
 function api_register_campus($listCampus = true) {
     $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 
-    $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
+    $sql = "update $tbl_settings SET selected_value='true' WHERE variable='registered'";
     Database::query($sql);
 
     if (!$listCampus) {
-        $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
+        $sql = "update $tbl_settings SET selected_value='true' WHERE variable='donotlistcampus'";
         Database::query($sql);
     }
 }

Doc Comments +10 added lines, -5 removed lines

@@ -1266,6 +1266,7 @@ 
  * Gets the list of courses a specific user is subscribed to
  * @param int       User ID
  * @param boolean   $fetch_session Whether to get session courses or not - NOT YET IMPLEMENTED
+ * @param integer $userid
  * @return array    Array of courses in the form [0]=>('code'=>xxx,'db'=>xxx,'dir'=>xxx,'status'=>d)
  * @deprecated use CourseManager::get_courses_list_by_user_id()
  */
@@ -1751,7 +1752,7 @@ 
 
 /**
  * Set that we are in a page inside a gradebook
- * @return bool
+ * @return boolean|null
  */
 function api_set_in_gradebook()
 {
@@ -3092,7 +3093,7 @@ 
 * on the session visibility
 * @param bool $tutor  Whether to check if the user has the tutor role
 * @param bool  $coach Whether to check if the user has the coach role
-* @return boolean true: the user has the rights to edit, false: he does not
+* @return boolean|null true: the user has the rights to edit, false: he does not
 */
 function api_is_allowed_to_session_edit($tutor = false, $coach = false)
 {
@@ -3132,7 +3133,7 @@ 
  * Checks whether the user is allowed in a specific tool for a specific action
  * @param string $tool the tool we are checking if the user has a certain permission
  * @param string $action the action we are checking (add, edit, delete, move, visibility)
- * @return bool
+ * @return boolean|null
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @author Julio Montoya
  * @version 1.0
@@ -5077,7 +5078,7 @@ 
  * @param string    The category if any (in most cases, this will remain null)
  * @param int       The access_url for which this parameter is valid
  * @param string $cat
- * @return bool|null
+ * @return false|null
  */
 function api_set_setting($var, $value, $subvar = null, $cat = null, $access_url = 1)
 {
@@ -5300,6 +5301,7 @@ 
  * @param string    Whether we want a simple list (display a category) or
  * a grouped list (group by variable as in settings.php default). Values: 'list' or 'group'
  * @param int       Access URL's ID. Optional. Uses 1 by default, which is the unique URL
+ * @param string $cat
  * @return array    Array of database results for the current settings of the current access URL
  */
 function &api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
@@ -6374,6 +6376,7 @@ 
 
 /**
  * Returns the <script> HTML tag
+ * @param string $file
  * @return string
  */
 function api_get_asset($file)
@@ -6697,7 +6700,7 @@ 
 /**
  * Returns an array of global configuration settings which should be ignored
  * when printing the configuration settings screens
- * @return array Array of strings, each identifying one of the excluded settings
+ * @return string[] Array of strings, each identifying one of the excluded settings
  */
 function api_get_locked_settings() {
     return array(
@@ -6738,6 +6741,7 @@ 
  * false if he isn't. If the user ID is given and is an integer, then the same
  * ID is simply returned
  * @param  integer User ID
+ * @param integer $user_id
  * @return boolean Integer User ID is logged in, or false otherwise
  */
 function api_user_is_login($user_id = null) {
@@ -7163,6 +7167,7 @@ 
 /**
  * Gets memory limit in bytes
  * @param string The memory size (128M, 1G, 1000K, etc)
+ * @param string $mem
  * @return int
  * @assert (null) === false
  * @assert ('1t')  === 1099511627776

Indentation +2 added lines, -4 removed lines

@@ -655,7 +655,6 @@ 
  * Also, this function provides conversion between path types, in this case the input path points inside the Chamilo area too.
  *
  * See $_configuration['course_folder'] in the configuration.php to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters.
-
  * @param string $path (optional)   A path which type is to be converted. Also, it may be a defined constant for a path.
  * This parameter has meaning when $type parameter has one of the following values: TO_WEB, TO_SYS, TO_REL. Otherwise it is ignored.
  * @return string                   The requested path or the converted path.
@@ -1838,7 +1837,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -4223,7 +4221,7 @@ 
     $countryCode = languageToCountryIsoCode($currentLanguageInfo['isocode']);
     $url = api_get_self();
     if ($showAsButton) {
-         $html = '<div class="btn-group">
+            $html = '<div class="btn-group">
               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 <span class="flag-icon flag-icon-'.$countryCode.'"></span>
                 '.$currentLanguageInfo['original_name'].'
@@ -6498,7 +6496,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[] = 'jqgrid';
+        $libraries[] = 'jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

Spacing +1 added lines, -1 removed lines

@@ -1956,7 +1956,7 @@
         $url_image = $webCourseHome.'/course-pic.png';
         $_course['course_image_large_source'] = $courseSys.'/course-pic.png';
     } else {
-        $url_image =  Display::return_icon(
+        $url_image = Display::return_icon(
                     'session_default.png',
                     null,
                     null,

Braces +110 added lines, -59 removed lines

@@ -906,7 +906,8 @@ 
         // becomes
         // http://localhost/chamilo/courses/TEST/document/image.png
         // TEST is a course directory name, so called "system course code".
-        if (strpos($path, 'download.php') !== false) { // Fast detection first.
+        if (strpos($path, 'download.php') !== false) {
+// Fast detection first.
             $path = urldecode($path);
             if (preg_match('/(.*)main\/document\/download.php\?doc_url=\/(.*)&cDir=\/(.*)?/', $path, $matches)) {
                 $sys_course_code =
@@ -938,7 +939,8 @@ 
     global $_configuration;
     $web_root = api_get_path(WEB_PATH);
     $ext = substr($web_path, strrpos($web_path, '.'));
-    if (isset($ext[2])) { // faster version of strlen to check if len>2
+    if (isset($ext[2])) {
+// faster version of strlen to check if len>2
         // Check for CDN definitions
         if (!empty($_configuration['cdn_enable']) && !empty($ext)) {
             foreach ($_configuration['cdn'] as $host => $exts) {
@@ -957,7 +959,8 @@ 
  * @return bool Return true if CAS authentification is activated
  *
  */
-function api_is_cas_activated() {
+function api_is_cas_activated()
+{
     return api_get_setting('cas_activate') == "true";
 }
 
@@ -965,7 +968,8 @@ 
  * @return bool     Return true if LDAP authentification is activated
  *
  */
-function api_is_ldap_activated() {
+function api_is_ldap_activated()
+{
     global $extAuthSource;
     return is_array($extAuthSource[LDAP_AUTH_SOURCE]);
 }
@@ -1012,7 +1016,8 @@ 
  * Note: The built-in function filter_var($urs, FILTER_VALIDATE_URL) has a bug for some versions of PHP.
  * @link http://bugs.php.net/51192
  */
-function api_valid_url($url, $absolute = false) {
+function api_valid_url($url, $absolute = false)
+{
     if ($absolute) {
         if (preg_match("
             /^                                                      # Start at the beginning of the text
@@ -1208,7 +1213,8 @@ 
 /**
  * @return array with the navigator name and version
  */
-function api_get_navigator() {
+function api_get_navigator()
+{
     $navigator = 'Unknown';
     $version = 0;
 
@@ -1327,10 +1333,12 @@ 
 
     $result['firstname'] = null;
     $result['lastname'] = null;
-    if (isset($user['firstname']) && isset($user['lastname'])) { // with only lowercase
+    if (isset($user['firstname']) && isset($user['lastname'])) {
+// with only lowercase
         $result['firstname'] = $user['firstname'];
         $result['lastname'] = $user['lastname'];
-    } elseif (isset($user['firstName']) && isset($user['lastName'])) { // with uppercase letters
+    } elseif (isset($user['firstName']) && isset($user['lastName'])) {
+// with uppercase letters
         $result['firstname'] = isset($user['firstName']) ? $user['firstName'] : null;
         $result['lastname'] = isset($user['lastName']) ? $user['lastName'] : null;
     }
@@ -1489,7 +1497,8 @@ 
     $loadOnlyVisibleExtraData = false,
     $loadAvatars = true,
     $updateCache = false
-) {
+)
+{
     $apcVar = null;
     $user = false;
     $cacheAvailable = api_get_configuration_value('apc');
@@ -2270,7 +2279,8 @@ 
     $session_id,
     $courseId = null,
     $ignore_visibility_for_admins = true
-) {
+)
+{
     if (api_is_platform_admin()) {
         if ($ignore_visibility_for_admins) {
             return SESSION_AVAILABLE;
@@ -2377,7 +2387,8 @@ 
 {
     $session_id = (int) $session_id;
     $session_img = '';
-    if ((int) $status_id != 5) { //check whether is not a student
+    if ((int) $status_id != 5) {
+//check whether is not a student
         if ($session_id > 0) {
             $session_img = "  ".Display::return_icon(
                 'star.png',
@@ -2403,7 +2414,8 @@ 
     $and = true,
     $with_base_content = false,
     $session_field = 'session_id'
-) {
+)
+{
     $session_id = intval($session_id);
 
     if (empty($session_field)) {
@@ -2977,7 +2989,8 @@ 
     $coach = false,
     $session_coach = false,
     $check_student_view = true
-) {
+)
+{
     $sessionId = api_get_session_id();
     $is_allowed_coach_to_edit = api_is_coach(null, null, $check_student_view);
     $session_visibility = api_get_session_visibility($sessionId);
@@ -3279,7 +3292,8 @@ 
 function api_not_allowed(
     $print_headers = false,
     $message = null
-) {
+)
+{
     if (api_get_setting('sso_authentication') === 'true') {
         global $osso;
         if ($osso) {
@@ -3534,7 +3548,8 @@ 
     $user_id = null,
     $type = null,
     $group_id = null
-) {
+)
+{
     if (!is_array($_course) || count($_course) == 0 || empty($tool) || empty($id)) {
         return -1;
     }
@@ -3601,7 +3616,8 @@ 
     $userId,
     $groupId = 0,
     $sessionId = 0
-) {
+)
+{
     if (empty($courseInfo)) {
         return false;
     }
@@ -3676,7 +3692,8 @@ 
     $start_visible = '',
     $end_visible = '',
     $session_id = 0
-) {
+)
+{
     if (empty($_course)) {
         return false;
     }
@@ -4006,7 +4023,8 @@ 
     $tool,
     $courseId,
     $session_id = 0
-) {
+)
+{
     $userId = intval($userId);
     $tool = Database::escape_string($tool);
     $session_id = intval($session_id);
@@ -4461,18 +4479,21 @@ 
     switch ($lang_type) {
         case 'platform_lang':
             $temp_lang = api_get_setting('platformLanguage');
-            if (!empty($temp_lang))
-                $return = $temp_lang;
+            if (!empty($temp_lang)) {
+                            $return = $temp_lang;
+            }
             break;
         case 'user_profil_lang':
             $_user = api_get_user_info();
 
-            if (isset($_user['language']) && !empty($_user['language']))
-                $return = $_user['language'];
+            if (isset($_user['language']) && !empty($_user['language'])) {
+                            $return = $_user['language'];
+            }
             break;
         case 'user_selected_lang':
-            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice']))
-                $return = $_SESSION['user_language_choice'];
+            if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) {
+                            $return = $_SESSION['user_language_choice'];
+            }
             break;
         case 'course_lang':
             global $_course;
@@ -4774,7 +4795,8 @@ 
  * @author      Yannick Warnier, adaptation for the Chamilo LMS, April, 2008
  * @author      Ivan Tcholakov, a sanity check about Directory class creation has been added, September, 2009
  */
-function rmdirr($dirname, $delete_only_content_in_folder = false, $strict = false) {
+function rmdirr($dirname, $delete_only_content_in_folder = false, $strict = false)
+{
     $res = true;
     // A sanity check.
     if (!file_exists($dirname)) {
@@ -4839,7 +4861,8 @@ 
  * @param string $source
  * @param string $dest
  */
-function copyr($source, $dest, $exclude = array(), $copied_files = array()) {
+function copyr($source, $dest, $exclude = array(), $copied_files = array())
+{
     if (empty($dest)) { return false; }
     // Simple copy for a file
     if (is_file($source)) {
@@ -4889,7 +4912,8 @@ 
     $course_info,
     $document,
     $source_course_id
-) {
+)
+{
     $table = Database::get_course_table(TABLE_DOCUMENT);
     $session_id = intval($session_id);
     $source_course_id = intval($source_course_id);
@@ -4970,7 +4994,8 @@ 
 /**
  * @param string $path
  */
-function api_chmod_R($path, $filemode) {
+function api_chmod_R($path, $filemode)
+{
     if (!is_dir($path)) {
         return chmod($path, $filemode);
     }
@@ -5057,7 +5082,8 @@ 
  * @return
  *   The info array.
  */
-function api_parse_info_file($filename) {
+function api_parse_info_file($filename)
+{
     $info = array();
 
     if (!file_exists($filename)) {
@@ -5146,7 +5172,8 @@ 
  * @param mixed the status (can be either int either string)
  * @return boolean if the status exists, else returns false
  */
-function api_status_exists($status_asked) {
+function api_status_exists($status_asked)
+{
     global $_status_list;
     return in_array($status_asked, $_status_list) ? true : isset($_status_list[$status_asked]);
 }
@@ -5159,7 +5186,8 @@ 
  * @param   mixed   The status (can be either int or string)
  * @return  mixed   Status ID if exists, false otherwise
  */
-function api_status_key($status) {
+function api_status_key($status)
+{
     global $_status_list;
     return isset($_status_list[$status]) ? $status : array_search($status, $_status_list);
 }
@@ -5168,7 +5196,8 @@ 
  * Gets the status langvars list
  * @return string[] the list of status with their translations
  */
-function api_get_status_langvars() {
+function api_get_status_langvars()
+{
     return array(
         COURSEMANAGER   => get_lang('Teacher', ''),
         SESSIONADMIN    => get_lang('SessionsAdmin', ''),
@@ -5184,7 +5213,8 @@ 
 * The function that retrieves all the possible settings for a certain config setting
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
-function api_get_settings_options($var) {
+function api_get_settings_options($var)
+{
     $table_settings_options = Database::get_main_table(TABLE_MAIN_SETTINGS_OPTIONS);
     $var = Database::escape_string($var);
     $sql = "SELECT * FROM $table_settings_options
@@ -5331,7 +5361,8 @@ 
                             "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url,".$row['access_url_changeable'].")";
                     Database::query($insert);
                 }
-            } else { // Such a setting does not exist.
+            } else {
+// Such a setting does not exist.
                 //error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all. The access_url is: '.$access_url.' ',0);
             }
         }
@@ -5529,7 +5560,8 @@ 
     $subKeyText = '',
     $accessUrlId = 1,
     $visibility = 0
-) {
+)
+{
     $em = Database::getManager();
     $settingRepo = $em->getRepository('ChamiloCoreBundle:SettingsCurrent');
     $accessUrlId = (int) $accessUrlId ?: 1;
@@ -5588,7 +5620,8 @@ 
  * @param   int $cid        Course id to check whether the user is allowed.
  * @return  bool
  */
-function api_is_course_visible_for_user($userid = null, $cid = null) {
+function api_is_course_visible_for_user($userid = null, $cid = null)
+{
     if ($userid === null) {
         $userid = api_get_user_id();
     }
@@ -5675,8 +5708,7 @@ 
         if ($row[0]['id_coach'] == $userid) {
             $is_courseMember = true;
             $is_courseAdmin = false;
-        }
-        elseif ($row[0]['session_admin_id'] == $userid) {
+        } elseif ($row[0]['session_admin_id'] == $userid) {
             $is_courseMember = false;
             $is_courseAdmin = false;
         } else {
@@ -5749,7 +5781,8 @@ 
  * @param string $tool
  * @return boolean true if the element is in the session, false else
  */
-function api_is_element_in_the_session($tool, $element_id, $session_id = null) {
+function api_is_element_in_the_session($tool, $element_id, $session_id = null)
+{
     if (is_null($session_id)) {
         $session_id = api_get_session_id();
     }
@@ -5815,7 +5848,8 @@ 
  * Fixes the $_SERVER['REQUEST_URI'] that is empty in IIS6.
  * @author Ivan Tcholakov, 28-JUN-2006.
  */
-function api_request_uri() {
+function api_request_uri()
+{
     if (!empty($_SERVER['REQUEST_URI'])) {
         return $_SERVER['REQUEST_URI'];
     }
@@ -5832,7 +5866,8 @@ 
  * @author Julio Montoya <gugli100@gmail.com>
  * @return int access_url_id of the current Chamilo Installation
  */
-function api_get_current_access_url_id() {
+function api_get_current_access_url_id()
+{
     $access_url_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
     $path = Database::escape_string(api_get_path(WEB_PATH));
     $sql = "SELECT id FROM $access_url_table WHERE url = '".$path."'";
@@ -5853,7 +5888,8 @@ 
  * @author Julio Montoya <gugli100@gmail.com>
  * @return int user id
  */
-function api_get_access_url_from_user($user_id) {
+function api_get_access_url_from_user($user_id)
+{
     $user_id = intval($user_id);
     $table_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     $table_url          = Database::get_main_table(TABLE_MAIN_ACCESS_URL);
@@ -5971,8 +6007,7 @@ 
     elseif (isset($_ENV['OS'])) {
         // Sometimes $_ENV['OS'] may not be present (bugs?)
         $os = $_ENV['OS'];
-    }
-    elseif (defined('PHP_OS')) {
+    } elseif (defined('PHP_OS')) {
         // PHP_OS means on which OS PHP was compiled, this is why
         // using PHP_OS is the last choice for detection.
         $os = PHP_OS;
@@ -6038,7 +6073,8 @@ 
     $image_height,
     $target_width,
     $target_height
-) {
+)
+{
     // Only maths is here.
     $result = array('width' => $image_width, 'height' => $image_height);
     if ($image_width <= 0 || $image_height <= 0) {
@@ -6203,7 +6239,8 @@ 
     $admin_id_to_check,
     $my_user_id = null,
     $allow_session_admin = false
-) {
+)
+{
     if (empty($my_user_id)) {
         $my_user_id = api_get_user_id();
     }
@@ -6256,7 +6293,8 @@ 
  *
  * @author Julio Montoya
  */
-function api_protect_global_admin_script() {
+function api_protect_global_admin_script()
+{
     if (!api_is_global_platform_admin()) {
         api_not_allowed();
         return false;
@@ -6490,7 +6528,8 @@ 
  *
  * @author Juan Carlos Raña Trabado
  */
-function api_check_browscap() {
+function api_check_browscap()
+{
     $setting = ini_get('browscap');
     if ($setting) {
         $browser = get_browser($_SERVER['HTTP_USER_AGENT'], true);
@@ -6504,7 +6543,8 @@ 
 /**
  * Returns the <script> HTML tag
  */
-function api_get_js($file) {
+function api_get_js($file)
+{
     return '<script type="text/javascript" src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$file.'"></script>'."\n";
 }
 
@@ -6530,7 +6570,8 @@ 
  * Returns the <link> HTML tag
  * @param string $file
  */
-function api_get_css($file, $media = 'screen') {
+function api_get_css($file, $media = 'screen')
+{
     return '<link href="'.$file.'" rel="stylesheet" media="'.$media.'" type="text/css" />'."\n";
 }
 
@@ -6573,7 +6614,8 @@ 
  * @return  string  html tags
  *
  */
-function api_get_jquery_ui_js($include_jqgrid = false) {
+function api_get_jquery_ui_js($include_jqgrid = false)
+{
     $libraries = array();
     if ($include_jqgrid) {
        $libraries[] = 'jqgrid';
@@ -6581,7 +6623,8 @@ 
     return api_get_jquery_libraries_js($libraries);
 }
 
-function api_get_jqgrid_js() {
+function api_get_jqgrid_js()
+{
     return api_get_jquery_libraries_js(array('jqgrid'));
 }
 
@@ -6593,7 +6636,8 @@ 
  * @return  string  html tags
  *
  */
-function api_get_jquery_libraries_js($libraries) {
+function api_get_jquery_libraries_js($libraries)
+{
     $js = '';
     $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
 
@@ -6836,7 +6880,8 @@ 
  * when printing the configuration settings screens
  * @return array Array of strings, each identifying one of the excluded settings
  */
-function api_get_locked_settings() {
+function api_get_locked_settings()
+{
     return array(
         'server_type',
         'permanently_remove_deleted_files',
@@ -6877,7 +6922,8 @@ 
  * @param  integer User ID
  * @return boolean Integer User ID is logged in, or false otherwise
  */
-function api_user_is_login($user_id = null) {
+function api_user_is_login($user_id = null)
+{
     $user_id = empty($user_id) ? api_get_user_id() : intval($user_id);
     return $user_id && !api_is_anonymous();
 }
@@ -6903,7 +6949,9 @@ 
         }
         $ip = trim($ip1);
     }
-    if (!empty($debug)) error_log('Real IP: '.$ip);
+    if (!empty($debug)) {
+        error_log('Real IP: '.$ip);
+    }
     return $ip;
 }
 
@@ -6991,7 +7039,8 @@ 
     $courseInfo = array(),
     $sessionId = 0,
     $userId = 0
-) {
+)
+{
     $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
     $courseId = $courseInfo['real_id'];
     $courseCode = $courseInfo['code'];
@@ -7788,7 +7837,8 @@ 
  * @param   bool    $listCampus Whether we authorize
  * @todo the $_settings should be reloaded here. => write api function for this and use this in global.inc.php also.
  */
-function api_register_campus($listCampus = true) {
+function api_register_campus($listCampus = true)
+{
     $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
 
     $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
@@ -7978,7 +8028,8 @@ 
     $data_file = array(),
     $embedded_image = false,
     $additionalParameters = array()
-) {
+)
+{
     global $platform_email;
 
     $mail = new PHPMailer();

main/exercise/exercise.class.php

Braces +34 added lines, -12 removed lines

@@ -3292,7 +3292,9 @@ 
                 );
         }
 
-        if ($debug) error_log('Start answer loop ');
+        if ($debug) {
+            error_log('Start answer loop ');
+        }
 
         for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
             $answer = $objAnswerTmp->selectAnswer($answerId);
@@ -3406,7 +3408,9 @@ 
                     }
                     $totalScore += $answerWeighting;
 
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case GLOBAL_MULTIPLE_ANSWER:
                     if ($from_database) {
@@ -3431,7 +3435,9 @@ 
                         $real_answers[$answerId] = (bool) $studentChoice;
                     }
                     $totalScore += $answerWeighting;
-                    if ($debug) error_log("studentChoice: $studentChoice");
+                    if ($debug) {
+                        error_log("studentChoice: $studentChoice");
+                    }
                     break;
                 case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
                     if ($from_database) {
@@ -4245,7 +4251,9 @@ 
             } // end switch Answertype
 
             if ($show_result) {
-                if ($debug) error_log('Showing questions $from '.$from);
+                if ($debug) {
+                    error_log('Showing questions $from '.$from);
+                }
                 if ($from == 'exercise_result') {
                     //display answers (if not matching type, or if the answer is correct)
                     if (
@@ -4529,7 +4537,8 @@ 
                                         $url_hotspot = $destination_items[4];
                                     }
                                 }
-                            } else {	// the first delineation feedback
+                            } else {
+// the first delineation feedback
                                 if ($debug > 0) {
                                     error_log(__LINE__.' first', 0);
                                 }
@@ -4557,7 +4566,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log('Showing questions $from '.$from);
+                    if ($debug) {
+                        error_log('Showing questions $from '.$from);
+                    }
 
                     switch ($answerType) {
                         case UNIQUE_ANSWER:
@@ -4874,7 +4885,8 @@ 
                                         $url_hotspot = $destination_items[4];
                                     }
                                 }
-                            } else {	// the first delineation feedback
+                            } else {
+// the first delineation feedback
                                 if ($debug > 0) {
                                     error_log(__LINE__.' first', 0);
                                 }
@@ -4919,10 +4931,14 @@ 
                     }
                 }
             }
-            if ($debug) error_log(' ------ ');
+            if ($debug) {
+                error_log(' ------ ');
+            }
         } // end for that loops over all answers of the current question
 
-        if ($debug) error_log('-- end answer loop --');
+        if ($debug) {
+            error_log('-- end answer loop --');
+        }
 
         $final_answer = true;
 
@@ -4994,7 +5010,9 @@ 
             // TODO Change this, because it is wrong to show the user
             //  some results that haven't been stored in the database yet
             if ($answerType == HOT_SPOT || $answerType == HOT_SPOT_ORDER || $answerType == HOT_SPOT_DELINEATION) {
-                if ($debug) error_log('$from AND this is a hotspot kind of question ');
+                if ($debug) {
+                    error_log('$from AND this is a hotspot kind of question ');
+                }
                 $my_exe_id = 0;
                 $from_database = 0;
                 if ($answerType == HOT_SPOT_DELINEATION) {
@@ -5195,8 +5213,12 @@ 
         // stored by exercise_results.php (using the session)
 
         if ($saved_results) {
-            if ($debug) error_log("Save question results $saved_results");
-            if ($debug) error_log(print_r($choice, 1));
+            if ($debug) {
+                error_log("Save question results $saved_results");
+            }
+            if ($debug) {
+                error_log(print_r($choice, 1));
+            }
 
             if (empty($choice)) {
                 $choice = 0;

Doc Comments +8 added lines, -6 removed lines

@@ -361,7 +361,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function selectPassPercentage()
     {
@@ -464,7 +464,7 @@ 
      * tells if questions are selected randomly, and if so returns the draws
      *
      * @author Olivier Brouckaert
-     * @return integer - 0 if not random, otherwise the draws
+     * @return boolean - 0 if not random, otherwise the draws
      */
     public function isRandom()
     {
@@ -2853,9 +2853,9 @@ 
      * @param int  int lp item id
      * @param int  int lp item_view id
      * @param array $questionList
-     * @param float $weight
+     * @param integer $weight
      *
-     * @return int
+     * @return false|string
      */
     public function save_stat_track_exercise_info(
         $clock_expired_time = 0,
@@ -5361,7 +5361,7 @@ 
      * @param int $exe_id
      * @param float $score
      * @param float $weight
-     * @return bool
+     * @return false|null
      */
     public function send_mail_notification_for_exam(
         $type = 'end',
@@ -5536,6 +5536,7 @@ 
      * @param array $question_list_answers
      * @param string $origin
      * @param int $exe_id
+     * @param string $url_email
      * @return null
      */
     private function send_notification_for_open_questions(
@@ -5626,6 +5627,7 @@ 
      * @param array $question_list_answers
      * @param string $origin
      * @param int $exe_id
+     * @param string $url_email
      * @return null
      */
     private function send_notification_for_oral_questions(
@@ -5776,7 +5778,7 @@ 
      * @param int     Maximum number of attempts (0 if no limit)
      * @param int     Feedback type
      * @todo this was function was added due the import exercise via CSV
-     * @return    int New exercise ID
+     * @return    string New exercise ID
      */
     public function createExercise(
         $title,

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -1715,10 +1715,10 @@ 
             $this->id = Database::insert($TBL_EXERCISES, $params);
 
             if ($this->id) {
-                $sql = "UPDATE $TBL_EXERCISES SET id = iid WHERE iid = {$this->id} ";
+                $sql = "update $TBL_EXERCISES SET id = iid WHERE iid = {$this->id} ";
                 Database::query($sql);
 
-                $sql = "UPDATE $TBL_EXERCISES
+                $sql = "update $TBL_EXERCISES
                         SET question_selection_type= ".intval($this->getQuestionSelectionType())."
                         WHERE id = ".$this->id." AND c_id = ".$this->course_id;
                 Database::query($sql);
@@ -1763,7 +1763,7 @@ 
         $question_list = $this->selectQuestionList(true);
         if (!empty($question_list)) {
             foreach ($question_list as $position => $questionId) {
-                $sql = "UPDATE $table SET
+                $sql = "update $table SET
                             question_order ='".intval($position)."'
                         WHERE
                             c_id = ".$this->course_id." AND
@@ -1840,7 +1840,7 @@ 
     public function delete()
     {
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
-        $sql = "UPDATE $TBL_EXERCISES SET active='-1'
+        $sql = "update $TBL_EXERCISES SET active='-1'
                 WHERE c_id = ".$this->course_id." AND id = ".intval($this->id);
         Database::query($sql);
 
@@ -2610,7 +2610,7 @@ 
             if (!empty($items)) {
                 foreach ($items as $item) {
                     $itemId = $item['iid'];
-                    $sql = "UPDATE $table SET title = '".$this->title."'                             
+                    $sql = "update $table SET title = '".$this->title."'                             
                             WHERE iid = $itemId AND c_id = $courseId ";
                     Database::query($sql);
                 }
@@ -2665,7 +2665,7 @@ 
 
         $di = new ChamiloIndexer();
         isset($_POST['language']) ? $lang = Database::escape_string($_POST['language']) : $lang = 'english';
-        $di->connectDb(NULL, NULL, $lang);
+        $di->connectDb(null, null, $lang);
         $di->addChunk($ic_slide);
 
         //index and return search engine document id
@@ -2779,7 +2779,7 @@ 
                         $qrow = Database::fetch_array($qres);
                         $objQuestion = Question::getInstance($qrow['type']);
                         $objQuestion = Question::read((int) $question_i);
-                        $objQuestion->search_engine_edit($this->id, FALSE, TRUE);
+                        $objQuestion->search_engine_edit($this->id, false, true);
                         unset($objQuestion);
                     }
                 }
@@ -5985,7 +5985,7 @@ 
 
         if ($quiz_id) {
 
-            $sql = "UPDATE $tbl_quiz SET id = iid WHERE iid = {$quiz_id} ";
+            $sql = "update $tbl_quiz SET id = iid WHERE iid = {$quiz_id} ";
             Database::query($sql);
         }
 
@@ -6651,7 +6651,7 @@ 
 
             if (empty($exercise_info['questions_to_check'])) {
                 if ($action == 'add') {
-                    $sql = "UPDATE $track_exercises 
+                    $sql = "update $track_exercises 
                             SET questions_to_check = '$question_id' 
                             WHERE exe_id = $exe_id ";
                     Database::query($sql);
@@ -6685,7 +6685,7 @@ 
                     }
                 }
                 $remind_list_string = Database::escape_string($remind_list_string);
-                $sql = "UPDATE $track_exercises 
+                $sql = "update $track_exercises 
                         SET questions_to_check = '$remind_list_string' 
                         WHERE exe_id = $exe_id ";
                 Database::query($sql);

Indentation +4 added lines, -4 removed lines

@@ -5087,7 +5087,7 @@ 
 
         //Fixes multiple answer question in order to be exact
         //if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
-       /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
+        /* if ($answerType == GLOBAL_MULTIPLE_ANSWER) {
             $diff = @array_diff($answer_correct_array, $real_answers);
 
             // All good answers or nothing works like exact
@@ -5657,7 +5657,7 @@ 
             '#student_complete_name#' => $user_info['complete_name'],
             '#course#' => $courseInfo['title']
         ];
-         if ($origin != 'learnpath' && $sendEnd) {
+            if ($origin != 'learnpath' && $sendEnd) {
             $msg .= '<br /><a href="#url#">'.get_lang('ClickToCommentAndGiveFeedback').'</a>';
             $variables['#url#'] = $url;
         }
@@ -7446,8 +7446,8 @@ 
     }
 
     /**
-    * @return string
-    */
+     * @return string
+     */
     public function get_formated_title()
     {
         if (api_get_configuration_value('save_titles_as_html')) {

main/session/session_course_edit.php

Braces +8 added lines, -2 removed lines

@@ -166,13 +166,19 @@
 
         <select name="id_coach[]" class="form-control" multiple>
             <option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
-            <option value="0" <?php if (count($arr_infos) == 0) echo 'selected="selected"'; ?>>
+            <option value="0" <?php if (count($arr_infos) == 0) {
+    echo 'selected="selected"';
+}
+?>>
                 <?php echo get_lang('None') ?>
             </option>
             <?php
             foreach ($coaches as $enreg) {
                 ?>
-                <option value="<?php echo $enreg['user_id']; ?>" <?php if (((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>>
+                <option value="<?php echo $enreg['user_id']; ?>" <?php if (((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) {
+    echo 'selected="selected"';
+}
+?>>
                     <?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
                 </option>
             <?php

main/exercise/unique_answer.class.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -495,7 +495,7 @@
         }
 
         if ($correct) {
-            $sql = "UPDATE $tbl_quiz_question
+            $sql = "update $tbl_quiz_question
                     SET ponderation = (ponderation + $score)
                     WHERE c_id = $course_id AND id = ".$question_id;
             Database::query($sql);

main/admin/add_users_to_usergroup.php

Braces +8 added lines, -2 removed lines

@@ -341,7 +341,10 @@ 
 $searchForm->display();
 echo '</div>';
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;">
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) {
+    echo '&add=true';
+}
+?>" style="margin:0px;">
 <?php
 echo '<legend>'.$tool_name.': '.$data['name'].'</legend>';
 
@@ -419,7 +422,10 @@ 
     ?>
     <br />
       <label class="control-label">
-          <input type="checkbox" <?php if ($user_with_any_group) echo 'checked="checked"'; ?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
+          <input type="checkbox" <?php if ($user_with_any_group) {
+    echo 'checked="checked"';
+}
+?> onchange="checked_in_no_group(this.checked);" name="user_with_any_group" id="user_with_any_group_id">
           <?php echo get_lang('UsersRegisteredInAnyGroup'); ?>
       </label>
     </div>