chamilo / chamilo-lms

main/admin/sub_language_ajax.inc.php

Spacing +8 added lines, -8 removed lines

@@ -9,9 +9,9 @@ 
 
 api_protect_admin_script();
 
-$new_language        = Security::remove_XSS($_REQUEST['new_language']);
-$language_variable    = Security::remove_XSS($_REQUEST['variable_language']);
-$file_id            = intval($_REQUEST['file_id']);
+$new_language = Security::remove_XSS($_REQUEST['new_language']);
+$language_variable = Security::remove_XSS($_REQUEST['variable_language']);
+$file_id = intval($_REQUEST['file_id']);
 /**
  * Code
  */
@@ -27,10 +27,10 @@ 
 
     //update variable language
     // Replace double quotes to avoid parse errors
-    $new_language = str_replace('"', '\"',$new_language);
+    $new_language = str_replace('"', '\"', $new_language);
     // Replace new line signs to avoid parse errors - see #6773
-    $new_language = str_replace("\n","\\n",$new_language);
-    $all_file_of_directory[$language_variable]="\"".$new_language."\";";
+    $new_language = str_replace("\n", "\\n", $new_language);
+    $all_file_of_directory[$language_variable] = "\"".$new_language."\";";
     $result_array = array();
 
     foreach ($all_file_of_directory as $key_value=>$value_info) {
@@ -40,7 +40,7 @@ 
     if (!empty($result_array)) {
         foreach ($result_array as $key => $result) {
             if ($result == false) {
-                $variables_with_problems .=$key.' <br />';
+                $variables_with_problems .= $key.' <br />';
             }
         }
     }
@@ -50,7 +50,7 @@ 
             Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success')
         );
 
-        $redirectUrl = api_get_path(WEB_CODE_PATH) . 'admin/extra_fields.php?type=';
+        $redirectUrl = api_get_path(WEB_CODE_PATH).'admin/extra_fields.php?type=';
 
         switch ($_REQUEST['extra_field_type']) {
             case \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE:

main/inc/lib/glossary.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
      *
      * @param array  $values  Array of title + description (name => $title, description => $comment)
      *
-     * @return mixed   Term id on success, false on failure
+     * @return false|string   Term id on success, false on failure
      *
      */
     public static function save_glossary($values, $showMessage = true)
@@ -448,7 +448,7 @@ 
 
     /**
      * Display the glossary terms in a list
-     * @return bool true
+     * @return string true
      */
     public static function displayGlossaryList()
     {
@@ -585,7 +585,7 @@ 
      * Update action icons column
      *
      * @param integer $glossary_id
-     * @param array   $url_params Parameters to use to affect links
+     * @param string   $url_params Parameters to use to affect links
      * @param array   $row The line of results from a query on the glossary table
      *
      * @return string HTML string for the action icons columns

Spacing +18 added lines, -18 removed lines

@@ -47,9 +47,9 @@ 
      *
      * @return string The glossary description
      */
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
+    public static function get_glossary_term_by_glossary_id($glossary_id)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $course_id = api_get_course_int_id();
         $sql = "SELECT description FROM $glossary_table
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
@@ -72,7 +72,7 @@ 
      */
     public static function get_glossary_term_by_glossary_name($glossary_name)
     {
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
         $sql_filter = api_get_session_condition($session_id);
@@ -225,7 +225,7 @@ 
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
                     WHERE c_id = $course_id ";
         $res_max = Database::query($get_max);
-        if (Database::num_rows($res_max)==0) {
+        if (Database::num_rows($res_max) == 0) {
             return 0;
         }
         $row = Database::fetch_array($res_max);
@@ -254,7 +254,7 @@ 
                 WHERE
                     c_id = $course_id AND
                     name = '".Database::escape_string($term)."'";
-        if ($not_id<>'') {
+        if ($not_id <> '') {
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
         }
         $result = Database::query($sql);
@@ -378,25 +378,25 @@ 
         $actionsLeft = '';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export">'.
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
         if (api_is_allowed_to_edit(null, true)) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=import">'.
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
         if (($view == 'table') || (!isset($view))) {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
-                Display::return_icon('view_detailed.png',get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
         } else {
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
-                Display::return_icon('view_text.png',get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
         /* BUILD SEARCH FORM */
@@ -433,7 +433,7 @@ 
             $table->set_header(1, get_lang('TermDefinition'), true);
             if (api_is_allowed_to_edit(null, true)) {
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
             }
             $content .= $table->return_table();
         }
@@ -455,8 +455,8 @@ 
         $content = '';
         foreach ($glossary_data as $key => $glossary_item) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true)) {
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
+            if (api_is_allowed_to_edit(null, true)) {
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
             }
             $content .= Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
         }
@@ -469,7 +469,7 @@ 
      * @return integer Count of glossary terms
      *
      */
-    public static function get_number_glossary_terms($session_id=0)
+    public static function get_number_glossary_terms($session_id = 0)
     {
         // Database table definition
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -563,7 +563,7 @@ 
         while ($data = Database::fetch_array($res)) {
             // Validation when belongs to a session
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
-            $array[0] = $data[0] . $session_img;
+            $array[0] = $data[0].$session_img;
 
             if (!$view || $view === 'table') {
                 $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
@@ -593,13 +593,13 @@ 
     {
         $glossary_id = $row[2];
         $return = '<a href="'.api_get_self().'?action=edit_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
-            Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
+            Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
         $glossary_term = $glossary_data['name'];
         if (api_is_allowed_to_edit(null, true)) {
             if ($glossary_data['session_id'] == api_get_session_id()) {
                 $return .= '<a href="'.api_get_self().'?action=delete_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.
-                    Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
+                    Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
             } else {
                 $return = get_lang('EditionNotAvailableFromSession');
             }

main/glossary/index.php

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
                     api_get_local_time($glossary_data['update_date'])
                 );
             } else {
-                 $glossary_data['update_date'] = '';
+                    $glossary_data['update_date'] = '';
             }
 
             $form->addLabel(get_lang('CreationDate'), $glossary_data['insert_date']);

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
         if (!api_is_allowed_to_edit(null, true)) {
             api_not_allowed(true);
         }
-        $tool_name =  get_lang('Add');
+        $tool_name = get_lang('Add');
         $form = new FormValidator(
             'glossary',
             'post',
@@ -190,7 +190,7 @@ 
         if (!api_is_allowed_to_edit(null, true)) {
             api_not_allowed(true);
         }
-        $tool_name =  get_lang('ImportGlossary');
+        $tool_name = get_lang('ImportGlossary');
         $form = new FormValidator(
             'glossary',
             'post',
@@ -218,7 +218,7 @@ 
                 foreach (GlossaryManager::get_glossary_terms() as $term) {
                     if (!GlossaryManager::delete_glossary($term['id'], false)) {
                         Display::addFlash(
-                            Display::return_message(get_lang("CannotDeleteGlossary") . ':' . $term['id'], 'error')
+                            Display::return_message(get_lang("CannotDeleteGlossary").':'.$term['id'], 'error')
                         );
                     } else {
                         $termsDeleted[] = $term['name'];
@@ -315,7 +315,7 @@ 
             if (count($badList) > 0) {
                 Display::addFlash(
                     Display::return_message(
-                        get_lang("GlossaryTermAlreadyExists").': ' . implode(', ', $badList),
+                        get_lang("GlossaryTermAlreadyExists").': '.implode(', ', $badList),
                         'error'
                     )
                 );
@@ -358,7 +358,7 @@ 
         GlossaryManager::export_to_pdf();
         break;
     case 'changeview':
-        if (in_array($_GET['view'], array('list','table'))) {
+        if (in_array($_GET['view'], array('list', 'table'))) {
             Session::write('glossary_view', $_GET['view']);
         } else {
             $view = Session::read('glossary_view');

main/inc/lib/usermanager.lib.php

Indentation +32 added lines, -32 removed lines

@@ -1267,13 +1267,13 @@ 
     }
 
     /**
-    * Get the users by ID
-    * @param array $ids student ids
-    * @param string $active
-    * @param string $order
-    * @param string $limit
-    * @return array $result student information
-    */
+     * Get the users by ID
+     * @param array $ids student ids
+     * @param string $active
+     * @param string $order
+     * @param string $limit
+     * @return array $result student information
+     */
     public static function get_user_list_by_ids($ids = array(), $active = null, $order = null, $limit = null)
     {
         if (empty($ids)) {
@@ -2314,7 +2314,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)
+        public static function get_extra_user_data_by_value($variable, $value, $all_visibility = true)
     {
         $extraFieldValue = new ExtraFieldValue('user');
         $extraField = new ExtraField('user');
@@ -3409,12 +3409,12 @@ 
         if ($tag_id == 0) {
             //the tag doesn't exist
             $sql = "INSERT INTO $table_user_tag (tag, field_id,count) VALUES ('$tag','$field_id', count + 1)";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = Database::insert_id();
         } else {
             //the tag exists we update it
             $sql = "UPDATE $table_user_tag SET count = count + 1 WHERE id  = $tag_id";
-             Database::query($sql);
+                Database::query($sql);
             $last_insert_id = $tag_id;
         }
 
@@ -3610,9 +3610,9 @@ 
     }
 
     /**
-      * Get extra filtrable user fields (only type select)
-      * @return array
-      */
+     * Get extra filtrable user fields (only type select)
+     * @return array
+     */
     public static function get_extra_filtrable_fields()
     {
         $extraFieldList = UserManager::get_extra_fields();
@@ -3637,9 +3637,9 @@ 
     }
 
     /**
-      * Get extra where clauses for finding users based on extra filtrable user fields (type select)
-      * @return string With AND clauses based on user's ID which have the values to search in extra user fields
-      */
+     * Get extra where clauses for finding users based on extra filtrable user fields (type select)
+     * @return string With AND clauses based on user's ID which have the values to search in extra user fields
+     */
     public static function get_search_form_where_extra_fields()
     {
         $useExtraFields = false;
@@ -3958,23 +3958,23 @@ 
     }
 
     /**
-    * Get users followed by human resource manager
-    * @param int $userId
-    * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
-    * @param bool $getOnlyUserId
-    * @param bool $getSql
-    * @param bool $getCount
-    * @param int $from
-    * @param int $numberItems
-    * @param int $column
-    * @param string $direction
-    * @param int $active
-    * @param string $lastConnectionDate
-    * @param int $status the function is called by who? COURSEMANAGER, DRH?
-    * @param string $keyword
+     * Get users followed by human resource manager
+     * @param int $userId
+     * @param int  $userStatus Filter users by status (STUDENT, COURSEMANAGER, etc)
+     * @param bool $getOnlyUserId
+     * @param bool $getSql
+     * @param bool $getCount
+     * @param int $from
+     * @param int $numberItems
+     * @param int $column
+     * @param string $direction
+     * @param int $active
+     * @param string $lastConnectionDate
+     * @param int $status the function is called by who? COURSEMANAGER, DRH?
+     * @param string $keyword
      *
-    * @return array user list
-    */
+     * @return array user list
+     */
     public static function getUsersFollowedByUser(
         $userId,
         $userStatus = null,

Braces +88 added lines, -56 removed lines

@@ -2165,8 +2165,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);
@@ -2258,8 +2259,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);
@@ -3042,13 +3044,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;
@@ -3056,11 +3060,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'];
@@ -3075,13 +3082,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;
@@ -3090,8 +3099,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;
     }
@@ -3103,22 +3114,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;
     }
 
@@ -3130,10 +3148,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;
@@ -3159,12 +3179,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 WHERE user_id=".$user_id." AND api_service='".$api_service."'";
@@ -4666,8 +4689,9 @@ 
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_RADIO:
@@ -4724,8 +4748,9 @@ 
                     );
 
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
@@ -4741,8 +4766,9 @@ 
                         array('multiple' => 'multiple')
                     );
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     break;
                 case ExtraField::FIELD_TYPE_DATE:
@@ -4750,8 +4776,9 @@ 
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
                     $form->setDefaults($defaults);
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     $form->applyFilter('theme', 'trim');
                     break;
@@ -4760,8 +4787,9 @@ 
                     $defaults['extra_'.$field_details[1]] = date('Y-m-d 12:00:00');
                     $form->setDefaults($defaults);
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
                     $form->applyFilter('theme', 'trim');
                     break;
@@ -4780,8 +4808,9 @@ 
                     $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3]);
 
                     if (!$admin_permissions) {
-                        if ($field_details[7] == 0)
-                            $form->freeze('extra_'.$field_details[1]);
+                        if ($field_details[7] == 0) {
+                                                    $form->freeze('extra_'.$field_details[1]);
+                        }
                     }
 
                     /* Recoding the selected values for double : if the user has
@@ -4841,8 +4870,9 @@ 
                     break;
                 case ExtraField::FIELD_TYPE_TIMEZONE:
                     $form->addElement('select', 'extra_'.$field_details[1], $field_details[3], api_get_timezones(), '');
-                    if ($field_details[7] == 0)
-                        $form->freeze('extra_'.$field_details[1]);
+                    if ($field_details[7] == 0) {
+                                            $form->freeze('extra_'.$field_details[1]);
+                    }
                     break;
                 case ExtraField::FIELD_TYPE_SOCIAL_PROFILE:
                     // get the social network's favicon
@@ -4867,8 +4897,9 @@ 
                     );
                     $form->applyFilter('extra_'.$field_details[1], 'stripslashes');
                     $form->applyFilter('extra_'.$field_details[1], 'trim');
-                    if ($field_details[7] == 0)
-                        $form->freeze('extra_'.$field_details[1]);
+                    if ($field_details[7] == 0) {
+                                            $form->freeze('extra_'.$field_details[1]);
+                    }
                     break;
                 case ExtraField::FIELD_TYPE_FILE:
                     $extra_field = 'extra_'.$field_details[1];
@@ -5277,8 +5308,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;

Spacing +36 added lines, -36 removed lines

@@ -34,7 +34,7 @@ 
     const USER_FIELD_TYPE_TIMEZONE = 11;
     const USER_FIELD_TYPE_SOCIAL_PROFILE = 12;
     const USER_FIELD_TYPE_FILE = 13;
-    const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER  = 14;
+    const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER = 14;
 
     private static $encryptionMethod;
 
@@ -540,7 +540,7 @@ 
         $res = Database::query($sql);
         while ($course = Database::fetch_object($res)) {
             $sql = "SELECT id FROM $table_course_user
-                    WHERE status=1 AND c_id = " . intval($course->c_id);
+                    WHERE status=1 AND c_id = ".intval($course->c_id);
             $res2 = Database::query($sql);
             if (Database::num_rows($res2) == 1) {
 
@@ -1244,7 +1244,7 @@ 
             // into ASCII letters in order they not to be totally removed.
             // 2. Applying the strict purifier.
             // 3. Length limitation.
-            $return  = api_get_setting('login_is_email') === 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH);
+            $return = api_get_setting('login_is_email') === 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH);
             $return = URLify::transliterate($return);
 
             return $return;
@@ -1338,12 +1338,12 @@ 
 
         if (!is_null($order)) {
             $order = Database::escape_string($order);
-            $sql .= ' ORDER BY ' . $order;
+            $sql .= ' ORDER BY '.$order;
         }
 
         if (!is_null($limit)) {
             $limit = Database::escape_string($limit);
-            $sql .= ' LIMIT ' . $limit;
+            $sql .= ' LIMIT '.$limit;
         }
 
         $rs = Database::query($sql);
@@ -1437,11 +1437,11 @@ 
             }
 
             if (api_is_multiple_url_enabled()) {
-                $sql_query .= ' AND auru.access_url_id = ' . api_get_current_access_url_id();
+                $sql_query .= ' AND auru.access_url_id = '.api_get_current_access_url_id();
             }
         } else {
             if (api_is_multiple_url_enabled()) {
-                $sql_query .= ' WHERE auru.access_url_id = ' . api_get_current_access_url_id();
+                $sql_query .= ' WHERE auru.access_url_id = '.api_get_current_access_url_id();
             }
         }
         if (count($order_by) > 0) {
@@ -1550,7 +1550,7 @@ 
             // directory might not have been created. Make sure it is before
             // going further.
 
-            $rootPath = api_get_path(SYS_UPLOAD_PATH) . 'users/' . substr((string) $id, 0, 1);
+            $rootPath = api_get_path(SYS_UPLOAD_PATH).'users/'.substr((string) $id, 0, 1);
             if (!is_dir($rootPath)) {
                 $perm = api_get_permissions_for_new_directories();
                 try {
@@ -1806,7 +1806,7 @@ 
         $path_info = self::get_user_picture_path_by_id($user_id, 'system');
         $path = $path_info['dir'];
         if (!empty($extra_field)) {
-            $path .= $extra_field . '/';
+            $path .= $extra_field.'/';
         }
         // If this directory does not exist - we create it.
         if (!file_exists($path)) {
@@ -2070,10 +2070,10 @@ 
         if (count($extra_files) > 0) {
             $extra_file_list = '<div class="files-production"><ul id="productions">';
             foreach ($extra_files as $file) {
-                $filename = substr($file,strlen($extra_field)+1);
+                $filename = substr($file, strlen($extra_field) + 1);
                 $extra_file_list .= '<li>'.Display::return_icon('archive.png').'<a href="'.$path.$extra_field.'/'.urlencode($filename).'" target="_blank">'.htmlentities($filename).'</a> ';
                 if ($showDelete) {
-                    $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_' . $extra_field . '['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>';
+                    $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_'.$extra_field.'['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>';
                 }
             }
             $extra_file_list .= '</ul></div>';
@@ -2715,7 +2715,7 @@ 
 
         if (api_is_allowed_to_create_course()) {
             $sessionListFromCourseCoach = array();
-            $sql =" SELECT DISTINCT session_id
+            $sql = " SELECT DISTINCT session_id
                     FROM $tbl_session_course_user
                     WHERE user_id = $user_id AND status = 2 ";
 
@@ -2723,7 +2723,7 @@ 
             if (Database::num_rows($result)) {
                 $result = Database::store_result($result);
                 foreach ($result as $session) {
-                    $sessionListFromCourseCoach[]= $session['session_id'];
+                    $sessionListFromCourseCoach[] = $session['session_id'];
                 }
             }
             if (!empty($sessionListFromCourseCoach)) {
@@ -2755,7 +2755,7 @@ 
         ";
 
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0) {
+        if (Database::num_rows($result) > 0) {
             while ($row = Database::fetch_assoc($result)) {
                 $sessions[$row['id']] = $row;
             }
@@ -2771,7 +2771,7 @@ 
                 ORDER BY access_start_date, access_end_date, name";
 
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0) {
+        if (Database::num_rows($result) > 0) {
             while ($row = Database::fetch_assoc($result)) {
                 if (empty($sessions[$row['id']])) {
                     $sessions[$row['id']] = $row;
@@ -3775,13 +3775,13 @@ 
         $useExtraFields = false;
         $extraFields = UserManager::get_extra_filtrable_fields();
         $extraFieldResult = array();
-        if (is_array($extraFields) && count($extraFields)>0 ) {
+        if (is_array($extraFields) && count($extraFields) > 0) {
             foreach ($extraFields as $extraField) {
                 $varName = 'field_'.$extraField['variable'];
                 if (UserManager::is_extra_field_available($extraField['variable'])) {
-                    if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
+                    if (isset($_GET[$varName]) && $_GET[$varName] != '0') {
                         $useExtraFields = true;
-                        $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
+                        $extraFieldResult[] = UserManager::get_extra_user_data_by_value(
                             $extraField['variable'],
                             $_GET[$varName]
                         );
@@ -3792,17 +3792,17 @@ 
 
         if ($useExtraFields) {
             $finalResult = array();
-            if (count($extraFieldResult)>1) {
-                for ($i=0; $i < count($extraFieldResult) -1; $i++) {
-                if (is_array($extraFieldResult[$i]) && is_array($extraFieldResult[$i+1])) {
-                        $finalResult  = array_intersect($extraFieldResult[$i], $extraFieldResult[$i+1]);
+            if (count($extraFieldResult) > 1) {
+                for ($i = 0; $i < count($extraFieldResult) - 1; $i++) {
+                if (is_array($extraFieldResult[$i]) && is_array($extraFieldResult[$i + 1])) {
+                        $finalResult = array_intersect($extraFieldResult[$i], $extraFieldResult[$i + 1]);
                     }
                 }
             } else {
                 $finalResult = $extraFieldResult[0];
             }
 
-            if (is_array($finalResult) && count($finalResult)>0) {
+            if (is_array($finalResult) && count($finalResult) > 0) {
                 $whereFilter = " AND u.id IN  ('".implode("','", $finalResult)."') ";
             } else {
                 //no results
@@ -3979,7 +3979,7 @@ 
             $sql = 'DELETE FROM '.$tbl_my_friend.'
                     WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND friend_user_id='.$friend_id.' '.$extra_condition;
             Database::query($sql);
-            $sql= 'DELETE FROM '.$tbl_my_friend.'
+            $sql = 'DELETE FROM '.$tbl_my_friend.'
                    WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND user_id='.$friend_id.' '.$extra_condition;
             Database::query($sql);
         } else {
@@ -4180,7 +4180,7 @@ 
 
         if (!empty($lastConnectionDate)) {
             $lastConnectionDate = Database::escape_string($lastConnectionDate);
-            $userConditions .=  " AND u.last_login <= '$lastConnectionDate' ";
+            $userConditions .= " AND u.last_login <= '$lastConnectionDate' ";
         }
 
         $courseConditions = null;
@@ -4248,7 +4248,7 @@ 
                 ;
                 break;
             case STUDENT_BOSS:
-                $drhConditions = " AND friend_user_id = $userId AND relation_type = " . USER_RELATION_TYPE_BOSS;
+                $drhConditions = " AND friend_user_id = $userId AND relation_type = ".USER_RELATION_TYPE_BOSS;
                 break;
         }
 
@@ -4343,7 +4343,7 @@ 
                     WHERE 
                         friend_user_id = $userId AND 
                         relation_type = $relationType AND 
-                        access_url_id = " . api_get_current_access_url_id();
+                        access_url_id = ".api_get_current_access_url_id();
         } else {
             $sql = "SELECT user_id FROM $userRelUserTable 
                     WHERE friend_user_id = $userId 
@@ -4628,7 +4628,7 @@ 
         if (empty($years)) {
             $years = 1;
         }
-        $inactive_time = $years * 31536000;  //1 year
+        $inactive_time = $years * 31536000; //1 year
         $rs = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
             if ($last_login_date = Database::result($rs, 0, 0)) {
@@ -4762,7 +4762,7 @@ 
                         'extra_'.$field_details[1],
                         $field_details[3],
                         $options,
-                        array('id' => 'extra_' . $field_details[1])
+                        array('id' => 'extra_'.$field_details[1])
                     );
 
                     if (!$admin_permissions) {
@@ -4916,7 +4916,7 @@ 
                     $extra_field = 'extra_'.$field_details[1];
                     $form->addElement('file', $extra_field, $field_details[3], null, '');
                     if ($extra_file_list = UserManager::build_user_extra_file_list($user_id, $field_details[1], '', true)) {
-                        $form->addElement('static', $extra_field . '_list', null, $extra_file_list);
+                        $form->addElement('static', $extra_field.'_list', null, $extra_file_list);
                     }
                     if ($field_details[7] == 0) {
                         $form->freeze($extra_field);
@@ -5088,7 +5088,7 @@ 
         $direction = null,
         $active = null,
         $lastConnectionDate = null
-    ){
+    ) {
         return self::getUsersFollowedByUser(
             $userId,
             $userStatus,
@@ -5315,12 +5315,12 @@ 
         if (!empty($_SERVER['HTTPS'])) {
             $url = 'https://secure.gravatar.com/avatar/';
         }
-        $url .= md5( strtolower( trim( $email ) ) );
+        $url .= md5(strtolower(trim($email)));
         $url .= "?s=$s&d=$d&r=$r";
-        if ( $img ) {
-            $url = '<img src="' . $url . '"';
-            foreach ( $atts as $key => $val )
-                $url .= ' ' . $key . '="' . $val . '"';
+        if ($img) {
+            $url = '<img src="'.$url.'"';
+            foreach ($atts as $key => $val)
+                $url .= ' '.$key.'="'.$val.'"';
             $url .= ' />';
         }
         return $url;

Doc Comments +22 added lines, -16 removed lines

@@ -130,9 +130,9 @@ 
     /**
      * Validates the password
      *
-     * @param $encoded
-     * @param $raw
-     * @param $salt
+     * @param string $encoded
+     * @param string $raw
+     * @param string $salt
      * @return bool
      */
     public static function isPasswordValid($encoded, $raw, $salt)
@@ -147,7 +147,7 @@ 
      * @param string $raw
      * @param User   $user
      *
-     * @return bool
+     * @return string
      */
     public static function encryptPassword($raw, User $user)
     {
@@ -1094,6 +1094,7 @@ 
     /**
      * Disables a user
      * @param int User id
+     * @param integer $user_id
      * @return bool
      * @uses UserManager::change_active_state() to actually disable the user
      * @assert (0) === false
@@ -1110,6 +1111,7 @@ 
     /**
      * Enable a user
      * @param int User id
+     * @param integer $user_id
      * @return bool
      * @uses UserManager::change_active_state() to actually disable the user
      * @assert (0) === false
@@ -1276,6 +1278,7 @@ 
      * Checks whether the user id exists in the database
      *
      * @param int User id
+     * @param integer $userId
      * @return bool True if user id was found, false otherwise
      */
     public static function is_user_id_valid($userId)
@@ -1417,7 +1420,7 @@ 
     /**
      * Get a list of users of which the given conditions match with a LIKE '%cond%'
      * @param array $conditions a list of condition (exemple : status=>STUDENT)
-     * @param array $order_by a list of fields on which sort
+     * @param string[] $order_by a list of fields on which sort
      * @return array An array with all users of the platform.
      * @todo optional course code parameter, optional sorting parameters...
      * @todo security filter order_by
@@ -1488,7 +1491,7 @@ 
      * @param   array $userInfo user information to avoid query the DB
      * returns the /main/img/unknown.jpg image set it at true
      *
-     * @return    array     Array of 2 elements: 'dir' and 'file' which contain
+     * @return    integer     Array of 2 elements: 'dir' and 'file' which contain
      * the dir and file as the name implies if image does not exist it will
      * return the unknow image if anonymous parameter is true if not it returns an empty array
      */
@@ -1980,7 +1983,7 @@ 
     /**
      * Returns an array with the user's productions.
      *
-     * @param    $user_id    User id
+     * @param    integer $user_id    User id
      * @return   array  An array containing the user's productions
      */
     public static function get_user_productions($user_id)
@@ -2135,7 +2138,7 @@ 
 
     /**
      * Build a list of extra file already uploaded in $user_folder/{$extra_field}/
-     * @param $user_id
+     * @param integer $user_id
      * @param $extra_field
      * @param bool $force
      * @param bool $showDelete
@@ -2240,7 +2243,7 @@ 
      * @param    int       $fieldType  Field's type
      * @param    string    $displayText Field's language var name
      * @param    string    $default Field's default value
-     * @return int
+     * @return boolean
      */
     public static function create_extra_field($variable, $fieldType, $displayText, $default)
     {
@@ -2274,6 +2277,7 @@ 
      * @param    boolean    Whether to prefix the fields indexes with "extra_" (might be used by formvalidator)
      * @param    boolean    Whether to return invisible fields as well
      * @param    boolean    Whether to split multiple-selection fields or not
+     * @param boolean $field_filter
      * @return    array    Array of fields => value for the given user
      */
     public static function get_extra_user_data(
@@ -3121,7 +3125,7 @@ 
      * @param    string  $user_id   User ID
      * @param   string  $course course directory
      * @param   string  $resourcetype resourcetype: images, all
-     * @return    int        User ID (or false if not found)
+     * @return    string        User ID (or false if not found)
      */
     public static function get_user_upload_files_by_course($user_id, $course, $resourcetype = 'all')
     {
@@ -3205,7 +3209,7 @@ 
     /**
      * Adds a new API key to the users' account
      * @param   int     Optional user ID (defaults to the results of api_get_user_id())
-     * @return  boolean True on success, false on failure
+     * @return  false|string True on success, false on failure
      */
     public static function add_api_key($user_id = null, $api_service = 'dokeos')
     {
@@ -3260,6 +3264,7 @@ 
      * Regenerate an API key from the user's account
      * @param   int     user ID (defaults to the results of api_get_user_id())
      * @param   string  API key's internal ID
+     * @param string $api_service
      * @return  int        num
      */
     public static function update_api_key($user_id, $api_service)
@@ -3289,6 +3294,7 @@ 
     /**
      * @param   int     user ID (defaults to the results of api_get_user_id())
      * @param   string    API key's internal ID
+     * @param string $api_service
      * @return  int    row ID, or return false if not found
      */
     public static function get_api_key_id($user_id, $api_service)
@@ -3504,7 +3510,7 @@ 
      * @param int $field_id
      * @param bool $show_links show links or not
      *
-     * @return array
+     * @return string
      */
     public static function get_user_tags_to_string($user_id, $field_id, $show_links = true)
     {
@@ -3601,7 +3607,7 @@ 
      * @param mixed $tag
      * @param int $user_id
      * @param int $field_id field id of the tag
-     * @return bool
+     * @return boolean|null
      */
     public static function add_tag($tag, $user_id, $field_id)
     {
@@ -5047,7 +5053,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function get_user_field_types()
     {
@@ -5339,7 +5345,7 @@ 
 
     /**
      * Get the boss user ID from a followed user id
-     * @param $userId
+     * @param integer $userId
      * @return bool
      */
     public static function getStudentBossList($userId)
@@ -5391,7 +5397,7 @@ 
      * Get either a Gravatar URL or complete image tag for a specified email address.
      *
      * @param string $email The email address
-     * @param string $s Size in pixels, defaults to 80px [ 1 - 2048 ]
+     * @param integer $s Size in pixels, defaults to 80px [ 1 - 2048 ]
      * @param string $d Default imageset to use [ 404 | mm | identicon | monsterid | wavatar ]
      * @param string $r Maximum rating (inclusive) [ g | pg | r | x ]
      * @param boole $img True to return a complete IMG tag False for just the URL

main/mySpace/works_in_session_report.php

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
 
     foreach ($sessionCourses as $sessionCourse) {
         $course = $sessionCourse->getCourse();
-        $coursesInfo[$course->getId()] =  $course->getCode();
+        $coursesInfo[$course->getId()] = $course->getCode();
         $criteria = Criteria::create()->where(
             Criteria::expr()->eq("status", Session::STUDENT)
         );
@@ -68,21 +68,21 @@ 
                 ];
             }
 
-            $usersInfo[$user->getId()][$course->getId() . '_score'] = null;
-            $usersInfo[$user->getId()][$course->getId() . '_progress'] = null;
-            $usersInfo[$user->getId()][$course->getId() . '_last_sent_date'] = null;
+            $usersInfo[$user->getId()][$course->getId().'_score'] = null;
+            $usersInfo[$user->getId()][$course->getId().'_progress'] = null;
+            $usersInfo[$user->getId()][$course->getId().'_last_sent_date'] = null;
 
             if (!$session->hasStudentInCourse($user, $course)) {
                 continue;
             }
 
-            $usersInfo[$user->getId()][$course->getId() . '_score'] = Tracking::get_avg_student_score(
+            $usersInfo[$user->getId()][$course->getId().'_score'] = Tracking::get_avg_student_score(
                 $user->getId(),
                 $course->getCode(),
                 null,
                 $session->getId()
             );
-            $usersInfo[$user->getId()][$course->getId() . '_progress'] = Tracking::get_avg_student_progress(
+            $usersInfo[$user->getId()][$course->getId().'_progress'] = Tracking::get_avg_student_progress(
                 $user->getId(),
                 $course->getCode(),
                 null,
@@ -95,7 +95,7 @@ 
                 continue;
             }
 
-            $usersInfo[$user->getId()][$course->getId() . '_last_sent_date'] = api_format_date(
+            $usersInfo[$user->getId()][$course->getId().'_last_sent_date'] = api_format_date(
                 $lastPublication->getSentDate()->getTimestamp(),
                 DATE_TIME_FORMAT_SHORT
             );
@@ -107,7 +107,7 @@ 
     $dataToExport = [
         [$toolName]
     ];
-    $fileName = 'works_in_session_' . api_get_local_time();
+    $fileName = 'works_in_session_'.api_get_local_time();
 
     $dataToExport['headers'][] = get_lang('OfficialCode');
     $dataToExport['headers'][] = get_lang('StudentName');
@@ -138,7 +138,7 @@ 
 }
 
 $interbreadcrumb[] = [
-    'url' => api_get_path(WEB_CODE_PATH) . 'mySpace/index.php',
+    'url' => api_get_path(WEB_CODE_PATH).'mySpace/index.php',
     'name' => get_lang('MySpace')
 ];
 
@@ -148,11 +148,11 @@ 
     $actions = [
         Display::url(
             Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
+            api_get_self().'?'.http_build_query(['export' => 'csv', 'session' => $session->getId()])
         ),
         Display::url(
             Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
+            api_get_self().'?'.http_build_query(['export' => 'xls', 'session' => $session->getId()])
         )
     ];
 }

main/tracking/userLog.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
 require_once api_get_path(SYS_CODE_PATH).'exercise/hotpotatoes.lib.php';
 
 if (isset($uInfo)) {
-    $interbreadcrumb[]= array(
+    $interbreadcrumb[] = array(
         'url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), 
         "name"=> api_ucfirst(get_lang('Users'))
     );
@@ -50,7 +50,7 @@ 
 /*]]>*/
 </style>";
 
-Display::display_header($nameTools,"Tracking");
+Display::display_header($nameTools, "Tracking");
 
 /*	Constants and variables */
 
@@ -58,11 +58,11 @@ 
 $is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course($user_id, $courseId);
 
 // Database Table Definitions
-$TABLECOURSUSER	        	= Database::get_main_table(TABLE_MAIN_COURSE_USER);
-$TABLEUSER	        		= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_course_user 	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_session 				= Database::get_main_table(TABLE_MAIN_SESSION);
-$TABLECOURSE_GROUPSUSER 	= Database::get_course_table(TABLE_GROUP_USER);
+$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+$TABLEUSER = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER);
 $now = api_get_utc_datetime();
 
 $sql = "SELECT 1
@@ -74,8 +74,8 @@ 
             OR (access_start_date='0000-00-00' AND access_end_date='0000-00-00'))
         WHERE session_id='".api_get_session_id()."' AND c_id = $courseId";
 //echo $sql;
-$result=Database::query($sql);
-if(!Database::num_rows($result)){
+$result = Database::query($sql);
+if (!Database::num_rows($result)) {
     $disabled = true;
 }
 
@@ -84,7 +84,7 @@ 
 $tbl_learnpath_view = Database::get_course_table(TABLE_LP_VIEW);
 $tbl_learnpath_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
 
-$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 // The variables for the days and the months
 $DaysShort = api_get_week_days_short();
@@ -109,7 +109,7 @@ 
 <table width="100%" cellpadding="2" cellspacing="3" border="0">
 <?php
 // check if uid is tutor of this group
-if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse )) {
+if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
     if (!$uInfo && !isset($uInfo)) {
         /*
         *		Display list of user of this group
@@ -133,7 +133,7 @@ 
         $step = 25; // number of student per page
         if ($userGroupNb > $step) {
             if (!isset($offset)) {
-                    $offset=0;
+                    $offset = 0;
             }
 
             $next     = $offset + $step;
@@ -186,13 +186,13 @@ 
         $list_users = getManyResults3Col($sql);
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0'>\n"
                     ."<tr align='center' valign='top' bgcolor='#E6E6E6'>\n"
-                    ."<td align='left'>",get_lang('UserName'),"</td>\n"
+                    ."<td align='left'>", get_lang('UserName'), "</td>\n"
                     ."</tr>\n";
         for ($i = 0; $i < sizeof($list_users); $i++) {
             echo    "<tr valign='top' align='center'>\n"
                     ."<td align='left'>"
-                    ."<a href='".api_get_self()."?uInfo=",$list_users[$i][0],"'>"
-                    .$list_users[$i][1]," ",$list_users[$i][2]
+                    ."<a href='".api_get_self()."?uInfo=", $list_users[$i][0], "'>"
+                    .$list_users[$i][1], " ", $list_users[$i][2]
                     ."</a>".
                     "</td>\n";
         }
@@ -249,7 +249,7 @@ 
             ";
 
             if (!isset($view)) {
-                $view ='0000000';
+                $view = '0000000';
             }
             //Logins
             TrackingUserLog::display_login_tracking_info($view, $uInfo, $courseId);
@@ -281,8 +281,8 @@ 
                 </tr>";
 
             $sql = "SELECT id, name FROM $tbl_learnpath_main";
-            $result=Database::query($sql);
-            $ar=Database::fetch_array($result);
+            $result = Database::query($sql);
+            $ar = Database::fetch_array($result);
 
             echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
             echo "<table cellpadding='2' cellspacing='1' border='0' align='center'><tr>
@@ -299,14 +299,14 @@ 
                     if ($ar['id'] == $scormcontopen) {
                         //have to list the students here
                         $contentId = intval($ar['id']);
-                        $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
-                                "FROM $tbl_learnpath_item i " .
-                                "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
-                                "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
+                        $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
+                                "FROM $tbl_learnpath_item i ".
+                                "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
+                                "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
                                 "WHERE (v.user_id=".intval($uInfo)." and v.lp_id=$contentId)
                                 ORDER BY v.id, i.id";
-                        $result3=Database::query($sql3);
-                        $ar3=Database::fetch_array($result3);
+                        $result3 = Database::query($sql3);
+                        $ar3 = Database::fetch_array($result3);
                         if (is_array($ar3)) {
                             echo "<tr><td>&nbsp;&nbsp;&nbsp;</td>
                                    <td class='secLine'>
@@ -328,7 +328,7 @@ 
                                 echo "<tr><td>&nbsp;&nbsp;&nbsp;</td><td>";
                                 echo "$title</td><td align=right>{$ar3['status']}</td><td align=right>{$ar3['score']}</td><td align=right>$time</td>";
                                 echo "</tr>";
-                                $ar3=Database::fetch_array($result3);
+                                $ar3 = Database::fetch_array($result3);
                             }
                         } else {
                             echo "<tr>";
@@ -339,7 +339,7 @@ 
                     $ar = Database::fetch_array($result);
                 }
             } else {
-                $noscorm=true;
+                $noscorm = true;
             }
 
             if ($noscorm) {

main/auth/openid/login.php

Spacing +14 added lines, -14 removed lines

@@ -64,7 +64,7 @@ 
     // Now that there is an association created, move on
     // to request authentication from the IdP
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
         $identity = 'http://openid.net/identifier_select/2.0';
     }
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -119,7 +119,7 @@ 
 
     $xrds_url = $claimed_id;
     if (_openid_is_xri($claimed_id)) {
-        $xrds_url = 'http://xri.net/' . $claimed_id;
+        $xrds_url = 'http://xri.net/'.$claimed_id;
     }
     $url = @parse_url($xrds_url);
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -182,7 +182,7 @@ 
     //@todo Remove Old Associations:
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
     $sql = "DELETE FROM $openid_association
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
     Database::query($sql);
 
     // Check to see if we have an association for this IdP already
@@ -339,17 +339,17 @@ 
     switch ($uri['scheme']) {
         case 'http':
             $port = isset($uri['port']) ? $uri['port'] : 80;
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
             break;
         case 'https':
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
             $port = isset($uri['port']) ? $uri['port'] : 443;
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
             break;
         default:
-            $result->error = 'invalid schema ' . $uri['scheme'];
+            $result->error = 'invalid schema '.$uri['scheme'];
             return $result;
     }
 
@@ -365,7 +365,7 @@ 
     // Construct the path to act on.
     $path = isset($uri['path']) ? $uri['path'] : '/';
     if (isset($uri['query'])) {
-        $path .= '?' . $uri['query'];
+        $path .= '?'.$uri['query'];
     }
 
     // Create HTTP request.
@@ -375,23 +375,23 @@ 
         // host that do not take into account the port number.
         'Host' => "Host: $host",
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
-        'Content-Length' => 'Content-Length: ' . strlen($data)
+        'Content-Length' => 'Content-Length: '.strlen($data)
     );
 
     // If the server url has a user then attempt to use basic authentication
     if (isset($uri['user'])) {
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
     }
 
     foreach ($headers as $header => $value) {
-        $defaults[$header] = $header . ': ' . $value;
+        $defaults[$header] = $header.': '.$value;
     }
 
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
+    $request = $method.' '.$path." HTTP/1.0\r\n";
     $request .= implode("\r\n", $defaults);
     $request .= "\r\n\r\n";
     if ($data) {
-        $request .= $data . "\r\n";
+        $request .= $data."\r\n";
     }
     $result->request = $request;
 
@@ -417,7 +417,7 @@ 
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
             // RFC 2109: the Set-Cookie response header comprises the token Set-
             // Cookie:, followed by a comma-separated list of one or more cookies.
-            $result->headers[$header] .= ',' . trim($value);
+            $result->headers[$header] .= ','.trim($value);
         } else {
             $result->headers[$header] = trim($value);
         }

main/ticket/projects.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $form = TicketManager::getCategoryForm($url, $projectId);
         $formToString = $form->returnForm();
         if ($form->validate()) {
-            $values =$form->getSubmitValues();
+            $values = $form->getSubmitValues();
 
             $params = [
                 'name' => $values['name'],
@@ -95,7 +95,7 @@ 
         $form->setDefaults($cat);
         $formToString = $form->returnForm();
         if ($form->validate()) {
-            $values =$form->getSubmitValues();
+            $values = $form->getSubmitValues();
 
             $params = [
                 'name' => $values['name'],

main/inc/lib/formvalidator/Rule/CompareFields.php

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values = [], $operator_and_max_value = null) {
+     * @return boolean True if date is valid
+     */
+    function validate($values = [], $operator_and_max_value = null) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file