chamilo / chamilo-lms

main/inc/lib/internationalization_database/transliteration/xb8.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: xb8.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
 
 return array(
-  'en' => array('reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
+    'en' => array('reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
     'rel', 'relg', 'relm', 'relb', 'rels', 'relt', 'relp', 'relh', 'rem', 'reb', 'rebs', 'res', 'ress', 'reng', 'rej', 'rec',
     'rek', 'ret', 'rep', 'reh', 'ryeo', 'ryeog', 'ryeogg', 'ryeogs', 'ryeon', 'ryeonj', 'ryeonh', 'ryeod', 'ryeol', 'ryeolg', 'ryeolm', 'ryeolb',
     'ryeols', 'ryeolt', 'ryeolp', 'ryeolh', 'ryeom', 'ryeob', 'ryeobs', 'ryeos', 'ryeoss', 'ryeong', 'ryeoj', 'ryeoc', 'ryeok', 'ryeot', 'ryeop', 'ryeoh',

main/inc/lib/internationalization_database/transliteration/xbd.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: xbd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
 
 return array(
-  'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
+    'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
     'bwa', 'bwag', 'bwagg', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
     'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwac', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaegg', 'bwaegs',
     'bwaen', 'bwaenj', 'bwaenh', 'bwaed', 'bwael', 'bwaelg', 'bwaelm', 'bwaelb', 'bwaels', 'bwaelt', 'bwaelp', 'bwaelh', 'bwaem', 'bwaeb', 'bwaebs', 'bwaes',

main/inc/lib/login_redirection.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,30 +18,30 @@ 
         if (api_is_student() && !api_get_setting('student_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_teacher() && !api_get_setting('teacher_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('teacher_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_drh() && !api_get_setting('drh_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('drh_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_session_admin() && !api_get_setting('sessionadmin_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('sessionadmin_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
 
         if (!empty($redirect_url)) {
-            header('Location: ' . $redirect_url . $param);
+            header('Location: '.$redirect_url.$param);
             exit();
         }
 
@@ -49,7 +49,7 @@ 
         if (CustomPages::enabled()) {
             CustomPages::display(CustomPages::INDEX_LOGGED);
         }
-        header('location: ' . api_get_path(WEB_PATH) . api_get_setting('page_after_login') . $param);
+        header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
         exit();
     }
 }

main/inc/lib/sessionmanager.lib.php

Indentation +1 added lines, -1 removed lines

@@ -6022,7 +6022,7 @@
         ]);
     }
 
-	/**
+    /**
      * Get the count of user courses in session
      * @param int $sessionId The session id
      * @return array

Braces +14 added lines, -10 removed lines

@@ -1588,8 +1588,10 @@ 
         if (empty($session_visibility)) {
             $session_visibility = $session->getVisibility();
             //default status loaded if empty
-            if (empty($session_visibility))
-                $session_visibility = SESSION_VISIBLE_READ_ONLY; // by default readonly 1
+            if (empty($session_visibility)) {
+                            $session_visibility = SESSION_VISIBLE_READ_ONLY;
+            }
+            // by default readonly 1
         } else {
             if (!in_array($session_visibility, array(SESSION_VISIBLE_READ_ONLY, SESSION_VISIBLE, SESSION_INVISIBLE))) {
                 $session_visibility = SESSION_VISIBLE_READ_ONLY;
@@ -2792,10 +2794,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 } else {
                     // The user is not subscribed to the session, so make sure
                     // he isn't subscribed to a course in this session either
@@ -2806,10 +2809,11 @@ 
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
-                        return true;
-                    else
-                        return false;
+                    if (Database::affected_rows($result) > 0) {
+                                            return true;
+                    } else {
+                                            return false;
+                    }
                 }
             } else {
                 // Assign user as a coach to course

Doc Comments +25 added lines, -18 removed lines

@@ -1336,7 +1336,7 @@ 
      * @param string    $description
      * @param int       $showDescription
      * @param int       $duration
-     * @param array     $extraFields
+     * @param boolean|null     $extraFields
      * @param int       $sessionAdminId
      * @param boolean $sendSubscriptionNotification Optional.
      *          Whether send a mail notification to users being subscribed
@@ -1565,7 +1565,7 @@ 
      * @param array $user_list
      * @param int $session_visibility
      * @param bool $empty_users
-     * @return bool
+     * @return false|null
      */
     public static function suscribe_users_to_session(
         $id_session,
@@ -1837,7 +1837,7 @@ 
      * @param array $courseInfo
      * @param int $status
      * @param bool $updateTotal
-     * @return bool
+     * @return false|null
      */
     public static function removeUsersFromCourseSession(
         $userList,
@@ -1903,7 +1903,7 @@ 
      * @param string $course_code
      * @param int $session_visibility
      * @param bool $removeUsersNotInList
-     * @return bool
+     * @return false|null
      */
     public static function subscribe_users_to_session_course(
         $user_list,
@@ -2086,7 +2086,7 @@ 
      * @param	bool	$removeExistingCoursesWithUsers Whether to unsubscribe
      * existing courses and users (true, default) or not (false)
      * @param $copyEvaluation from base course to session course
-     * @return	void	Nothing, or false on error
+     * @return	false|null	Nothing, or false on error
      * */
     public static function add_courses_to_session(
         $sessionId,
@@ -2282,6 +2282,8 @@ 
      *
      * @param int Session id
      * @param int Course id
+     * @param integer $session_id
+     * @param integer $course_id
      * @return bool True in case of success, false otherwise
      */
     public static function unsubscribe_course_from_session($session_id, $course_id)
@@ -2337,7 +2339,7 @@ 
      * @param	string	$variable Field's internal variable name
      * @param	int		$fieldType Field's type
      * @param	string	$displayText Field's language var name
-     * @return int     new extra field id
+     * @return boolean     new extra field id
      */
     public static function create_session_extra_field($variable, $fieldType, $displayText)
     {
@@ -2561,7 +2563,7 @@ 
      * @param	array	id_checked
      * @param	bool	include delete session
      * @param	bool	optional, true if the function is called by a webservice, false otherwise.
-     * @return	void	Nothing, or false on error
+     * @return	boolean	Nothing, or false on error
      * The parameters is a array to delete sessions
      * */
     public static function delete_session_category($id_checked, $delete_session = false, $from_ws = false)
@@ -3056,6 +3058,7 @@ 
      * @param string $orderCondition
      * @param string $keyword
      * @param string $description
+     * @param integer $status
      * @return array sessions
      */
     public static function getSessionsFollowedByUser(
@@ -3268,8 +3271,8 @@ 
     /**
      * Gets the list of courses by session filtered by access_url
      *
-     * @param $userId
-     * @param $sessionId
+     * @param integer $userId
+     * @param null|integer $sessionId
      * @param null $from
      * @param null $limit
      * @param null $column
@@ -3394,6 +3397,7 @@ 
     /**
      * Gets the count of courses by session filtered by access_url
      * @param int session id
+     * @param integer $session_id
      * @return array list of courses
      */
     public static function getCourseCountBySessionId($session_id, $keyword = null)
@@ -3645,6 +3649,7 @@ 
      * Updates a session status
      * @param	int 	session id
      * @param	int 	status
+     * @param integer $status
      */
     public static function set_session_status($session_id, $status)
     {
@@ -3853,7 +3858,7 @@ 
      * Protect a session to be edited.
      * @param int $id
      * @param bool $checkSession
-     * @return mixed | bool true if pass the check, api_not_allowed otherwise
+     * @return boolean|null | bool true if pass the check, api_not_allowed otherwise
      */
     public static function protectSession($id, $checkSession = true)
     {
@@ -3961,7 +3966,7 @@ 
 
     /**
      * @param $id
-     * @return bool
+     * @return null|boolean
      */
     public static function protect_teacher_session_edit($id)
     {
@@ -4025,7 +4030,7 @@ 
      *  true: if the session exists it will be updated.
      *  false: if session exists a new session will be created adding a counter session1, session2, etc
      * @param int $defaultUserId
-     * @param mixed $logger
+     * @param Logger $logger
      * @param array $extraFields convert a file row to an extra field. Example in CSV file there's a SessionID then it will
      * converted to extra_external_session_id if you set this: array('SessionId' => 'extra_external_session_id')
      * @param string $extraFieldId
@@ -5273,7 +5278,6 @@ 
      * @param string $lastConnectionDate
      * @param array $sessionIdList
      * @param array $studentIdList
-     * @param int $userStatus STUDENT|COURSEMANAGER constants
      *
      * @return array|int
      */
@@ -5425,7 +5429,7 @@ 
     /**
      * Get the list of course tools that have to be dealt with in case of
      * registering any course to a session
-     * @return array The list of tools to be dealt with (literal names)
+     * @return string[] The list of tools to be dealt with (literal names)
      */
     public static function getCourseToolToBeManaged()
     {
@@ -5439,7 +5443,7 @@ 
      * Calls the methods bound to each tool when a course is registered into a session
      * @param int $sessionId
      * @param int $courseId
-     * @return void
+     * @return boolean|null
      */
     public static function installCourse($sessionId, $courseId)
     {
@@ -6079,6 +6083,7 @@ 
      * @param int $categoryId The internal ID of the session category
      * @param string $target Value to search for in the session field values
      * @param array $extraFields A list of fields to be scanned and returned
+     * @param DateTime $publicationDate
      * @return mixed
      */
     public static function getShortSessionListAndExtraByCategory($categoryId, $target, $extraFields = null, $publicationDate = null)
@@ -6591,6 +6596,8 @@ 
      * Converts "start date" and "end date" to "From start date to end date" string
      * @param string $startDate
      * @param string $endDate
+     * @param boolean $showTime
+     * @param boolean $dateHuman
      *
      * @return string
      */
@@ -7407,7 +7414,7 @@ 
     /**
      * Get link to the admin page for this session
      * @param   int $id Session ID
-     * @return mixed    URL to the admin page to manage the session, or false on error
+     * @return false|string    URL to the admin page to manage the session, or false on error
      */
     public static function getAdminPath($id)
     {
@@ -7424,7 +7431,7 @@ 
      * If a course is provided, build the link to the course
      * @param   int $id Session ID
      * @param   int $courseId Course ID (optional) in case the link has to send straight to the course
-     * @return mixed    URL to the page to use the session, or false on error
+     * @return false|string    URL to the page to use the session, or false on error
      */
     public static function getPath($id, $courseId = 0)
     {
@@ -7522,7 +7529,7 @@ 
     /**
      * Return true if coach is allowed to access this session
      * @param int $sessionId
-     * @return bool
+     * @return integer
      */
     public static function isSessionDateOkForCoach($sessionId)
     {

Spacing +194 added lines, -194 removed lines

@@ -143,7 +143,7 @@ 
                     return $msg;
                 }
             } else {
-                $rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='" . $name . "'");
+                $rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='".$name."'");
                 if (Database::num_rows($rs)) {
                     $msg = get_lang('SessionNameAlreadyExists');
                     return $msg;
@@ -256,7 +256,7 @@ 
     public static function session_name_exists($name)
     {
         $name = Database::escape_string($name);
-        $sql = "SELECT COUNT(*) as count FROM " . Database::get_main_table(TABLE_MAIN_SESSION) . "
+        $sql = "SELECT COUNT(*) as count FROM ".Database::get_main_table(TABLE_MAIN_SESSION)."
                 WHERE name = '$name'";
         $result = Database::fetch_array(Database::query($sql));
 
@@ -287,7 +287,7 @@ 
             $where .= " AND (
                             s.session_admin_id = $user_id  OR
                             sru.user_id = '$user_id' AND
-                            sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'
+                            sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."'
                             )
                       ";
 
@@ -305,7 +305,7 @@ 
             $where_condition = str_replace('category_name', 'sc.name', $where_condition);
             $where_condition = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $where_condition
             );
             $where_condition = str_replace(
@@ -350,7 +350,7 @@ 
 
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
 
                 $sql = "SELECT count(id) as total_rows FROM (
                 SELECT DISTINCT
@@ -400,14 +400,14 @@ 
             if (api_is_session_admin() &&
                 api_get_setting('allow_session_admins_to_manage_all_sessions') == 'false'
             ) {
-                $where .=" AND s.session_admin_id = $user_id ";
+                $where .= " AND s.session_admin_id = $user_id ";
             }
         }
 
         if (!api_is_platform_admin() && api_is_teacher() &&
             api_get_setting('allow_teachers_to_create_sessions') == 'true'
         ) {
-            $where .=" AND s.id_coach = $user_id ";
+            $where .= " AND s.id_coach = $user_id ";
         }
 
         $extra_field = new ExtraField('session');
@@ -457,10 +457,10 @@ 
         $query = "$select FROM $tbl_session s $inject_joins $where $inject_where";
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
                 $query = "$select
                         FROM $tbl_session s $inject_joins
                         INNER JOIN $table_access_url_rel_session ar
@@ -564,7 +564,7 @@ 
                 INNER JOIN $tbl_lp l ON l.id = v.lp_id
                 INNER JOIN $tbl_user u ON u.user_id = v.user_id
                 INNER JOIN $tbl_course c
-                WHERE v.session_id = " . $sessionId;
+                WHERE v.session_id = ".$sessionId;
         $result_rows = Database::query($sql);
         $row = Database::fetch_array($result_rows);
         $num = $row['total_rows'];
@@ -616,7 +616,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -625,7 +625,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         $sql = "SELECT u.user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
@@ -684,13 +684,13 @@ 
             foreach ($lessons as $lesson) {
                 $data[$lesson['id']] = (!empty($user_lessons[$lesson['id']]['progress'])) ? $user_lessons[$lesson['id']]['progress'] : 0;
                 $progress += $data[$lesson['id']];
-                $data[$lesson['id']] = $data[$lesson['id']] . '%';
+                $data[$lesson['id']] = $data[$lesson['id']].'%';
                 $count++;
             }
             if ($count == 0) {
                 $data['total'] = 0;
             } else {
-                $data['total'] = round($progress / $count, 2) . '%';
+                $data['total'] = round($progress / $count, 2).'%';
             }
             $table[] = $data;
         }
@@ -731,7 +731,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -740,7 +740,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         $sql = "SELECT u.user_id, u.lastname, u.firstname, u.username, u.email, s.c_id
@@ -842,7 +842,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -851,7 +851,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO, fix create report without session
@@ -884,7 +884,7 @@ 
         /**
          *  Lessons
          */
-        $sql = "SELECT * FROM $tbl_course_lp WHERE c_id = %s ";  //AND session_id = %s
+        $sql = "SELECT * FROM $tbl_course_lp WHERE c_id = %s "; //AND session_id = %s
         $sql_query = sprintf($sql, $course['real_id']);
         $result = Database::query($sql_query);
         $arrLesson = array(array());
@@ -892,7 +892,7 @@ 
             if (empty($arrLesson[$row['session_id']]['lessons_total'])) {
                 $arrLesson[$row['session_id']]['lessons_total'] = 1;
             } else {
-                $arrLesson[$row['session_id']]['lessons_total'] ++;
+                $arrLesson[$row['session_id']]['lessons_total']++;
             }
         }
 
@@ -959,7 +959,7 @@ 
                 $course['real_id']
             );
             foreach ($user_list as $user_id) {
-                isset($survey_user_list[$user_id]) ? $survey_user_list[$user_id] ++ : $survey_user_list[$user_id] = 1;
+                isset($survey_user_list[$user_id]) ? $survey_user_list[$user_id]++ : $survey_user_list[$user_id] = 1;
             }
         }
 
@@ -1013,7 +1013,7 @@ 
             $assignments_done = Tracking::count_student_assignments($user['user_id'], $course['code'], $user['id_session']);
             $assignments_left = $assignments_total - $assignments_done;
             if (!empty($assignments_total)) {
-                $assignments_progress = round((( $assignments_done * 100 ) / $assignments_total), 2);
+                $assignments_progress = round((($assignments_done * 100) / $assignments_total), 2);
             } else {
                 $assignments_progress = 0;
             }
@@ -1043,7 +1043,7 @@ 
             $wiki_read = $row['count'];
             $wiki_unread = $wiki_total - $wiki_read;
             if (!empty($wiki_total)) {
-                $wiki_progress = round((( $wiki_read * 100 ) / $wiki_total), 2);
+                $wiki_progress = round((($wiki_read * 100) / $wiki_total), 2);
             } else {
                 $wiki_progress = 0;
             }
@@ -1052,7 +1052,7 @@ 
             $surveys_done = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0);
             $surveys_left = $surveys_total - $surveys_done;
             if (!empty($surveys_total)) {
-                $surveys_progress = round((( $surveys_done * 100 ) / $surveys_total), 2);
+                $surveys_progress = round((($surveys_done * 100) / $surveys_total), 2);
             } else {
                 $surveys_progress = 0;
             }
@@ -1065,7 +1065,7 @@ 
             );
             $forums_left = $forums_total - $forums_done;
             if (!empty($forums_total)) {
-                $forums_progress = round((( $forums_done * 100 ) / $forums_total), 2);
+                $forums_progress = round((($forums_done * 100) / $forums_total), 2);
             } else {
                 $forums_progress = 0;
             }
@@ -1073,58 +1073,58 @@ 
             //Overall Total
             $overall_total = ($course_description_progress + $exercises_progress + $forums_progress + $assignments_progress + $wiki_progress + $surveys_progress) / 6;
 
-            $link = '<a href="' . api_get_path(WEB_CODE_PATH) . 'mySpace/myStudents.php?student=' . $user[0] . '&details=true&course=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkForum = '<a href="' . api_get_path(WEB_CODE_PATH) . 'forum/index.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkWork = '<a href="' . api_get_path(WEB_CODE_PATH) . 'work/work.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
-            $linkWiki = '<a href="' . api_get_path(WEB_CODE_PATH) . 'wiki/index.php?cidReq=' . $course['code'] . '&session_id=' . $user['id_session'] . '&action=statistics"> %s </a>';
-            $linkSurvey = '<a href="' . api_get_path(WEB_CODE_PATH) . 'survey/survey_list.php?cidReq=' . $course['code'] . '&id_session=' . $user['id_session'] . '"> %s </a>';
+            $link = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$user[0].'&details=true&course='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkForum = '<a href="'.api_get_path(WEB_CODE_PATH).'forum/index.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkWork = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
+            $linkWiki = '<a href="'.api_get_path(WEB_CODE_PATH).'wiki/index.php?cidReq='.$course['code'].'&session_id='.$user['id_session'].'&action=statistics"> %s </a>';
+            $linkSurvey = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?cidReq='.$course['code'].'&id_session='.$user['id_session'].'"> %s </a>';
 
             $table[] = array(
                 'lastname' => $user[1],
                 'firstname' => $user[2],
                 'username' => $user[3],
                 #'profile'   => '',
-                'total' => round($overall_total, 2) . '%',
-                'courses' => sprintf($link, $course_description_progress . '%'),
-                'lessons' => sprintf($link, $lessons_progress . '%'),
-                'exercises' => sprintf($link, $exercises_progress . '%'),
-                'forums' => sprintf($link, $forums_progress . '%'),
-                'homeworks' => sprintf($link, $assignments_progress . '%'),
-                'wikis' => sprintf($link, $wiki_progress . '%'),
-                'surveys' => sprintf($link, $surveys_progress . '%'),
+                'total' => round($overall_total, 2).'%',
+                'courses' => sprintf($link, $course_description_progress.'%'),
+                'lessons' => sprintf($link, $lessons_progress.'%'),
+                'exercises' => sprintf($link, $exercises_progress.'%'),
+                'forums' => sprintf($link, $forums_progress.'%'),
+                'homeworks' => sprintf($link, $assignments_progress.'%'),
+                'wikis' => sprintf($link, $wiki_progress.'%'),
+                'surveys' => sprintf($link, $surveys_progress.'%'),
                 //course description
-                'course_description_progress' => $course_description_progress . '%',
+                'course_description_progress' => $course_description_progress.'%',
                 //lessons
                 'lessons_total' => sprintf($link, $lessons_total),
                 'lessons_done' => sprintf($link, $lessons_done),
                 'lessons_left' => sprintf($link, $lessons_left),
-                'lessons_progress' => sprintf($link, $lessons_progress . '%'),
+                'lessons_progress' => sprintf($link, $lessons_progress.'%'),
                 //exercises
                 'exercises_total' => sprintf($link, $exercises_total),
                 'exercises_done' => sprintf($link, $exercises_done),
                 'exercises_left' => sprintf($link, $exercises_left),
-                'exercises_progress' => sprintf($link, $exercises_progress . '%'),
+                'exercises_progress' => sprintf($link, $exercises_progress.'%'),
                 //forums
                 'forums_total' => sprintf($linkForum, $forums_total),
                 'forums_done' => sprintf($linkForum, $forums_done),
                 'forums_left' => sprintf($linkForum, $forums_left),
-                'forums_progress' => sprintf($linkForum, $forums_progress . '%'),
+                'forums_progress' => sprintf($linkForum, $forums_progress.'%'),
                 //assignments
                 'assignments_total' => sprintf($linkWork, $assignments_total),
                 'assignments_done' => sprintf($linkWork, $assignments_done),
                 'assignments_left' => sprintf($linkWork, $assignments_left),
-                'assignments_progress' => sprintf($linkWork, $assignments_progress . '%'),
+                'assignments_progress' => sprintf($linkWork, $assignments_progress.'%'),
                 //wiki
                 'wiki_total' => sprintf($linkWiki, $wiki_total),
                 'wiki_revisions' => sprintf($linkWiki, $wiki_revisions),
                 'wiki_read' => sprintf($linkWiki, $wiki_read),
                 'wiki_unread' => sprintf($linkWiki, $wiki_unread),
-                'wiki_progress' => sprintf($linkWiki, $wiki_progress . '%'),
+                'wiki_progress' => sprintf($linkWiki, $wiki_progress.'%'),
                 //survey
                 'surveys_total' => sprintf($linkSurvey, $surveys_total),
                 'surveys_done' => sprintf($linkSurvey, $surveys_done),
                 'surveys_left' => sprintf($linkSurvey, $surveys_left),
-                'surveys_progress' => sprintf($linkSurvey, $surveys_progress . '%'),
+                'surveys_progress' => sprintf($linkSurvey, $surveys_progress.'%'),
             );
         }
 
@@ -1204,7 +1204,7 @@ 
 
         $limit = null;
         if (!empty($options['limit'])) {
-            $limit = " LIMIT " . $options['limit'];
+            $limit = " LIMIT ".$options['limit'];
         }
 
         if (!empty($options['where'])) {
@@ -1213,7 +1213,7 @@ 
 
         $order = null;
         if (!empty($options['order'])) {
-            $order = " ORDER BY " . $options['order'];
+            $order = " ORDER BY ".$options['order'];
         }
 
         //TODO add course name
@@ -1226,7 +1226,7 @@ 
                     " : "
                     u.lastname,
                     u.firstname,
-                ") . "
+                ")."
                 a.logout_course_date,
                 a.counter,
                 c.title,
@@ -1308,7 +1308,7 @@ 
             if (Database::num_rows($result) > 0) {
                 $row = Database::fetch_array($result);
                 $count = $row['count'] + 1;
-                $session_name = $session_name . '_' . $count;
+                $session_name = $session_name.'_'.$count;
                 $result = self::session_name_exists($session_name);
                 if (!$result) {
                     return $session_name;
@@ -1388,7 +1388,7 @@ 
 
             return false;
         } else {
-            $sql = "SELECT id FROM $tbl_session WHERE name='" . Database::escape_string($name) . "'";
+            $sql = "SELECT id FROM $tbl_session WHERE name='".Database::escape_string($name)."'";
             $rs = Database::query($sql);
             $exists = false;
             while ($row = Database::fetch_array($rs)) {
@@ -1756,7 +1756,7 @@ 
         // Delete users from the session
         if ($empty_users === true) {
             $sql = "DELETE FROM $tbl_session_rel_user
-                    WHERE session_id = $id_session AND relation_type<>" . SESSION_RELATION_TYPE_RRHH . "";
+                    WHERE session_id = $id_session AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
             Database::query($sql);
         }
 
@@ -1767,7 +1767,7 @@ 
             $enreg_user = Database::escape_string($enreg_user);
             $nbr_users++;
             $sql = "INSERT IGNORE INTO $tbl_session_rel_user (relation_type, session_id, user_id, registered_at)
-                    VALUES (0, $id_session, $enreg_user, '" . api_get_utc_datetime() . "')";
+                    VALUES (0, $id_session, $enreg_user, '".api_get_utc_datetime()."')";
             Database::query($sql);
         }
 
@@ -1857,9 +1857,9 @@ 
         is_array($courseInfo) ? $courseId = $courseInfo['real_id'] : $courseId = $courseInfo;
 
         $statusCondition = null;
-        if (isset($status) && !is_null($status))  {
+        if (isset($status) && !is_null($status)) {
             $status = intval($status);
-            $statusCondition  = " AND status = $status";
+            $statusCondition = " AND status = $status";
         }
 
         foreach ($userList as $userId) {
@@ -1991,7 +1991,7 @@ 
             if (empty($count)) {
                 // If user is not registered to a session then add it.
                 $sql = "INSERT IGNORE INTO $tbl_session_rel_user (session_id, user_id, registered_at)
-                        VALUES ($session_id, $enreg_user, '" . api_get_utc_datetime() . "')";
+                        VALUES ($session_id, $enreg_user, '".api_get_utc_datetime()."')";
                 Database::query($sql);
 
                 $sql = "UPDATE $tbl_session SET nbr_users = nbr_users + 1
@@ -2034,7 +2034,7 @@ 
 		               WHERE
                             session_id = $session_id AND
 		                    user_id = $user_id AND
-		                    relation_type <> " . SESSION_RELATION_TYPE_RRHH . "";
+		                    relation_type <> ".SESSION_RELATION_TYPE_RRHH."";
         $result = Database::query($delete_sql);
         $return = Database::affected_rows($result);
 
@@ -2118,7 +2118,7 @@ 
                 FROM $tbl_session_rel_user
                 WHERE
                     session_id = $sessionId AND
-                    relation_type<>" . SESSION_RELATION_TYPE_RRHH;
+                    relation_type<>".SESSION_RELATION_TYPE_RRHH;
         $result = Database::query($sql);
         $user_list = Database::store_result($result);
 
@@ -2130,7 +2130,7 @@ 
 
                     $sql = "DELETE FROM $tbl_session_rel_course
                             WHERE
-                                c_id = " . $existingCourse['c_id'] . " AND
+                                c_id = ".$existingCourse['c_id']." AND
                                 session_id = $sessionId";
                     Database::query($sql);
 
@@ -2193,7 +2193,7 @@ 
                             $links = $cat->get_links(null, false, $courseInfo['code'], 0);
 
                             $cat->set_session_id($sessionId);
-                            $oldCategoryId= $cat->get_id();
+                            $oldCategoryId = $cat->get_id();
                             $newId = $cat->add();
                             $newCategoryIdList[$oldCategoryId] = $newId;
 
@@ -2381,8 +2381,8 @@ 
         $return_value = false;
         $sql = "SELECT c_id FROM $tbl_session_course
                 WHERE
-                  session_id = " . intval($session_id) . " AND
-                  c_id = " . intval($courseId) . "";
+                  session_id = ".intval($session_id)." AND
+                  c_id = " . intval($courseId)."";
         $result = Database::query($sql);
         $num = Database::num_rows($result);
         if ($num > 0) {
@@ -2405,8 +2405,8 @@ 
         }
 
         $sql = 'SELECT *
-		        FROM ' . $tbl_session . '
-		        WHERE name = "' . Database::escape_string($session_name) . '"';
+		        FROM ' . $tbl_session.'
+		        WHERE name = "' . Database::escape_string($session_name).'"';
         $result = Database::query($sql);
         $num = Database::num_rows($result);
         if ($num > 0) {
@@ -2446,8 +2446,8 @@ 
         $month_end = intval($smonth_end);
         $day_end = intval($sday_end);
 
-        $date_start = "$year_start-" . (($month_start < 10) ? "0$month_start" : $month_start) . "-" . (($day_start < 10) ? "0$day_start" : $day_start);
-        $date_end = "$year_end-" . (($month_end < 10) ? "0$month_end" : $month_end) . "-" . (($day_end < 10) ? "0$day_end" : $day_end);
+        $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+        $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
 
         if (empty($name)) {
             $msg = get_lang('SessionCategoryNameIsRequired');
@@ -2519,8 +2519,8 @@ 
         $month_end = intval($smonth_end);
         $day_end = intval($sday_end);
         $id = intval($id);
-        $date_start = "$year_start-" . (($month_start < 10) ? "0$month_start" : $month_start) . "-" . (($day_start < 10) ? "0$day_start" : $day_start);
-        $date_end = "$year_end-" . (($month_end < 10) ? "0$month_end" : $month_end) . "-" . (($day_end < 10) ? "0$day_end" : $day_end);
+        $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+        $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
 
         if (empty($name)) {
             $msg = get_lang('SessionCategoryNameIsRequired');
@@ -2540,13 +2540,13 @@ 
         if ($date_end <> null) {
             $sql = "UPDATE $tbl_session_category
                     SET
-                        name = '" . Database::escape_string($name) . "',
+                        name = '".Database::escape_string($name)."',
                         date_start = '$date_start' ,
                         date_end = '$date_end'
                     WHERE id= $id";
         } else {
             $sql = "UPDATE $tbl_session_category SET
-                        name = '" . Database::escape_string($name) . "',
+                        name = '".Database::escape_string($name)."',
                         date_start = '$date_start',
                         date_end = NULL
                     WHERE id= $id";
@@ -2576,10 +2576,10 @@ 
 
         //Setting session_category_id to 0
         $sql = "UPDATE $tbl_session SET session_category_id = 0
-                WHERE session_category_id IN (" . $id_checked . ")";
+                WHERE session_category_id IN (".$id_checked.")";
         Database::query($sql);
 
-        $sql = "SELECT id FROM $tbl_session WHERE session_category_id IN (" . $id_checked . ")";
+        $sql = "SELECT id FROM $tbl_session WHERE session_category_id IN (".$id_checked.")";
         $result = Database::query($sql);
         while ($rows = Database::fetch_array($result)) {
             $session_id = $rows['id'];
@@ -2591,7 +2591,7 @@ 
                 }
             }
         }
-        $sql = "DELETE FROM $tbl_session_category WHERE id IN (" . $id_checked . ")";
+        $sql = "DELETE FROM $tbl_session_category WHERE id IN (".$id_checked.")";
         Database::query($sql);
 
         // Add event to system log
@@ -2664,7 +2664,7 @@ 
                 $value = Database::escape_string($options['value']);
                 $sql_query .= ' AND ';
                 if (in_array($field, $availableFields) && in_array($operator, $availableOperator)) {
-                    $sql_query .= $field . " $operator '" . $value . "'";
+                    $sql_query .= $field." $operator '".$value."'";
                 }
             }
         }
@@ -2731,8 +2731,8 @@ 
     {
         $tbl_session_category = Database::get_main_table(TABLE_MAIN_SESSION_CATEGORY);
         $id = api_get_current_access_url_id();
-        $sql = 'SELECT * FROM ' . $tbl_session_category . '
-                WHERE access_url_id = ' . $id . '
+        $sql = 'SELECT * FROM '.$tbl_session_category.'
+                WHERE access_url_id = ' . $id.'
                 ORDER BY name ASC';
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
@@ -2911,11 +2911,11 @@ 
                         INNER JOIN $tbl_session_rel_access_url a ON (a.session_id = s.session_id)
                         WHERE
                             s.user_id = $userId AND
-                            relation_type=" . SESSION_RELATION_TYPE_RRHH . " AND
-                            access_url_id = " . api_get_current_access_url_id() . "";
+                            relation_type=".SESSION_RELATION_TYPE_RRHH." AND
+                            access_url_id = " . api_get_current_access_url_id()."";
             } else {
                 $sql = "SELECT session_id FROM $tbl_session_rel_user s
-                        WHERE user_id = $userId AND relation_type=" . SESSION_RELATION_TYPE_RRHH . "";
+                        WHERE user_id = $userId AND relation_type=".SESSION_RELATION_TYPE_RRHH."";
             }
             $result = Database::query($sql);
 
@@ -2925,7 +2925,7 @@ 
                             WHERE
                                 session_id = {$row['session_id']} AND
                                 user_id = $userId AND
-                                relation_type=" . SESSION_RELATION_TYPE_RRHH . " ";
+                                relation_type=".SESSION_RELATION_TYPE_RRHH." ";
                     Database::query($sql);
                 }
             }
@@ -2939,8 +2939,8 @@ 
                         VALUES (
                             $session_id,
                             $userId,
-                            '" . SESSION_RELATION_TYPE_RRHH . "',
-                            '" . api_get_utc_datetime() . "'
+                            '".SESSION_RELATION_TYPE_RRHH."',
+                            '" . api_get_utc_datetime()."'
                         )";
 
                 Database::query($sql);
@@ -2982,8 +2982,8 @@ 
                     WHERE
                         sru.user_id = '$userId' AND
                         sru.session_id = '$sessionId' AND
-                        sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "' AND
-                        access_url_id = " . api_get_current_access_url_id() . "
+                        sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."' AND
+                        access_url_id = " . api_get_current_access_url_id()."
                         ";
         } else {
             $sql = "$select FROM $tbl_session s
@@ -2992,7 +2992,7 @@ 
                         sru.session_id = s.id AND
                         sru.user_id = '$userId' AND
                         sru.session_id = '$sessionId' AND
-                        sru.relation_type = '" . SESSION_RELATION_TYPE_RRHH . "'
+                        sru.relation_type = '".SESSION_RELATION_TYPE_RRHH."'
                     ";
         }
 
@@ -3090,7 +3090,7 @@ 
 
         $limitCondition = null;
         if (!empty($start) && !empty($limit)) {
-            $limitCondition = " LIMIT " . intval($start) . ", " . intval($limit);
+            $limitCondition = " LIMIT ".intval($start).", ".intval($limit);
         }
 
         if (empty($orderCondition)) {
@@ -3168,26 +3168,26 @@ 
 
         $sessions = array();
         if (Database::num_rows($result) > 0) {
-            $sysUploadPath = api_get_path(SYS_UPLOAD_PATH). 'sessions/';
-            $webUploadPath = api_get_path(WEB_UPLOAD_PATH). 'sessions/';
+            $sysUploadPath = api_get_path(SYS_UPLOAD_PATH).'sessions/';
+            $webUploadPath = api_get_path(WEB_UPLOAD_PATH).'sessions/';
             $imgPath = Display::return_icon('session_default_small.png', null, null, null, null, true);
 
             $tableExtraFields = Database::get_main_table(TABLE_EXTRA_FIELD);
-            $sql = "SELECT id FROM " . $tableExtraFields . "
+            $sql = "SELECT id FROM ".$tableExtraFields."
                     WHERE extra_field_type = 3 AND variable='image'";
             $resultField = Database::query($sql);
             $imageFieldId = Database::fetch_assoc($resultField);
 
             while ($row = Database::fetch_array($result)) {
 
-                $row['image'] =  null;
-                $sessionImage = $sysUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
+                $row['image'] = null;
+                $sessionImage = $sysUploadPath.$imageFieldId['id'].'_'.$row['id'].'.png';
 
                 if (is_file($sessionImage)) {
-                    $sessionImage = $webUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
+                    $sessionImage = $webUploadPath.$imageFieldId['id'].'_'.$row['id'].'.png';
                     $row['image'] = $sessionImage;
                 } else {
-                    $row['image'] =  $imgPath;
+                    $row['image'] = $imgPath;
                 }
 
                 $sessions[$row['id']] = $row;
@@ -3257,7 +3257,7 @@ 
                 return intval($count[0]);
             }
 
-            while ($row = Database::fetch_array($result,'ASSOC'))	{
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $courses[$row['real_id']] = $row;
             }
         }
@@ -3301,7 +3301,7 @@ 
         }
 
         $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
-        $tbl_session_rel_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+        $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 
         if ($getCount) {
             $select = "SELECT COUNT(DISTINCT(c.code)) as count ";
@@ -3326,7 +3326,7 @@ 
 		        ";
         if ($getCount) {
             $result = Database::query($sql);
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
         }
 
@@ -3341,7 +3341,7 @@ 
         $courses = array();
 
         if ($num_rows > 0) {
-            while ($row = Database::fetch_array($result,'ASSOC'))	{
+            while ($row = Database::fetch_array($result, 'ASSOC')) {
                 $courses[$row['id']] = $row;
             }
         }
@@ -3419,7 +3419,7 @@ 
         $result = Database::query($sql);
         $num_rows = Database::num_rows($result);
         if ($num_rows > 0) {
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             return $row['count'];
         }
 
@@ -3531,9 +3531,9 @@ 
 
             if ($access_url_id != -1) {
                 $sql = 'SELECT DISTINCT session.*
-                    FROM ' . $session_table . ' session INNER JOIN ' . $tbl_session_rel_access_url . ' session_rel_url
+                    FROM ' . $session_table.' session INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url
                     ON (session.id = session_rel_url.session_id)
-                    WHERE '.$sqlCoach.' access_url_id = ' . $access_url_id;
+                    WHERE '.$sqlCoach.' access_url_id = '.$access_url_id;
             }
         }
         $sql .= ' ORDER by name';
@@ -3567,8 +3567,8 @@ 
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
                 WHERE
                     session_rcru.user_id = user.user_id AND
-                    session_rcru.session_id = '" . intval($session_id) . "' AND
-                    session_rcru.c_id ='" . intval($courseId) . "' AND
+                    session_rcru.session_id = '".intval($session_id)."' AND
+                    session_rcru.c_id ='" . intval($courseId)."' AND
                     user.user_id = " . intval($user_id);
 
         $result = Database::query($sql);
@@ -3599,8 +3599,8 @@ 
         $sql = "SELECT session_rcru.status
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
                 WHERE session_rcru.user_id = user.user_id AND
-                    session_rcru.session_id = '" . intval($session_id) . "' AND
-                    session_rcru.c_id ='" . intval($courseId) . "' AND
+                    session_rcru.session_id = '".intval($session_id)."' AND
+                    session_rcru.c_id ='" . intval($courseId)."' AND
                     user.user_id = " . intval($user_id);
         $result = Database::query($sql);
         $status = false;
@@ -3677,7 +3677,7 @@ 
         // Get timestamp for now in UTC - see http://php.net/manual/es/function.time.php#117251
         $now = time() - date('Z');
         // Timestamp in one month
-        $inOneMonth = $now + (30*24*3600);
+        $inOneMonth = $now + (30 * 24 * 3600);
         $inOneMonth = api_get_local_time($inOneMonth);
         if (api_strtotime($s['access_start_date']) < $now) {
             $s['access_start_date'] = api_get_local_time($now);
@@ -3699,16 +3699,16 @@ 
         }
         // Now try to create the session
         $sid = self::create_session(
-            $s['name'] . ' ' . get_lang('CopyLabelSuffix'),
+            $s['name'].' '.get_lang('CopyLabelSuffix'),
             $s['access_start_date'],
             $s['access_end_date'],
             $s['display_start_date'],
             $s['display_end_date'],
             $s['coach_access_start_date'],
             $s['coach_access_end_date'],
-            (int)$s['id_coach'],
+            (int) $s['id_coach'],
             $s['session_category_id'],
-            (int)$s['visibility'],
+            (int) $s['visibility'],
             true
         );
 
@@ -3822,7 +3822,7 @@ 
         $session_table = Database::get_main_table(TABLE_MAIN_SESSION);
         $sql = "SELECT DISTINCT id
 	         	FROM $session_table
-	         	WHERE session.id_coach =  '" . $user_id . "' AND id = '$session_id'";
+	         	WHERE session.id_coach =  '".$user_id."' AND id = '$session_id'";
         $result = Database::query($sql);
         if ($result && Database::num_rows($result)) {
             return true;
@@ -3841,7 +3841,7 @@ 
         $access_url_rel_session_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $sql = "SELECT count(id) FROM $session_table s";
         if (!empty($access_url_id) && $access_url_id == intval($access_url_id)) {
-            $sql .= ", $access_url_rel_session_table u " .
+            $sql .= ", $access_url_rel_session_table u ".
                 " WHERE s.id = u.session_id AND u.access_url_id = $access_url_id";
         }
         $res = Database::query($sql);
@@ -4093,7 +4093,7 @@ 
 
         $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
         $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-        $tbl_session_course  = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+        $tbl_session_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
         $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
         $sessions = array();
@@ -4187,10 +4187,10 @@ 
                     $suffix = null;
                     while (!$unique_name) {
                         if ($i > 1) {
-                            $suffix = ' - ' . $i;
+                            $suffix = ' - '.$i;
                         }
-                        $sql = 'SELECT 1 FROM ' . $tbl_session . '
-                                WHERE name="' . $session_name . $suffix . '"';
+                        $sql = 'SELECT 1 FROM '.$tbl_session.'
+                                WHERE name="' . $session_name.$suffix.'"';
                         $rs = Database::query($sql);
 
                         if (Database::result($rs, 0, 0)) {
@@ -4208,13 +4208,13 @@ 
 
                     // Creating the session.
                     $sql = "INSERT IGNORE INTO $tbl_session SET
-                            name = '" . $session_name . "',
+                            name = '".$session_name."',
                             id_coach = '$coach_id',
                             access_start_date = '$date_start',
                             access_end_date = '$date_end',
                             visibility = '$visibilityAfterExpirationPerSession',
                             $sessionCondition
-                            session_admin_id = " . intval($defaultUserId) . $extraParameters . $extraSessionParameters;
+                            session_admin_id = ".intval($defaultUserId).$extraParameters.$extraSessionParameters;
                     Database::query($sql);
 
                     $session_id = Database::insert_id();
@@ -4254,7 +4254,7 @@ 
                                 access_start_date = '$date_start',
                                 access_end_date = '$date_end',
                                 visibility = '$visibilityAfterExpirationPerSession',
-                                session_category_id = '$session_category_id' " . $extraParameters . $extraSessionParameters;
+                                session_category_id = '$session_category_id' ".$extraParameters.$extraSessionParameters;
 
                         Database::query($sql);
 
@@ -4274,7 +4274,7 @@ 
 
                             // Delete session-user relation only for students
                             $sql = "DELETE FROM $tbl_session_user
-                                    WHERE session_id = '$session_id' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+                                    WHERE session_id = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
                             Database::query($sql);
 
                             $sql = "DELETE FROM $tbl_session_course WHERE session_id = '$session_id'";
@@ -4362,7 +4362,7 @@ 
 
                             // Delete session-user relation only for students
                             $sql = "DELETE FROM $tbl_session_user
-                                    WHERE session_id = '$session_id' AND relation_type <> " . SESSION_RELATION_TYPE_RRHH;
+                                    WHERE session_id = '$session_id' AND relation_type <> ".SESSION_RELATION_TYPE_RRHH;
                             Database::query($sql);
 
                             $sql = "DELETE FROM $tbl_session_course WHERE session_id = '$session_id'";
@@ -4405,7 +4405,7 @@ 
                             $sql = "INSERT IGNORE INTO $tbl_session_user SET
                                     user_id = '$user_id',
                                     session_id = '$session_id',
-                                    registered_at = '" . api_get_utc_datetime() . "'";
+                                    registered_at = '".api_get_utc_datetime()."'";
                             Database::query($sql);
                             if ($debug) {
                                 $logger->addInfo("Sessions - Adding User #$user_id ($user) to session #$session_id");
@@ -5049,7 +5049,7 @@ 
 
         if (!empty($lastConnectionDate)) {
             $lastConnectionDate = Database::escape_string($lastConnectionDate);
-            $userConditions .=  " AND u.last_login <= '$lastConnectionDate' ";
+            $userConditions .= " AND u.last_login <= '$lastConnectionDate' ";
         }
 
         if (!empty($keyword)) {
@@ -5108,7 +5108,7 @@ 
         $result = Database::query($sql);
         $result = Database::store_result($result);
 
-        return $result ;
+        return $result;
     }
 
     /**
@@ -5168,7 +5168,7 @@ 
                     $userToString = null;
                     foreach ($userList as $userInfo) {
                         $newUserList[] = $userInfo['user_id'];
-                        $userToString .= $userInfo['firstname'] . ' ' . $userInfo['lastname'] . '<br />';
+                        $userToString .= $userInfo['firstname'].' '.$userInfo['lastname'].'<br />';
                     }
 
                     if (!empty($sessionsDestination)) {
@@ -5181,7 +5181,7 @@ 
                                 $messages[] = Display::return_message(sprintf(get_lang('SessionXSkipped'), $sessionDestinationId), 'warning', false);
                                 continue;
                             }
-                            $messages[] = Display::return_message(get_lang('StudentList') . '<br />' . $userToString, 'info', false);
+                            $messages[] = Display::return_message(get_lang('StudentList').'<br />'.$userToString, 'info', false);
                             SessionManager::suscribe_users_to_session(
                                 $sessionDestinationId,
                                 $newUserList,
@@ -5232,7 +5232,7 @@ 
                 }
             }
         }
-        $sessionUrl = api_get_path(WEB_CODE_PATH) . 'admin/resume_session.php?id_session=';
+        $sessionUrl = api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session=';
 
         $htmlResult = null;
 
@@ -5247,7 +5247,7 @@ 
                     $sessionInfo = self::fetch($sessionId);
                     $htmlResult .= '<br />';
                     $htmlResult .= Display::url(
-                        get_lang('Session') . ': ' . $sessionInfo['name'] . ' <br />', $sessionUrl . $sessionId, array('target' => '_blank')
+                        get_lang('Session').': '.$sessionInfo['name'].' <br />', $sessionUrl.$sessionId, array('target' => '_blank')
                     );
                     $teacherList = array();
                     foreach ($coachList as $coachId) {
@@ -5360,7 +5360,7 @@ 
                 }
 
                 $sessionIdList = array_map('intval', $sessionIdList);
-                $sessionToString = implode("', '",  $sessionIdList);
+                $sessionToString = implode("', '", $sessionIdList);
 
                 $course = Database::get_main_table(TABLE_MAIN_COURSE);
                 $sessionCourse = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
@@ -5372,7 +5372,7 @@ 
                         INNER JOIN $courseUser cu ON (cu.c_id = c.id)
 		                WHERE src.session_id IN ('$sessionToString') AND cu.status = 1";
                 $result = Database::query($sql);
-                while($row = Database::fetch_array($result, 'ASSOC')) {
+                while ($row = Database::fetch_array($result, 'ASSOC')) {
                     $teacherListId[$row['user_id']] = $row['user_id'];
                 }
             } else {
@@ -5447,7 +5447,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'add' . $tool;
+            $method = 'add'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5466,7 +5466,7 @@ 
         $toolList = self::getCourseToolToBeManaged();
 
         foreach ($toolList as $tool) {
-            $method = 'remove' . $tool;
+            $method = 'remove'.$tool;
             if (method_exists(get_class(), $method)) {
                 self::$method($sessionId, $courseId);
             }
@@ -5584,18 +5584,18 @@ 
                         }
                     }
 
-                    $message .= '<strong>' . get_lang('User') . '</strong> ' . $userInfo['complete_name'] . ' <br />';
+                    $message .= '<strong>'.get_lang('User').'</strong> '.$userInfo['complete_name'].' <br />';
 
                     if (!in_array($userInfo['status'], array(DRH)) && !api_is_platform_admin_by_id($userInfo['user_id'])) {
-                        $message .= get_lang('UserMustHaveTheDrhRole') . '<br />';
+                        $message .= get_lang('UserMustHaveTheDrhRole').'<br />';
                         continue;
                     }
 
                     if (!empty($sessionList)) {
-                        $message .= '<strong>' . get_lang('Sessions') . ':</strong> <br />';
-                        $message .= implode(', ', $sessionList) . '<br /><br />';
+                        $message .= '<strong>'.get_lang('Sessions').':</strong> <br />';
+                        $message .= implode(', ', $sessionList).'<br /><br />';
                     } else {
-                        $message .= get_lang('NoSessionProvided') . ' <br /><br />';
+                        $message .= get_lang('NoSessionProvided').' <br /><br />';
                     }
                 }
             }
@@ -5775,8 +5775,8 @@ 
 
         $firstAccess = api_strtotime($courseAccess['login_course_date'], 'UTC');
 
-        $endDateInSeconds = $firstAccess + $duration*24*60*60;
-        $leftDays = round(($endDateInSeconds- $currentTime) / 60 / 60 / 24);
+        $endDateInSeconds = $firstAccess + $duration * 24 * 60 * 60;
+        $leftDays = round(($endDateInSeconds - $currentTime) / 60 / 60 / 24);
 
         return $leftDays;
     }
@@ -6058,7 +6058,7 @@ 
         $sql = "SELECT COUNT(1) as count, u.id, scu.status status_in_session, u.status user_status
                 FROM $tableSessionRelCourseRelUser scu
                 INNER JOIN $tableUser u ON scu.user_id = u.id
-                WHERE scu.session_id = " . intval($sessionId) ."
+                WHERE scu.session_id = ".intval($sessionId)."
                 GROUP BY u.id";
 
         $result = Database::query($sql);
@@ -6093,7 +6093,7 @@ 
             $sfTable = Database::get_main_table(TABLE_EXTRA_FIELD);
             $sfvTable = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
             // Join session field and session field values tables
-            $joinTable = $sfTable . ' sf INNER JOIN ' . $sfvTable . ' sfv ON sf.id = sfv.field_id';
+            $joinTable = $sfTable.' sf INNER JOIN '.$sfvTable.' sfv ON sf.id = sfv.field_id';
             $fieldsArray = array();
             foreach ($extraFields as $field) {
                 $fieldsArray[] = Database::escape_string($field);
@@ -6136,14 +6136,14 @@ 
                 for ($i = 1; $i < count($fieldsArray); $i++) {
                     $whereParams .= ', ?';
                 }
-                $whereFieldVariables = ' variable IN ( ' . $whereParams .' )';
-                $whereFieldIds = 'field_id IN ( ' . $whereParams .  ' )';
+                $whereFieldVariables = ' variable IN ( '.$whereParams.' )';
+                $whereFieldIds = 'field_id IN ( '.$whereParams.' )';
             }
             // Get session fields
             $extraField = new ExtraField('session');
             $questionMarks = substr(str_repeat('?, ', count($fieldsArray)), 0, -2);
             $fieldsList = $extraField->get_all(array(
-                ' variable IN ( ' . $questionMarks . ' )' => $fieldsArray,
+                ' variable IN ( '.$questionMarks.' )' => $fieldsArray,
             ));
             // Index session fields
             foreach ($fieldsList as $field) {
@@ -6152,7 +6152,7 @@ 
             // Get session field values
             $extra = new ExtraFieldValue('session');
             $questionMarksFields = substr(str_repeat('?, ', count($fields)), 0, -2);
-            $sessionFieldValueList = $extra->get_all(array ('where' => array('field_id IN ( ' . $questionMarksFields . ' )' => array_keys($fields))));
+            $sessionFieldValueList = $extra->get_all(array('where' => array('field_id IN ( '.$questionMarksFields.' )' => array_keys($fields))));
             // Add session fields values to session list
             foreach ($sessionList as $id => &$session) {
                 foreach ($sessionFieldValueList as $sessionFieldValue) {
@@ -6205,7 +6205,7 @@ 
             // Check the result
             if ($result < 1) {
                 // If not found any result, update error message
-                $errorResult['errorMessage'] = 'Not found any session category name ' . $categoryName;
+                $errorResult['errorMessage'] = 'Not found any session category name '.$categoryName;
             } elseif (count($result) > 1 && !$force) {
                 // If found more than one result and force is disabled, update error message
                 $errorResult['errorMessage'] = 'Found many session categories';
@@ -6264,7 +6264,7 @@ 
             // Check if session list query had result
             if (!empty($sessionList)) {
                 // implode all session id
-                $sessionIdsString = '(' . implode(', ', array_keys($sessionList)) . ')';
+                $sessionIdsString = '('.implode(', ', array_keys($sessionList)).')';
                 // Get all field variables
                 $sessionFieldList = Database::select(
                     'id, variable',
@@ -6351,7 +6351,7 @@ 
                 return $sessionList;
             } else {
                 // Not found result, update error message
-                $errorResult['errorMessage'] = 'Not found any session for session category id ' . $sessionCategoryId;
+                $errorResult['errorMessage'] = 'Not found any session for session category id '.$sessionCategoryId;
             }
         }
 
@@ -6455,7 +6455,7 @@ 
 
         $sessionExtraField = new ExtraField('session');
         $fieldList = $sessionExtraField->get_all(array(
-            "variable IN ( " . implode(", ", $variablePlaceHolders) . " ) " => $variables,
+            "variable IN ( ".implode(", ", $variablePlaceHolders)." ) " => $variables,
         ));
 
         $fields = array();
@@ -6469,7 +6469,7 @@ 
         $extra = new ExtraFieldValue('session');
         $sessionFieldValueList = $extra->get_all(
             array(
-                "field_id IN ( " . implode(", ", $variablePlaceHolders) . " )" => array_keys($fields),
+                "field_id IN ( ".implode(", ", $variablePlaceHolders)." )" => array_keys($fields),
             )
         );
 
@@ -6540,7 +6540,7 @@ 
                 FROM $sessionTable s
                 INNER JOIN $sessionUserTable sru ON s.id = sru.id_session
                 WHERE
-                    (sru.id_user IN (" . implode(', ', $userIdList) . ")
+                    (sru.id_user IN (".implode(', ', $userIdList).")
                     AND sru.relation_type = 0
                 )";
 
@@ -6556,7 +6556,7 @@ 
                         WHERE
                             srau.access_url_id = $accessUrlId
                             AND (
-                                sru.id_user IN (" . implode(', ', $userIdList) . ")
+                                sru.id_user IN (".implode(', ', $userIdList).")
                                 AND sru.relation_type = 0
                             )";
             }
@@ -6577,7 +6577,7 @@ 
      */
     public static function getSessionVisibility($sessionInfo)
     {
-        switch($sessionInfo['visibility']) {
+        switch ($sessionInfo['visibility']) {
             case 1:
                 return get_lang('ReadOnly');
             case 2:
@@ -6607,7 +6607,7 @@ 
         }
         $result = '';
         if (!empty($startDateToLocal) && !empty($endDateToLocal)) {
-            $result =  sprintf(get_lang('FromDateXToDateY'), $startDateToLocal, $endDateToLocal);
+            $result = sprintf(get_lang('FromDateXToDateY'), $startDateToLocal, $endDateToLocal);
         } else {
             if (!empty($startDateToLocal)) {
                 $result = get_lang('From').' '.$startDateToLocal;
@@ -6752,7 +6752,7 @@ 
                     get_lang('CoachName'),
                     null,
                     [
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'session.ajax.php?a=search_general_coach',
+                        'url' => api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=search_general_coach',
                         'width' => '100%',
                     ]
                 );
@@ -6763,7 +6763,7 @@ 
         $form->addHtml('<div id="ajax_list_coachs"></div>');
 
         $form->addButtonAdvancedSettings('advanced_params');
-        $form->addElement('html','<div id="advanced_params_options" style="display:none">');
+        $form->addElement('html', '<div id="advanced_params_options" style="display:none">');
 
         $form->addSelect('session_category', get_lang('SessionCategory'), $categoriesOptions, array(
             'id' => 'session_category'
@@ -6930,16 +6930,16 @@ 
         if (api_is_session_admin() &&
             api_get_setting('allow_session_admins_to_see_all_sessions') == 'false'
         ) {
-            $where.=" WHERE s.session_admin_id = $user_id ";
+            $where .= " WHERE s.session_admin_id = $user_id ";
         }
 
         if (!empty($options['where'])) {
             $options['where'] = str_replace('course_title', 'c.title', $options['where']);
-            $options['where'] = str_replace("( session_active = '0' )", '1=1',  $options['where']);
+            $options['where'] = str_replace("( session_active = '0' )", '1=1', $options['where']);
 
             $options['where'] = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $options['where']
             );
 
@@ -6981,10 +6981,10 @@ 
                        $where ";
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
 
                 $query_rows = "SELECT count(*) as total_rows
                                FROM $tbl_session s
@@ -7029,12 +7029,12 @@ 
                     //get_lang('CourseTitle'),
                     get_lang('Visibility'),
                 );
-                $column_model = array (
-                    array('name'=>'name', 'index'=>'s.name', 'width'=>'160',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'category_name', 'index'=>'category_name', 'width'=>'40',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'50',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
-                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'50',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
-                    array('name'=>'visibility', 'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
+                $column_model = array(
+                    array('name'=>'name', 'index'=>'s.name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'category_name', 'index'=>'category_name', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
+                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'50', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
+                    array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
                 );
                 break;
             case 'complete':
@@ -7047,12 +7047,12 @@ 
                     get_lang('Visibility'),
                     get_lang('CourseTitle'),
                 );
-                $column_model = array (
-                    array('name'=>'name', 'index'=>'s.name', 'width'=>'200',  'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'70',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
-                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'70',   'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
-                    array('name'=>'coach_name', 'index'=>'coach_name',     'width'=>'70',   'align'=>'left', 'search' => 'false', 'searchoptions' => array('sopt' => $operators)),
-                    array('name'=>'session_active', 'index'=>'session_active', 'width'=>'25',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
+                $column_model = array(
+                    array('name'=>'name', 'index'=>'s.name', 'width'=>'200', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'display_start_date', 'index'=>'display_start_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_today', 'sopt' => $date_operators)),
+                    array('name'=>'display_end_date', 'index'=>'display_end_date', 'width'=>'70', 'align'=>'left', 'search' => 'true', 'searchoptions' => array('dataInit' => 'date_pick_one_month', 'sopt' => $date_operators)),
+                    array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'70', 'align'=>'left', 'search' => 'false', 'searchoptions' => array('sopt' => $operators)),
+                    array('name'=>'session_active', 'index'=>'session_active', 'width'=>'25', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
                         // for the bottom bar
                         'searchoptions' => array(
                             'defaultValue'  => '1',
@@ -7060,8 +7060,8 @@ 
                         // for the top bar
                         'editoptions' => array('value' => '" ":'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive')),
                     ),
-                    array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
-                    array('name'=>'course_title',    'index'=>'course_title',   'width'=>'50',   'hidden' => 'true', 'search' => 'true', 'searchoptions' => array('searchhidden' =>'true','sopt' => $operators)),
+                    array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
+                    array('name'=>'course_title', 'index'=>'course_title', 'width'=>'50', 'hidden' => 'true', 'search' => 'true', 'searchoptions' => array('searchhidden' =>'true', 'sopt' => $operators)),
                 );
                 break;
         }
@@ -7070,14 +7070,14 @@ 
         $session_field = new ExtraField('session');
         $rules = $session_field->getRules($columns, $column_model);
 
-        $column_model[] = array('name'=>'actions', 'index'=>'actions', 'width'=>'80',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false');
+        $column_model[] = array('name'=>'actions', 'index'=>'actions', 'width'=>'80', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false');
         $columns[] = get_lang('Actions');
 
         foreach ($column_model as $col_model) {
             $simple_column_name[] = $col_model['name'];
         }
 
-        $return_array =  array(
+        $return_array = array(
             'columns' => $columns,
             'column_model' => $column_model,
             'rules' => $rules,
@@ -7166,7 +7166,7 @@ 
             if (api_is_session_admin() &&
                 api_get_setting('allow_session_admins_to_manage_all_sessions') == 'false'
             ) {
-                $where.=" AND s.session_admin_id = $user_id ";
+                $where .= " AND s.session_admin_id = $user_id ";
             }
         }
 
@@ -7249,11 +7249,11 @@ 
             }
             $options['where'] = str_replace('course_title', 'c.title', $options['where']);
 
-            $options['where'] = str_replace("( session_active = '0' )", '1=1',  $options['where']);
+            $options['where'] = str_replace("( session_active = '0' )", '1=1', $options['where']);
 
             $options['where'] = str_replace(
                 array("AND session_active = '1'  )", " AND (  session_active = '1'  )"),
-                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 " )
+                array(') GROUP BY s.name HAVING session_active = 1 ', " GROUP BY s.name HAVING session_active = 1 ")
                 , $options['where']
             );
 
@@ -7288,10 +7288,10 @@ 
             $where;
 
         if (api_is_multiple_url_enabled()) {
-            $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
-                $where.= " AND ar.access_url_id = $access_url_id ";
+                $where .= " AND ar.access_url_id = $access_url_id ";
                 $query = "$select
                     FROM $tbl_session s
                     LEFT JOIN $tbl_session_field_values fv ON (fv.session_id = s.id)
@@ -7318,7 +7318,7 @@ 
         $formatted_sessions = array();
 
         if (Database::num_rows($result)) {
-            $sessions   = Database::store_result($result, 'ASSOC');
+            $sessions = Database::store_result($result, 'ASSOC');
             foreach ($sessions as $session) {
                 $session_id = $session['id'];
                 $session['name'] = Display::url($session['name'], "resume_session.php?id_session=".$session['id']);
@@ -7333,14 +7333,14 @@ 
 
                 switch ($session['visibility']) {
                     case SESSION_VISIBLE_READ_ONLY: //1
-                        $session['visibility'] =  get_lang('ReadOnly');
+                        $session['visibility'] = get_lang('ReadOnly');
                         break;
                     case SESSION_VISIBLE:           //2
                     case SESSION_AVAILABLE:         //4
-                        $session['visibility'] =  get_lang('Visible');
+                        $session['visibility'] = get_lang('Visible');
                         break;
                     case SESSION_INVISIBLE:         //3
-                        $session['visibility'] =  api_ucfirst(get_lang('Invisible'));
+                        $session['visibility'] = api_ucfirst(get_lang('Invisible'));
                         break;
                 }
 
@@ -7416,7 +7416,7 @@ 
         if (empty($session)) {
             return false;
         }
-        return api_get_path(WEB_CODE_PATH) . 'session/resume_session.php?id_session=' . $id;
+        return api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$id;
     }
 
     /**
@@ -7434,7 +7434,7 @@ 
             return false;
         }
         if (empty($courseId)) {
-            return api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . $id;
+            return api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$id;
         } else {
             $courseInfo = api_get_course_info_by_id($courseId);
             if ($courseInfo) {
@@ -7680,7 +7680,7 @@ 
             // sort $listCat by catSessionName
             usort($listCat, 'self::compareBySessionName');
             // in each catSession sort sessionList by sessionName
-            foreach($listCat as $i => $listCatSessionInfo) {
+            foreach ($listCat as $i => $listCatSessionInfo) {
                 $listSessionList = $listCatSessionInfo['sessionList'];
                 usort($listSessionList, 'self::compareCatSessionInfo');
                 $listCat[$i]['sessionList'] = $listSessionList;
@@ -7695,8 +7695,8 @@ 
             );
 
             $userCatId = intval($userCatId);
-            $listResults[$userCatId]['courseInUserCategoryId'] =  $userCatId;
-            $listResults[$userCatId]['courseInUserCategoryTitle'] =  $userCatTitle;
+            $listResults[$userCatId]['courseInUserCategoryId'] = $userCatId;
+            $listResults[$userCatId]['courseInUserCategoryTitle'] = $userCatTitle;
             $listResults[$userCatId]['courseInUserCatList'][] = $listOneCourse;
         }
 
@@ -7722,7 +7722,7 @@ 
     {
         if ($listA['sessionName'] == $listB['sessionName']) {
             return 0;
-        } else if($listA['sessionName'] > $listB['sessionName']) {
+        } else if ($listA['sessionName'] > $listB['sessionName']) {
             return 1;
         } else {
             return -1;
@@ -7742,7 +7742,7 @@ 
             return 1;
         } else if ($listA['catSessionName'] == $listB['catSessionName']) {
             return 0;
-        } else if($listA['catSessionName'] > $listB['catSessionName']) {
+        } else if ($listA['catSessionName'] > $listB['catSessionName']) {
             return 1;
         } else {
             return -1;
@@ -7758,7 +7758,7 @@ 
     {
         if ($listA['courseInUserCategoryTitle'] == $listB['courseInUserCategoryTitle']) {
             return 0;
-        } else if($listA['courseInUserCategoryTitle'] > $listB['courseInUserCategoryTitle']) {
+        } else if ($listA['courseInUserCategoryTitle'] > $listB['courseInUserCategoryTitle']) {
             return 1;
         } else {
             return -1;
@@ -7774,7 +7774,7 @@ 
     {
         if ($listA['title'] == $listB['title']) {
             return 0;
-        } else if($listA['title'] > $listB['title']) {
+        } else if ($listA['title'] > $listB['title']) {
             return 1;
         } else {
             return -1;
@@ -7820,8 +7820,8 @@ 
 
                 $marginShift = 20;
                 if ($catSessionName != '') {
-                    $htmlCatSessions .= '<div style="margin-left:'.$marginShift.'px;">' .
-                        CourseManager::course_item_html($listParamsCatSession, true) . '</div>';
+                    $htmlCatSessions .= '<div style="margin-left:'.$marginShift.'px;">'.
+                        CourseManager::course_item_html($listParamsCatSession, true).'</div>';
                     $marginShift = 40;
                 }
 

main/inc/lib/conditional_login.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) {
                         $_SESSION['conditional_login']['uid'] = $user['user_id'];
                         $_SESSION['conditional_login']['can_login'] = false;
-                        header("Location:". $condition['url']);
+                        header("Location:".$condition['url']);
                         exit();
                     }
                 }

main/inc/lib/image.lib.php

Indentation +120 added lines, -120 removed lines

@@ -47,7 +47,7 @@ 
             if ($height >= $max_size_for_picture) {
                 // scale width
                 $new_width = round($width * ($max_size_for_picture / $height));
-                 $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
+                    $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
             }
         }
     }
@@ -149,7 +149,7 @@ 
 
     public function __construct($path)
     {
-          parent::__construct($path);
+            parent::__construct($path);
     }
 
     public function set_image_wrapper()
@@ -184,19 +184,19 @@ 
         }
     }
 
-	public function get_image_size()
+    public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
-	    if ($this->image_validated) {
+        $imagesize = array('width'=>0,'height'=>0);
+        if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
-	    }
-	    return $imagesize;
-	}
+        }
+        return $imagesize;
+    }
 
-	//@todo implement border logic case for Imagick
-	public function resize($thumbw, $thumbh, $border, $specific_size = false)
+    //@todo implement border logic case for Imagick
+    public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
 
         if ($specific_size) {
             $width = $thumbw;
@@ -206,10 +206,10 @@ 
             $width  = (int)($this->width * $scale);
             $height = (int)($this->height * $scale);
         }
-		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
-		$this->width  = $thumbw;
-		$this->height = $thumbh;
-	}
+        $result = $this->image->resizeImage($width, $height, $this->filter, 1);
+        $this->width  = $thumbw;
+        $this->height = $thumbh;
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -224,8 +224,8 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->image->cropimage($width, $height, $x, $y);
-		$this->width  = $width;
-		$this->height = $height;
+        $this->width  = $width;
+        $this->height = $height;
     }
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
@@ -235,35 +235,35 @@ 
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				break;
-		}
-		$result = false;
-		try {
-		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                break;
+        }
+        $result = false;
+        try {
+            $result = $this->image->writeImage($file);
+        } catch(ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
-		if (!$file) {
-		    echo $this->image;
-		    $this->image->clear();
+        if (!$file) {
+            echo $this->image;
+            $this->image->clear();
             $this->image->destroy();
-		} else {
-		    $this->image->clear();
+        } else {
+            $this->image->clear();
             $this->image->destroy();
-		    return $result;
-		}
-	}
+            return $result;
+        }
+    }
 
 }
 
@@ -285,21 +285,21 @@ 
         $this->fill_image_info();
 
         switch ($this->type) {
-        	case 0:
-        		$handler = false;
-        		break;
-		    case 1 :
+            case 0:
+                $handler = false;
+                break;
+            case 1 :
                 $handler = @imagecreatefromgif($this->path);
                 $this->type = 'gif';
                 break;
-		    case 2 :
+            case 2 :
                 $handler = @imagecreatefromjpeg($this->path);
                 $this->type = 'jpg';
                 break;
-		    case 3 :
-		        $handler = @imagecreatefrompng($this->path);
-		        $this->type = 'png';
-		        break;
+            case 3 :
+                $handler = @imagecreatefrompng($this->path);
+                $this->type = 'png';
+                break;
         }
         if ($handler) {
             $this->image_validated = true;
@@ -313,29 +313,29 @@ 
     {
         $return_array = array('width'=>0,'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+            $return_array = array('width'=>$this->width,'height'=>$this->height);
         }
         return $return_array;
-	}
+    }
 
     public function fill_image_info()
     {
-    	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
-			$this->width    = $image_info[0];
-			$this->height   = $image_info[1];
-			$this->type     = $image_info[2];
-    	} else {
-    		$this->width    = 0;
-    		$this->height   = 0;
-    		$this->type     = 0;
-    	}
+        if (file_exists($this->path)) {
+            $image_info     = getimagesize($this->path);
+            $this->width    = $image_info[0];
+            $this->height   = $image_info[1];
+            $this->type     = $image_info[2];
+        } else {
+            $this->width    = 0;
+            $this->height   = 0;
+            $this->type     = 0;
+        }
     }
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;
-		if ($border == 1) {
+        if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -344,17 +344,17 @@ 
                 $width = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
-			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			if (!empty($this->color)) {
-				@imagefill($dst_img, 0, 0, $this->color);
-			}
-			$this->width = $thumbw;
-			$this->height = $thumbh;
-		} elseif ($border == 0) {
+            $deltaw = (int)(($thumbw - $width) / 2);
+            $deltah = (int)(($thumbh - $height) / 2);
+            $dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            if (!empty($this->color)) {
+                @imagefill($dst_img, 0, 0, $this->color);
+            }
+            $this->width = $thumbw;
+            $this->height = $thumbh;
+        } elseif ($border == 0) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -363,19 +363,19 @@ 
                 $width  = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = 0;
-			$deltah = 0;
-			$dst_img = @ImageCreateTrueColor($width, $height);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			$this->width = $width;
-			$this->height = $height;
-		}
-		$src_img = $this->bg;
-		@ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
-		$this->bg = $dst_img;
-		@imagedestroy($src_img);
-	}
+            $deltaw = 0;
+            $deltah = 0;
+            $dst_img = @ImageCreateTrueColor($width, $height);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            $this->width = $width;
+            $this->height = $height;
+        }
+        $src_img = $this->bg;
+        @ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
+        $this->bg = $dst_img;
+        @imagedestroy($src_img);
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -389,7 +389,7 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->width = $width;
-		$this->height = $height;
+        $this->height = $height;
         $src = null;
         $dest = @imagecreatetruecolor($width, $height);
         $type = $this->type;
@@ -400,56 +400,56 @@ 
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagejpeg($dest, $this->path);
                 break;
-		    case 'png' :
+            case 'png' :
                 $src = @imagecreatefrompng($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagepng($dest, $this->path);
                 break;
-		    case 'gif' :
-		        $src = @imagecreatefromgif($this->path);
+            case 'gif' :
+                $src = @imagecreatefromgif($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagegif($dest, $this->path);
-		        break;
+                break;
             default: return 0;
         }
         @imagedestroy($dest);
         @imagedestroy($src);
     }
 
-	public function send_image($file = '', $compress = -1, $convert_file_to = null)
+    public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
-				return imagejpeg($this->bg, $file, $compress);
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagepng($this->bg, $file, $compress);
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagegif($this->bg, $file, $compress);
-				break;
-			default: return 0;
-		}
-		// TODO: Occupied memory is not released, because the following fragment of code is actually dead.
-		@imagedestroy($this->bg);
-	}
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                if ($compress == -1) $compress = 100;
+                return imagejpeg($this->bg, $file, $compress);
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagepng($this->bg, $file, $compress);
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagegif($this->bg, $file, $compress);
+                break;
+            default: return 0;
+        }
+        // TODO: Occupied memory is not released, because the following fragment of code is actually dead.
+        @imagedestroy($this->bg);
+    }
 
     /**
      * Convert image to black & white

Spacing +19 added lines, -19 removed lines

@@ -115,7 +115,7 @@ 
             return false;
         }
         $this->path = preg_match(VALID_WEB_PATH, $path) ? (api_is_internal_path($path) ? api_get_path(TO_SYS, $path) : $path) : $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -157,7 +157,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -165,7 +165,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -186,7 +186,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -203,8 +203,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -250,7 +250,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -311,9 +311,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -321,7 +321,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -341,11 +341,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -360,8 +360,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -419,7 +419,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -463,11 +463,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;
 

Braces +57 added lines, -19 removed lines

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

Doc Comments +16 added lines

@@ -63,6 +63,9 @@ 
         return $image;
     }
 
+    /**
+     * @param string $convert_file_to
+     */
     public function send_image(
         $file = '',
         $compress = -1,
@@ -144,6 +147,9 @@ 
     public $image;
     public $filter = Imagick::FILTER_LANCZOS;
 
+    /**
+     * @param string $path
+     */
     public function __construct($path)
     {
           parent::__construct($path);
@@ -191,6 +197,10 @@ 
 	}
 
 	//@todo implement border logic case for Imagick
+
+	/**
+	 * @param integer $border
+	 */
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
 	    if (!$this->image_validated) return false;
@@ -272,6 +282,9 @@ 
 {
     public $bg;
 
+    /**
+     * @param string $path
+     */
     function __construct($path) {
         parent::__construct($path);
     }
@@ -329,6 +342,9 @@ 
     	}
     }
 
+    /**
+     * @param integer $border
+     */
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;

main/inc/lib/timeline.lib.php

Indentation +23 added lines, -23 removed lines

@@ -25,10 +25,10 @@ 
     );
     public $is_course_model = true;
 
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_course_table(TABLE_TIMELINE);
-	}
+    }
 
     /**
      * Get the count of elements
@@ -52,16 +52,16 @@ 
     /**
      * Displays the title + grid
      */
-	public function listing()
+    public function listing()
     {
-		// action links
-		$html = '<div class="actions">';
+        // action links
+        $html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
-		$html .= '</div>';
+        $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+        $html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
-	}
+    }
 
     public function get_status_list()
     {
@@ -89,7 +89,7 @@ 
 
         $form->addElement('text', 'headline', get_lang('Name'), array('size' => '70'));
         //$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'Careers','Width' => '100%', 'Height' => '250'));
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             //$form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -173,7 +173,7 @@ 
 
         // Setting the rules
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
-		return $form;
+        return $form;
 
     }
 
@@ -184,11 +184,11 @@ 
     public function save_item($params)
     {
         $params['c_id'] = api_get_course_int_id();
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     /**
@@ -199,16 +199,16 @@ 
         $params['c_id'] = api_get_course_int_id();
         $params['parent_id'] = '0';
         $params['type'] = 'default';
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     public function delete($id) {
-	    parent::delete($id);
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        parent::delete($id);
+        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
 
     public function get_url($id) {
@@ -247,7 +247,7 @@ 
         $item['asset'] = array( 'media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
-         );
+            );
 
         //Cleaning items
         unset($item['id']);

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
 	public function __construct()
     {
-        $this->table =  Database::get_course_table(TABLE_TIMELINE);
+        $this->table = Database::get_course_table(TABLE_TIMELINE);
 	}
 
     /**
@@ -46,7 +46,7 @@ 
      */
     public function get_all($where_conditions = array())
     {
-        return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC'));
+        return Database::select('*', $this->table, array('where'=>$where_conditions, 'order' =>'headline ASC'));
     }
 
     /**
@@ -57,7 +57,7 @@ 
 		// action links
 		$html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', '32').'</a>';
 		$html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
@@ -244,7 +244,7 @@ 
         }
         unset($item['end_date']);
         // Assets
-        $item['asset'] = array( 'media'     => $item['media'],
+        $item['asset'] = array('media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
          );

main/inc/lib/urlmanager.lib.php

Indentation +66 added lines, -66 removed lines

@@ -11,15 +11,15 @@ 
 class UrlManager
 {
     /**
-    * Creates a new url access
-    *
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	string	$url The URL of the site
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return boolean if success
-    */
+     * Creates a new url access
+     *
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	string	$url The URL of the site
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return boolean if success
+     */
     public static function add($url, $description, $active)
     {
         $tms = time();
@@ -36,15 +36,15 @@ 
     }
 
     /**
-    * Updates an URL access
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	int 	$url_id The url id
-    * @param	string 	$url
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return 	boolean if success
-    */
+     * Updates an URL access
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	int 	$url_id The url id
+     * @param	string 	$url
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return 	boolean if success
+     */
     public static function update($url_id, $url, $description, $active)
     {
         $url_id = intval($url_id);
@@ -63,12 +63,12 @@ 
     }
 
     /**
-    * Deletes an url
-    * @author Julio Montoya
-    * @param int $id url id
+     * Deletes an url
+     * @author Julio Montoya
+     * @param int $id url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete($id)
     {
         $id = intval($id);
@@ -200,12 +200,12 @@ 
     }
 
     /**
-    * Gets the inner join of access_url and the course table
-    *
-    * @author Julio Montoya
-    * @param int  access url id
-    * @return array   Database::store_result of the result
-    **/
+     * Gets the inner join of access_url and the course table
+     *
+     * @author Julio Montoya
+     * @param int  access url id
+     * @return array   Database::store_result of the result
+     **/
     public static function get_url_rel_course_data($access_url_id = null)
     {
         $where = '';
@@ -362,12 +362,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a User (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a User (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_user_exist($user_id, $url_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -377,15 +377,15 @@ 
         $num = Database::num_rows($result);
 
         return $num;
-	}
+    }
 
     /**
-    * Checks the relationship between an URL and a Course (return the num_rows)
-    * @author Julio Montoya
-    * @param int $courseId
-    * @param int $urlId
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Course (return the num_rows)
+     * @author Julio Montoya
+     * @param int $courseId
+     * @param int $urlId
+     * @return boolean true if success
+     * */
     public static function relation_url_course_exist($courseId, $urlId)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -420,12 +420,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a Session (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Session (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
         $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -737,13 +737,13 @@ 
     }
 
     /**
-    * Deletes an url and user relationship
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
+     * Deletes an url and user relationship
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_user($user_id, $url_id)
     {
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -758,13 +758,13 @@ 
     }
 
     /**
-    * Deletes an url and course relationship
-    * @author Julio Montoya
-    * @param  int  $courseId
-    * @param  int  $urlId
+     * Deletes an url and course relationship
+     * @author Julio Montoya
+     * @param  int  $courseId
+     * @param  int  $urlId
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
         $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -814,13 +814,13 @@ 
     }
 
     /**
-    * Deletes an url and session relationship
-    * @author Julio Montoya
-    * @param  char  course code
-    * @param  int url id
+     * Deletes an url and session relationship
+     * @author Julio Montoya
+     * @param  char  course code
+     * @param  int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_session($session_id, $url_id)
     {
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);

Doc Comments +16 added lines, -13 removed lines

@@ -18,7 +18,7 @@ 
     * @param	string	$url The URL of the site
     * @param	string  $description The description of the site
     * @param	int		$active is active or not
-    * @return boolean if success
+    * @return Doctrine\DBAL\Driver\Statement|null if success
     */
     public static function add($url, $description, $active)
     {
@@ -43,7 +43,7 @@ 
     * @param	string 	$url
     * @param	string  $description The description of the site
     * @param	int		$active is active or not
-    * @return 	boolean if success
+    * @return 	Doctrine\DBAL\Driver\Statement|null if success
     */
     public static function update($url_id, $url, $description, $active)
     {
@@ -386,7 +386,7 @@ 
     * @author Julio Montoya
     * @param int user id
     * @param int url id
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_user_exist($user_id, $url_id)
     {
@@ -404,7 +404,7 @@ 
     * @author Julio Montoya
     * @param int $courseId
     * @param int $urlId
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_course_exist($courseId, $urlId)
     {
@@ -425,7 +425,7 @@ 
      * @author Julio Montoya
      * @param int $userGroupId
      * @param int $urlId
-     * @return boolean true if success
+     * @return integer true if success
      * */
     public static function relationUrlUsergroupExist($userGroupId, $urlId)
     {
@@ -445,7 +445,7 @@ 
     * @author Julio Montoya
     * @param int user id
     * @param int url id
-    * @return boolean true if success
+    * @return integer true if success
     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
@@ -568,6 +568,8 @@ 
      * @author Julio Montoya
      * @param  array of course ids
      * @param  array of url_ids
+     * @param integer[] $courseCategoryList
+     * @param integer[] $urlList
      * @return array
      **/
     public static function addCourseCategoryListToUrl($courseCategoryList, $urlList)
@@ -598,7 +600,7 @@ 
      * @author Julio Montoya
      * @param int $categoryCourseId
      * @param int $urlId
-     * @return boolean true if success
+     * @return integer true if success
      * */
     public static function relationUrlCourseCategoryExist($categoryCourseId, $urlId)
     {
@@ -615,7 +617,7 @@ 
     /**
      * @param int $userGroupId
      * @param int $urlId
-     * @return int
+     * @return string
      */
     public static function addUserGroupToUrl($userGroupId, $urlId)
     {
@@ -716,7 +718,7 @@ 
      * @param int $courseId
      * @param int $url_id
      *
-     * @return resource
+     * @return boolean
      */
     public static function add_course_to_url($courseId, $url_id = 1)
     {
@@ -807,7 +809,7 @@ 
     * @param  int  $courseId
     * @param  int  $urlId
      *
-    * @return boolean true if success
+    * @return Doctrine\DBAL\Driver\Statement|null true if success
     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
@@ -825,7 +827,7 @@ 
      * @param  int $userGroupId
      * @param  int $urlId
      *
-     * @return boolean true if success
+     * @return Doctrine\DBAL\Driver\Statement|null true if success
      * */
     public static function delete_url_rel_usergroup($userGroupId, $urlId)
     {
@@ -844,7 +846,7 @@ 
      * @param  int $userGroupId
      * @param  int $urlId
      *
-     * @return boolean true if success
+     * @return Doctrine\DBAL\Driver\Statement|null true if success
      * */
     public static function deleteUrlRelCourseCategory($userGroupId, $urlId)
     {
@@ -862,8 +864,9 @@ 
     * @author Julio Montoya
     * @param  char  course code
     * @param  int url id
+    * @param integer $url_id
      *
-    * @return boolean true if success
+    * @return Doctrine\DBAL\Driver\Statement|null true if success
     * */
     public static function delete_url_rel_session($session_id, $url_id)
     {

Spacing +40 added lines, -40 removed lines

@@ -23,7 +23,7 @@ 
     public static function add($url, $description, $active)
     {
         $tms = time();
-        $table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "INSERT INTO $table
                 SET url 	= '".Database::escape_string($url)."',
                 description = '".Database::escape_string($description)."',
@@ -92,7 +92,7 @@ 
         $sql = "DELETE FROM $tableUser WHERE access_url_id = ".$id;
         Database::query($sql);
 
-        $sql= "DELETE FROM $table WHERE id = ".$id;
+        $sql = "DELETE FROM $table WHERE id = ".$id;
         Database::query($sql);
 
         return true;
@@ -105,7 +105,7 @@ 
      */
     public static function url_exist($url)
     {
-        $table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT id FROM $table
                 WHERE url = '".Database::escape_string($url)."' ";
         $res = Database::query($sql);
@@ -139,10 +139,10 @@ 
      * */
     public static function url_count()
     {
-        $table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT count(id) as count_result FROM $table_access_url";
         $res = Database::query($sql);
-        $url = Database::fetch_array($res,'ASSOC');
+        $url = Database::fetch_array($res, 'ASSOC');
         $result = $url['count_result'];
 
         return $result;
@@ -160,7 +160,7 @@ 
                 FROM $table
                 ORDER BY id";
         $res = Database::query($sql);
-        $urls = array ();
+        $urls = array();
         while ($url = Database::fetch_array($res)) {
             $urls[] = $url;
         }
@@ -277,7 +277,7 @@ 
      **/
     public static function get_url_rel_session_data($access_url_id = null)
     {
-        $where ='';
+        $where = '';
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 
@@ -313,7 +313,7 @@ 
         $table_user_group = Database::get_main_table(TABLE_USERGROUP);
 
         if (!empty($access_url_id)) {
-            $where ="WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
+            $where = "WHERE $table_url_rel_usergroup.access_url_id = ".intval($access_url_id);
         }
 
         $sql = "SELECT id, name, access_url_id
@@ -391,7 +391,7 @@ 
     public static function relation_url_user_exist($user_id, $url_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $sql= "SELECT user_id FROM $table
+        $sql = "SELECT user_id FROM $table
                WHERE access_url_id = ".intval($url_id)." AND user_id = ".intval($user_id)." ";
         $result = Database::query($sql);
         $num = Database::num_rows($result);
@@ -409,7 +409,7 @@ 
     public static function relation_url_course_exist($courseId, $urlId)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql= "SELECT c_id FROM $table_url_rel_course
+        $sql = "SELECT c_id FROM $table_url_rel_course
                WHERE
                     access_url_id = ".intval($urlId)." AND
                     c_id = '".intval($courseId)."'";
@@ -430,7 +430,7 @@ 
     public static function relationUrlUsergroupExist($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
-        $sql= "SELECT usergroup_id FROM $table
+        $sql = "SELECT usergroup_id FROM $table
                WHERE 
                     access_url_id = ".intval($urlId)." AND
                     usergroup_id = ".intval($userGroupId);
@@ -449,9 +449,9 @@ 
     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
-        $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $session_id = intval($session_id);
-        $url_id		= intval($url_id);
+        $url_id = intval($url_id);
         $sql = "SELECT session_id FROM $table_url_rel_session
                 WHERE
                     access_url_id = ".intval($url_id)." AND
@@ -477,7 +477,7 @@ 
         if (is_array($user_list) && is_array($url_list)) {
             foreach ($url_list as $url_id) {
                 foreach ($user_list as $user_id) {
-                    $count = UrlManager::relation_url_user_exist($user_id,$url_id);
+                    $count = UrlManager::relation_url_user_exist($user_id, $url_id);
                     if ($count == 0) {
                         $sql = "INSERT INTO $table_url_rel_user
                                 SET 
@@ -505,19 +505,19 @@ 
      * @param  array of url_ids
      * @return array
      **/
-    public static function add_courses_to_urls($course_list,$url_list)
+    public static function add_courses_to_urls($course_list, $url_list)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
         $result_array = array();
 
-        if (is_array($course_list) && is_array($url_list)){
+        if (is_array($course_list) && is_array($url_list)) {
             foreach ($url_list as $url_id) {
                 foreach ($course_list as $course_code) {
                     $courseInfo = api_get_course_info($course_code);
                     $courseId = $courseInfo['real_id'];
 
                     $count = self::relation_url_course_exist($courseId, $url_id);
-                    if ($count==0) {
+                    if ($count == 0) {
                         $sql = "INSERT INTO $table_url_rel_course
                                 SET c_id = '".$courseId."', access_url_id = ".intval($url_id);
                         $result = Database::query($sql);
@@ -603,7 +603,7 @@ 
     public static function relationUrlCourseCategoryExist($categoryCourseId, $urlId)
     {
         $table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql= "SELECT course_category_id FROM $table
+        $sql = "SELECT course_category_id FROM $table
                WHERE access_url_id = ".intval($urlId)." AND
                      course_category_id = ".intval($categoryCourseId);
         $result = Database::query($sql);
@@ -773,7 +773,7 @@ 
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $result = true;
         if (!empty($user_id) && !empty($url_id)) {
-            $sql= "DELETE FROM $table_url_rel_user
+            $sql = "DELETE FROM $table_url_rel_user
                    WHERE user_id = ".intval($user_id)." AND access_url_id = ".intval($url_id);
             $result = Database::query($sql);
         }
@@ -793,7 +793,7 @@ 
         $table_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $result = true;
         if (!empty($userId)) {
-            $sql= "DELETE FROM $table_url_rel_user
+            $sql = "DELETE FROM $table_url_rel_user
                    WHERE user_id = ".intval($userId);
             Database::query($sql);
         }
@@ -811,8 +811,8 @@ 
     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
-        $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql= "DELETE FROM $table_url_rel_course
+        $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+        $sql = "DELETE FROM $table_url_rel_course
                WHERE c_id = '".intval($courseId)."' AND access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
 
@@ -830,7 +830,7 @@ 
     public static function delete_url_rel_usergroup($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USERGROUP);
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE usergroup_id = '".intval($userGroupId)."' AND
                      access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
@@ -849,7 +849,7 @@ 
     public static function deleteUrlRelCourseCategory($userGroupId, $urlId)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql= "DELETE FROM $table
+        $sql = "DELETE FROM $table
                WHERE course_category_id = '".intval($userGroupId)."' AND
                      access_url_id=".intval($urlId)."  ";
         $result = Database::query($sql);
@@ -868,9 +868,9 @@ 
     public static function delete_url_rel_session($session_id, $url_id)
     {
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-        $sql= "DELETE FROM $table_url_rel_session
+        $sql = "DELETE FROM $table_url_rel_session
                WHERE session_id = ".intval($session_id)." AND access_url_id=".intval($url_id)."  ";
-        $result = Database::query($sql,'ASSOC');
+        $result = Database::query($sql, 'ASSOC');
 
         return $result;
     }
@@ -883,7 +883,7 @@ 
      * */
     public static function update_urls_rel_user($user_list, $access_url_id)
     {
-        $table_url_rel_user	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $sql = "SELECT user_id FROM $table_url_rel_user WHERE access_url_id = ".intval($access_url_id);
         $result = Database::query($sql);
         $existing_users = array();
@@ -937,7 +937,7 @@ 
         $result = Database::query($sql);
 
         $existing_courses = array();
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existing_courses[] = $row['c_id'];
         }
 
@@ -970,7 +970,7 @@ 
         $result = Database::query($sql);
         $existingItems = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existingItems[] = $row['usergroup_id'];
         }
 
@@ -1003,7 +1003,7 @@ 
         $result = Database::query($sql);
         $existingItems = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existingItems[] = $row['course_category_id'];
         }
 
@@ -1044,13 +1044,13 @@ 
      * */
     public static function update_urls_rel_session($session_list, $access_url_id)
     {
-        $table_url_rel_session	= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
         $sql = "SELECT session_id FROM $table_url_rel_session WHERE access_url_id=".intval($access_url_id);
         $result = Database::query($sql);
         $existing_sessions = array();
 
-        while ($row = Database::fetch_array($result)){
+        while ($row = Database::fetch_array($result)) {
             $existing_sessions[] = $row['session_id'];
         }
 
@@ -1080,13 +1080,13 @@ 
      */
     public static function get_access_url_from_user($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);
+        $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table_url_rel_user url_rel_user INNER JOIN $table_url u
                 ON (url_rel_user.access_url_id = u.id)
                 WHERE user_id = ".intval($user_id);
         $result = Database::query($sql);
-        $url_list = Database::store_result($result,'ASSOC');
+        $url_list = Database::store_result($result, 'ASSOC');
 
         return $url_list;
     }
@@ -1097,14 +1097,14 @@ 
      */
     public static function get_access_url_from_course($courseId)
     {
-        $table	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $table_url	= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table c INNER JOIN $table_url u
                 ON (c.access_url_id = u.id)
                 WHERE c_id = ".intval($courseId);
 
         $result = Database::query($sql);
-        $url_list = Database::store_result($result,'ASSOC');
+        $url_list = Database::store_result($result, 'ASSOC');
         return $url_list;
     }
 
@@ -1115,7 +1115,7 @@ 
     public static function get_access_url_from_session($session_id)
     {
         $table_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
-        $table_url  = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT url, access_url_id FROM $table_url_rel_session url_rel_session INNER JOIN $table_url u
                 ON (url_rel_session.access_url_id = u.id)
                 WHERE session_id = ".intval($session_id);
@@ -1131,7 +1131,7 @@ 
      */
     public static function get_url_id($url)
     {
-        $table_access_url= Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
+        $table_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
         $sql = "SELECT id FROM $table_access_url WHERE url = '".Database::escape_string($url)."'";
         $result = Database::query($sql);
         $access_url_id = Database::result($result, 0, 0);

main/inc/lib/tracking.lib.php

Braces +74 added lines, -31 removed lines

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

Doc Comments +13 added lines, -6 removed lines

@@ -1333,6 +1333,8 @@ 
      * @param   string type of time filter: 'last_week' or 'custom'
      * @param   string  start date date('Y-m-d H:i:s')
      * @param   string  end date date('Y-m-d H:i:s')
+     * @param string $start_date
+     * @param string $end_date
      * @return timestamp $nb_seconds
      */
     public static function get_time_spent_on_the_platform(
@@ -1435,7 +1437,7 @@ 
      * Get first connection date for a student
      * @param    int $student_id
      *
-     * @return    string|bool Date format long without day or false if there are no connections
+     * @return    string|false Date format long without day or false if there are no connections
      */
     public static function get_first_connection_date($student_id)
     {
@@ -1465,7 +1467,7 @@ 
      * @param int $student_id
      * @param bool $warning_message Show a warning message (optional)
      * @param bool $return_timestamp True for returning results in timestamp (optional)
-     * @return string|int|bool Date format long without day, false if there are no connections or
+     * @return string Date format long without day, false if there are no connections or
      * timestamp if parameter $return_timestamp is true
      */
     public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false)
@@ -2762,6 +2764,9 @@ 
      * @param     array         Limit average to listed lp ids
      * @param     int            Session id (optional), if param $session_id is
      * null(default) it'll return results including sessions, 0 = session is not filtered
+     * @param integer $student_id
+     * @param string $course_code
+     * @param integer $session_id
      * @return     int         Total time
      */
     public static function get_time_spent_in_lp($student_id, $course_code, $lp_ids = array(), $session_id = null)
@@ -2831,6 +2836,8 @@ 
      * @param     int|array    Student id(s)
      * @param     string         Course code
      * @param     int         Learning path id
+     * @param integer $student_id
+     * @param string $course_code
      * @return     int         Total time
      */
     public static function get_last_connection_time_in_lp($student_id, $course_code, $lp_id, $session_id = 0)
@@ -5504,7 +5511,7 @@ 
 
     /**
     * @param FormValidator $form
-    * @return mixed
+    * @return FormValidator
     */
     public static function setUserSearchForm($form)
     {
@@ -6985,7 +6992,7 @@ 
      * @param int $user_id
      * @param int $course_id
      * @param int $session_id
-     * @return array
+     * @return string[]
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
@@ -7031,9 +7038,9 @@ 
     /**
      * Displays the exercise results for a specific user in a specific course.
      * @param   string $view
-     * @param   int $user_id    User ID
+     * @param   int $userId    User ID
      * @param   string  $courseCode Course code
-     * @return array
+     * @return string[]
      * @todo remove globals
      */
     public function display_exercise_tracking_info($view, $userId, $courseCode)

Indentation +861 added lines, -861 removed lines

@@ -311,8 +311,8 @@ 
                     $extend_link = '';
                     if (!empty($inter_num)) {
                         $extend_link = Display::url(
-                              Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                              api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
+                                Display::return_icon('visible.gif', get_lang('HideAttemptView')),
+                                api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
                         );
                     }
                     $title = $row['mytitle'];
@@ -1365,7 +1365,7 @@ 
             case 'last_30_days':
                 $new_date = date('Y-m-d H:i:s', strtotime('-30 day'));
                 $condition_time = ' AND (login_date >= "'.$new_date.'" AND logout_date <= "'.$today.'") ';
-               break;
+                break;
             case 'custom':
                 if (!empty($start_date) && !empty($end_date)) {
                     $start_date = Database::escape_string($start_date);
@@ -1375,10 +1375,10 @@ 
                 break;
         }
 
-    	$sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
+        $sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
     	        FROM '.$tbl_track_login.'
                 WHERE '.$userCondition.$condition_time;
-    	$rs = Database::query($sql);
+        $rs = Database::query($sql);
         $row = Database::fetch_array($rs, 'ASSOC');
         $diff = $row['diff'];
 
@@ -1400,18 +1400,18 @@ 
     public static function get_time_spent_on_the_course($user_id, $courseId, $session_id = 0)
     {
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-
-    	$tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	if (is_array($user_id)) {
-    	    $user_id = array_map('intval', $user_id);
-    		$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
-    	} else {
-    		$user_id = intval($user_id);
-    		$condition_user = " AND user_id = $user_id ";
-    	}
-
-    	$sql = "SELECT
+        $session_id  = intval($session_id);
+
+        $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        if (is_array($user_id)) {
+            $user_id = array_map('intval', $user_id);
+            $condition_user = " AND user_id IN (".implode(',',$user_id).") ";
+        } else {
+            $user_id = intval($user_id);
+            $condition_user = " AND user_id = $user_id ";
+        }
+
+        $sql = "SELECT
     	        SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
                 FROM $tbl_track_course
                 WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) ";
@@ -1426,9 +1426,9 @@ 
 
         $sql .= $condition_user;
         $rs = Database::query($sql);
-    	$row = Database::fetch_array($rs);
+        $row = Database::fetch_array($rs);
 
-    	return $row['nb_seconds'];
+        return $row['nb_seconds'];
     }
 
     /**
@@ -1439,25 +1439,25 @@ 
      */
     public static function get_first_connection_date($student_id)
     {
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $tbl_track_login . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date ASC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs)>0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
                 return api_convert_and_format_date(
                     $first_login_date,
                     DATE_FORMAT_SHORT,
                     date_default_timezone_get()
                 );
-    		}
-    	}
+            }
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -1470,38 +1470,38 @@ 
      */
     public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false)
     {
-    	$table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $table . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date
                 DESC LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
-    			$last_login_date = api_get_local_time($last_login_date);
-    			if ($return_timestamp) {
-    				return api_strtotime($last_login_date,'UTC');
-    			} else {
-    				if (!$warning_message) {
-    					return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					$timestamp = api_strtotime($last_login_date,'UTC');
-    					$currentTimestamp = time();
-
-    					//If the last connection is > than 7 days, the text is red
-    					//345600 = 7 days in seconds
-    					if ($currentTimestamp - $timestamp > 604800) {
-    						return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
-    					} else {
-    						return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
+                $last_login_date = api_get_local_time($last_login_date);
+                if ($return_timestamp) {
+                    return api_strtotime($last_login_date,'UTC');
+                } else {
+                    if (!$warning_message) {
+                        return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        $timestamp = api_strtotime($last_login_date,'UTC');
+                        $currentTimestamp = time();
+
+                        //If the last connection is > than 7 days, the text is red
+                        //345600 = 7 days in seconds
+                        if ($currentTimestamp - $timestamp > 604800) {
+                            return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
+                        } else {
+                            return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                        }
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1555,30 +1555,30 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	$student_id  = intval($student_id);
+        $student_id  = intval($student_id);
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	$sql = 'SELECT login_course_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $sql = 'SELECT login_course_date
     	        FROM '.$tbl_track_login.'
                 WHERE
                     user_id = '.$student_id.' AND
                     c_id = '.$courseId.' AND
                     session_id = '.$session_id.'
                 ORDER BY login_course_date ASC LIMIT 0,1';
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
-    			if ($convert_date) {
-    				return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
-    			} else {
-    				return $first_login_date;
-    			}
-    		}
-    	}
-
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
+                if ($convert_date) {
+                    return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
+                } else {
+                    return $first_login_date;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -1594,13 +1594,13 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	// protect data
-    	$student_id  = intval($student_id);
+        // protect data
+        $student_id  = intval($student_id);
         $courseId = $courseInfo['real_id'];
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$sql = 'SELECT access_date
+        $tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $sql = 'SELECT access_date
                 FROM '.$tbl_track_e_access.'
                 WHERE   access_user_id = '.$student_id.' AND
                         c_id = "'.$courseId.'" AND
@@ -1608,39 +1608,39 @@ 
                 ORDER BY access_date DESC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
                 if (empty($last_login_date)) {
                     return false;
                 }
                 //see #5736
                 $last_login_date_timestamp = api_strtotime($last_login_date);
-    			$now = time();
-    			//If the last connection is > than 7 days, the text is red
-    			//345600 = 7 days in seconds
-    			if ($now - $last_login_date_timestamp > 604800) {
-    				if ($convert_date) {
+                $now = time();
+                //If the last connection is > than 7 days, the text is red
+                //345600 = 7 days in seconds
+                if ($now - $last_login_date_timestamp > 604800) {
+                    if ($convert_date) {
                         $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
                         $icon = api_is_allowed_to_edit() ?
                             '<a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'">
                               '.Display::return_icon('messagebox_warning.gif').'
                              </a>'
                             : null;
-    					return $icon. Display::label($last_login_date, 'warning');
-    				} else {
-    					return $last_login_date;
-    				}
-    			} else {
-    				if ($convert_date) {
-    					return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					return $last_login_date;
-    				}
-    			}
-    		}
-    	}
-    	return false;
+                        return $icon. Display::label($last_login_date, 'warning');
+                    } else {
+                        return $last_login_date;
+                    }
+                } else {
+                    if ($convert_date) {
+                        return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        return $last_login_date;
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1653,36 +1653,36 @@ 
      */
     public static function get_course_connections_count($courseId, $session_id = 0, $start = 0, $stop = null)
     {
-    	if ($start < 0) {
-    		$start = 0;
-    	}
-    	if (!isset($stop) or ($stop < 0)) {
-    		$stop = api_get_utc_datetime();
-    	}
+        if ($start < 0) {
+            $start = 0;
+        }
+        if (!isset($stop) or ($stop < 0)) {
+            $stop = api_get_utc_datetime();
+        }
 
         $start = Database::escape_string($start);
         $stop = Database::escape_string($stop);
 
-    	$month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' ";
+        $month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' ";
 
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-    	$count = 0;
+        $session_id  = intval($session_id);
+        $count = 0;
 
-    	$tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	$sql = "SELECT count(*) as count_connections
+        $tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $sql = "SELECT count(*) as count_connections
                 FROM $tbl_track_e_course_access
                 WHERE
                     c_id = $courseId AND
                     session_id = $session_id
                     $month_filter";
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
-    		$row = Database::fetch_object($rs);
-    		$count = $row->count_connections;
-    	}
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs)>0) {
+            $row = Database::fetch_object($rs);
+            $count = $row->count_connections;
+        }
 
-    	return $count;
+        return $count;
     }
 
     /**
@@ -1693,25 +1693,25 @@ 
      */
     public static function count_course_per_student($user_id, $include_sessions = true)
     {
-    	$user_id = intval($user_id);
-    	$tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-    	$tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+        $user_id = intval($user_id);
+        $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+        $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
-    	$sql = 'SELECT DISTINCT c_id
+        $sql = 'SELECT DISTINCT c_id
                 FROM ' . $tbl_course_rel_user . '
                 WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH;
-    	$rs = Database::query($sql);
-    	$nb_courses = Database::num_rows($rs);
+        $rs = Database::query($sql);
+        $nb_courses = Database::num_rows($rs);
 
-    	if ($include_sessions) {
-    		$sql = 'SELECT DISTINCT c_id
+        if ($include_sessions) {
+            $sql = 'SELECT DISTINCT c_id
                     FROM ' . $tbl_session_course_rel_user . '
                     WHERE user_id = ' . $user_id;
-    		$rs = Database::query($sql);
-    		$nb_courses += Database::num_rows($rs);
-    	}
+            $rs = Database::query($sql);
+            $nb_courses += Database::num_rows($rs);
+        }
 
-    	return $nb_courses;
+        return $nb_courses;
     }
 
     /**
@@ -1742,25 +1742,25 @@ 
         $into_lp = 0
     ) {
         $course_code = Database::escape_string($course_code);
-    	$course_info = api_get_course_info($course_code);
-    	if (!empty($course_info)) {
-    		// table definition
-    		$tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
-    		$tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-
-    		// Compose a filter based on optional exercise given
-    		$condition_quiz = "";
-    		if (!empty($exercise_id)) {
-    			$exercise_id = intval($exercise_id);
-    			$condition_quiz =" AND id = $exercise_id ";
-    		}
-
-    		// Compose a filter based on optional session id given
-    		$condition_session = "";
-    		if (isset($session_id)) {
-    			$session_id = intval($session_id);
-    			$condition_session = " AND session_id = $session_id ";
-    		}
+        $course_info = api_get_course_info($course_code);
+        if (!empty($course_info)) {
+            // table definition
+            $tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
+            $tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+            // Compose a filter based on optional exercise given
+            $condition_quiz = "";
+            if (!empty($exercise_id)) {
+                $exercise_id = intval($exercise_id);
+                $condition_quiz =" AND id = $exercise_id ";
+            }
+
+            // Compose a filter based on optional session id given
+            $condition_session = "";
+            if (isset($session_id)) {
+                $session_id = intval($session_id);
+                $condition_session = " AND session_id = $session_id ";
+            }
             if ($active_filter == 1) {
                 $condition_active = 'AND active <> -1';
             } elseif ($active_filter == 0) {
@@ -1776,7 +1776,7 @@ 
                 $select_lp_id = ', orig_lp_id as lp_id ';
             }
 
-    		$sql = "SELECT count(id) FROM $tbl_course_quiz
+            $sql = "SELECT count(id) FROM $tbl_course_quiz
     				WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz ";
             $count_quiz = 0;
             $countQuizResult = Database::query($sql);
@@ -1784,21 +1784,21 @@ 
                 $count_quiz = Database::fetch_row($countQuizResult);
             }
 
-    		if (!empty($count_quiz[0]) && !empty($student_id)) {
-    			if (is_array($student_id)) {
+            if (!empty($count_quiz[0]) && !empty($student_id)) {
+                if (is_array($student_id)) {
                     $student_id = array_map('intval', $student_id);
-    				$condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
-    			} else {
+                    $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
+                } else {
                     $student_id = intval($student_id);
-    				$condition_user = " AND exe_user_id = '$student_id' ";
-    			}
+                    $condition_user = " AND exe_user_id = '$student_id' ";
+                }
 
-    			if (empty($exercise_id)) {
-    				$sql = "SELECT id FROM $tbl_course_quiz
+                if (empty($exercise_id)) {
+                    $sql = "SELECT id FROM $tbl_course_quiz
     						WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz";
                     $result = Database::query($sql);
                     $exercise_list = array();
-    				$exercise_id = null;
+                    $exercise_id = null;
                     if (!empty($result) && Database::num_rows($result)) {
                         while ($row = Database::fetch_array($result)) {
                             $exercise_list[] = $row['id'];
@@ -1807,11 +1807,11 @@ 
                     if (!empty($exercise_list)) {
                         $exercise_id = implode("','",$exercise_list);
                     }
-    			}
+                }
 
-    			$count_quiz = Database::fetch_row(Database::query($sql));
+                $count_quiz = Database::fetch_row(Database::query($sql));
 
-    			$sql = "SELECT
+                $sql = "SELECT
     			        SUM(exe_result/exe_weighting*100) as avg_score,
     			        COUNT(*) as num_attempts
     			        $select_lp_id
@@ -1825,20 +1825,20 @@ 
                             $condition_into_lp
                         ORDER BY exe_date DESC";
 
-    			$res = Database::query($sql);
-    			$row = Database::fetch_array($res);
-    			$quiz_avg_score = null;
+                $res = Database::query($sql);
+                $row = Database::fetch_array($res);
+                $quiz_avg_score = null;
 
-    			if (!empty($row['avg_score'])) {
-    				$quiz_avg_score = round($row['avg_score'],2);
-    			}
+                if (!empty($row['avg_score'])) {
+                    $quiz_avg_score = round($row['avg_score'],2);
+                }
 
-    			if(!empty($row['num_attempts'])) {
-    				$quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
-    			}
-    			if (is_array($student_id)) {
-    				$quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
-    			}
+                if(!empty($row['num_attempts'])) {
+                    $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
+                }
+                if (is_array($student_id)) {
+                    $quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
+                }
                 if ($into_lp == 0) {
                     return $quiz_avg_score;
                 } else {
@@ -1861,9 +1861,9 @@ 
                         return array($quiz_avg_score, null);
                     }
                 }
-    		}
-    	}
-    	return null;
+            }
+        }
+        return null;
     }
 
     /**
@@ -1896,15 +1896,15 @@ 
         $find_all_lp = 0
     ) {
         $courseId = intval($courseId);
-    	$student_id  = intval($student_id);
-    	$exercise_id = intval($exercise_id);
-    	$session_id  = intval($session_id);
+        $student_id  = intval($student_id);
+        $exercise_id = intval($exercise_id);
+        $session_id  = intval($session_id);
 
-    	$lp_id = intval($lp_id);
+        $lp_id = intval($lp_id);
         $lp_item_id = intval($lp_item_id);
-    	$tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 
-    	$sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
+        $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
                 WHERE  ex.c_id = $courseId
                 AND ex.exe_exo_id = $exercise_id
                 AND status = ''
@@ -1919,11 +1919,11 @@ 
                 AND orig_lp_item_id = $lp_item_id";
         }
 
-    	$rs = Database::query($sql);
-    	$row = Database::fetch_row($rs);
-    	$count_attempts = $row[0];
+        $rs = Database::query($sql);
+        $row = Database::fetch_row($rs);
+        $count_attempts = $row[0];
 
-    	return $count_attempts;
+        return $count_attempts;
     }
 
     /**
@@ -1933,7 +1933,7 @@ 
      * @param int    $user_id
      * @param int    $courseId
      * @param int    $session_id
-    */
+     */
     public static function get_exercise_student_progress($exercise_list, $user_id, $courseId, $session_id)
     {
         $courseId = intval($courseId);
@@ -3597,8 +3597,8 @@ 
 
         $condition_session = '';
         if (isset($session_id)) {
-             $session_id = intval($session_id);
-             $condition_session = ' AND f.session_id = '. $session_id;
+                $session_id = intval($session_id);
+                $condition_session = ' AND f.session_id = '. $session_id;
         }
 
         $groupId = intval($groupId);
@@ -5503,9 +5503,9 @@ 
     }
 
     /**
-    * @param FormValidator $form
-    * @return mixed
-    */
+     * @param FormValidator $form
+     * @return mixed
+     */
     public static function setUserSearchForm($form)
     {
         global $_configuration;
@@ -5785,26 +5785,26 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
-    	$sql = "SELECT count(tool) AS total_number_of_items
+        $sql = "SELECT count(tool) AS total_number_of_items
     	        FROM $table_item_property track_resource, $table_user user
     	        WHERE
                     track_resource.c_id = $course_id AND
                     track_resource.insert_user_id = user.user_id AND
                     session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                     )";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -5816,10 +5816,10 @@ 
     	            'thematic_advance',
     	            'thematic_plan'
                 )";
-    	$res = Database::query($sql);
-    	$obj = Database::fetch_object($res);
+        $res = Database::query($sql);
+        $obj = Database::fetch_object($res);
 
-    	return $obj->total_number_of_items;
+        return $obj->total_number_of_items;
     }
 
     /**
@@ -5834,12 +5834,12 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
-    	$table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-    	$session_id = intval($session_id);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+        $session_id = intval($session_id);
 
-    	$sql = "SELECT
+        $sql = "SELECT
                     tool as col0,
                     lastedit_type as col1,
                     ref as ref,
@@ -5853,16 +5853,16 @@ 
                   track_resource.insert_user_id = user.user_id AND
                   session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                      ) ";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -5875,41 +5875,41 @@ 
     	            'thematic_plan'
                 )";
 
-    	if ($column == 0) {
-    		$column = '0';
-    	}
-    	if ($column != '' && $direction != '') {
-    		if ($column != 2 && $column != 4) {
-    			$sql .= " ORDER BY col$column $direction";
-    		}
-    	} else {
-    		$sql .= " ORDER BY col5 DESC ";
-    	}
+        if ($column == 0) {
+            $column = '0';
+        }
+        if ($column != '' && $direction != '') {
+            if ($column != 2 && $column != 4) {
+                $sql .= " ORDER BY col$column $direction";
+            }
+        } else {
+            $sql .= " ORDER BY col5 DESC ";
+        }
 
         $from = intval($from);
         $number_of_items = intval($number_of_items);
 
-    	$sql .= " LIMIT $from, $number_of_items ";
-
-    	$res = Database::query($sql);
-    	$resources = array();
-    	$thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
-    	while ($row = Database::fetch_array($res)) {
-    		$ref = $row['ref'];
-    		$table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
-    		$table_tool = Database :: get_course_table($table_name['table_name']);
-
-    		$id = $table_name['id_tool'];
-    		$recorset = false;
+        $sql .= " LIMIT $from, $number_of_items ";
 
-    		if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
-    			$tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
-    			$sql = "SELECT thematic_id FROM $table_tool
+        $res = Database::query($sql);
+        $resources = array();
+        $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
+        while ($row = Database::fetch_array($res)) {
+            $ref = $row['ref'];
+            $table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
+            $table_tool = Database :: get_course_table($table_name['table_name']);
+
+            $id = $table_name['id_tool'];
+            $recorset = false;
+
+            if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
+                $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
+                $sql = "SELECT thematic_id FROM $table_tool
     			        WHERE c_id = $course_id AND id = $ref";
-    			$rs_thematic  = Database::query($sql);
-    			if (Database::num_rows($rs_thematic)) {
-    				$row_thematic = Database::fetch_array($rs_thematic);
-    				$thematic_id = $row_thematic['thematic_id'];
+                $rs_thematic  = Database::query($sql);
+                if (Database::num_rows($rs_thematic)) {
+                    $row_thematic = Database::fetch_array($rs_thematic);
+                    $thematic_id = $row_thematic['thematic_id'];
 
                     $sql = "SELECT session.id, session.name, user.username
                             FROM $tbl_thematic t, $table_session session, $table_user user
@@ -5918,9 +5918,9 @@ 
                               t.session_id = session.id AND
                               session.id_coach = user.user_id AND
                               t.id = $thematic_id";
-    				$recorset = Database::query($sql);
-    			}
-    		} else {
+                    $recorset = Database::query($sql);
+                }
+            } else {
                 $sql = "SELECT session.id, session.name, user.username
                           FROM $table_tool tool, $table_session session, $table_user user
     			          WHERE
@@ -5928,127 +5928,127 @@ 
     			              tool.session_id = session.id AND
     			              session.id_coach = user.user_id AND
     			              tool.$id = $ref";
-    			$recorset = Database::query($sql);
-    		}
-
-    		if (!empty($recorset)) {
-    			$obj = Database::fetch_object($recorset);
-
-    			$name_session = '';
-    			$coach_name = '';
-    			if (!empty($obj)) {
-    				$name_session = $obj->name;
-    				$coach_name   = $obj->username;
-    			}
-
-    			$url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
-    			$row[0] = '';
-    			if ($row['col6'] != 2) {
-    				if (in_array($row['col0'], $thematic_tools)) {
-
-    					$exp_thematic_tool = explode('_', $row['col0']);
-    					$thematic_tool_title = '';
-    					if (is_array($exp_thematic_tool)) {
-    						foreach ($exp_thematic_tool as $exp) {
-    							$thematic_tool_title .= api_ucfirst($exp);
-    						}
-    					} else {
-    						$thematic_tool_title = api_ucfirst($row['col0']);
-    					}
-
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
-    				} else {
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
-    				}
-    			} else {
-    				$row[0] = api_ucfirst($row['col0']);
-    			}
-    			$row[1] = get_lang($row[1]);
-    			$row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
-    			$row[5] = '';
-    			//@todo Improve this code please
-    			switch ($table_name['table_name']) {
-    				case 'document' :
-    					$sql = "SELECT tool.title as title FROM $table_tool tool
+                $recorset = Database::query($sql);
+            }
+
+            if (!empty($recorset)) {
+                $obj = Database::fetch_object($recorset);
+
+                $name_session = '';
+                $coach_name = '';
+                if (!empty($obj)) {
+                    $name_session = $obj->name;
+                    $coach_name   = $obj->username;
+                }
+
+                $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
+                $row[0] = '';
+                if ($row['col6'] != 2) {
+                    if (in_array($row['col0'], $thematic_tools)) {
+
+                        $exp_thematic_tool = explode('_', $row['col0']);
+                        $thematic_tool_title = '';
+                        if (is_array($exp_thematic_tool)) {
+                            foreach ($exp_thematic_tool as $exp) {
+                                $thematic_tool_title .= api_ucfirst($exp);
+                            }
+                        } else {
+                            $thematic_tool_title = api_ucfirst($row['col0']);
+                        }
+
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
+                    } else {
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
+                    }
+                } else {
+                    $row[0] = api_ucfirst($row['col0']);
+                }
+                $row[1] = get_lang($row[1]);
+                $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
+                $row[5] = '';
+                //@todo Improve this code please
+                switch ($table_name['table_name']) {
+                    case 'document' :
+                        $sql = "SELECT tool.title as title FROM $table_tool tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
 
-    					break;
-    				case 'announcement':
+                        break;
+                    case 'announcement':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'glossary':
+                        break;
+                    case 'glossary':
                         $sql = "SELECT name FROM $table_tool
     					        WHERE c_id = $course_id AND glossary_id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->name;
                         }
-    					break;
-    				case 'lp':
+                        break;
+                    case 'lp':
                         $sql = "SELECT name
                                 FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->name;
-    					break;
-    				case 'quiz':
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->name;
+                        break;
+                    case 'quiz':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'course_description':
+                        break;
+                    case 'course_description':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'thematic':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-    					}
-    					break;
-    				case 'thematic_advance':
-    					$rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->content;
-    					}
-    					break;
-    				case 'thematic_plan':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-    					}
-    					break;
-    				default:
-    					break;
-    			}
-
-    			$row2 = $name_session;
-    			if (!empty($coach_name)) {
-    				$row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
-    			}
-    			$row[2] = $row2;
+                        break;
+                    case 'thematic':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+                    case 'thematic_advance':
+                        $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->content;
+                        }
+                        break;
+                    case 'thematic_plan':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                $row2 = $name_session;
+                if (!empty($coach_name)) {
+                    $row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
+                }
+                $row[2] = $row2;
                 if (!empty($row['col3'])) {
                     $userInfo = api_get_user_info($row['user_id']);
 
@@ -6065,11 +6065,11 @@ 
                     $row[4] = $ip;
                 }
 
-    			$resources[] = $row;
-    		}
-    	}
+                $resources[] = $row;
+            }
+        }
 
-    	return $resources;
+        return $resources;
     }
 
     /**
@@ -6079,63 +6079,63 @@ 
      */
     public static function get_tool_name_table($tool)
     {
-    	switch ($tool) {
-    		case 'document':
-    			$table_name = TABLE_DOCUMENT;
-    			$link_tool = 'document/document.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'learnpath':
-    			$table_name = TABLE_LP_MAIN;
-    			$link_tool = 'lp/lp_controller.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'quiz':
-    			$table_name = TABLE_QUIZ_TEST;
-    			$link_tool = 'exercise/exercise.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'glossary':
-    			$table_name = TABLE_GLOSSARY;
-    			$link_tool = 'glossary/index.php';
-    			$id_tool = 'glossary_id';
-    			break;
-    		case 'link':
-    			$table_name = TABLE_LINK;
-    			$link_tool = 'link/link.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'course_description':
-    			$table_name = TABLE_COURSE_DESCRIPTION;
-    			$link_tool = 'course_description/';
-    			$id_tool = 'id';
-    			break;
-    		case 'announcement':
-    			$table_name = TABLE_ANNOUNCEMENT;
-    			$link_tool = 'announcements/announcements.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic':
-    			$table_name = TABLE_THEMATIC;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_advance':
-    			$table_name = TABLE_THEMATIC_ADVANCE;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_plan':
-    			$table_name = TABLE_THEMATIC_PLAN;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		default:
-    			$table_name = $tool;
-    		break;
-    	}
-
-    	return array(
+        switch ($tool) {
+            case 'document':
+                $table_name = TABLE_DOCUMENT;
+                $link_tool = 'document/document.php';
+                $id_tool = 'id';
+                break;
+            case 'learnpath':
+                $table_name = TABLE_LP_MAIN;
+                $link_tool = 'lp/lp_controller.php';
+                $id_tool = 'id';
+                break;
+            case 'quiz':
+                $table_name = TABLE_QUIZ_TEST;
+                $link_tool = 'exercise/exercise.php';
+                $id_tool = 'id';
+                break;
+            case 'glossary':
+                $table_name = TABLE_GLOSSARY;
+                $link_tool = 'glossary/index.php';
+                $id_tool = 'glossary_id';
+                break;
+            case 'link':
+                $table_name = TABLE_LINK;
+                $link_tool = 'link/link.php';
+                $id_tool = 'id';
+                break;
+            case 'course_description':
+                $table_name = TABLE_COURSE_DESCRIPTION;
+                $link_tool = 'course_description/';
+                $id_tool = 'id';
+                break;
+            case 'announcement':
+                $table_name = TABLE_ANNOUNCEMENT;
+                $link_tool = 'announcements/announcements.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic':
+                $table_name = TABLE_THEMATIC;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_advance':
+                $table_name = TABLE_THEMATIC_ADVANCE;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_plan':
+                $table_name = TABLE_THEMATIC_PLAN;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            default:
+                $table_name = $tool;
+            break;
+        }
+
+        return array(
             'table_name' => $table_name,
             'link_tool' => $link_tool,
             'id_tool' => $id_tool
@@ -6144,45 +6144,45 @@ 
 
     public static function display_additional_profile_fields()
     {
-    	// getting all the extra profile fields that are defined by the platform administrator
-    	$extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
-
-    	// creating the form
-    	$return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
-
-    	// the select field with the additional user profile fields (= this is where we select the field of which we want to see
-    	// the information the users have entered or selected.
-    	$return .= '<select name="additional_profile_field">';
-    	$return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
-    	$extra_fields_to_show = 0;
-    	foreach ($extra_fields as $key=>$field) {
-    		// show only extra fields that are visible + and can be filtered, added by J.Montoya
-    		if ($field[6]==1 && $field[8] == 1) {
-    			if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
-    				$selected = 'selected="selected"';
-    			} else {
-    				$selected = '';
-    			}
-    			$extra_fields_to_show++;
-    			$return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
-    		}
-    	}
-    	$return .= '</select>';
-
-    	// the form elements for the $_GET parameters (because the form is passed through GET
-    	foreach ($_GET as $key=>$value){
-    		if ($key <> 'additional_profile_field')    {
-    			$return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
-    		}
-    	}
-    	// the submit button
-    	$return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
-    	$return .= '</form>';
-    	if ($extra_fields_to_show > 0) {
-    		return $return;
-    	} else {
-    		return '';
-    	}
+        // getting all the extra profile fields that are defined by the platform administrator
+        $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
+
+        // creating the form
+        $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
+
+        // the select field with the additional user profile fields (= this is where we select the field of which we want to see
+        // the information the users have entered or selected.
+        $return .= '<select name="additional_profile_field">';
+        $return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
+        $extra_fields_to_show = 0;
+        foreach ($extra_fields as $key=>$field) {
+            // show only extra fields that are visible + and can be filtered, added by J.Montoya
+            if ($field[6]==1 && $field[8] == 1) {
+                if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
+                    $selected = 'selected="selected"';
+                } else {
+                    $selected = '';
+                }
+                $extra_fields_to_show++;
+                $return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
+            }
+        }
+        $return .= '</select>';
+
+        // the form elements for the $_GET parameters (because the form is passed through GET
+        foreach ($_GET as $key=>$value){
+            if ($key <> 'additional_profile_field')    {
+                $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
+            }
+        }
+        // the submit button
+        $return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
+        $return .= '</form>';
+        if ($extra_fields_to_show > 0) {
+            return $return;
+        } else {
+            return '';
+        }
     }
 
     /**
@@ -6201,31 +6201,31 @@ 
      */
     public static function get_addtional_profile_information_of_field_by_user($field_id, $users)
     {
-    	// Database table definition
-    	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+        // Database table definition
+        $table_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
         $extraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-    	$result_extra_field = UserManager::get_extra_field_information($field_id);
-
-    	if (!empty($users)) {
-    		if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
-    			foreach($users as $user_id) {
-    				$user_result = UserManager::get_user_tags($user_id, $field_id);
-    				$tag_list = array();
-    				foreach($user_result as $item) {
-    					$tag_list[] = $item['tag'];
-    				}
-    				$return[$user_id][] = implode(', ',$tag_list);
-    			}
-    		} else {
-    			$new_user_array = array();
-    			foreach ($users as $user_id) {
-    				$new_user_array[]= "'".$user_id."'";
-    			}
-    			$users = implode(',',$new_user_array);
+        $result_extra_field = UserManager::get_extra_field_information($field_id);
+
+        if (!empty($users)) {
+            if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
+                foreach($users as $user_id) {
+                    $user_result = UserManager::get_user_tags($user_id, $field_id);
+                    $tag_list = array();
+                    foreach($user_result as $item) {
+                        $tag_list[] = $item['tag'];
+                    }
+                    $return[$user_id][] = implode(', ',$tag_list);
+                }
+            } else {
+                $new_user_array = array();
+                foreach ($users as $user_id) {
+                    $new_user_array[]= "'".$user_id."'";
+                }
+                $users = implode(',',$new_user_array);
                 $extraFieldType = EntityExtraField::USER_FIELD_TYPE;
-    			// Selecting only the necessary information NOT ALL the user list
-    			$sql = "SELECT user.user_id, v.value
+                // Selecting only the necessary information NOT ALL the user list
+                $sql = "SELECT user.user_id, v.value
     			        FROM $table_user user
     			        INNER JOIN $table_user_field_values v
                         ON (user.user_id = v.item_id)
@@ -6236,27 +6236,27 @@ 
                             v.field_id=".intval($field_id)." AND
                             user.user_id IN ($users)";
 
-    			$result = Database::query($sql);
-    			while($row = Database::fetch_array($result)) {
-    				// get option value for field type double select by id
-    				if (!empty($row['value'])) {
-    					if ($result_extra_field['field_type'] ==
+                $result = Database::query($sql);
+                while($row = Database::fetch_array($result)) {
+                    // get option value for field type double select by id
+                    if (!empty($row['value'])) {
+                        if ($result_extra_field['field_type'] ==
                             ExtraField::FIELD_TYPE_DOUBLE_SELECT
                         ) {
-    						$id_double_select = explode(';', $row['value']);
-    						if (is_array($id_double_select)) {
-    							$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
-    							$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
-    							$row['value'] = ($value1.';'.$value2);
-    						}
-    					}
-    				}
-    				// get other value from extra field
-    				$return[$row['user_id']][] = $row['value'];
-    			}
-    		}
-    	}
-    	return $return;
+                            $id_double_select = explode(';', $row['value']);
+                            if (is_array($id_double_select)) {
+                                $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+                                $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+                                $row['value'] = ($value1.';'.$value2);
+                            }
+                        }
+                    }
+                    // get other value from extra field
+                    $return[$row['user_id']][] = $row['value'];
+                }
+            }
+        }
+        return $return;
     }
 
     /**
@@ -6265,18 +6265,18 @@ 
      */
     public function count_student_in_course()
     {
-    	global $nbStudents;
-    	return $nbStudents;
+        global $nbStudents;
+        return $nbStudents;
     }
 
     public function sort_users($a, $b)
     {
-    	return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
+        return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
     }
 
     public function sort_users_desc($a, $b)
     {
-    	return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
+        return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
     }
 
     /**
@@ -6285,8 +6285,8 @@ 
      */
     public static function get_number_of_users()
     {
-    	global $user_ids;
-    	return count($user_ids);
+        global $user_ids;
+        return count($user_ids);
     }
 
     /**
@@ -6302,37 +6302,37 @@ 
     {
         global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id;
 
-    	$course_code = Database::escape_string($course_code);
-    	$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $course_code = Database::escape_string($course_code);
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-    	$access_url_id = api_get_current_access_url_id();
+        $access_url_id = api_get_current_access_url_id();
 
-    	// get all users data from a course for sortable with limit
-    	if (is_array($user_ids)) {
-    		$user_ids = array_map('intval', $user_ids);
-    		$condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
-    	} else {
-    		$user_ids = intval($user_ids);
-    		$condition_user = " WHERE user.user_id = $user_ids ";
-    	}
+        // get all users data from a course for sortable with limit
+        if (is_array($user_ids)) {
+            $user_ids = array_map('intval', $user_ids);
+            $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
+        } else {
+            $user_ids = intval($user_ids);
+            $condition_user = " WHERE user.user_id = $user_ids ";
+        }
 
-    	if (!empty($_GET['user_keyword'])) {
-    		$keyword = trim(Database::escape_string($_GET['user_keyword']));
-    		$condition_user .=  " AND (
+        if (!empty($_GET['user_keyword'])) {
+            $keyword = trim(Database::escape_string($_GET['user_keyword']));
+            $condition_user .=  " AND (
                 user.firstname LIKE '%".$keyword."%' OR
                 user.lastname LIKE '%".$keyword."%'  OR
                 user.username LIKE '%".$keyword."%'  OR
                 user.email LIKE '%".$keyword."%'
              ) ";
-    	}
+        }
 
         $url_table = null;
         $url_condition = null;
-    	if (api_is_multiple_url_enabled()) {
-    		$url_table = ", ".$tbl_url_rel_user." as url_users";
-    		$url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
-    	}
+        if (api_is_multiple_url_enabled()) {
+            $url_table = ", ".$tbl_url_rel_user." as url_users";
+            $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
+        }
 
         $invitedUsersCondition = '';
 
@@ -6340,7 +6340,7 @@ 
             $invitedUsersCondition = " AND user.status != " . INVITEE;
         }
 
-    	$sql = "SELECT  user.user_id as user_id,
+        $sql = "SELECT  user.user_id as user_id,
                     user.official_code  as col0,
                     user.lastname       as col1,
                     user.firstname      as col2,
@@ -6348,17 +6348,17 @@ 
                 FROM $tbl_user as user $url_table
     	        $condition_user $url_condition $invitedUsersCondition";
 
-    	if (!in_array($direction, array('ASC','DESC'))) {
-    		$direction = 'ASC';
-    	}
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
-    	$column = intval($column);
+        $column = intval($column);
 
-    	$from = intval($from);
-    	$number_of_items = intval($number_of_items);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
 
-    	$sql .= " ORDER BY col$column $direction ";
-    	$sql .= " LIMIT $from,$number_of_items";
+        $sql .= " ORDER BY col$column $direction ";
+        $sql .= " LIMIT $from,$number_of_items";
 
         $res = Database::query($sql);
         $users = array();
@@ -6392,7 +6392,7 @@ 
             }
         }
 
-    	while ($user = Database::fetch_array($res, 'ASSOC')) {
+        while ($user = Database::fetch_array($res, 'ASSOC')) {
             $courseInfo = api_get_course_info($course_code);
             $courseId = $courseInfo['real_id'];
 
@@ -6423,10 +6423,10 @@ 
                 $session_id
             );
 
-    		if (empty($avg_student_progress)) {
+            if (empty($avg_student_progress)) {
                 $avg_student_progress = 0;
-    		}
-    		$user['average_progress'] = $avg_student_progress.'%';
+            }
+            $user['average_progress'] = $avg_student_progress.'%';
 
             $total_user_exercise = Tracking::get_exercise_student_progress(
                 $total_exercises,
@@ -6446,11 +6446,11 @@ 
 
             $user['exercise_average_best_attempt'] = $total_user_exercise;
 
-    		if (is_numeric($avg_student_score)) {
-    			$user['student_score']  = $avg_student_score.'%';
-    		} else {
-    			$user['student_score']  = $avg_student_score;
-    		}
+            if (is_numeric($avg_student_score)) {
+                $user['student_score']  = $avg_student_score.'%';
+            } else {
+                $user['student_score']  = $avg_student_score;
+            }
 
             $user['count_assignments'] = Tracking::count_student_assignments(
                 $user['user_id'],
@@ -6473,29 +6473,29 @@ 
                 $session_id
             );
 
-    		// we need to display an additional profile field
-    		$user['additional'] = '';
+            // we need to display an additional profile field
+            $user['additional'] = '';
 
-    		if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
-    			if (isset($additional_user_profile_info[$user['user_id']]) &&
+            if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
+                if (isset($additional_user_profile_info[$user['user_id']]) &&
                     is_array($additional_user_profile_info[$user['user_id']])
                 ) {
-    				$user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
-    			}
-    		}
+                    $user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
+                }
+            }
 
             if (empty($session_id)) {
                 $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
             }
 
-    		$user['link'] = '<center>
+            $user['link'] = '<center>
                              <a href="../mySpace/myStudents.php?student='.$user['user_id'].'&details=true&course='.$course_code.'&origin=tracking_course&id_session='.$session_id.'">
     		                 '.Display::return_icon('2rightarrow.png').'
     		                 </a>
                          </center>';
 
-    		// store columns in array $users
-    		$is_western_name_order = api_is_western_name_order();
+            // store columns in array $users
+            $is_western_name_order = api_is_western_name_order();
             $user_row = array();
             $user_row[]= $user['official_code']; //0
             if ($is_western_name_order) {
@@ -6531,21 +6531,21 @@ 
 
             $users[] = $user_row;
 
-    		if ($export_csv) {
-    		    if (empty($session_id)) {
+            if ($export_csv) {
+                if (empty($session_id)) {
                     $user_row = array_map('strip_tags', $user_row);
-    			    unset($user_row[14]);
-    			    unset($user_row[15]);
+                    unset($user_row[14]);
+                    unset($user_row[15]);
                 } else {
                     $user_row = array_map('strip_tags', $user_row);
                     unset($user_row[13]);
                     unset($user_row[14]);
                 }
 
-    			$csv_content[] = $user_row;
-    		}
-    	}
-    	return $users;
+                $csv_content[] = $user_row;
+            }
+        }
+        return $users;
     }
 }
 
@@ -6563,18 +6563,18 @@ 
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-
-    	// protected data
-    	$user_id = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id = Database::escape_string($course_id);
-
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$tempView = $view;
-    	if(substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		echo "
+        $MonthsLong = $GLOBALS['MonthsLong'];
+
+        // protected data
+        $user_id = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id = Database::escape_string($course_id);
+
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $tempView = $view;
+        if(substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font>" .
@@ -6582,9 +6582,9 @@ 
                     </td>
                 </tr>
                 ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
 
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                         FROM $track_access_table
                         WHERE access_user_id = $user_id
                         AND c_id = $course_id
@@ -6592,11 +6592,11 @@ 
                         GROUP BY YEAR(access_date),MONTH(access_date)
                         ORDER BY YEAR(access_date),MONTH(access_date) ASC";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = getManyResults3Col($sql);
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = getManyResults3Col($sql);
 
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LoginsTitleMonthColumn')."
                     </td>
@@ -6604,36 +6604,36 @@ 
                     ".get_lang('LoginsTitleCountColumn')."
                     </td>
                 </tr>";
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
-    				echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
-    				echo"</tr>";
-    				$total = $total + $results[$j][1];
-    			}
-    			echo "<tr>";
-    			echo "<td>".get_lang('Total')."</td>";
-    			echo "<td align='right' class='content'>".$total."</td>";
-    			echo"</tr>";
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    		echo "
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
+                    echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
+                    echo"</tr>";
+                    $total = $total + $results[$j][1];
+                }
+                echo "<tr>";
+                echo "<td>".get_lang('Total')."</td>";
+                echo "<td align='right' class='content'>".$total."</td>";
+                echo"</tr>";
+            } else {
+                echo "<tr>";
+                echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".$user_id."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LoginsAndAccessTools')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6646,38 +6646,38 @@ 
      */
     public function display_exercise_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
+        global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
-    	if(substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		echo "<tr>
+        if(substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            echo "<tr>
                     <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('ExercicesResults')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
 
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = ".intval($user_id)."
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TBL_TRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '".intval($user_id)."' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
-    		echo "
+            echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
+            echo "
                 <tr bgcolor='#E6E6E6'>
                     <td>
                     ".get_lang('ExercicesTitleExerciceColumn')."
@@ -6690,28 +6690,28 @@ 
                     </td>
                 </tr>";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++) {
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				echo "<tr>\n";
-    				echo "<td class='content'>".$results[$i][0]."</td>\n";
-    				echo "<td class='content'>".$display_date."</td>\n";
-    				echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
-    				echo "</tr>\n";
-    			}
-    		} else {
-    			// istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-    				?>
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++) {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    echo "<tr>\n";
+                    echo "<td class='content'>".$results[$i][0]."</td>\n";
+                    echo "<td class='content'>".$display_date."</td>\n";
+                    echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
+                    echo "</tr>\n";
+                }
+            } else {
+                // istvan begin
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+                    ?>
                     <tr>
                         <td class="content"><?php echo $title; ?></td>
                         <td class="content" align="center"><?php echo $display_date; ?></td>
@@ -6721,26 +6721,26 @@ 
 
                     <?php
                 }
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			echo "<tr>\n";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
-    			echo "</tr>\n";
-    		}
-    		echo "</table>";
-    		echo "</td>\n</tr>\n";
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    		echo "
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                echo "<tr>\n";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
+                echo "</tr>\n";
+            }
+            echo "</table>";
+            echo "</td>\n</tr>\n";
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+            echo "
                 <tr>
                     <td valign='top'>
                         +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=$user_id&view=".$new_view."' class='specialLink'>".get_lang('ExercicesResults')."</a>
                     </td>
                 </tr>";
-    	}
+        }
     }
 
     /**
@@ -6749,27 +6749,27 @@ 
      */
     public function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info_by_id($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$new_view = substr_replace($view,'0',2,1);
-    		echo "<tr>
+        if (substr($view,2,1) == '1') {
+            $new_view = substr_replace($view,'0',2,1);
+            echo "<tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('WorkUploads')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
-    		$sql = "SELECT u.upload_date, w.title, w.author,w.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
+            $sql = "SELECT u.upload_date, w.title, w.author,w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE u.upload_work_id = w.id
                         AND u.upload_user_id = '".intval($user_id)."'
                         AND u.c_id = '".intval($course_id)."'
                     ORDER BY u.upload_date DESC";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine' width='40%'>
                     ".get_lang('WorkTitle')."
                     </td>
@@ -6780,35 +6780,35 @@ 
                     ".get_lang('Date')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				echo "<tr>";
-    				echo "<td class='content'>"
-    				."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
-    				."</td>";
-    				echo "<td class='content'>".$results[$j][2]."</td>";
-    				echo "<td class='content'>".$beautifulDate."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',2,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    echo "<tr>";
+                    echo "<td class='content'>"
+                    ."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
+                    ."</td>";
+                    echo "<td class='content'>".$results[$j][2]."</td>";
+                    echo "<td class='content'>".$beautifulDate."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',2,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('WorkUploads')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6817,55 +6817,55 @@ 
      */
     public function display_links_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		echo "
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            echo "
                 <tr>
                         <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('LinksAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00010'>".get_lang('ExportAsCSV')."</a>]
                         </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
-    		$sql = "SELECT cl.title, cl.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
+            $sql = "SELECT cl.title, cl.url
                     FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                     WHERE sl.links_link_id = cl.id
                         AND sl.c_id = $courseId
                         AND sl.links_user_id = ".intval($user_id)."
                     GROUP BY cl.title, cl.url";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults2Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LinksTitleLinkColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td ><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td ><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LinksAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6878,61 +6878,61 @@ 
      */
     public static function display_document_tracking_info($view, $user_id, $course_code, $session_id = 0)
     {
-    	// protect data
+        // protect data
         $user_id = intval($user_id);
         $courseId = api_get_course_int_id($course_code);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-    	if(substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		echo "
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        if(substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('DocumentsAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00001'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                     FROM $downloads_table
                     WHERE c_id = $courseId
                         AND down_user_id = $user_id
                         AND down_session_id = $session_id
                     GROUP BY down_doc_path";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults1Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('DocumentsTitleDocumentColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'>".$results[$j]."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'>".$results[$j]."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('DocumentsAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6989,43 +6989,43 @@ 
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-
-    	// protected data
-    	$user_id    = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id  = intval($course_id);
-
-    	$tempView = $view;
-    	if (substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		$title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+        $MonthsLong = $GLOBALS['MonthsLong'];
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+
+        // protected data
+        $user_id    = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id  = intval($course_id);
+
+        $tempView = $view;
+        if (substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                     FROM $track_access_table
                     WHERE access_user_id = $user_id
                     AND c_id = $course_id
                     AND access_session_id = $session_id
                     GROUP BY YEAR(access_date),MONTH(access_date)
                     ORDER BY YEAR(access_date),MONTH(access_date) ASC";
-    		//$results = getManyResults2Col($sql);
-    		$results = getManyResults3Col($sql);
-    		$title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
-    		$line='';
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0].';'.$results[$j][1]."\n";
-    				$total = $total + $results[$j][1];
-    			}
-    			$line .= get_lang('Total').";".$total."\n";
-    		} else {
-    			$line= get_lang('NoResult')."</center></td>";
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    	}
-    	return array($title_line, $line);
+            //$results = getManyResults2Col($sql);
+            $results = getManyResults3Col($sql);
+            $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
+            $line='';
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0].';'.$results[$j][1]."\n";
+                    $total = $total + $results[$j][1];
+                }
+                $line .= get_lang('Total').";".$total."\n";
+            } else {
+                $line= get_lang('NoResult')."</center></td>";
+            }
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7038,67 +7038,67 @@ 
      */
     public function display_exercise_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
+        global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
-    	if (substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		$title[1] = get_lang('ExercicesDetails');
-    		$line = '';
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+        if (substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            $title[1] = get_lang('ExercicesDetails');
+            $line = '';
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = $userId
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TABLETRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '$userId' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		$title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++)
-    			{
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				$line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
-    			}
-    		} else {
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++)
+                {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
+                }
+            } else {
                 // istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-
-    				$line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
-    			}
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    	}
-    	return array($title_line, $line);
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+
+                    $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
+                }
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7107,37 +7107,37 @@ 
      */
     public function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info();
         $user_id = intval($user_id);
         $course_id = intval($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$sql = "SELECT u.upload_date, w.title, w.author, w.url
+        if (substr($view,2,1) == '1') {
+            $sql = "SELECT u.upload_date, w.title, w.author, w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE
                         u.upload_work_id = w.id AND
                         u.upload_user_id = '$user_id' AND
                         u.c_id = '$course_id'
                     ORDER BY u.upload_date DESC";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-
-    		$title[1]=get_lang('WorksDetails');
-    		$line='';
-    		$title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
-
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				$line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
-    			}
-
-    		} else {
-    			$line= get_lang('NoResult');
-    		}
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+
+            $title[1]=get_lang('WorksDetails');
+            $line='';
+            $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
+
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
+                }
+
+            } else {
+                $line= get_lang('NoResult');
+            }
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7146,32 +7146,32 @@ 
      */
     public function display_links_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
         $line = null;
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		$title[1]=get_lang('LinksDetails');
-    		$sql = "SELECT cl.title, cl.url
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            $title[1]=get_lang('LinksDetails');
+            $sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
                             AND sl.c_id = $courseId
                             AND sl.links_user_id = $userId
                         GROUP BY cl.title, cl.url";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		$title_line= get_lang('LinksTitleLinkColumn')."\n";
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0]."\n";
-    			}
-    		} else {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResults2Col($sql);
+            $title_line= get_lang('LinksTitleLinkColumn')."\n";
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0]."\n";
+                }
+            } else {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7184,38 +7184,38 @@ 
      */
     public function display_document_tracking_info($view, $user_id, $courseCode, $session_id = 0)
     {
-    	// protect data
-    	$user_id     = intval($user_id);
+        // protect data
+        $user_id     = intval($user_id);
         $courseId = api_get_course_int_id($courseCode);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 
-    	if (substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		$title[1]= get_lang('DocumentsDetails');
+        if (substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            $title[1]= get_lang('DocumentsDetails');
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                         FROM $downloads_table
                         WHERE c_id = $courseId
                             AND down_user_id = $user_id
                             AND down_session_id = $session_id
                         GROUP BY down_doc_path";
 
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		$title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
+            $results = StatsUtils::getManyResults1Col($sql);
+            $title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
             $line = null;
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j]."\n";
-    			}
-    		} else {
-    			$line = get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    	}
-    	return array($title_line, $line);
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j]."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+        }
+        return array($title_line, $line);
     }
 
     /**

Spacing +429 added lines, -429 removed lines

@@ -114,7 +114,7 @@ 
         $extendedAttempt = null,
         $extendedAll = null,
         $type = 'classic',
-        $allowExtend =  true
+        $allowExtend = true
     ) {
         if (empty($courseInfo) || empty($lp_id)) {
             return null;
@@ -138,22 +138,22 @@ 
         $extend_all = 0;
 
         if ($origin == 'tracking') {
-            $url_suffix = '&session_id=' . $session_id . '&course=' . $courseCode . '&student_id=' . $user_id . '&lp_id=' . $lp_id . '&origin=' . $origin;
+            $url_suffix = '&session_id='.$session_id.'&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.$lp_id.'&origin='.$origin;
         } else {
-            $url_suffix = '&lp_id=' . $lp_id;
+            $url_suffix = '&lp_id='.$lp_id;
         }
 
         if (!empty($extendedAll)) {
             $extend_all_link = Display::url(
                 Display::return_icon('view_less_stats.gif', get_lang('HideAllAttempts')),
-                api_get_self() . '?action=stats' . $url_suffix
+                api_get_self().'?action=stats'.$url_suffix
             );
 
             $extend_all = 1;
         } else {
             $extend_all_link = Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('ShowAllAttempts')),
-                api_get_self() . '?action=stats&extend_all=1' . $url_suffix
+                api_get_self().'?action=stats&extend_all=1'.$url_suffix
             );
         }
 
@@ -165,24 +165,24 @@ 
 
         $actionColumn = null;
         if ($type == 'classic') {
-            $actionColumn = ' <th>' . get_lang('Actions') . '</th>';
+            $actionColumn = ' <th>'.get_lang('Actions').'</th>';
         }
         $output .= '<div class="table-responsive">';
         $output .= '<table class="table tracking">
             <thead>
             <tr class="table-header">
-                <th width="16">' . ($allowExtend == true ? $extend_all_link : '&nbsp;') . '</th>
+                <th width="16">' . ($allowExtend == true ? $extend_all_link : '&nbsp;').'</th>
                 <th colspan="4">
-                    ' . get_lang('ScormLessonTitle') .'
+                    ' . get_lang('ScormLessonTitle').'
                 </th>
                 <th colspan="2">
-                    ' . get_lang('ScormStatus') . '
+                    ' . get_lang('ScormStatus').'
                 </th>
                 <th colspan="2">
-                    ' . get_lang('ScormScore') . '
+                    ' . get_lang('ScormScore').'
                 </th>
                 <th colspan="2">
-                    ' . get_lang('ScormTime') . '
+                    ' . get_lang('ScormTime').'
                 </th>
                 '.$actionColumn.'
                 </tr>
@@ -245,7 +245,7 @@ 
                 // Prepare statement to go through each attempt.
                 $viewCondition = null;
                 if (!empty($view)) {
-                    $viewCondition =  " AND v.view_count = $view  ";
+                    $viewCondition = " AND v.view_count = $view  ";
                 }
 
                 $sql = "SELECT
@@ -293,7 +293,7 @@ 
                                 FROM $TBL_QUIZ
                                 WHERE
                                     c_id = $course_id AND
-                                    id ='" . $my_path . "'";
+                                    id ='".$my_path."'";
                         $res_result_disabled = Database::query($sql);
                         $row_result_disabled = Database::fetch_row($res_result_disabled);
 
@@ -315,7 +315,7 @@ 
                     if (!empty($inter_num)) {
                         $extend_link = Display::url(
                               Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                              api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
+                              api_get_self().'?action=stats&fold_id='.$my_item_id.$url_suffix
                         );
                     }
                     $title = $row['mytitle'];
@@ -333,7 +333,7 @@ 
 
                     $action = null;
                     if ($type == 'classic') {
-                        $action =  '<td></td>';
+                        $action = '<td></td>';
                     }
 
                     if (in_array($row['item_type'], $chapterTypes)) {
@@ -377,13 +377,13 @@ 
                                 $extend_this_attempt = 1;
                                 $extend_attempt_link = Display::url(
                                     Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                                    api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&fold_attempt_id=' . $row['iv_id'] . $url_suffix
+                                    api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix
                                 );
                             } else { // Same case if fold_attempt_id is set, so not implemented explicitly.
                                 // The extend button for this attempt has not been clicked.
                                 $extend_attempt_link = Display::url(
                                     Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
-                                    api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix
+                                    api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                                 );
                             }
                         }
@@ -416,7 +416,7 @@ 
                         }
 
                         // Remove "NaN" if any (@todo: locate the source of these NaN)
-                        $time = str_replace('NaN', '00' . $h . '00\'00"', $time);
+                        $time = str_replace('NaN', '00'.$h.'00\'00"', $time);
 
                         if ($row['item_type'] != 'dir') {
                             if (!$is_allowed_to_edit && $result_disabled_ext_all) {
@@ -444,13 +444,13 @@ 
                                 $action = '<td></td>';
                             }
 
-                            $output .= '<tr class="' . $oddclass . '">
+                            $output .= '<tr class="'.$oddclass.'">
                                     <td></td>
-                                    <td>' . $extend_attempt_link . '</td>
-                                    <td colspan="3">' . get_lang('Attempt') . ' ' . $attemptCount . '</td>
-                                    <td colspan="2">' . learnpathItem::humanize_status($lesson_status, true, $type) . '</td>
-                                    <td colspan="2">' . $view_score . '</td>
-                                    <td colspan="2">' . $time . '</td>
+                                    <td>' . $extend_attempt_link.'</td>
+                                    <td colspan="3">' . get_lang('Attempt').' '.$attemptCount.'</td>
+                                    <td colspan="2">' . learnpathItem::humanize_status($lesson_status, true, $type).'</td>
+                                    <td colspan="2">' . $view_score.'</td>
+                                    <td colspan="2">' . $time.'</td>
                                     '.$action.'
                                 </tr>';
                             $attemptCount++;
@@ -463,10 +463,10 @@ 
                                     if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                         $temp[] = '/';
                                     } else {
-                                        $temp[] = ($score == 0 ? '0/' . $maxscore : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
+                                        $temp[] = ($score == 0 ? '0/'.$maxscore : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1)));
                                     }
                                 } else {
-                                    $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
+                                    $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1)));
                                 }
                                 $temp[] = $time;
                                 $csv_content[] = $temp;
@@ -503,13 +503,13 @@ 
                                         <td></td>
                                         <td></td>
                                         <td></td>
-                                        <td>'.$interaction['order_id'] . '</td>
-                                        <td>'.$interaction['id'] . '</td>
+                                        <td>'.$interaction['order_id'].'</td>
+                                        <td>'.$interaction['id'].'</td>
                                         <td colspan="2">' . $interaction['type'].'</td>
-                                        <td>'.$student_response . '</td>
-                                        <td>'.$interaction['result'] . '</td>
-                                        <td>'.$interaction['latency'] . '</td>
-                                        <td>'.$interaction['time'] . '</td>
+                                        <td>'.$student_response.'</td>
+                                        <td>'.$interaction['result'].'</td>
+                                        <td>'.$interaction['latency'].'</td>
+                                        <td>'.$interaction['time'].'</td>
                                         '.$action.'
                                     </tr>';
                                 $counter++;
@@ -526,12 +526,12 @@ 
                                         <td></td>
                                         <td></td>
                                         <td></td>
-                                        <td>' . $interaction['order_id'] . '</td>
-                                        <td colspan="2">' . $interaction['objective_id'] . '</td>
-                                        <td colspan="2">' . $interaction['status'] .'</td>
-                                        <td>' . $interaction['score_raw'] . '</td>
-                                        <td>' . $interaction['score_max'] . '</td>
-                                        <td>' . $interaction['score_min'] . '</td>
+                                        <td>' . $interaction['order_id'].'</td>
+                                        <td colspan="2">' . $interaction['objective_id'].'</td>
+                                        <td colspan="2">' . $interaction['status'].'</td>
+                                        <td>' . $interaction['score_raw'].'</td>
+                                        <td>' . $interaction['score_max'].'</td>
+                                        <td>' . $interaction['score_min'].'</td>
                                         '.$action.'
                                      </tr>';
                                 $counter++;
@@ -554,7 +554,7 @@ 
                         $my_path = Database::escape_string($my_path);
                         $sql = "SELECT results_disabled
                                 FROM $TBL_QUIZ
-                                WHERE c_id = $course_id AND id ='" . $my_path . "'";
+                                WHERE c_id = $course_id AND id ='".$my_path."'";
                         $res_result_disabled = Database::query($sql);
                         $row_result_disabled = Database::fetch_row($res_result_disabled);
 
@@ -578,14 +578,14 @@ 
                             $extend_this_attempt = 1;
                             $extend_attempt_link = Display::url(
                                 Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                                api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&fold_attempt_id=' . $row['iv_id'] . $url_suffix
+                                api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix
                             );
                         } else {
                             // Same case if fold_attempt_id is set, so not implemented explicitly.
                             // The extend button for this attempt has not been clicked.
                             $extend_attempt_link = Display::url(
                                 Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
-                                api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix
+                                api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                             );
                         }
                     }
@@ -600,7 +600,7 @@ 
                     if ($inter_num > 1) {
                         $extend_link = Display::url(
                             Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')),
-                            api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix
+                            api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix
                         );
                     }
 
@@ -616,15 +616,15 @@ 
 
                     // Selecting the exe_id from stats attempts tables in order to look the max score value.
 
-                    $sql = 'SELECT * FROM ' . $tbl_stats_exercices . '
+                    $sql = 'SELECT * FROM '.$tbl_stats_exercices.'
                              WHERE
-                                exe_exo_id="' . $row['path'] . '" AND
-                                exe_user_id="' . $user_id . '" AND
-                                orig_lp_id = "' . $lp_id . '" AND
-                                orig_lp_item_id = "' . $row['myid'] . '" AND
-                                c_id = ' . $course_id . ' AND
+                                exe_exo_id="' . $row['path'].'" AND
+                                exe_user_id="' . $user_id.'" AND
+                                orig_lp_id = "' . $lp_id.'" AND
+                                orig_lp_item_id = "' . $row['myid'].'" AND
+                                c_id = ' . $course_id.' AND
                                 status <> "incomplete" AND
-                                session_id = ' . $session_id . '
+                                session_id = ' . $session_id.'
                              ORDER BY exe_date DESC
                              LIMIT 1';
 
@@ -655,8 +655,8 @@ 
                                         FROM $TBL_LP_ITEM_VIEW
                                         WHERE
                                             c_id = $course_id AND
-                                            lp_item_id = '" . (int) $my_id . "' AND
-                                            lp_view_id = '" . (int) $my_lp_view_id . "'
+                                            lp_item_id = '".(int) $my_id."' AND
+                                            lp_view_id = '" . (int) $my_lp_view_id."'
                                         ORDER BY view_count DESC limit 1";
                                 $res_score = Database::query($sql);
                                 $row_score = Database::fetch_array($res_score);
@@ -665,8 +665,8 @@ 
                                         FROM $TBL_LP_ITEM_VIEW
                                         WHERE
                                             c_id = $course_id AND
-                                            lp_item_id = '" . (int) $my_id . "' AND
-                                            lp_view_id = '" . (int) $my_lp_view_id . "'";
+                                            lp_item_id = '".(int) $my_id."' AND
+                                            lp_view_id = '" . (int) $my_lp_view_id."'";
                                 $res_time = Database::query($sql);
                                 $row_time = Database::fetch_array($res_time);
 
@@ -725,16 +725,16 @@ 
                     } else {
                         $correct_test_link = '-';
                         if ($row['item_type'] == 'quiz') {
-                            $my_url_suffix = '&course=' . $courseCode . '&student_id=' . $user_id . '&lp_id=' . intval($row['mylpid']) . '&origin=' . $origin;
-                            $sql = 'SELECT * FROM ' . $tbl_stats_exercices . '
+                            $my_url_suffix = '&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.intval($row['mylpid']).'&origin='.$origin;
+                            $sql = 'SELECT * FROM '.$tbl_stats_exercices.'
                                      WHERE
-                                        exe_exo_id="' . $row['path'] . '" AND
-                                        exe_user_id="' . $user_id . '" AND
-                                        orig_lp_id = "' . $lp_id . '" AND
-                                        orig_lp_item_id = "' . $row['myid'] . '" AND
-                                        c_id = ' . $course_id . ' AND
+                                        exe_exo_id="' . $row['path'].'" AND
+                                        exe_user_id="' . $user_id.'" AND
+                                        orig_lp_id = "' . $lp_id.'" AND
+                                        orig_lp_item_id = "' . $row['myid'].'" AND
+                                        c_id = ' . $course_id.' AND
                                         status <> "incomplete" AND
-                                        session_id = ' . $session_id . '
+                                        session_id = ' . $session_id.'
                                      ORDER BY exe_date DESC ';
 
                             $resultLastAttempt = Database::query($sql);
@@ -746,12 +746,12 @@ 
                                 ) {
                                     $correct_test_link = Display::url(
                                         Display::return_icon('view_less_stats.gif', get_lang('HideAllAttempts')),
-                                        api_get_self() . '?action=stats' . $my_url_suffix . '&session_id=' . $session_id . '&lp_item_id=' . $my_id
+                                        api_get_self().'?action=stats'.$my_url_suffix.'&session_id='.$session_id.'&lp_item_id='.$my_id
                                     );
                                 } else {
                                     $correct_test_link = Display::url(
                                         Display::return_icon('view_more_stats.gif', get_lang('ShowAllAttemptsByExercise')),
-                                        api_get_self() . '?action=stats&extend_attempt=1' . $my_url_suffix . '&session_id=' . $session_id . '&lp_item_id=' . $my_id
+                                        api_get_self().'?action=stats&extend_attempt=1'.$my_url_suffix.'&session_id='.$session_id.'&lp_item_id='.$my_id
                                     );
                                 }
                             }
@@ -761,14 +761,14 @@ 
 
                         $action = null;
                         if ($type == 'classic') {
-                            $action =  '<td>' . $correct_test_link . '</td>';
+                            $action = '<td>'.$correct_test_link.'</td>';
                         }
 
                         if ($lp_id == $my_lp_id && false) {
 
-                            $output .= '<tr class =' . $oddclass . '>
-                                    <td>' . $extend_link . '</td>
-                                    <td colspan="4">' . $title . '</td>
+                            $output .= '<tr class ='.$oddclass.'>
+                                    <td>' . $extend_link.'</td>
+                                    <td colspan="4">' . $title.'</td>
                                     <td colspan="2">&nbsp;</td>
                                     <td colspan="2">&nbsp;</td>
                                     <td colspan="2">&nbsp;</td>
@@ -793,13 +793,13 @@ 
                                     $scoreItem .= ExerciseLib::show_score($score, $maxscore, false);
                                 }
                             } else {
-                                $scoreItem .= $score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . $maxscore);
+                                $scoreItem .= $score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.$maxscore);
                             }
 
                             $output .= '
                                 <td>'.$extend_link.'</td>
-                                <td colspan="4">' . $title . '</td>
-                                <td colspan="2">' . learnpathitem::humanize_status($lesson_status) .'</td>
+                                <td colspan="4">' . $title.'</td>
+                                <td colspan="2">' . learnpathitem::humanize_status($lesson_status).'</td>
                                 <td colspan="2">'.$scoreItem.'</td>
                                 <td colspan="2">'.$time.'</td>
                                 '.$action.'
@@ -816,10 +816,10 @@ 
                                 if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                     $temp[] = '/';
                                 } else {
-                                    $temp[] = ($score == 0 ? '0/' . $maxscore : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
+                                    $temp[] = ($score == 0 ? '0/'.$maxscore : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1)));
                                 }
                             } else {
-                                $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
+                                $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1)));
                             }
                             $temp[] = $time;
                             $csv_content[] = $temp;
@@ -830,7 +830,7 @@ 
 
                     $action = null;
                     if ($type == 'classic') {
-                        $action =  '<td></td>';
+                        $action = '<td></td>';
                     }
 
                     if ($extend_this_attempt || $extend_all) {
@@ -867,11 +867,11 @@ 
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                    <td>' . $interaction['order_id'] . '</td>
-                                    <td colspan="2">'.$interaction['objective_id'] . '</td>
-                                    <td colspan="2">' . $interaction['status'] . '</td>
+                                    <td>' . $interaction['order_id'].'</td>
+                                    <td colspan="2">'.$interaction['objective_id'].'</td>
+                                    <td colspan="2">' . $interaction['status'].'</td>
                                     <td>' . $interaction['score_raw'].'</td>
-                                    <td>' . $interaction['score_max'] .'</td>
+                                    <td>' . $interaction['score_max'].'</td>
                                     <td>' . $interaction['score_min'].'</td>
                                     '.$action.'
                                </tr>';
@@ -880,7 +880,7 @@ 
                     }
 
                     // Attempts listing by exercise.
-                    if ($lp_id == $my_lp_id && $lp_item_id== $my_id && $extendedAttempt) {
+                    if ($lp_id == $my_lp_id && $lp_item_id == $my_id && $extendedAttempt) {
                         // Get attempts of a exercise.
                         if (!empty($lp_id) &&
                             !empty($lp_item_id) &&
@@ -895,15 +895,15 @@ 
                             $row_path = Database::fetch_array($res_path);
 
                             if (Database::num_rows($res_path) > 0) {
-                                $sql = 'SELECT * FROM ' . $tbl_stats_exercices . '
+                                $sql = 'SELECT * FROM '.$tbl_stats_exercices.'
                                         WHERE
-                                            exe_exo_id="' . (int) $row_path['path'] . '" AND
+                                            exe_exo_id="' . (int) $row_path['path'].'" AND
                                             status <> "incomplete" AND
-                                            exe_user_id="' . $user_id . '" AND
-                                            orig_lp_id = "' . (int) $lp_id . '" AND
-                                            orig_lp_item_id = "' . (int) $lp_item_id . '" AND
-                                            c_id = ' . $course_id . '  AND
-                                            session_id = ' . $session_id . '
+                                            exe_user_id="' . $user_id.'" AND
+                                            orig_lp_id = "' . (int) $lp_id.'" AND
+                                            orig_lp_item_id = "' . (int) $lp_item_id.'" AND
+                                            c_id = ' . $course_id.'  AND
+                                            session_id = ' . $session_id.'
                                         ORDER BY exe_date';
                                 $res_attempts = Database::query($sql);
                                 $num_attempts = Database::num_rows($res_attempts);
@@ -921,7 +921,7 @@ 
                                         if ($mktime_start_date && $mktime_exe_date) {
                                             $mytime = ((int) $mktime_exe_date - (int) $mktime_start_date);
                                             $time_attemp = learnpathItem :: getScormTimeFromParameter('js', $mytime);
-                                            $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp);
+                                            $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp);
                                         } else {
                                             $time_attemp = ' - ';
                                         }
@@ -947,33 +947,33 @@ 
                                             $my_lesson_status = learnpathitem::humanize_status('incomplete');
                                         }
 
-                                        $output .= '<tr class="' . $oddclass . '" >
+                                        $output .= '<tr class="'.$oddclass.'" >
                                         <td></td>
-                                        <td>' . $extend_attempt_link . '</td>
-                                        <td colspan="3">' . get_lang('Attempt').' '. $n.'</td>
-                                        <td colspan="2">' . $my_lesson_status . '</td>
-                                        <td colspan="2">'.$view_score . '</td>
-                                        <td colspan="2">'.$time_attemp . '</td>';
+                                        <td>' . $extend_attempt_link.'</td>
+                                        <td colspan="3">' . get_lang('Attempt').' '.$n.'</td>
+                                        <td colspan="2">' . $my_lesson_status.'</td>
+                                        <td colspan="2">'.$view_score.'</td>
+                                        <td colspan="2">'.$time_attemp.'</td>';
                                         if ($action == 'classic') {
                                             if ($origin != 'tracking') {
                                                 if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                                     $output .= '<td>
-                                                            <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="' . get_lang('ShowAttempt') . '" title="' . get_lang('ShowAttempt') . '">
+                                                            <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="'.get_lang('ShowAttempt').'" title="'.get_lang('ShowAttempt').'">
                                                             </td>';
                                                 } else {
                                                     $output .= '<td>
-                                                            <a href="../exercise/exercise_show.php?origin=' . $origin . '&id=' . $my_exe_id . '&cidReq=' . $courseCode . '" target="_parent">
-                                                            <img src="' . Display::returnIconPath('quiz.gif').'" alt="' . get_lang('ShowAttempt') . '" title="' . get_lang('ShowAttempt') . '">
+                                                            <a href="../exercise/exercise_show.php?origin=' . $origin.'&id='.$my_exe_id.'&cidReq='.$courseCode.'" target="_parent">
+                                                            <img src="' . Display::returnIconPath('quiz.gif').'" alt="'.get_lang('ShowAttempt').'" title="'.get_lang('ShowAttempt').'">
                                                             </a></td>';
                                                 }
                                             } else {
                                                 if (!$is_allowed_to_edit && $result_disabled_ext_all) {
                                                     $output .= '<td>
-                                                                <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="' . get_lang('ShowAndQualifyAttempt') . '" title="' . get_lang('ShowAndQualifyAttempt') . '"></td>';
+                                                                <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="'.get_lang('ShowAndQualifyAttempt').'" title="'.get_lang('ShowAndQualifyAttempt').'"></td>';
                                                 } else {
                                                     $output .= '<td>
-                                                                    <a href="../exercise/exercise_show.php?cidReq=' . $courseCode . '&origin=correct_exercise_in_lp&id=' . $my_exe_id . '" target="_parent">
-                                                                    <img src="' . Display::returnIconPath('quiz.gif').'" alt="' . get_lang('ShowAndQualifyAttempt') . '" title="' . get_lang('ShowAndQualifyAttempt') . '"></a></td>';
+                                                                    <a href="../exercise/exercise_show.php?cidReq=' . $courseCode.'&origin=correct_exercise_in_lp&id='.$my_exe_id.'" target="_parent">
+                                                                    <img src="' . Display::returnIconPath('quiz.gif').'" alt="'.get_lang('ShowAndQualifyAttempt').'" title="'.get_lang('ShowAndQualifyAttempt').'"></a></td>';
                                                 }
                                             }
                                         }
@@ -1032,13 +1032,13 @@ 
         }
 
         $total_time = learnpathItem::getScormTimeFromParameter('js', $total_time);
-        $total_time = str_replace('NaN', '00' . $h . '00\'00"', $total_time);
+        $total_time = str_replace('NaN', '00'.$h.'00\'00"', $total_time);
 
         if (!$is_allowed_to_edit && $result_disabled_ext_all) {
             $final_score = Display::return_icon('invisible.gif', get_lang('ResultsHiddenByExerciseSetting'));
         } else {
             if (is_numeric($total_score)) {
-                $final_score = $total_score . '%';
+                $final_score = $total_score.'%';
             } else {
                 $final_score = $total_score;
             }
@@ -1054,19 +1054,19 @@ 
 
         $action = null;
         if ($type == 'classic') {
-            $action =  '<td></td>';
+            $action = '<td></td>';
         }
 
         $output .= '<tr class="'.$oddclass.'">
                 <td></td>
                 <td colspan="4">
-                    <i>' . get_lang('AccomplishedStepsTotal') .'</i>
+                    <i>' . get_lang('AccomplishedStepsTotal').'</i>
                 </td>
                 <td colspan="2">'.$progress.'%</td>
                 <td colspan="2">
                     ' . $final_score.'
                 </td>
-                <td colspan="2">' . $total_time . '</div>
+                <td colspan="2">' . $total_time.'</div>
                 '.$action.'
            </tr>';
 
@@ -1410,7 +1410,7 @@ 
     	$tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
     	if (is_array($user_id)) {
     	    $user_id = array_map('intval', $user_id);
-    		$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
+    		$condition_user = " AND user_id IN (".implode(',', $user_id).") ";
     	} else {
     		$user_id = intval($user_id);
     		$condition_user = " AND user_id = $user_id ";
@@ -1446,13 +1446,13 @@ 
     {
     	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
     	$sql = 'SELECT login_date
-    	        FROM ' . $tbl_track_login . '
-                WHERE login_user_id = ' . intval($student_id) . '
+    	        FROM ' . $tbl_track_login.'
+                WHERE login_user_id = ' . intval($student_id).'
                 ORDER BY login_date ASC
                 LIMIT 0,1';
 
     	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
+    	if (Database::num_rows($rs) > 0) {
     		if ($first_login_date = Database::result($rs, 0, 0)) {
                 return api_convert_and_format_date(
                     $first_login_date,
@@ -1477,8 +1477,8 @@ 
     {
     	$table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
     	$sql = 'SELECT login_date
-    	        FROM ' . $table . '
-                WHERE login_user_id = ' . intval($student_id) . '
+    	        FROM ' . $table.'
+                WHERE login_user_id = ' . intval($student_id).'
                 ORDER BY login_date
                 DESC LIMIT 0,1';
 
@@ -1487,18 +1487,18 @@ 
     		if ($last_login_date = Database::result($rs, 0, 0)) {
     			$last_login_date = api_get_local_time($last_login_date);
     			if ($return_timestamp) {
-    				return api_strtotime($last_login_date,'UTC');
+    				return api_strtotime($last_login_date, 'UTC');
     			} else {
     				if (!$warning_message) {
     					return api_format_date($last_login_date, DATE_FORMAT_SHORT);
     				} else {
-    					$timestamp = api_strtotime($last_login_date,'UTC');
+    					$timestamp = api_strtotime($last_login_date, 'UTC');
     					$currentTimestamp = time();
 
     					//If the last connection is > than 7 days, the text is red
     					//345600 = 7 days in seconds
     					if ($currentTimestamp - $timestamp > 604800) {
-    						return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
+    						return '<span style="color: #F00;">'.api_format_date($last_login_date, DATE_FORMAT_SHORT).'</span>';
     					} else {
     						return api_format_date($last_login_date, DATE_FORMAT_SHORT);
     					}
@@ -1533,7 +1533,7 @@ 
         $sql = "$select
                 FROM $tbl_track_login
                 WHERE
-                    login_user_id IN (' ". implode("','", $studentList) . "' ) AND
+                    login_user_id IN (' ".implode("','", $studentList)."' ) AND
                     login_date < '$date'
                 ";
         $rs = Database::query($sql);
@@ -1632,7 +1632,7 @@ 
                               '.Display::return_icon('messagebox_warning.gif').'
                              </a>'
                             : null;
-    					return $icon. Display::label($last_login_date, 'warning');
+    					return $icon.Display::label($last_login_date, 'warning');
     				} else {
     					return $last_login_date;
     				}
@@ -1682,7 +1682,7 @@ 
                     session_id = $session_id
                     $month_filter";
     	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
+    	if (Database::num_rows($rs) > 0) {
     		$row = Database::fetch_object($rs);
     		$count = $row->count_connections;
     	}
@@ -1703,14 +1703,14 @@ 
     	$tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
     	$sql = 'SELECT DISTINCT c_id
-                FROM ' . $tbl_course_rel_user . '
+                FROM ' . $tbl_course_rel_user.'
                 WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH;
     	$rs = Database::query($sql);
     	$nb_courses = Database::num_rows($rs);
 
     	if ($include_sessions) {
     		$sql = 'SELECT DISTINCT c_id
-                    FROM ' . $tbl_session_course_rel_user . '
+                    FROM ' . $tbl_session_course_rel_user.'
                     WHERE user_id = ' . $user_id;
     		$rs = Database::query($sql);
     		$nb_courses += Database::num_rows($rs);
@@ -1757,7 +1757,7 @@ 
     		$condition_quiz = "";
     		if (!empty($exercise_id)) {
     			$exercise_id = intval($exercise_id);
-    			$condition_quiz =" AND id = $exercise_id ";
+    			$condition_quiz = " AND id = $exercise_id ";
     		}
 
     		// Compose a filter based on optional session id given
@@ -1810,7 +1810,7 @@ 
                         }
                     }
                     if (!empty($exercise_list)) {
-                        $exercise_id = implode("','",$exercise_list);
+                        $exercise_id = implode("','", $exercise_list);
                     }
     			}
 
@@ -1835,10 +1835,10 @@ 
     			$quiz_avg_score = null;
 
     			if (!empty($row['avg_score'])) {
-    				$quiz_avg_score = round($row['avg_score'],2);
+    				$quiz_avg_score = round($row['avg_score'], 2);
     			}
 
-    			if(!empty($row['num_attempts'])) {
+    			if (!empty($row['num_attempts'])) {
     				$quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
     			}
     			if (is_array($student_id)) {
@@ -1968,7 +1968,7 @@ 
             $row = Database::fetch_row($rs);
             $count = $row[0];
         }
-        $count = ($count != 0 ) ? 100*round(intval($count)/count($exercise_list), 2) .'%' : '0%';
+        $count = ($count != 0) ? 100 * round(intval($count) / count($exercise_list), 2).'%' : '0%';
         return $count;
     }
 
@@ -1993,7 +1993,7 @@ 
                 );
 
                 if (!empty($best_attempt) && !empty($best_attempt['exe_weighting'])) {
-                    $result += $best_attempt['exe_result']/$best_attempt['exe_weighting'];
+                    $result += $best_attempt['exe_result'] / $best_attempt['exe_weighting'];
                 }
             }
             $result = $result / count($exercise_list);
@@ -2030,7 +2030,7 @@ 
         $query = sprintf($sql, intval($courseId), $sessionId);
         $rs = Database::query($query);
         $teachers = array();
-        while ($teacher = Database::fetch_array($rs,'ASSOC')) {
+        while ($teacher = Database::fetch_array($rs, 'ASSOC')) {
             $teachers[] = $teacher;
         }
         $data = array();
@@ -2154,7 +2154,7 @@ 
             $data[] = array(
                 'course' => $course['title'],
                 'session' => $teacher['name'],
-                'tutor' => $tutor['username'] . ' - ' . $tutor['lastname'] . ' ' . $tutor['firstname'],
+                'tutor' => $tutor['username'].' - '.$tutor['lastname'].' '.$tutor['firstname'],
                 'documents' => $totalDocuments,
                 'links' => $totalLinks,
                 'forums' => $totalForums,
@@ -2217,7 +2217,7 @@ 
             for ($i = 0; $i < count($lpIdList); $i++) {
                 $placeHolders[] = '?';
             }
-            $lpConditions['AND id IN(' . implode(', ', $placeHolders) . ') '] = $lpIdList;
+            $lpConditions['AND id IN('.implode(', ', $placeHolders).') '] = $lpIdList;
         }
 
         if ($onlySeriousGame) {
@@ -2237,14 +2237,14 @@ 
 
         $conditions = [
             " c_id = {$courseInfo['real_id']} ",
-            " lp_view.lp_id IN(" . implode(', ', $filteredLP) . ") "
+            " lp_view.lp_id IN(".implode(', ', $filteredLP).") "
         ];
 
         $groupBy = 'GROUP BY lp_id';
 
         if (is_array($studentId)) {
             $studentId = array_map('intval', $studentId);
-            $conditions[] = " lp_view.user_id IN (" . implode(',', $studentId) . ")  ";
+            $conditions[] = " lp_view.user_id IN (".implode(',', $studentId).")  ";
 
 
         } else {
@@ -2379,7 +2379,7 @@ 
             // Compose a filter based on optional learning paths list given
             $condition_lp = "";
             if (count($lp_ids) > 0) {
-                $condition_lp =" AND id IN(".implode(',',$lp_ids).") ";
+                $condition_lp = " AND id IN(".implode(',', $lp_ids).") ";
             }
 
             // Compose a filter based on optional session id
@@ -2419,9 +2419,9 @@ 
             // prepare filter on users
             if (is_array($student_id)) {
                 array_walk($student_id, 'intval');
-                $condition_user1 =" AND user_id IN (".implode(',', $student_id).") ";
+                $condition_user1 = " AND user_id IN (".implode(',', $student_id).") ";
             } else {
-                $condition_user1 =" AND user_id = $student_id ";
+                $condition_user1 = " AND user_id = $student_id ";
             }
 
             if ($count_row_lp > 0 && !empty($student_id)) {
@@ -2464,7 +2464,7 @@ 
                                     ORDER BY lp_item_id";
                             $res_lp_item = Database::query($sql);
 
-                            while ($row_lp_item = Database::fetch_array($res_lp_item,'ASSOC')) {
+                            while ($row_lp_item = Database::fetch_array($res_lp_item, 'ASSOC')) {
                                 $my_lp_item_id = $row_lp_item['lp_item_id'];
 
                                 // Getting the most recent attempt
@@ -2487,8 +2487,8 @@ 
                                         ORDER BY view_count DESC
                                         LIMIT 1";
                                 $res_lp_item_result = Database::query($sql);
-                                while ($row_max_score = Database::fetch_array($res_lp_item_result,'ASSOC')) {
-                                    $list[]= $row_max_score;
+                                while ($row_max_score = Database::fetch_array($res_lp_item_result, 'ASSOC')) {
+                                    $list[] = $row_max_score;
                                 }
                             }
                         } else {
@@ -2512,8 +2512,8 @@ 
                             if ($debug) echo $sql.'<br />';
                             $res_max_score = Database::query($sql);
 
-                            while ($row_max_score = Database::fetch_array($res_max_score,'ASSOC')) {
-                                $list[]= $row_max_score;
+                            while ($row_max_score = Database::fetch_array($res_max_score, 'ASSOC')) {
+                                $list[] = $row_max_score;
                             }
                         }
 
@@ -2528,7 +2528,7 @@ 
                             $max_score_item_view = $row_max_score['max_score_item_view'];
                             $score = $row_max_score['score'];
 
-                            if ($debug) echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>';
+                            if ($debug) echo '<h3>Item Type: '.$row_max_score['item_type'].'</h3>';
 
                             if ($row_max_score['item_type'] == 'sco') {
                                 /* Check if it is sco (easier to get max_score)
@@ -2546,7 +2546,7 @@ 
                                 }
                                 // Avoid division by zero errors
                                 if (!empty($max_score)) {
-                                    $lp_partial_total += $score/$max_score;
+                                    $lp_partial_total += $score / $max_score;
                                 }
                                 if ($debug) echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
                             } else {
@@ -2570,10 +2570,10 @@ 
                                         ORDER BY exe_date DESC
                                         LIMIT 1";
 
-                                if ($debug) echo $sql .'<br />';
+                                if ($debug) echo $sql.'<br />';
                                 $result_last_attempt = Database::query($sql);
                                 $num = Database :: num_rows($result_last_attempt);
-                                if ($num > 0 ) {
+                                if ($num > 0) {
                                     $id_last_attempt = Database :: result($result_last_attempt, 0, 0);
                                     if ($debug) echo $id_last_attempt.'<br />';
 
@@ -2602,13 +2602,13 @@ 
                                         $max_score = $row_max_score_bis['maxscore'];
                                     }
                                     if (!empty($max_score) && floatval($max_score) > 0) {
-                                        $lp_partial_total += $score/$max_score;
+                                        $lp_partial_total += $score / $max_score;
                                     }
                                     if ($debug) echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />';
                                 }
                             }
 
-                            if (in_array($row_max_score['item_type'], array('quiz','sco'))) {
+                            if (in_array($row_max_score['item_type'], array('quiz', 'sco'))) {
                                 // Normal way
                                 if ($use_max_score[$lp_id]) {
                                     $count_items++;
@@ -2643,8 +2643,8 @@ 
                     if ($debug) echo $sql;
                     $result_have_quiz = Database::query($sql);
 
-                    if (Database::num_rows($result_have_quiz) > 0 ) {
-                        $row = Database::fetch_array($result_have_quiz,'ASSOC');
+                    if (Database::num_rows($result_have_quiz) > 0) {
+                        $row = Database::fetch_array($result_have_quiz, 'ASSOC');
                         if (is_numeric($row['count']) && $row['count'] != 0) {
                             $lp_with_quiz++;
                         }
@@ -2656,7 +2656,7 @@ 
 
                 if ($lp_with_quiz != 0) {
                     if (!$return_array) {
-                        $score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2);
+                        $score_of_scorm_calculate = round(($global_result / $lp_with_quiz), 2);
                         if ($debug) var_dump($score_of_scorm_calculate);
                         if (empty($lp_ids)) {
                             if ($debug) echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>';
@@ -2730,9 +2730,9 @@ 
 
         if (is_array($student_id)) {
             array_walk($student_id, 'intval');
-            $conditions[] =" lp_view.user_id IN (".implode(',', $student_id).") ";
+            $conditions[] = " lp_view.user_id IN (".implode(',', $student_id).") ";
         } else {
-            $conditions[] =" lp_view.user_id = $student_id ";
+            $conditions[] = " lp_view.user_id = $student_id ";
         }
 
         $conditionsToString = implode('AND ', $conditions);
@@ -2756,7 +2756,7 @@ 
             return 0;
         }
 
-        return ($row['sum_score'] / $row['sum_max_score'])*100;
+        return ($row['sum_score'] / $row['sum_max_score']) * 100;
 
     }
 
@@ -2786,7 +2786,7 @@ 
             // Compose a filter based on optional learning paths list given
             $condition_lp = "";
             if (count($lp_ids) > 0) {
-                $condition_lp =" AND id IN(".implode(',',$lp_ids).") ";
+                $condition_lp = " AND id IN(".implode(',', $lp_ids).") ";
             }
 
             // Compose a filter based on optional session id
@@ -2848,7 +2848,7 @@ 
 
         if (!empty($course)) {
 
-            $course_id	 = $course['real_id'];
+            $course_id = $course['real_id'];
 
             $lp_table    = Database :: get_course_table(TABLE_LP_MAIN);
             $t_lpv       = Database :: get_course_table(TABLE_LP_VIEW);
@@ -2862,8 +2862,8 @@ 
             // calculates last connection time
             if ($count_row_lp > 0) {
                 $sql = 'SELECT MAX(start_time)
-                        FROM ' . $t_lpiv . ' AS item_view
-                        INNER JOIN ' . $t_lpv . ' AS view
+                        FROM ' . $t_lpiv.' AS item_view
+                        INNER JOIN ' . $t_lpv.' AS view
                             ON item_view.lp_view_id = view.id
                         WHERE
                             item_view.c_id 		= '.$course_id.' AND
@@ -2899,15 +2899,15 @@ 
 
         // At first, courses where $coach_id is coach of the course //
         $sql = 'SELECT session_id, c_id
-                FROM ' . $tbl_session_course_user . '
+                FROM ' . $tbl_session_course_user.'
                 WHERE user_id=' . $coach_id.' AND status=2';
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 $sql = 'SELECT scu.session_id, scu.c_id
-                    FROM ' . $tbl_session_course_user . ' scu
+                    FROM ' . $tbl_session_course_user.' scu
                     INNER JOIN '.$tbl_session_rel_access_url.'  sru
                     ON (scu.session_id=sru.session_id)
                     WHERE
@@ -2941,28 +2941,28 @@ 
 
         // Then, courses where $coach_id is coach of the session    //
         $sql = 'SELECT session_course_user.user_id
-                FROM ' . $tbl_session_course_user . ' as session_course_user
+                FROM ' . $tbl_session_course_user.' as session_course_user
                 INNER JOIN     '.$tbl_session_user.' sru
                 ON session_course_user.user_id = sru.user_id AND session_course_user.session_id = sru.session_id
-                INNER JOIN ' . $tbl_session_course . ' as session_course
+                INNER JOIN ' . $tbl_session_course.' as session_course
                 ON session_course.c_id = session_course_user.c_id
                 AND session_course_user.session_id = session_course.session_id
-                INNER JOIN ' . $tbl_session . ' as session
+                INNER JOIN ' . $tbl_session.' as session
                 ON session.id = session_course.session_id
                 AND session.id_coach = ' . $coach_id;
         if (api_is_multiple_url_enabled()) {
-            $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+            $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
             $access_url_id = api_get_current_access_url_id();
-            if ($access_url_id != -1){
+            if ($access_url_id != -1) {
                 $sql = 'SELECT session_course_user.user_id
-                        FROM ' . $tbl_session_course_user . ' as session_course_user
+                        FROM ' . $tbl_session_course_user.' as session_course_user
                         INNER JOIN     '.$tbl_session_user.' sru
                             ON session_course_user.user_id = sru.user_id AND
                                session_course_user.session_id = sru.session_id
-                        INNER JOIN ' . $tbl_session_course . ' as session_course
+                        INNER JOIN ' . $tbl_session_course.' as session_course
                             ON session_course.c_id = session_course_user.c_id AND
                             session_course_user.session_id = session_course.session_id
-                        INNER JOIN ' . $tbl_session . ' as session
+                        INNER JOIN ' . $tbl_session.' as session
                             ON session.id = session_course.session_id AND
                             session.id_coach = ' . $coach_id.'
                         INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url
@@ -2992,8 +2992,8 @@ 
 
         $students = [];
         // At first, courses where $coach_id is coach of the course //
-        $sql = 'SELECT c_id FROM ' . $tbl_session_course_user . '
-                WHERE session_id="' . $id_session . '" AND user_id=' . $coach_id.' AND status=2';
+        $sql = 'SELECT c_id FROM '.$tbl_session_course_user.'
+                WHERE session_id="' . $id_session.'" AND user_id='.$coach_id.' AND status=2';
         $result = Database::query($sql);
 
         while ($a_courses = Database::fetch_array($result)) {
@@ -3003,7 +3003,7 @@ 
                     FROM $tbl_session_course_user AS srcru
                     WHERE
                         c_id = '$courseId' AND
-                        session_id = '" . $id_session . "'";
+                        session_id = '".$id_session."'";
             $rs = Database::query($sql);
             while ($row = Database::fetch_array($rs)) {
                 $students[$row['user_id']] = $row['user_id'];
@@ -3011,15 +3011,15 @@ 
         }
 
         // Then, courses where $coach_id is coach of the session
-        $sql = 'SELECT id_coach FROM ' . $tbl_session . '
-                WHERE id="' . $id_session.'" AND id_coach="' . $coach_id . '"';
+        $sql = 'SELECT id_coach FROM '.$tbl_session.'
+                WHERE id="' . $id_session.'" AND id_coach="'.$coach_id.'"';
         $result = Database::query($sql);
 
         //He is the session_coach so we select all the users in the session
         if (Database::num_rows($result) > 0) {
             $sql = 'SELECT DISTINCT srcru.user_id
-                    FROM ' . $tbl_session_course_user . ' AS srcru
-                    WHERE session_id="' . $id_session . '"';
+                    FROM ' . $tbl_session_course_user.' AS srcru
+                    WHERE session_id="' . $id_session.'"';
             $result = Database::query($sql);
             while ($row = Database::fetch_array($result)) {
                 $students[$row['user_id']] = $row['user_id'];
@@ -3046,8 +3046,8 @@ 
 
         // At first, courses where $coach_id is coach of the course //
 
-        $sql = 'SELECT 1 FROM ' . $tbl_session_course_user . '
-                WHERE user_id=' . $coach_id .' AND status=2';
+        $sql = 'SELECT 1 FROM '.$tbl_session_course_user.'
+                WHERE user_id=' . $coach_id.' AND status=2';
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return true;
@@ -3055,12 +3055,12 @@ 
 
         // Then, courses where $coach_id is coach of the session
         $sql = 'SELECT session_course_user.user_id
-                FROM ' . $tbl_session_course_user . ' as session_course_user
-                INNER JOIN ' . $tbl_session_course . ' as session_course
+                FROM ' . $tbl_session_course_user.' as session_course_user
+                INNER JOIN ' . $tbl_session_course.' as session_course
                     ON session_course.c_id = session_course_user.c_id
-                INNER JOIN ' . $tbl_session . ' as session
+                INNER JOIN ' . $tbl_session.' as session
                     ON session.id = session_course.session_id
-                    AND session.id_coach = ' . $coach_id . '
+                    AND session.id_coach = ' . $coach_id.'
                 WHERE user_id = ' . $student_id;
         $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
@@ -3092,16 +3092,16 @@ 
         // At first, courses where $coach_id is coach of the course.
 
         $sql = 'SELECT DISTINCT c.code
-                FROM ' . $tbl_session_course_user . ' sc
+                FROM ' . $tbl_session_course_user.' sc
                 INNER JOIN '.$tbl_course.' c
                 ON (c.id = sc.c_id)
                 WHERE user_id = ' . $coach_id.' AND status = 2';
 
         if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();
-            if ($access_url_id != -1){
+            if ($access_url_id != -1) {
                 $sql = 'SELECT DISTINCT c.code
-                        FROM ' . $tbl_session_course_user . ' scu
+                        FROM ' . $tbl_session_course_user.' scu
                         INNER JOIN '.$tbl_course.' c
                         ON (c.code = scu.c_id)
                         INNER JOIN '.$tbl_course_rel_access_url.' cru
@@ -3114,7 +3114,7 @@ 
         }
 
         if (!empty($id_session)) {
-            $sql .= ' AND session_id=' . $id_session;
+            $sql .= ' AND session_id='.$id_session;
         }
 
         $courseList = array();
@@ -3126,25 +3126,25 @@ 
         // Then, courses where $coach_id is coach of the session
 
         $sql = 'SELECT DISTINCT course.code
-                FROM ' . $tbl_session_course . ' as session_course
-                INNER JOIN ' . $tbl_session . ' as session
+                FROM ' . $tbl_session_course.' as session_course
+                INNER JOIN ' . $tbl_session.' as session
                     ON session.id = session_course.session_id
-                    AND session.id_coach = ' . $coach_id . '
-                INNER JOIN ' . $tbl_course . ' as course
+                    AND session.id_coach = ' . $coach_id.'
+                INNER JOIN ' . $tbl_course.' as course
                     ON course.id = session_course.c_id';
 
         if (api_is_multiple_url_enabled()) {
             $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
             $access_url_id = api_get_current_access_url_id();
-            if ($access_url_id != -1){
+            if ($access_url_id != -1) {
                 $sql = 'SELECT DISTINCT c.code
-                    FROM ' . $tbl_session_course . ' as session_course
+                    FROM ' . $tbl_session_course.' as session_course
                     INNER JOIN '.$tbl_course.' c
                     ON (c.id = session_course.c_id)
-                    INNER JOIN ' . $tbl_session . ' as session
+                    INNER JOIN ' . $tbl_session.' as session
                     ON session.id = session_course.session_id
-                        AND session.id_coach = ' . $coach_id . '
-                    INNER JOIN ' . $tbl_course . ' as course
+                        AND session.id_coach = ' . $coach_id.'
+                    INNER JOIN ' . $tbl_course.' as course
                         ON course.id = session_course.c_id
                      INNER JOIN '.$tbl_course_rel_access_url.' course_rel_url
                     ON (course_rel_url.c_id = c.id)';
@@ -3152,12 +3152,12 @@ 
         }
 
         if (!empty ($id_session)) {
-            $sql .= ' WHERE session_course.session_id=' . $id_session;
+            $sql .= ' WHERE session_course.session_id='.$id_session;
             if (api_is_multiple_url_enabled())
-            $sql .=  ' AND access_url_id = '.$access_url_id;
-        }  else {
+            $sql .= ' AND access_url_id = '.$access_url_id;
+        } else {
             if (api_is_multiple_url_enabled())
-            $sql .=  ' WHERE access_url_id = '.$access_url_id;
+            $sql .= ' WHERE access_url_id = '.$access_url_id;
         }
 
         $result = Database::query($sql);
@@ -3213,7 +3213,7 @@ 
             }
         }
 
-        $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+        $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
         $access_url_id = api_get_current_access_url_id();
 
         $sql = "
@@ -3333,7 +3333,7 @@ 
             // table definition
             $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
             $tbl_document = Database :: get_course_table(TABLE_DOCUMENT);
-            $course_id	 = $a_course['real_id'];
+            $course_id = $a_course['real_id'];
             if (is_array($student_id)) {
                 $studentList = array_map('intval', $student_id);
                 $condition_user = " AND ip.insert_user_id IN ('".implode(',', $studentList)."') ";
@@ -3384,7 +3384,7 @@ 
         $a_course = CourseManager::get_course_information($course_code);
         if (!empty($a_course)) {
             $course_id = $a_course['real_id'];
-            $conditions[]= " ip.c_id  = $course_id AND pub.c_id  = $course_id ";
+            $conditions[] = " ip.c_id  = $course_id AND pub.c_id  = $course_id ";
         }
 
         // table definition
@@ -3393,14 +3393,14 @@ 
 
         if (is_array($student_id)) {
             $studentList = array_map('intval', $student_id);
-            $conditions[]= " ip.insert_user_id IN ('".implode("','", $studentList)."') ";
+            $conditions[] = " ip.insert_user_id IN ('".implode("','", $studentList)."') ";
         } else {
             $student_id = intval($student_id);
-            $conditions[]= " ip.insert_user_id = '$student_id' ";
+            $conditions[] = " ip.insert_user_id = '$student_id' ";
         }
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $conditions[]= " pub.session_id = $session_id ";
+            $conditions[] = " pub.session_id = $session_id ";
         }
         $conditionToString = implode('AND', $conditions);
 
@@ -3433,8 +3433,8 @@ 
         $courseCondition = null;
         $conditions = array();
         if (!empty($courseInfo)) {
-            $course_id	    = $courseInfo['real_id'];
-            $conditions[]= " post.c_id  = $course_id AND forum.c_id = $course_id ";
+            $course_id = $courseInfo['real_id'];
+            $conditions[] = " post.c_id  = $course_id AND forum.c_id = $course_id ";
         }
 
         // Table definition.
@@ -3443,15 +3443,15 @@ 
 
         if (is_array($student_id)) {
             $studentList = array_map('intval', $student_id);
-            $conditions[]= " post.poster_id IN ('".implode("','", $studentList)."') ";
+            $conditions[] = " post.poster_id IN ('".implode("','", $studentList)."') ";
         } else {
             $student_id = intval($student_id);
-            $conditions[]= " post.poster_id = '$student_id' ";
+            $conditions[] = " post.poster_id = '$student_id' ";
         }
 
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $conditions[]= " forum.session_id = $session_id";
+            $conditions[] = " forum.session_id = $session_id";
         }
 
         $conditionsToString = implode('AND ', $conditions);
@@ -3486,7 +3486,7 @@ 
             $condition_session = '';
             if (isset($session_id)) {
                 $session_id = intval($session_id);
-                $condition_session = api_get_session_condition($session_id, true,  false, 'f.session_id');
+                $condition_session = api_get_session_condition($session_id, true, false, 'f.session_id');
             }
 
             $course_id = $courseInfo['real_id'];
@@ -3542,7 +3542,7 @@ 
         $condition_session = '';
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $condition_session = ' AND f.session_id = '. $session_id;
+            $condition_session = ' AND f.session_id = '.$session_id;
         }
 
         $groupId = intval($groupId);
@@ -3603,7 +3603,7 @@ 
         $condition_session = '';
         if (isset($session_id)) {
              $session_id = intval($session_id);
-             $condition_session = ' AND f.session_id = '. $session_id;
+             $condition_session = ' AND f.session_id = '.$session_id;
         }
 
         $groupId = intval($groupId);
@@ -3682,7 +3682,7 @@ 
     {
         $student_id = intval($student_id);
         $courseId = intval($courseId);
-        $session_id    = intval($session_id);
+        $session_id = intval($session_id);
         $date_time  = '';
 
         // table definition
@@ -3751,7 +3751,7 @@ 
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 
         $sql = 'SELECT 1
-                FROM ' . $table . '
+                FROM ' . $table.'
                 WHERE down_user_id = '.$student_id.'
                 AND c_id  = "'.$courseId.'"
                 AND down_session_id = '.$session_id.' ';
@@ -3829,30 +3829,30 @@ 
                 '.$inner.'
                 WHERE c.id = '.$courseId.'
                 GROUP BY stats_login.user_id
-                HAVING DATE_SUB( "' . $now . '", INTERVAL '.$since.' DAY) > max_date ';
+                HAVING DATE_SUB( "' . $now.'", INTERVAL '.$since.' DAY) > max_date ';
 
         if ($since == 'never') {
             if (empty($session_id)) {
                 $sql = 'SELECT course_user.user_id
-                        FROM ' . $table_course_rel_user . ' course_user
-                        LEFT JOIN ' . $tbl_track_login . ' stats_login
+                        FROM ' . $table_course_rel_user.' course_user
+                        LEFT JOIN ' . $tbl_track_login.' stats_login
                         ON course_user.user_id = stats_login.user_id AND
-                        relation_type<>' . COURSE_RELATION_TYPE_RRHH . '
-                        INNER JOIN ' . $tableCourse . ' c
+                        relation_type<>' . COURSE_RELATION_TYPE_RRHH.'
+                        INNER JOIN ' . $tableCourse.' c
                         ON (c.id = course_user.c_id)
                         WHERE
-                            course_user.c_id = ' . $courseId . ' AND
+                            course_user.c_id = ' . $courseId.' AND
                             stats_login.login_course_date IS NULL
                         GROUP BY course_user.user_id';
             } else {
                 $sql = 'SELECT session_course_user.user_id
                         FROM '.$tbl_session_course_user.' session_course_user
-                        LEFT JOIN ' . $tbl_track_login . ' stats_login
+                        LEFT JOIN ' . $tbl_track_login.' stats_login
                         ON session_course_user.user_id = stats_login.user_id
-                        INNER JOIN ' . $tableCourse . ' c
+                        INNER JOIN ' . $tableCourse.' c
                         ON (c.id = session_course_user.c_id)
                         WHERE
-                            session_course_user.c_id = ' . $courseId . ' AND
+                            session_course_user.c_id = ' . $courseId.' AND
                             stats_login.login_course_date IS NULL
                         GROUP BY session_course_user.user_id';
 
@@ -3861,7 +3861,7 @@ 
 
         $rs = Database::query($sql);
         $inactive_users = array();
-        while($user = Database::fetch_array($rs)) {
+        while ($user = Database::fetch_array($rs)) {
             $inactive_users[] = $user['user_id'];
         }
 
@@ -3883,10 +3883,10 @@ 
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
 
         $sql = 'SELECT '.$student_id.'
-                FROM ' . $table . '
+                FROM ' . $table.'
                 WHERE
-                    access_user_id=' . $student_id . ' AND
-                    c_id="' . $courseId . '" AND
+                    access_user_id=' . $student_id.' AND
+                    c_id="' . $courseId.'" AND
                     access_session_id = "'.$session_id.'" ';
 
         $rs = Database::query($sql);
@@ -3904,13 +3904,13 @@ 
     {
         $hr_dept_id = intval($hr_dept_id);
         $a_students = array();
-        $tbl_user     = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 
         $sql = 'SELECT DISTINCT user_id FROM '.$tbl_user.' as user
                 WHERE hr_dept_id='.$hr_dept_id;
         $rs = Database::query($sql);
 
-        while($user = Database :: fetch_array($rs)) {
+        while ($user = Database :: fetch_array($rs)) {
             $a_students[$user['user_id']] = $user['user_id'];
         }
 
@@ -3935,7 +3935,7 @@ 
         $condition_session     = '';
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $condition_session = ' AND access_session_id = '. $session_id;
+            $condition_session = ' AND access_session_id = '.$session_id;
         }
         $sql = "SELECT
                     access_tool,
@@ -4047,7 +4047,7 @@ 
             if (!empty($date_from) && !empty($date_to)) {
                 $fieldStartDate = $fields['start_date'];
                 if (!isset($fields['end_date'])) {
-                    $where .= sprintf(" AND ($fieldStartDate BETWEEN '%s' AND '%s' )", $date_from, $date_to) ;
+                    $where .= sprintf(" AND ($fieldStartDate BETWEEN '%s' AND '%s' )", $date_from, $date_to);
                 } else {
                     $fieldEndDate = $fields['end_date'];
                     $where .= sprintf(" AND fieldStartDate >= '%s'
@@ -4063,12 +4063,12 @@ 
                 $where
                 GROUP BY %s";
             $sql = sprintf($sql,
-                $fields['user'],    //user field
-                $tableName,         //FROM
-                $fields['course'],  //course condition
-                $course['real_id'],    //course condition
-                $fields['user'],    //user condition
-                $userId,            //user condition
+                $fields['user'], //user field
+                $tableName, //FROM
+                $fields['course'], //course condition
+                $course['real_id'], //course condition
+                $fields['user'], //user condition
+                $userId, //user condition
                 $fields['user']     //GROUP BY
                 );
             $rs = Database::query($sql);
@@ -4076,7 +4076,7 @@ 
             //iterate query
             if (Database::num_rows($rs) > 0) {
                 while ($row = Database::fetch_array($rs)) {
-                    $data[$row['user']] = (isset($data[$row['user']])) ?  $data[$row['user']] + $row[total]: $row['total'];
+                    $data[$row['user']] = (isset($data[$row['user']])) ? $data[$row['user']] + $row[total] : $row['total'];
                 }
             }
         }
@@ -4099,11 +4099,11 @@ 
         $courseId = api_get_course_int_id($course_code);
         $data = array();
 
-        $TABLETRACK_DOWNLOADS   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        $TABLETRACK_DOWNLOADS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
         $condition_session = '';
         if (isset($session_id)) {
             $session_id = intval($session_id);
-            $condition_session = ' AND down_session_id = '. $session_id;
+            $condition_session = ' AND down_session_id = '.$session_id;
         }
         $sql = "SELECT down_doc_path, COUNT(DISTINCT down_user_id), COUNT(down_doc_path) as count_down
                 FROM $TABLETRACK_DOWNLOADS
@@ -4288,7 +4288,7 @@ 
 
             $final_course_data = array();
 
-            foreach($my_course_data as $course_id => $value) {
+            foreach ($my_course_data as $course_id => $value) {
                 $final_course_data[$course_id] = $course_list[$course_id];
             }
             $course_in_session[$my_session_id]['course_list'] = $final_course_data;
@@ -4311,7 +4311,7 @@ 
                           '.Display::tag('th', get_lang('Course'), array('width'=>'300px')).'
                           '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).'
                           '.Display::tag('th', get_lang('Progress'), array('class'=>'head')).'
-                          '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')),array('class'=>'head')).'
+                          '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).'
                           '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).'
                           '.Display::tag('th', get_lang('Details'), array('class'=>'head')).'
                         </tr>';
@@ -4400,7 +4400,7 @@ 
             $all_exercise_start_time = array();
 
             foreach ($course_in_session as $my_session_id => $session_data) {
-                $course_list  = $session_data['course_list'];
+                $course_list = $session_data['course_list'];
                 $user_count = count(SessionManager::get_users_by_session($my_session_id));
                 $exercise_graph_name_list = array();
                 //$user_results = array();
@@ -4445,20 +4445,20 @@ 
 
                             $score = 0;
                             if (!empty($user_result_data['exe_weighting']) && intval($user_result_data['exe_weighting']) != 0) {
-                                $score = intval($user_result_data['exe_result']/$user_result_data['exe_weighting'] * 100);
+                                $score = intval($user_result_data['exe_result'] / $user_result_data['exe_weighting'] * 100);
                             }
                             $time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0;
                             $all_exercise_start_time[] = $time;
                             $my_results[] = $score;
-                            if (count($exercise_list)<=10) {
+                            if (count($exercise_list) <= 10) {
                                 $title = cut($course_data['title'], 30)." \n ".cut($exercise_data['title'], 30);
-                                $exercise_graph_name_list[]= $title;
+                                $exercise_graph_name_list[] = $title;
                                 $all_exercise_graph_name_list[] = $title;
                             } else {
                                 // if there are more than 10 results, space becomes difficult to find, so only show the title of the exercise, not the tool
                                 $title = cut($exercise_data['title'], 30);
-                                $exercise_graph_name_list[]= $title;
-                                $all_exercise_graph_name_list[]= $title;
+                                $exercise_graph_name_list[] = $title;
+                                $all_exercise_graph_name_list[] = $title;
                             }
                         }
                     }
@@ -4491,7 +4491,7 @@ 
             }
 
             $html .= Display::page_subheader(
-                Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL) . ' ' . get_lang('Sessions')
+                Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL).' '.get_lang('Sessions')
             );
 
             $html .= '<div class="table-responsive">';
@@ -4545,7 +4545,7 @@ 
                                 $courseInfo['real_id'],
                                 $my_session_id
                             );
-                            if ($attempts > 1)  {
+                            if ($attempts > 1) {
                                 $answered_exercises++;
                             }
                         }
@@ -4558,7 +4558,7 @@ 
                     $all_average += $average;
                 }
 
-                $all_average = $all_average /  count($course_list);
+                $all_average = $all_average / count($course_list);
 
                 if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) {
                     $html .= '<tr style="background-color:#FBF09D">';
@@ -4584,16 +4584,16 @@ 
             }
             $html .= '</tbody>';
             $html .= '</table></div><br />';
-            $html .= Display::div($main_session_graph, array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') );
+            $html .= Display::div($main_session_graph, array('id'=>'session_graph', 'class'=>'chart-session', 'style'=>'position:relative; text-align: center;'));
 
             // Checking selected session.
 
             if (isset($_GET['session_id'])) {
                 $session_id_from_get = intval($_GET['session_id']);
-                $session_data 	= $course_in_session[$session_id_from_get];
-                $course_list 	= $session_data['course_list'];
+                $session_data = $course_in_session[$session_id_from_get];
+                $course_list = $session_data['course_list'];
 
-                $html .= Display::tag('h3',$session_data['name'].' - '.get_lang('CourseList'));
+                $html .= Display::tag('h3', $session_data['name'].' - '.get_lang('CourseList'));
 
                 $html .= '<div class="table-responsive">';
                 $html .= '<table class="table table-hover table-striped">';
@@ -4602,15 +4602,15 @@ 
                     <thead>
                     <tr>
                       <th width="300px">'.get_lang('Course').'</th>
-                      '.Display::tag('th', get_lang('PublishedExercises'),    	array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('NewExercises'),    		array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('MyAverage'), 				array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('AverageExerciseResult'), 	array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('TimeSpentInTheCourse'),    array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('LPProgress')     ,      	array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('LastConnexion'),         	array('class'=>'head')).'
-                      '.Display::tag('th', get_lang('Details'),               	array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('PublishedExercises'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('NewExercises'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('MyAverage'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('LPProgress'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).'
+                      '.Display::tag('th', get_lang('Details'), array('class'=>'head')).'
                     </tr>
                     </thead>
                     <tbody>
@@ -4629,14 +4629,14 @@ 
                         $count_exercises = count($exercises);
                     }
                     $answered_exercises = 0;
-                    foreach($exercises as $exercise_item) {
+                    foreach ($exercises as $exercise_item) {
                         $attempts = Event::count_exercise_attempts_by_user(
                             api_get_user_id(),
                             $exercise_item['id'],
                             $courseId,
                             $session_id_from_get
                         );
-                        if ($attempts > 1)  {
+                        if ($attempts > 1) {
                             $answered_exercises++;
                         }
                     }
@@ -4645,7 +4645,7 @@ 
 
                     // Average
                     $average = ExerciseLib::get_average_score_by_course($courseId, $session_id_from_get);
-                    $my_average	= ExerciseLib::get_average_score_by_course_by_user(api_get_user_id(), $courseId, $session_id_from_get);
+                    $my_average = ExerciseLib::get_average_score_by_course_by_user(api_get_user_id(), $courseId, $session_id_from_get);
 
                     $stats_array[$course_code] = array(
                         'exercises' => $count_exercises,
@@ -4722,7 +4722,7 @@ 
 
                     if ($course_code == $courseCodeFromGet && $_GET['session_id'] == $session_id_from_get) {
                         $details = '<a href="#">';
-                        $details .=Display::return_icon('2rightarrow_na.png', get_lang('Details'));
+                        $details .= Display::return_icon('2rightarrow_na.png', get_lang('Details'));
                     } else {
                         $details = '<a href="'.api_get_self().'?course='.$course_code.'&session_id='.$session_id_from_get.$extra_params.'">';
                         $details .= Display::return_icon('2rightarrow.png', get_lang('Details'));
@@ -4822,7 +4822,7 @@ 
                     );
 
                     $html .= '<tr class="row_even">';
-                    $url = api_get_path(WEB_CODE_PATH) . "exercise/overview.php?cidReq={$course_info['code']}&id_session=$session_id&exerciseId={$exercices['id']}";
+                    $url = api_get_path(WEB_CODE_PATH)."exercise/overview.php?cidReq={$course_info['code']}&id_session=$session_id&exerciseId={$exercices['id']}";
 
                     if ($visible_return['value'] == true) {
                         $exercices['title'] = Display::url(
@@ -4849,7 +4849,7 @@ 
                         );
 
                         $latest_attempt_url = '';
-                        $best_score = $position = $percentage_score_result  = '-';
+                        $best_score = $position = $percentage_score_result = '-';
                         $graph = $normal_graph = null;
 
                         // Getting best results
@@ -4881,11 +4881,11 @@ 
                                 $weighting      = $exercise_stat['exe_weighting'];
                                 $exe_id         = $exercise_stat['exe_id'];
 
-                                $latest_attempt_url .= api_get_path(WEB_CODE_PATH) . 'exercise/result.php?id='.$exe_id.'&cidReq='.$course_info['code'].'&show_headers=1&id_session='.$session_id;
+                                $latest_attempt_url .= api_get_path(WEB_CODE_PATH).'exercise/result.php?id='.$exe_id.'&cidReq='.$course_info['code'].'&show_headers=1&id_session='.$session_id;
                                 $percentage_score_result = Display::url(ExerciseLib::show_score($score, $weighting), $latest_attempt_url);
                                 $my_score = 0;
                                 if (!empty($weighting) && intval($weighting) != 0) {
-                                    $my_score = $score/$weighting;
+                                    $my_score = $score / $weighting;
                                 }
                                 //@todo this function slows the page
                                 if (is_int($user_list)) {
@@ -4899,14 +4899,14 @@ 
                         }
                         $html .= Display::div(
                             $normal_graph,
-                            array('id'=>'main_graph_'.$exercices['id'],'class'=>'dialog', 'style'=>'display:none')
+                            array('id'=>'main_graph_'.$exercices['id'], 'class'=>'dialog', 'style'=>'display:none')
                         );
 
                         if (empty($graph)) {
                             $graph = '-';
                         } else {
                             $graph = Display::url(
-                                '<img src="' . $graph . '" >',
+                                '<img src="'.$graph.'" >',
                                 $normal_graph,
                                 array(
                                     'id' => $exercices['id'],
@@ -4940,7 +4940,7 @@ 
 
             // LP table results
             $html .= '<div class="table-responsive">';
-            $html .='<table class="table table-striped table-hover">';
+            $html .= '<table class="table table-striped table-hover">';
             $html .= '<thead><tr>';
             $html .= Display::tag('th', get_lang('Learnpaths'), array('class'=>'head', 'style'=>'color:#000'));
             $html .= Display::tag('th', get_lang('LatencyTimeSpent'), array('class'=>'head', 'style'=>'color:#000'));
@@ -4976,7 +4976,7 @@ 
                     $time_spent_in_lp = api_time_to_hms($time_spent_in_lp);
 
                     $html .= '<tr class="row_even">';
-                    $url = api_get_path(WEB_CODE_PATH) . "lp/lp_controller.php?cidReq={$course_code}&id_session=$session_id&lp_id=$lp_id&action=view";
+                    $url = api_get_path(WEB_CODE_PATH)."lp/lp_controller.php?cidReq={$course_code}&id_session=$session_id&lp_id=$lp_id&action=view";
 
                     if ($learnpath['lp_visibility'] == 0) {
                         $html .= Display::tag('td', $learnpath['lp_name']);
@@ -4995,7 +4995,7 @@ 
                     if (!empty($last_connection_in_lp)) {
                         $last_connection = api_convert_and_format_date($last_connection_in_lp, DATE_TIME_FORMAT_LONG);
                     }
-                    $html .= Display::tag('td', $last_connection, array('align'=>'center','width'=>'180px'));
+                    $html .= Display::tag('td', $last_connection, array('align'=>'center', 'width'=>'180px'));
                     $html .= "</tr>";
                 }
             } else {
@@ -5005,7 +5005,7 @@ 
                         </td>
                       </tr>';
             }
-            $html .='</tbody></table></div>';
+            $html .= '</tbody></table></div>';
 
             $html .= self::displayUserSkills($user_id, $course_info['id'], $session_id);
         }
@@ -5034,7 +5034,7 @@ 
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setSerieDescription('Serie2', get_lang('AverageScore'));
         $myData->setAxisUnit(0, '%');
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
         $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
@@ -5042,9 +5042,9 @@ 
 
         if ($myCache->isInCache($chartHash)) {
             //if we already created the img
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Define width, height and angle */
             $mainWidth = 860;
@@ -5073,7 +5073,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     'FontSize' => 10)
             );
             /* Write the chart title */
@@ -5090,7 +5090,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     'FontSize' => 6
                 )
             );
@@ -5132,7 +5132,7 @@ 
             /* Draw the line chart */
             $myPicture->setFontProperties(
                 array(
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     'FontSize' => 10
                 )
             );
@@ -5165,12 +5165,12 @@ 
             );
 
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
 
-        $html = '<img src="' . $imgPath . '">';
+        $html = '<img src="'.$imgPath.'">';
 
         return $html;
     }
@@ -5191,12 +5191,12 @@ 
 
         foreach ($attempts as $attempt) {
             if (api_get_user_id() == $attempt['exe_user_id']) {
-                if ($attempt['exe_weighting'] != 0 ) {
-                    $my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting'];
+                if ($attempt['exe_weighting'] != 0) {
+                    $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting'];
                 }
             } else {
-                if ($attempt['exe_weighting'] != 0 ) {
-                    $exercise_result[]=  $attempt['exe_result']/$attempt['exe_weighting'];
+                if ($attempt['exe_weighting'] != 0) {
+                    $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting'];
                 }
             }
         }
@@ -5205,27 +5205,27 @@ 
         rsort($my_exercise_result_array);
         $my_exercise_result = 0;
         if (isset($my_exercise_result_array[0])) {
-            $my_exercise_result = $my_exercise_result_array[0] *100;
+            $my_exercise_result = $my_exercise_result_array[0] * 100;
         }
 
         $max     = 100;
-        $pieces  = 5 ;
+        $pieces  = 5;
         $part    = round($max / $pieces);
         $x_axis = array();
         $final_array = array();
         $my_final_array = array();
 
-        for ($i=1; $i <=$pieces; $i++) {
+        for ($i = 1; $i <= $pieces; $i++) {
             $sum = 1;
             if ($i == 1) {
                 $sum = 0;
             }
-            $min = ($i-1)*$part + $sum;
-            $max = ($i)*$part;
-            $x_axis[]= $min." - ".$max;
+            $min = ($i - 1) * $part + $sum;
+            $max = ($i) * $part;
+            $x_axis[] = $min." - ".$max;
             $count = 0;
-            foreach($exercise_result as $result) {
-                $percentage = $result*100;
+            foreach ($exercise_result as $result) {
+                $percentage = $result * 100;
                 //echo $percentage.' - '.$min.' - '.$max."<br />";
                 if ($percentage >= $min && $percentage <= $max) {
                     //echo ' is > ';
@@ -5233,7 +5233,7 @@ 
                 }
             }
             //echo '<br />';
-            $final_array[]= $count;
+            $final_array[] = $count;
 
             if ($my_exercise_result >= $min && $my_exercise_result <= $max) {
                 $my_final_array[] = 1;
@@ -5243,9 +5243,9 @@ 
         }
 
         //Fix to remove the data of the user with my data
-        for($i = 0; $i<=count($my_final_array); $i++) {
+        for ($i = 0; $i <= count($my_final_array); $i++) {
             if (!empty($my_final_array[$i])) {
-                $my_final_array[$i] =  $final_array[$i] + 1; //Add my result
+                $my_final_array[$i] = $final_array[$i] + 1; //Add my result
                 $final_array[$i] = 0;
             }
         }
@@ -5255,16 +5255,16 @@ 
         $dataSet->addPoints($final_array, 'Serie1');
         $dataSet->addPoints($my_final_array, 'Serie2');
         $dataSet->normalize(100, "%");
-        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
         $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
         $chartHash = $myCache->getHash($dataSet);
         if ($myCache->isInCache($chartHash)) {
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Create the pChart object */
             $widthSize = 80;
@@ -5280,7 +5280,7 @@ 
             $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
 
             /* Set the default font */
-            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize));
+            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize));
 
             /* Do not write the chart title */
 
@@ -5344,9 +5344,9 @@ 
 
             /* Save and write in cache */
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
 
         return $imgPath;
@@ -5366,12 +5366,12 @@ 
         }
         foreach ($attempts as $attempt) {
             if (api_get_user_id() == $attempt['exe_user_id']) {
-                if ($attempt['exe_weighting'] != 0 ) {
-                    $my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting'];
+                if ($attempt['exe_weighting'] != 0) {
+                    $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting'];
                 }
             } else {
-                if ($attempt['exe_weighting'] != 0 ) {
-                    $exercise_result[]=  $attempt['exe_result']/$attempt['exe_weighting'];
+                if ($attempt['exe_weighting'] != 0) {
+                    $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting'];
                 }
             }
         }
@@ -5380,32 +5380,32 @@ 
         rsort($my_exercise_result_array);
         $my_exercise_result = 0;
         if (isset($my_exercise_result_array[0])) {
-            $my_exercise_result = $my_exercise_result_array[0] *100;
+            $my_exercise_result = $my_exercise_result_array[0] * 100;
         }
 
         $max = 100;
-        $pieces = 5 ;
+        $pieces = 5;
         $part = round($max / $pieces);
         $x_axis = array();
         $final_array = array();
         $my_final_array = array();
 
-        for ($i=1; $i <=$pieces; $i++) {
+        for ($i = 1; $i <= $pieces; $i++) {
             $sum = 1;
             if ($i == 1) {
                 $sum = 0;
             }
-            $min = ($i-1)*$part + $sum;
-            $max = ($i)*$part;
-            $x_axis[]= $min." - ".$max;
+            $min = ($i - 1) * $part + $sum;
+            $max = ($i) * $part;
+            $x_axis[] = $min." - ".$max;
             $count = 0;
-            foreach($exercise_result as $result) {
-                $percentage = $result*100;
+            foreach ($exercise_result as $result) {
+                $percentage = $result * 100;
                 if ($percentage >= $min && $percentage <= $max) {
                     $count++;
                 }
             }
-            $final_array[]= $count;
+            $final_array[] = $count;
 
             if ($my_exercise_result >= $min && $my_exercise_result <= $max) {
                 $my_final_array[] = 1;
@@ -5416,9 +5416,9 @@ 
 
         //Fix to remove the data of the user with my data
 
-        for($i = 0; $i<=count($my_final_array); $i++) {
+        for ($i = 0; $i <= count($my_final_array); $i++) {
             if (!empty($my_final_array[$i])) {
-                $my_final_array[$i] =  $final_array[$i] + 1; //Add my result
+                $my_final_array[$i] = $final_array[$i] + 1; //Add my result
                 $final_array[$i] = 0;
             }
         }
@@ -5436,7 +5436,7 @@ 
         $dataSet->setXAxisName(get_lang('Score'));
         $dataSet->normalize(100, "%");
 
-        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -5444,9 +5444,9 @@ 
         $chartHash = $myCache->getHash($dataSet);
 
         if ($myCache->isInCache($chartHash)) {
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Create the pChart object */
             $widthSize = 480;
@@ -5462,7 +5462,7 @@ 
             $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0));
 
             /* Set the default font */
-            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
+            $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', 'FontSize' => 10));
 
             /* Write the chart title */
             $myPicture->drawText(
@@ -5521,9 +5521,9 @@ 
 
             /* Write and save into cache */
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
 
         return $imgPath;
@@ -5650,7 +5650,7 @@ 
                         $whereSessionParams .= $sessionIdx.',';
                     }
                 }
-                $whereSessionParams = substr($whereSessionParams,0,-1);
+                $whereSessionParams = substr($whereSessionParams, 0, -1);
             }
 
             if (!empty($exerciseId)) {
@@ -5711,7 +5711,7 @@ 
                     qq.position = rq.question_order AND
                     ta.question_id = rq.question_id
                 WHERE
-                    te.c_id = $courseIdx ".(empty($whereSessionParams)?'':"AND te.session_id IN ($whereSessionParams)")."
+                    te.c_id = $courseIdx ".(empty($whereSessionParams) ? '' : "AND te.session_id IN ($whereSessionParams)")."
                     AND q.c_id = $courseIdx
                     $where $order $limit";
             $sql_query = vsprintf($sql, $whereParams);
@@ -5759,7 +5759,7 @@ 
             // Now fill users data
             $sqlUsers = "SELECT user_id, username, lastname, firstname
                          FROM $tuser
-                         WHERE user_id IN (".implode(',',$userIds).")";
+                         WHERE user_id IN (".implode(',', $userIds).")";
             $resUsers = Database::query($sqlUsers);
             while ($rowUser = Database::fetch_assoc($resUsers)) {
                 $users[$rowUser['user_id']] = $rowUser;
@@ -5863,7 +5863,7 @@ 
                 <table class="table" id="skillList">
                     <thead>
                         <tr>
-                            <th>' . get_lang('AchievedSkills') . '</th>
+                            <th>' . get_lang('AchievedSkills').'</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -5882,10 +5882,10 @@ 
 
                 $html .= '
                                             <li class="thumbnail">
-                                                <a href="' . api_get_path(WEB_PATH) . 'badge/' . $userSkill->getId() . '/user/' . $userId . '" target="_blank">
-                                                    <img class="img-responsive" title="' . $skill->getName() . '" src="' . $skill->getWebIconPath() . '" width="64" height="64">
+                                                <a href="' . api_get_path(WEB_PATH).'badge/'.$userSkill->getId().'/user/'.$userId.'" target="_blank">
+                                                    <img class="img-responsive" title="' . $skill->getName().'" src="'.$skill->getWebIconPath().'" width="64" height="64">
                                                     <div class="caption">
-                                                        <p class="text-center">' . $skill->getName() . '</p>
+                                                        <p class="text-center">' . $skill->getName().'</p>
                                                     </div>
                                                 </a>
                                             </li>
@@ -5935,7 +5935,7 @@ 
     	        WHERE
                     track_resource.c_id = $course_id AND
                     track_resource.insert_user_id = user.user_id AND
-                    session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
+                    session_id ".(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
     	if (isset($_GET['keyword'])) {
     		$keyword = Database::escape_string(trim($_GET['keyword']));
@@ -5993,7 +5993,7 @@ 
                 WHERE
                   track_resource.c_id = $course_id AND
                   track_resource.insert_user_id = user.user_id AND
-                  session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
+                  session_id ".(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
     	if (isset($_GET['keyword'])) {
     		$keyword = Database::escape_string(trim($_GET['keyword']));
@@ -6287,7 +6287,7 @@ 
     public static function display_additional_profile_fields()
     {
     	// getting all the extra profile fields that are defined by the platform administrator
-    	$extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
+    	$extra_fields = UserManager :: get_extra_fields(0, 50, 5, 'ASC');
 
     	// creating the form
     	$return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
@@ -6299,8 +6299,8 @@ 
     	$extra_fields_to_show = 0;
     	foreach ($extra_fields as $key=>$field) {
     		// show only extra fields that are visible + and can be filtered, added by J.Montoya
-    		if ($field[6]==1 && $field[8] == 1) {
-    			if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
+    		if ($field[6] == 1 && $field[8] == 1) {
+    			if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field']) {
     				$selected = 'selected="selected"';
     			} else {
     				$selected = '';
@@ -6312,8 +6312,8 @@ 
     	$return .= '</select>';
 
     	// the form elements for the $_GET parameters (because the form is passed through GET
-    	foreach ($_GET as $key=>$value){
-    		if ($key <> 'additional_profile_field')    {
+    	foreach ($_GET as $key=>$value) {
+    		if ($key <> 'additional_profile_field') {
     			$return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
     		}
     	}
@@ -6350,21 +6350,21 @@ 
     	$result_extra_field = UserManager::get_extra_field_information($field_id);
 
     	if (!empty($users)) {
-    		if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
-    			foreach($users as $user_id) {
+    		if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG) {
+    			foreach ($users as $user_id) {
     				$user_result = UserManager::get_user_tags($user_id, $field_id);
     				$tag_list = array();
-    				foreach($user_result as $item) {
+    				foreach ($user_result as $item) {
     					$tag_list[] = $item['tag'];
     				}
-    				$return[$user_id][] = implode(', ',$tag_list);
+    				$return[$user_id][] = implode(', ', $tag_list);
     			}
     		} else {
     			$new_user_array = array();
     			foreach ($users as $user_id) {
-    				$new_user_array[]= "'".$user_id."'";
+    				$new_user_array[] = "'".$user_id."'";
     			}
-    			$users = implode(',',$new_user_array);
+    			$users = implode(',', $new_user_array);
                 $extraFieldType = EntityExtraField::USER_FIELD_TYPE;
     			// Selecting only the necessary information NOT ALL the user list
     			$sql = "SELECT user.user_id, v.value
@@ -6379,7 +6379,7 @@ 
                             user.user_id IN ($users)";
 
     			$result = Database::query($sql);
-    			while($row = Database::fetch_array($result)) {
+    			while ($row = Database::fetch_array($result)) {
     				// get option value for field type double select by id
     				if (!empty($row['value'])) {
     					if ($result_extra_field['field_type'] ==
@@ -6418,7 +6418,7 @@ 
 
     public function sort_users_desc($a, $b)
     {
-    	return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
+    	return strcmp(trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
     }
 
     /**
@@ -6453,7 +6453,7 @@ 
     	// get all users data from a course for sortable with limit
     	if (is_array($user_ids)) {
     		$user_ids = array_map('intval', $user_ids);
-    		$condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
+    		$condition_user = " WHERE user.user_id IN (".implode(',', $user_ids).") ";
     	} else {
     		$user_ids = intval($user_ids);
     		$condition_user = " WHERE user.user_id = $user_ids ";
@@ -6461,7 +6461,7 @@ 
 
     	if (!empty($_GET['user_keyword'])) {
     		$keyword = trim(Database::escape_string($_GET['user_keyword']));
-    		$condition_user .=  " AND (
+    		$condition_user .= " AND (
                 user.firstname LIKE '%".$keyword."%' OR
                 user.lastname LIKE '%".$keyword."%'  OR
                 user.username LIKE '%".$keyword."%'  OR
@@ -6479,7 +6479,7 @@ 
         $invitedUsersCondition = '';
 
         if (!$includeInvitedUsers) {
-            $invitedUsersCondition = " AND user.status != " . INVITEE;
+            $invitedUsersCondition = " AND user.status != ".INVITEE;
         }
 
     	$sql = "SELECT  user.user_id as user_id,
@@ -6490,7 +6490,7 @@ 
                 FROM $tbl_user as user $url_table
     	        $condition_user $url_condition $invitedUsersCondition";
 
-    	if (!in_array($direction, array('ASC','DESC'))) {
+    	if (!in_array($direction, array('ASC', 'DESC'))) {
     		$direction = 'ASC';
     	}
 
@@ -6627,7 +6627,7 @@ 
     		}
 
             if (empty($session_id)) {
-                $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
+                $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0).' / '.$total_surveys;
             }
 
     		$user['link'] = '<center>
@@ -6639,37 +6639,37 @@ 
     		// store columns in array $users
     		$is_western_name_order = api_is_western_name_order();
             $user_row = array();
-            $user_row[]= $user['official_code']; //0
+            $user_row[] = $user['official_code']; //0
             if ($is_western_name_order) {
-                $user_row[]= $user['firstname'];
-                $user_row[]= $user['lastname'];
+                $user_row[] = $user['firstname'];
+                $user_row[] = $user['lastname'];
             } else {
-                $user_row[]= $user['lastname'];
-                $user_row[]= $user['firstname'];
+                $user_row[] = $user['lastname'];
+                $user_row[] = $user['firstname'];
             }
-            $user_row[]= $user['username'];
-            $user_row[]= $user['time'];
-            $user_row[]= $user['average_progress'];
-            $user_row[]= $user['exercise_progress'];
-            $user_row[]= $user['exercise_average_best_attempt'];
-            $user_row[]= $user['student_score'];
-            $user_row[]= $user['count_assignments'];
-            $user_row[]= $user['count_messages'];
+            $user_row[] = $user['username'];
+            $user_row[] = $user['time'];
+            $user_row[] = $user['average_progress'];
+            $user_row[] = $user['exercise_progress'];
+            $user_row[] = $user['exercise_average_best_attempt'];
+            $user_row[] = $user['student_score'];
+            $user_row[] = $user['count_assignments'];
+            $user_row[] = $user['count_messages'];
 
             $userGroupManager = new UserGroup();
             $user_row[] = $userGroupManager->getLabelsFromNameList($user['user_id'], UserGroup::NORMAL_CLASS);
 
             if (empty($session_id)) {
-                $user_row[]= $user['survey'];
+                $user_row[] = $user['survey'];
             }
 
-            $user_row[]= $user['first_connection'];
-            $user_row[]= $user['last_connection'];
+            $user_row[] = $user['first_connection'];
+            $user_row[] = $user['last_connection'];
             if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
-                $user_row[]= $user['additional'];
+                $user_row[] = $user['additional'];
             }
 
-            $user_row[]= $user['link'];
+            $user_row[] = $user['link'];
 
             $users[] = $user_row;
 
@@ -6714,8 +6714,8 @@ 
 
     	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
     	$tempView = $view;
-    	if(substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
+    	if (substr($view, 0, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 0, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -6748,9 +6748,9 @@ 
                 </tr>";
     		$total = 0;
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				echo "<tr>";
-    				echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
+    				echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0]) - 1].' '.date('Y', $results[$j][0])."</a></td>";
     				echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
     				echo"</tr>";
     				$total = $total + $results[$j][1];
@@ -6767,7 +6767,7 @@ 
     		echo "</table>";
     		echo "</td></tr>";
     	} else {
-    		$new_view = substr_replace($view,'1',0,1);
+    		$new_view = substr_replace($view, '1', 0, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -6790,8 +6790,8 @@ 
     {
     	global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
-    	if(substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
+    	if (substr($view, 1, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 1, 1);
     		echo "<tr>
                     <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('ExercicesResults')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>]
@@ -6833,7 +6833,7 @@ 
                 </tr>";
 
     		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++) {
+    			for ($i = 0; $i < sizeof($results); $i++) {
     				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
     				echo "<tr>\n";
     				echo "<td class='content'>".$results[$i][0]."</td>\n";
@@ -6848,8 +6848,8 @@ 
 
     		// The Result of Tests
     		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
+    			for ($i = 0; $i < sizeof($hpresults); $i++) {
+    				$title = GetQuizName($hpresults[$i][0], '');
     				if ($title == '')
     				$title = basename($hpresults[$i][0]);
     				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
@@ -6875,7 +6875,7 @@ 
     		echo "</table>";
     		echo "</td>\n</tr>\n";
     	} else {
-    		$new_view = substr_replace($view,'1',1,1);
+    		$new_view = substr_replace($view, '1', 1, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -6894,8 +6894,8 @@ 
     	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info_by_id($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$new_view = substr_replace($view,'0',2,1);
+    	if (substr($view, 2, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 2, 1);
     		echo "<tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('WorkUploads')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>]
@@ -6909,7 +6909,7 @@ 
                         AND u.c_id = '".intval($course_id)."'
                     ORDER BY u.upload_date DESC";
     		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
+    		$results = StatsUtils::getManyResultsXCol($sql, 4);
     		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
     		echo "<tr>
                     <td class='secLine' width='40%'>
@@ -6923,7 +6923,7 @@ 
                     </td>
                 </tr>";
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
     				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
     				echo "<tr>";
@@ -6942,7 +6942,7 @@ 
     		echo "</table>";
     		echo "</td></tr>";
     	} else {
-    		$new_view = substr_replace($view,'1',2,1);
+    		$new_view = substr_replace($view, '1', 2, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -6961,8 +6961,8 @@ 
     {
     	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
+    	if (substr($view, 3, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 3, 1);
     		echo "
                 <tr>
                         <td valign='top'>
@@ -6986,7 +6986,7 @@ 
                     </td>
                 </tr>";
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				echo "<tr>";
     				echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
     				echo"</tr>";
@@ -6999,7 +6999,7 @@ 
     		echo "</table>";
     		echo "</td></tr>";
     	} else {
-    		$new_view = substr_replace($view,'1',3,1);
+    		$new_view = substr_replace($view, '1', 3, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -7026,8 +7026,8 @@ 
     	$session_id = intval($session_id);
 
     	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-    	if(substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
+    	if (substr($view, 4, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 4, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -7053,7 +7053,7 @@ 
                     </td>
                 </tr>";
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				echo "<tr>";
     				echo "<td class='content'>".$results[$j]."</td>";
     				echo"</tr>";
@@ -7066,7 +7066,7 @@ 
     		echo "</table>";
     		echo "</td></tr>";
     	} else {
-    		$new_view = substr_replace($view,'1',4,1);
+    		$new_view = substr_replace($view, '1', 4, 1);
     		echo "
                 <tr>
                     <td valign='top'>
@@ -7100,11 +7100,11 @@ 
                    ORDER BY login_date DESC LIMIT 1";
         $ip = '';
         $res_ip = Database::query($sql_ip);
-        if ($res_ip !== false && Database::num_rows($res_ip)>0) {
+        if ($res_ip !== false && Database::num_rows($res_ip) > 0) {
             $row_ip = Database::fetch_row($res_ip);
             if ($return_as_link) {
                 $ip = Display::url(
-                    (empty($body_replace)?$row_ip[1]:$body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1],
+                    (empty($body_replace) ? $row_ip[1] : $body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1],
                     array('title'=>get_lang('TraceIP'), 'target'=>'_blank')
                 );
             } else {
@@ -7140,9 +7140,9 @@ 
     	$course_id  = intval($course_id);
 
     	$tempView = $view;
-    	if (substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		$title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
+    	if (substr($view, 0, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 0, 1);
+    		$title[1] = get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
     		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                     FROM $track_access_table
                     WHERE access_user_id = $user_id
@@ -7152,20 +7152,20 @@ 
                     ORDER BY YEAR(access_date),MONTH(access_date) ASC";
     		//$results = getManyResults2Col($sql);
     		$results = getManyResults3Col($sql);
-    		$title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
-    		$line='';
+    		$title_line = get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
+    		$line = '';
     		$total = 0;
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				$line .= $results[$j][0].';'.$results[$j][1]."\n";
     				$total = $total + $results[$j][1];
     			}
     			$line .= get_lang('Total').";".$total."\n";
     		} else {
-    			$line= get_lang('NoResult')."</center></td>";
+    			$line = get_lang('NoResult')."</center></td>";
     		}
     	} else {
-    		$new_view = substr_replace($view,'1',0,1);
+    		$new_view = substr_replace($view, '1', 0, 1);
     	}
     	return array($title_line, $line);
     }
@@ -7183,8 +7183,8 @@ 
     	global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
-    	if (substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
+    	if (substr($view, 1, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 1, 1);
     		$title[1] = get_lang('ExercicesDetails');
     		$line = '';
     		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
@@ -7208,7 +7208,7 @@ 
     		$title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
 
     		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++)
+    			for ($i = 0; $i < sizeof($results); $i++)
     			{
     				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
     				$line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
@@ -7220,8 +7220,8 @@ 
 
     		// The Result of Tests
     		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
+    			for ($i = 0; $i < sizeof($hpresults); $i++) {
+    				$title = GetQuizName($hpresults[$i][0], '');
 
     				if ($title == '')
     				$title = basename($hpresults[$i][0]);
@@ -7235,10 +7235,10 @@ 
     		}
 
     		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			$line=get_lang('NoResult');
+    			$line = get_lang('NoResult');
     		}
     	} else {
-    		$new_view = substr_replace($view,'1',1,1);
+    		$new_view = substr_replace($view, '1', 1, 1);
     	}
     	return array($title_line, $line);
     }
@@ -7254,7 +7254,7 @@ 
         $user_id = intval($user_id);
         $course_id = intval($course_id);
 
-    	if (substr($view,2,1) == '1') {
+    	if (substr($view, 2, 1) == '1') {
     		$sql = "SELECT u.upload_date, w.title, w.author, w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE
@@ -7262,21 +7262,21 @@ 
                         u.upload_user_id = '$user_id' AND
                         u.c_id = '$course_id'
                     ORDER BY u.upload_date DESC";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
+    		$results = StatsUtils::getManyResultsXCol($sql, 4);
 
-    		$title[1]=get_lang('WorksDetails');
-    		$line='';
-    		$title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
+    		$title[1] = get_lang('WorksDetails');
+    		$line = '';
+    		$title_line = get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
 
     		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
     				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
     				$line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
     			}
 
     		} else {
-    			$line= get_lang('NoResult');
+    			$line = get_lang('NoResult');
     		}
     	}
     	return array($title_line, $line);
@@ -7292,9 +7292,9 @@ 
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
         $line = null;
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		$title[1]=get_lang('LinksDetails');
+    	if (substr($view, 3, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 3, 1);
+    		$title[1] = get_lang('LinksDetails');
     		$sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
@@ -7302,16 +7302,16 @@ 
                             AND sl.links_user_id = $userId
                         GROUP BY cl.title, cl.url";
     		$results = StatsUtils::getManyResults2Col($sql);
-    		$title_line= get_lang('LinksTitleLinkColumn')."\n";
+    		$title_line = get_lang('LinksTitleLinkColumn')."\n";
     		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				$line .= $results[$j][0]."\n";
     			}
     		} else {
-    			$line=get_lang('NoResult');
+    			$line = get_lang('NoResult');
     		}
     	} else {
-    		$new_view = substr_replace($view,'1',3,1);
+    		$new_view = substr_replace($view, '1', 3, 1);
     	}
     	return array($title_line, $line);
     }
@@ -7333,9 +7333,9 @@ 
 
     	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 
-    	if (substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		$title[1]= get_lang('DocumentsDetails');
+    	if (substr($view, 4, 1) == '1') {
+    		$new_view = substr_replace($view, '0', 4, 1);
+    		$title[1] = get_lang('DocumentsDetails');
 
     		$sql = "SELECT down_doc_path
                         FROM $downloads_table
@@ -7348,14 +7348,14 @@ 
     		$title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
             $line = null;
     		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
+    			for ($j = 0; $j < count($results); $j++) {
     				$line .= $results[$j]."\n";
     			}
     		} else {
     			$line = get_lang('NoResult');
     		}
     	} else {
-    		$new_view = substr_replace($view,'1',4,1);
+    		$new_view = substr_replace($view, '1', 4, 1);
     	}
     	return array($title_line, $line);
     }