chamilo / chamilo-lms

main/webservices/user_info.soap.php

Braces +2 added lines, -1 removed lines

@@ -184,7 +184,8 @@
  * @param int    End date, in YYYYMMDD format
  * @return array Events list
  */
-function WSEventsList($username, $signature, $datestart = 0, $dateend = 0) {
+function WSEventsList($username, $signature, $datestart = 0, $dateend = 0)
+{
 
     if (empty($username) or empty($signature)) { return -1; }
 

main/webservices/lp.php

Braces +50 added lines, -21 removed lines

@@ -20,7 +20,8 @@ 
 
 define('WS_ERROR_SECRET_KEY', 1);
 
-function return_error($code) {
+function return_error($code)
+{
     $fault = null;
     switch ($code) {
         case WS_ERROR_SECRET_KEY:
@@ -48,19 +49,22 @@ 
         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);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -76,8 +80,9 @@ 
     }
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -140,7 +145,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSImportLP');
+    if ($debug) {
+        error_log('WSImportLP');
+    }
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -156,7 +163,9 @@ 
     $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
-        if ($debug) error_log('Course not found');
+        if ($debug) {
+            error_log('Course not found');
+        }
         return 'Course not found';
     }
 
@@ -169,7 +178,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -196,7 +207,9 @@ 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
 
     if (!$manifest) {
-        if ($debug) error_log('manifest.xml file not found');
+        if ($debug) {
+            error_log('manifest.xml file not found');
+        }
         return 'manifest.xml file not found';
     }
 
@@ -214,10 +227,14 @@ 
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
 
-        if ($debug) error_log('scorm was added');
+        if ($debug) {
+            error_log('scorm was added');
+        }
         return 1;
     } else {
-        if ($debug) error_log('manifest data empty');
+        if ($debug) {
+            error_log('manifest data empty');
+        }
         return 'manifest data empty';
     }
 }
@@ -310,7 +327,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
 
@@ -324,7 +343,9 @@ 
         );
 
         if (empty($sessionId)) {
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -405,7 +426,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
     $courseId = $courseInfo['real_id'];
@@ -430,7 +453,9 @@ 
 
     $lp = new learnpath($courseCode, $lpId, null);
     if ($lp) {
-        if ($debug) error_log("LP deleted $lpId");
+        if ($debug) {
+            error_log("LP deleted $lpId");
+        }
 
         $course_dir = $courseInfo['directory'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
@@ -446,7 +471,9 @@ 
                 if ($item) {
                     $documentId = $item->get_path();
 
-                    if ($debug) error_log("lp item id found #$itemId");
+                    if ($debug) {
+                        error_log("lp item id found #$itemId");
+                    }
 
                     $documentInfo = DocumentManager::get_document_data_by_id(
                         $documentId,
@@ -472,7 +499,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log("Document not found #$itemId");
+                    if ($debug) {
+                        error_log("Document not found #$itemId");
+                    }
                 }
             }
         }

main/gradebook/lib/fe/displaygradebook.php

Braces +3 added lines, -2 removed lines

@@ -545,8 +545,9 @@
             $scoretotal = $cattotal[0]->calc_score(api_get_user_id());
             $scoretotal_display = isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable');
             $scoreinfo = get_lang('StatsStudent').' :<b> '.$user['complete_name'].'</b><br />';
-            if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search'])))
-                $scoreinfo .= '<br />'.get_lang('TotalForThisCategory').' : <b>'.$scorecourse_display.'</b>';
+            if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
+                            $scoreinfo .= '<br />'.get_lang('TotalForThisCategory').' : <b>'.$scorecourse_display.'</b>';
+            }
             $scoreinfo .= '<br />'.get_lang('Total').' : <b>'.$scoretotal_display.'</b>';
             Display::addFlash(
                 Display::return_message($scoreinfo, 'normal', false)

main/lp/learnpath.class.php

Braces +63 added lines, -40 removed lines

@@ -3964,7 +3964,8 @@ 
         if ($num > 0) {
             $i = 1;
             while ($row = Database::fetch_array($res)) {
-                if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
+                if ($row['display_order'] != $i) {
+// If we find a gap in the order, we need to fix it.
                     $sql = "UPDATE $lp_table SET display_order = $i
                             WHERE c_id = $courseId AND id = ".$row['id'];
                     Database::query($sql);
@@ -3975,9 +3976,11 @@ 
                 $i++;
             }
         }
-        if ($num > 1) { // If there's only one element, no need to sort.
+        if ($num > 1) {
+// If there's only one element, no need to sort.
             $order = $lps[$lp_id]['display_order'];
-            if ($order > 1) { // If it's the first element, no need to move up.
+            if ($order > 1) {
+// If it's the first element, no need to move up.
                 $sql = "UPDATE $lp_table SET display_order = $order
                         WHERE c_id = $courseId AND id = ".$lp_order[$order - 1];
                 Database::query($sql);
@@ -4037,9 +4040,11 @@ 
                 $i++;
             }
         }
-        if ($num > 1) { // If there's only one element, no need to sort.
+        if ($num > 1) {
+// If there's only one element, no need to sort.
             $order = $lps[$lp_id]['display_order'];
-            if ($order < $max) { // If it's the first element, no need to move up.
+            if ($order < $max) {
+// If it's the first element, no need to move up.
                 $sql_u1 = "UPDATE $lp_table SET display_order = $order
                            WHERE c_id = ".$courseId." AND id = ".$lp_order[$order + 1];
                 Database::query($sql_u1);
@@ -4842,8 +4847,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4908,8 +4914,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4922,8 +4929,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -5112,8 +5120,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database::get_course_table(TABLE_LP_MAIN);
@@ -6708,10 +6717,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database::get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='".Database::escape_string($new_comment)."'";
-                        if ($new_title)
-                            $ct .= ", title='".Database::escape_string($new_title)."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='".Database::escape_string($new_comment)."'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='".Database::escape_string($new_title)."' ";
+                        }
 
                         $sql = "UPDATE ".$tbl_doc." SET ".substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = ".$document_id;
@@ -7443,8 +7454,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
+                    if ($arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
+                    }
                 }
             }
             reset($arrLP);
@@ -7461,11 +7473,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
@@ -7492,9 +7506,11 @@ 
                 $arrHide = array();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                     }
                 }
@@ -7917,9 +7933,11 @@ 
             $s_selected_position = 0;
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7953,8 +7971,7 @@ 
 
         if (is_numeric($extra_info)) {
             $form->addHidden('path', $extra_info);
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $form->addHidden('path', $extra_info['path']);
         }
 
@@ -8818,9 +8835,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -9020,9 +9039,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -10232,10 +10253,11 @@ 
 
                 // Dependency to other files - not yet supported.
                 $i = 1;
-                if ($inc_docs)
-                foreach ($inc_docs as $doc_info) {
+                if ($inc_docs) {
+                                foreach ($inc_docs as $doc_info) {
                     if (count($doc_info) < 1 || empty($doc_info[0])) {
                         continue;
+                }
                     }
                     $my_dep = $xmldoc->createElement('resource');
                     $res_id = 'RESOURCE_'.$item->get_id().'_'.$i;
@@ -10686,7 +10708,8 @@ 
 
                                                 // File path is courses/CHAMILO/document/....
                                                 $info_file_path = explode('/', $file_path);
-                                                if ($info_file_path[0] == 'courses') { // Add character "/" in file path.
+                                                if ($info_file_path[0] == 'courses') {
+// Add character "/" in file path.
                                                     $file_path_dest = 'document/'.$file_path;
                                                 }
 

main/inc/lib/search/search_widget.php

Braces +9 added lines, -5 removed lines

@@ -198,7 +198,8 @@ 
     $sf_terms,
     $op,
     $prefilter_prefix = null
-) {
+)
+{
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
     $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
     $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
@@ -336,7 +337,8 @@ 
     $specific_fields = get_specific_field_list();
     $url_params = array();
 
-    if (($cid = api_get_course_id()) != -1) { // with cid
+    if (($cid = api_get_course_id()) != -1) {
+// with cid
 
         // get search engine terms
         $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
@@ -354,7 +356,8 @@ 
             $url_params[] = 'sf_'.$specific_field['code'];
             unset($temp);
         }
-    } else { // without cid
+    } else {
+// without cid
         // prepare specific fields names (and also get possible URL param names)
         foreach ($specific_fields as $specific_field) {
             //get Xapian terms for a specific term prefix, in ISO, apparently
@@ -366,9 +369,10 @@ 
 
     // Tool introduction
     // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
-    if (api_get_course_id() !== -1)
-    if (!empty($groupId)) {
+    if (api_get_course_id() !== -1) {
+        if (!empty($groupId)) {
         Display::display_introduction_section(TOOL_SEARCH.$groupId);
+    }
     } else {
         Display::display_introduction_section(TOOL_SEARCH);
     }

main/inc/lib/usermanager.lib.php

Braces +65 added lines, -41 removed lines

@@ -2440,8 +2440,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2533,8 +2534,9 @@ 
         if (empty($user_id)) {
             $user_id = 0;
         } else {
-            if ($user_id != strval(intval($user_id)))
-                return array();
+            if ($user_id != strval(intval($user_id))) {
+                            return array();
+            }
         }
         $extra_data = array();
         $t_uf = Database::get_main_table(TABLE_EXTRA_FIELD);
@@ -2651,7 +2653,7 @@ 
      * @return array with extra data info of a user i.e array('field_variable'=>'value');
      */
      public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true)
-    {
+     {
         $extraFieldValue = new ExtraFieldValue('user');
         $extraField = new ExtraField('user');
 
@@ -3354,13 +3356,15 @@ 
      */
     public static function get_api_keys($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3368,11 +3372,14 @@ 
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE user_id = $user_id AND api_service='$api_service';";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num == 0)
-            return false;
+        if ($num == 0) {
+                    return false;
+        }
         $list = array();
         while ($row = Database::fetch_array($res)) {
             $list[$row['id']] = $row['api_key'];
@@ -3387,13 +3394,15 @@ 
      */
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
         if (empty($user_id)) {
             $user_id = api_get_user_id();
         }
-        if ($user_id === false)
-            return false;
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3402,8 +3411,10 @@ 
         $md5 = md5((time() + ($user_id * 5)) - rand(10000, 10000)); //generate some kind of random key
         $sql = "INSERT INTO $t_api (user_id, api_key,api_service) VALUES ($user_id,'$md5','$service_name')";
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::insert_id();
         return ($num == 0) ? false : $num;
     }
@@ -3415,22 +3426,29 @@ 
      */
     public static function delete_api_key($key_id)
     {
-        if ($key_id != strval(intval($key_id)))
-            return false;
-        if ($key_id === false)
-            return false;
+        if ($key_id != strval(intval($key_id))) {
+                    return false;
+        }
+        if ($key_id === false) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $sql = "SELECT * FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         $num = Database::num_rows($res);
-        if ($num !== 1)
-            return false;
+        if ($num !== 1) {
+                    return false;
+        }
         $sql = "DELETE FROM $t_api WHERE id = ".$key_id;
         $res = Database::query($sql);
-        if ($res === false)
-            return false; //error during query
+        if ($res === false) {
+                    return false;
+        }
+        //error during query
         return true;
     }
 
@@ -3442,10 +3460,12 @@ 
      */
     public static function update_api_key($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
         $service_name = Database::escape_string($api_service);
         if (is_string($service_name) === false) {
             return false;
@@ -3472,12 +3492,15 @@ 
      */
     public static function get_api_key_id($user_id, $api_service)
     {
-        if ($user_id != strval(intval($user_id)))
-            return false;
-        if ($user_id === false)
-            return false;
-        if (empty($api_service))
-            return false;
+        if ($user_id != strval(intval($user_id))) {
+                    return false;
+        }
+        if ($user_id === false) {
+                    return false;
+        }
+        if (empty($api_service)) {
+                    return false;
+        }
         $t_api = Database::get_main_table(TABLE_MAIN_USER_API_KEY);
         $api_service = Database::escape_string($api_service);
         $sql = "SELECT id FROM $t_api 
@@ -5418,8 +5441,9 @@ 
         $url .= "?s=$s&d=$d&r=$r";
         if ($img) {
             $url = '<img src="'.$url.'"';
-            foreach ($atts as $key => $val)
-                $url .= ' '.$key.'="'.$val.'"';
+            foreach ($atts as $key => $val) {
+                            $url .= ' '.$key.'="'.$val.'"';
+            }
             $url .= ' />';
         }
         return $url;

main/forum/forumfunction.inc.php

Braces +18 added lines, -9 removed lines

@@ -1045,7 +1045,8 @@ 
     $id,
     $current_visibility_status,
     $additional_url_parameters = ''
-) {
+)
+{
     $html = '';
     $id = (int) $id;
     $current_visibility_status = (int) $current_visibility_status;
@@ -1513,7 +1514,8 @@ 
     $course_code = '',
     $includeGroupsForum = true,
     $sessionId = 0
-) {
+)
+{
     $course_info = api_get_course_info($course_code);
 
     $table_forums = Database::get_course_table(TABLE_FORUM);
@@ -1992,7 +1994,8 @@ 
     $recursive = false,
     $postId = null,
     $depth = -1
-) {
+)
+{
     $em = Database::getManager();
 
     if (api_is_allowed_to_edit(false, true)) {
@@ -2577,7 +2580,8 @@ 
     $showMessage = true,
     $userId = 0,
     $sessionId = 0
-) {
+)
+{
     $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
     $userId = $userId ?: api_get_user_id();
     $course_id = $courseInfo['real_id'];
@@ -3138,7 +3142,8 @@ 
     $thread_qualify = 0,
     $qualify_time,
     $session_id = 0
-) {
+)
+{
     $table_threads_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
     $table_threads = Database::get_course_table(TABLE_FORUM_THREAD);
 
@@ -3327,7 +3332,8 @@ 
     $course_id,
     $user_id,
     $thread_id
-) {
+)
+{
     $table_threads_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
     $table_threads_qualify_log = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY_LOG);
 
@@ -3549,7 +3555,8 @@ 
     $current_forum,
     $form_values = '',
     $id_attach = 0
-) {
+)
+{
     // Initialize the object.
     $form = new FormValidator(
         'edit_post',
@@ -5706,7 +5713,8 @@ 
  * @param null $courseId Course ID to find row to update.
  * @return int Number of affected rows.
  */
-function editAttachedFile($array, $id, $courseId = null) {
+function editAttachedFile($array, $id, $courseId = null)
+{
     // Init variables
     $setString = '';
     $id = intval($id);
@@ -5835,7 +5843,8 @@ 
     $postId = 0,
     $attachId = 0,
     $courseId = 0
-) {
+)
+{
     $forumId = intval($forumId);
     $courseId = intval($courseId);
     $attachId = intval($attachId);

main/inc/lib/events.lib.php

Braces +2 added lines, -1 removed lines

@@ -871,7 +871,8 @@
                     WHERE dokeos_folder = "'.$event_message_language.'"
                 )';
             Database::query($sql);
-        } else { // else we create a new record
+        } else {
+// else we create a new record
             // gets the language_-_id
             $lang_id = '(SELECT id FROM '.Database::get_main_table(TABLE_MAIN_LANGUAGE).'
                         WHERE dokeos_folder = "'.$event_message_language.'")';

main/inc/lib/api.lib.php

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();