chamilo / chamilo-lms

main/inc/lib/userportal.lib.php

Indentation +17 added lines, -17 removed lines

@@ -248,17 +248,17 @@ 
                 }
             }
 
-			if (trim($home_top_temp) == '' && api_is_platform_admin()) {
-				$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
-			} else {
-				$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
-			}
-			$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
-			$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
-		}
-
-		return $html;
-	}
+            if (trim($home_top_temp) == '' && api_is_platform_admin()) {
+                $home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
+            } else {
+                $home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
+            }
+            $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
+            $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
+        }
+
+        return $html;
+    }
 
     function return_notice()
     {
@@ -509,7 +509,7 @@ 
                     $thereIsSubCat = true;
                 } elseif (api_get_setting('show_empty_course_categories') == 'true') {
                     /* End changed code to eliminate the (0 courses) after empty categories. */
-                      $htmlListCat .= '<li>';
+                        $htmlListCat .= '<li>';
                     $htmlListCat .= $catLine['name'];
                     $htmlListCat .= "</li>";
                     $thereIsSubCat = true;
@@ -639,11 +639,11 @@ 
     }
 
     /**
-    * retrieves all the courses that the user has already subscribed to
-    * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
-    * @param int $user_id: the id of the user
-    * @return array an array containing all the information of the courses of the given user
-    */
+     * retrieves all the courses that the user has already subscribed to
+     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
+     * @param int $user_id: the id of the user
+     * @return array an array containing all the information of the courses of the given user
+     */
     public function get_courses_of_user($user_id)
     {
         $table_course = Database::get_main_table(TABLE_MAIN_COURSE);

Spacing +66 added lines, -66 removed lines

@@ -72,9 +72,9 @@ 
                 );
 
                 foreach ($exercises as $exercise_item) {
-                    $exercise_item['course_code']     = $course_code;
-                    $exercise_item['session_id']     = $session_id;
-                    $exercise_item['tms']     = api_strtotime($exercise_item['end_time'], 'UTC');
+                    $exercise_item['course_code'] = $course_code;
+                    $exercise_item['session_id'] = $session_id;
+                    $exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
 
                     $exercise_list[] = $exercise_item;
                 }
@@ -214,16 +214,16 @@ 
         if ($show_menu) {
             $html .= '<ul class="nav nav-pills nav-stacked">';
             if ($show_create_link) {
-                $html .= '<li class="add-course"><a href="' . api_get_path(WEB_CODE_PATH) . 'create_course/add_course.php">'.
-                    Display::return_icon('new-course.png',  get_lang('CourseCreate')).(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
+                $html .= '<li class="add-course"><a href="'.api_get_path(WEB_CODE_PATH).'create_course/add_course.php">'.
+                    Display::return_icon('new-course.png', get_lang('CourseCreate')).(api_get_setting('course_validation') == 'true' ? get_lang('CreateCourseRequest') : get_lang('CourseCreate')).'</a></li>';
             }
 
             if ($show_course_link) {
                 if (!api_is_drh() && !api_is_session_admin()) {
-                    $html .=  '<li class="list-course"><a href="'. api_get_path(WEB_CODE_PATH) . 'auth/courses.php">'.
-                        Display::return_icon('catalog-course.png', get_lang('CourseCatalog')) .get_lang('CourseCatalog').'</a></li>';
+                    $html .= '<li class="list-course"><a href="'.api_get_path(WEB_CODE_PATH).'auth/courses.php">'.
+                        Display::return_icon('catalog-course.png', get_lang('CourseCatalog')).get_lang('CourseCatalog').'</a></li>';
                 } else {
-                    $html .= '<li><a href="' . api_get_path(WEB_CODE_PATH) . 'dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
+                    $html .= '<li><a href="'.api_get_path(WEB_CODE_PATH).'dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
                 }
             }
             $html .= '</ul>';
@@ -253,7 +253,7 @@ 
         // Including the page for the news
         $html = '';
         if (!empty($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/', $_GET['include'])) {
-            $open = @(string)file_get_contents($this->home.$_GET['include']);
+            $open = @(string) file_get_contents($this->home.$_GET['include']);
             $html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
         } else {
             // Hiding home top when user not connected.
@@ -283,15 +283,15 @@ 
                     $home_top_temp = file_get_contents($this->home.'home_top.html');
                 } else {
                     if (file_exists($this->default_home.'home_top.html')) {
-                        $home_top_temp = file_get_contents($this->default_home . 'home_top.html');
+                        $home_top_temp = file_get_contents($this->default_home.'home_top.html');
                     }
                 }
             }
 
 			if (trim($home_top_temp) == '' && api_is_platform_admin()) {
-				$home_top_temp = '<div class="welcome-mascot">' . get_lang('PortalHomepageDefaultIntroduction') . '</div>';
+				$home_top_temp = '<div class="welcome-mascot">'.get_lang('PortalHomepageDefaultIntroduction').'</div>';
 			} else {
-				$home_top_temp = '<div class="welcome-home-top-temp">' . $home_top_temp . '</div>';
+				$home_top_temp = '<div class="welcome-home-top-temp">'.$home_top_temp.'</div>';
 			}
 			$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
 			$html = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
@@ -309,9 +309,9 @@ 
 
         $html = '';
         // Notice
-        $home_notice = @(string)file_get_contents($this->home.'home_notice_'.$user_selected_language.'.html');
+        $home_notice = @(string) file_get_contents($this->home.'home_notice_'.$user_selected_language.'.html');
         if (empty($home_notice)) {
-            $home_notice = @(string)file_get_contents($this->home.'home_notice.html');
+            $home_notice = @(string) file_get_contents($this->home.'home_notice.html');
         }
 
         if (!empty($home_notice)) {
@@ -344,7 +344,7 @@ 
         }
 
         $html = '';
-        $home_menu = @(string)file_get_contents($this->home.'home_menu_'.$user_selected_language.'.html');
+        $home_menu = @(string) file_get_contents($this->home.'home_menu_'.$user_selected_language.'.html');
         if (!empty($home_menu)) {
             $home_menu_content = '<ul class="nav nav-pills nav-stacked">';
             $home_menu_content .= api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
@@ -395,9 +395,9 @@ 
         if (api_get_setting('allow_public_certificates') == 'true') {
             $searchItem = Display::tag(
                 'li',
-                Display::url(Display::return_icon('search_graduation.png',get_lang('Search'),null,ICON_SIZE_SMALL).
+                Display::url(Display::return_icon('search_graduation.png', get_lang('Search'), null, ICON_SIZE_SMALL).
                     get_lang('Search'),
-                    api_get_path(WEB_CODE_PATH) . "gradebook/search.php"
+                    api_get_path(WEB_CODE_PATH)."gradebook/search.php"
                 )
             );
         }
@@ -413,7 +413,7 @@ 
             $content .= Display::tag(
                 'li',
                 Display::url(
-                    Display::return_icon('skill-badges.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('MySkills'),
+                    Display::return_icon('skill-badges.png', get_lang('MySkills'), null, ICON_SIZE_SMALL).get_lang('MySkills'),
                     api_get_path(WEB_CODE_PATH).'social/my_skills_report.php'
                 )
             );
@@ -421,8 +421,8 @@ 
             if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) {
                 $content .= Display::tag('li',
                     Display::url(Display::return_icon('edit-skill.png', get_lang('MySkills'), null,
-                            ICON_SIZE_SMALL) . get_lang('ManageSkills'),
-                        api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php'));
+                            ICON_SIZE_SMALL).get_lang('ManageSkills'),
+                        api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php'));
             }
         }
 
@@ -475,7 +475,7 @@ 
 
         // Get list of courses in category $category.
         $sql = "SELECT * FROM $main_course_table cours
-                WHERE category_code = '" . $category . "'
+                WHERE category_code = '".$category."'
                 ORDER BY title, UPPER(visual_code)";
 
         // Showing only the courses of the current access_url_id.
@@ -521,7 +521,7 @@ 
                     FROM $main_category_table t1
                     LEFT JOIN $main_category_table t2 ON t1.code=t2.parent_id
                     LEFT JOIN $main_course_table t3 ON (t3.category_code = t1.code $platform_visible_courses)
-                    WHERE t1.parent_id ". (empty($category) ? "IS NULL" : "='$category'")."
+                    WHERE t1.parent_id ".(empty($category) ? "IS NULL" : "='$category'")."
                     GROUP BY t1.name,t1.code,t1.parent_id,t1.children_count 
                     ORDER BY t1.tree_pos, t1.name";
 
@@ -596,10 +596,10 @@ 
         }
         $result .= $htmlTitre;
         if ($thereIsSubCat) {
-            $result .=  $htmlListCat;
+            $result .= $htmlListCat;
         }
         while ($categoryName = Database::fetch_array($resCats)) {
-            $result .= '<h3>' . $categoryName['name'] . "</h3>\n";
+            $result .= '<h3>'.$categoryName['name']."</h3>\n";
         }
         $numrows = Database::num_rows($sql_result_courses);
         $courses_list_string = '';
@@ -697,12 +697,12 @@ 
         if ($courses_shown > 0) {
             // Only display the list of courses and categories if there was more than
                     // 0 courses visible to the world (we're in the anonymous list here).
-            $result .=  $courses_list_string;
+            $result .= $courses_list_string;
         }
         if ($category != '') {
-            $result .=  '<p><a href="'.api_get_self().'"> ' .
+            $result .= '<p><a href="'.api_get_self().'"> '.
                 Display :: return_icon('back.png', get_lang('BackToHomePage')).
-                get_lang('BackToHomePage') . '</a></p>';
+                get_lang('BackToHomePage').'</a></p>';
         }
         return $result;
     }
@@ -797,7 +797,7 @@ 
             if (!empty($title)) {
                 $html .= '<div class="panel-heading">'.$title.'</div>';
             }
-            $html.= '<div class="panel-body">'.$content.'</div>';
+            $html .= '<div class="panel-body">'.$content.'</div>';
             $html = Display::div($html, $params);
         }
 
@@ -844,7 +844,7 @@ 
             $usergroup_list = $usergroup->get_usergroup_by_user(api_get_user_id());
             $classes = '';
             if (!empty($usergroup_list)) {
-                foreach($usergroup_list as $group_id) {
+                foreach ($usergroup_list as $group_id) {
                     $data = $usergroup->get($group_id);
                     $data['name'] = Display::url($data['name'], api_get_path(WEB_CODE_PATH).'user/classes.php?id='.$data['id']);
                     $classes .= Display::tag('li', $data['name']);
@@ -853,7 +853,7 @@ 
             if (api_is_platform_admin()) {
                 $classes .= Display::tag(
                     'li',
-                    Display::url(get_lang('AddClasses') ,api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
+                    Display::url(get_lang('AddClasses'), api_get_path(WEB_CODE_PATH).'admin/usergroups.php?action=add')
                 );
             }
             if (!empty($classes)) {
@@ -875,11 +875,11 @@ 
             $content = null;
 
             if (api_get_setting('allow_social_tool') == 'true') {
-                $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/social/home.php">
-                <img class="img-circle" src="' . $userPicture . '" ></a>';
+                $content .= '<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/social/home.php">
+                <img class="img-circle" src="' . $userPicture.'" ></a>';
             } else {
-                $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/auth/profile.php">
-                <img class="img-circle" title="' . get_lang('EditProfile') . '" src="' . $userPicture. '" ></a>';
+                $content .= '<a style="text-align:center" href="'.api_get_path(WEB_PATH).'main/auth/profile.php">
+                <img class="img-circle" title="' . get_lang('EditProfile').'" src="'.$userPicture.'" ></a>';
             }
 
             $html = self::show_right_block(
@@ -932,18 +932,18 @@ 
                 $link = '?f=social';
             }
             $profile_content .= '<li class="inbox-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.
-                Display::return_icon('inbox.png',get_lang('Inbox'),null,ICON_SIZE_SMALL).get_lang('Inbox').$cant_msg.' </a></li>';
+                Display::return_icon('inbox.png', get_lang('Inbox'), null, ICON_SIZE_SMALL).get_lang('Inbox').$cant_msg.' </a></li>';
             $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.
-                Display::return_icon('new-message.png',get_lang('Compose'),null,ICON_SIZE_SMALL).get_lang('Compose').' </a></li>';
+                Display::return_icon('new-message.png', get_lang('Compose'), null, ICON_SIZE_SMALL).get_lang('Compose').' </a></li>';
 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $total_invitations = Display::badge($total_invitations);
-                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitations.png',get_lang('PendingInvitations'),null,ICON_SIZE_SMALL).get_lang('PendingInvitations').$total_invitations.'</a></li>';
+                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitations.png', get_lang('PendingInvitations'), null, ICON_SIZE_SMALL).get_lang('PendingInvitations').$total_invitations.'</a></li>';
             }
 
             if (isset($_configuration['allow_my_files_link_in_homepage']) && $_configuration['allow_my_files_link_in_homepage']) {
                 $myFiles = '<li class="myfiles-social"><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.
-                    Display::return_icon('sn-files.png',get_lang('Files'),null,ICON_SIZE_SMALL).get_lang('MyFiles').'</a></li>';
+                    Display::return_icon('sn-files.png', get_lang('Files'), null, ICON_SIZE_SMALL).get_lang('MyFiles').'</a></li>';
 
                 if (api_get_setting('allow_my_files') === 'false') {
                     $myFiles = '';
@@ -955,7 +955,7 @@ 
 
         $editProfileUrl = Display::getProfileEditionLink($user_id);
 
-        $profile_content .= '<li class="profile-social"><a href="' . $editProfileUrl . '">'.
+        $profile_content .= '<li class="profile-social"><a href="'.$editProfileUrl.'">'.
             Display::return_icon(
                 'edit-profile.png',
                 get_lang('EditProfile'),
@@ -1045,17 +1045,17 @@ 
         if ($show_create_link) {
             $my_account_content .= '<li class="add-course"><a href="main/create_course/add_course.php">';
             if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin()) {
-                $my_account_content .= Display::return_icon('new-course.png',get_lang('CreateCourseRequest'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('new-course.png', get_lang('CreateCourseRequest'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CreateCourseRequest');
             } else {
-                $my_account_content .= Display::return_icon('new-course.png',get_lang('CourseCreate'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('new-course.png', get_lang('CourseCreate'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CourseCreate');
             }
             $my_account_content .= '</a></li>';
 
             if (SessionManager::allowToManageSessions()) {
                 $my_account_content .= '<li class="add-course"><a href="main/session/session_add.php">';
-                $my_account_content .= Display::return_icon('session.png',get_lang('AddSession'),null,ICON_SIZE_SMALL);
+                $my_account_content .= Display::return_icon('session.png', get_lang('AddSession'), null, ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('AddSession');
                 $my_account_content .= '</a></li>';
             }
@@ -1063,20 +1063,20 @@ 
 
         //Sort courses
         $url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
-        $img_order= Display::return_icon('order-course.png',get_lang('SortMyCourses'),null,ICON_SIZE_SMALL);
+        $img_order = Display::return_icon('order-course.png', get_lang('SortMyCourses'), null, ICON_SIZE_SMALL);
         $my_account_content .= '<li class="order-course">'.Display::url($img_order.get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
 
         // Session history
         if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.Display::return_icon('history-course.png',get_lang('DisplayTrainingList'),null,ICON_SIZE_SMALL).get_lang('DisplayTrainingList').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.Display::return_icon('history-course.png', get_lang('DisplayTrainingList'), null, ICON_SIZE_SMALL).get_lang('DisplayTrainingList').'</a></li>';
         } else {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.Display::return_icon('history-course.png',get_lang('HistoryTrainingSessions'),null,ICON_SIZE_SMALL).get_lang('HistoryTrainingSessions').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.Display::return_icon('history-course.png', get_lang('HistoryTrainingSessions'), null, ICON_SIZE_SMALL).get_lang('HistoryTrainingSessions').'</a></li>';
         }
 
         // Course catalog
         if ($show_course_link) {
             if (!api_is_drh()) {
-                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.Display::return_icon('catalog-course.png',get_lang('CourseCatalog'),null,ICON_SIZE_SMALL).get_lang('CourseCatalog').'</a></li>';
+                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.Display::return_icon('catalog-course.png', get_lang('CourseCatalog'), null, ICON_SIZE_SMALL).get_lang('CourseCatalog').'</a></li>';
             } else {
                 $my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
             }
@@ -1275,7 +1275,7 @@ 
 
                             $actions = null;
                             if (api_is_platform_admin()) {
-                                $actions = api_get_path(WEB_CODE_PATH) .'session/resume_session.php?id_session='.$session_id;
+                                $actions = api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$session_id;
                             }
 
                             $coachId = $session_box['id_coach'];
@@ -1285,12 +1285,12 @@ 
                             $params['category_id'] = $session_box['category_id'];
                             $params['title'] = $session_box['title'];
                             $params['id_coach'] = $coachId;
-                            $params['coach_url'] = api_get_path(WEB_AJAX_PATH) . 'user_manager.ajax.php?a=get_user_popup&user_id=' . $coachId;
+                            $params['coach_url'] = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId;
                             $params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
                             $params['coach_avatar'] = UserManager::getUserPicture($coachId, USER_IMAGE_SIZE_SMALL);
                             $params['date'] = $session_box['dates'];
                             $params['image'] = isset($imageField['value']) ? $imageField['value'] : null;
-                            $params['duration'] = isset($session_box['duration']) ? ' ' . $session_box['duration'] : null;
+                            $params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
                             $params['edit_actions'] = $actions;
                             $params['show_description'] = $session_box['show_description'];
                             $params['description'] = $session_box['description'];
@@ -1386,7 +1386,7 @@ 
                                 $sessionParams[0]['date'] = $session_box['dates'];
                                 $sessionParams[0]['course_list_session_style'] = $coursesListSessionStyle;
                                 $sessionParams[0]['title'] = $session_box['title'];
-                                $sessionParams[0]['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'] . ' | ': '') . $session_box['dates'];
+                                $sessionParams[0]['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
                                 $sessionParams[0]['show_actions'] = api_is_platform_admin();
                                 $sessionParams[0]['courses'] = $html_courses_session;
                                 $sessionParams[0]['show_simple_session_info'] = false;
@@ -1430,13 +1430,13 @@ 
                             if (
                                 !empty($session_category_start_date)
                             ) {
-                                $categoryParams['subtitle'] = get_lang('From') . ' ' . $session_category_start_date;
+                                $categoryParams['subtitle'] = get_lang('From').' '.$session_category_start_date;
                             }
 
                             if (
                                 !empty($session_category_end_date)
                             ) {
-                                $categoryParams['subtitle'] = get_lang('Until') . ' ' . $session_category_end_date;
+                                $categoryParams['subtitle'] = get_lang('Until').' '.$session_category_end_date;
                             }
                         }
 
@@ -1461,7 +1461,7 @@ 
 
             $this->tpl->assign('all_courses', $allCoursesInSessions);
             $this->tpl->assign('session', $listSession);
-            $this->tpl->assign('show_tutor', (api_get_setting('show_session_coach')==='true' ? true : false));
+            $this->tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
             $this->tpl->assign('gamification_mode', $gamificationModeIsActive);
 
             if (api_get_configuration_value('view_grid_courses')) {
@@ -1476,7 +1476,7 @@ 
         }
 
         return [
-            'html' => $specialCourseList . $sessions_with_category.$sessions_with_no_category.$listCourse,
+            'html' => $specialCourseList.$sessions_with_category.$sessions_with_no_category.$listCourse,
             'session_count' => $sessionCount,
             'course_count' => $courseCount
         ];
@@ -1623,7 +1623,7 @@ 
                         $htmlCategory .= '<div class="panel panel-default">';
                     }
                     $htmlCategory .= '<div class="panel-body">';
-                    $coursesInfo =  $listCourse['course'];
+                    $coursesInfo = $listCourse['course'];
 
                     $htmlCategory .= self::getHtmlForCourse(
                         $coursesInfo,
@@ -1640,7 +1640,7 @@ 
                             $listCategorySession['catSessionName']
                         );
                         // list of session
-                        $htmlSession = '';    // start
+                        $htmlSession = ''; // start
                         foreach ($listCategorySession['sessionList'] as $k => $listSession) {
                             // add session
                             $htmlSession .= '<div class="session-view-row">';
@@ -1657,8 +1657,8 @@ 
                         $htmlSessionCategory .= $htmlSession;
                     }
                     $htmlSessionCategory .= '</div>'; // end session cat block
-                    $htmlCategory .=  $htmlSessionCategory .'</div></div>' ;
-                    $htmlCategory .= '';   // end course block
+                    $htmlCategory .= $htmlSessionCategory.'</div></div>';
+                    $htmlCategory .= ''; // end course block
                 }
                 $userCategoryHtml .= $htmlCategory;
             }
@@ -1685,11 +1685,11 @@ 
                 }
             }
             $htmlCategory .= '';
-            $userCategoryHtml .= $htmlCategory;   // end user cat block
+            $userCategoryHtml .= $htmlCategory; // end user cat block
             if ($userCategoryId != 0) {
                 $userCategoryHtml .= '</div>';
             }
-            $html .= $userCategoryHtml;   //
+            $html .= $userCategoryHtml; //
         }
         $html .= '</div>';
 
@@ -1830,11 +1830,11 @@ 
         $html = '';
 
         if ($categorySessionId == 0) {
-            $class1 = 'session-view-lvl-2';    // session
-            $class2 = 'session-view-lvl-4';    // got to course in session link
+            $class1 = 'session-view-lvl-2'; // session
+            $class2 = 'session-view-lvl-4'; // got to course in session link
         } else {
-            $class1 = 'session-view-lvl-3';    // session
-            $class2 = 'session-view-lvl-5';    // got to course in session link
+            $class1 = 'session-view-lvl-3'; // session
+            $class2 = 'session-view-lvl-5'; // got to course in session link
         }
 
         $icon = Display::return_icon(
@@ -1862,7 +1862,7 @@ 
         if ($listA['userCatTitle'] == $listB['userCatTitle']) {
             if ($listA['title'] == $listB['title']) {
                 return 0;
-            } else if($listA['title'] > $listB['title']) {
+            } else if ($listA['title'] > $listB['title']) {
                 return 1;
             } else {
                 return -1;
@@ -1883,7 +1883,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;

main/inc/lib/text.lib.php

Spacing +74 added lines, -74 removed lines

@@ -58,10 +58,10 @@ 
     if (@preg_match('/(.*<head.*)(<meta[^>]*content=[^>]*>)(.*<\/head>.*)/si', $string, $matches)) {
         $meta = $matches[2];
         if (@preg_match("/(<meta[^>]*charset=)(.*)([\"';][^>]*>)/si", $meta, $matches1)) {
-            $meta = $matches1[1] . $encoding . $matches1[3];
-            $string = $matches[1] . $meta . $matches[3];
+            $meta = $matches1[1].$encoding.$matches1[3];
+            $string = $matches[1].$meta.$matches[3];
         } else {
-            $string = $matches[1] . '<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>' . $matches[3];
+            $string = $matches[1].'<meta http-equiv="Content-Type" content="text/html; charset='.$encoding.'"/>'.$matches[3];
         }
     } else {
         $count = 1;
@@ -168,9 +168,9 @@ 
     if (!preg_match(_PCRE_XML_ENCODING, $string)) {
         if (strpos($matches[0], 'standalone') !== false) {
             // The encoding option should precede the standalone option, othewise DOMDocument fails to load the document.
-            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone' , $matches[0]);
+            $replace = str_replace('standalone', ' encoding="'.$to_encoding.'" standalone', $matches[0]);
         } else {
-            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>' , $matches[0]);
+            $replace = str_replace('?>', ' encoding="'.$to_encoding.'"?>', $matches[0]);
         }
         return api_convert_encoding(str_replace($matches[0], $replace, $string), $to_encoding, $from_encoding);
     }
@@ -335,7 +335,7 @@ 
 function _make_url_clickable_cb($matches) {
     $url = $matches[2];
 
-    if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+    if (')' == $matches[3] && strpos($url, '(')) {
         // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
         // Then we can let the parenthesis balancer do its thing below.
         $url .= $matches[3];
@@ -345,16 +345,16 @@ 
     }
 
     // Include parentheses in the URL only if paired
-    while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-        $suffix = strrchr( $url, ')' ) . $suffix;
-        $url = substr( $url, 0, strrpos( $url, ')' ) );
+    while (substr_count($url, '(') < substr_count($url, ')')) {
+        $suffix = strrchr($url, ')').$suffix;
+        $url = substr($url, 0, strrpos($url, ')'));
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
+    if (empty($url))
         return $matches[0];
 
-    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+    return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -374,10 +374,10 @@ 
  * @param string $_context Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
     //$original_url = $url;
 
-    if ( '' == $url )
+    if ('' == $url)
         return $url;
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -387,9 +387,9 @@ 
      * presume it needs http:// appended (unless a relative
      * link starting with /, # or ? or a php file).
      */
-    if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+    if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) &&
+        !preg_match('/^[a-z0-9-]+?\.php/i', $url))
+        $url = 'http://'.$url;
 
     return Security::remove_XSS($url);
 
@@ -437,12 +437,12 @@ 
  * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
     $subject = (string) $subject;
 
     $count = 1;
-    while ( $count ) {
-        $subject = str_replace( $search, '', $subject, $count );
+    while ($count) {
+        $subject = str_replace($search, '', $subject, $count);
     }
 
     return $subject;
@@ -464,17 +464,17 @@ 
 function _make_web_ftp_clickable_cb($matches) {
     $ret = '';
     $dest = $matches[2];
-    $dest = 'http://' . $dest;
+    $dest = 'http://'.$dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
+    if (empty($dest))
         return $matches[0];
 
     // removed trailing [.,;:)] from URL
-    if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+    if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
         $ret = substr($dest, -1);
-        $dest = substr($dest, 0, strlen($dest)-1);
+        $dest = substr($dest, 0, strlen($dest) - 1);
     }
-    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+    return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -490,8 +490,8 @@ 
  * @return string HTML A element with email address.
  */
 function _make_email_clickable_cb($matches) {
-    $email = $matches[2] . '@' . $matches[3];
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+    $email = $matches[2].'@'.$matches[3];
+    return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -505,30 +505,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
     $r = '';
-    $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+    $textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-    foreach ( $textarr as $piece ) {
+    foreach ($textarr as $piece) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+        if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
             $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+        elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
             $nested_code_pre--;
 
-        if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+        if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && !preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
             $r .= $piece;
             continue;
         }
 
         // Long strings might contain expensive edge cases ...
-        if ( 10000 < strlen( $piece ) ) {
+        if (10000 < strlen($piece)) {
             // ... break it up
-            foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-                if ( 2101 < strlen( $chunk ) ) {
+            foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+                if (2101 < strlen($chunk)) {
                     $r .= $chunk; // Too big, no whitespace: bail.
                 } else {
-                    $r .= make_clickable( $chunk );
+                    $r .= make_clickable($chunk);
                 }
             }
         } else {
@@ -549,18 +549,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
             // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-            $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+            $ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-            $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-            $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+            $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+            $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-            $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+            $ret = substr($ret, 1, -1); // Remove our whitespace padding.
             $r .= $ret;
         }
     }
 
     // Cleanup of accidental links within links
-    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+    $r = preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
     return $r;
 }
 
@@ -595,27 +595,27 @@ 
  * @param int $goal The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
     $chunks = array();
 
-    $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+    $string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-    while ( $goal < strlen( $string_nullspace ) ) {
-        $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+    while ($goal < strlen($string_nullspace)) {
+        $pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-        if ( false === $pos ) {
-            $pos = strpos( $string_nullspace, "\000", $goal + 1 );
-            if ( false === $pos ) {
+        if (false === $pos) {
+            $pos = strpos($string_nullspace, "\000", $goal + 1);
+            if (false === $pos) {
                 break;
             }
         }
 
-        $chunks[] = substr( $string, 0, $pos + 1 );
-        $string = substr( $string, $pos + 1 );
-        $string_nullspace = substr( $string_nullspace, $pos + 1 );
+        $chunks[] = substr($string, 0, $pos + 1);
+        $string = substr($string, $pos + 1);
+        $string_nullspace = substr($string_nullspace, $pos + 1);
     }
 
-    if ( $string ) {
+    if ($string) {
         $chunks[] = $string;
     }
 
@@ -693,7 +693,7 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
+       $time = api_strtotime($date, 'UTC');
        return date('W', $time);
     } else {
         return date('W');
@@ -710,17 +710,17 @@ 
  * @return a reduce string
  */
 
-function substrwords($text,$maxchar,$end='...')
+function substrwords($text, $maxchar, $end = '...')
 {
-	if(strlen($text)>$maxchar)
+	if (strlen($text) > $maxchar)
 	{
-		$words=explode(" ",$text);
+		$words = explode(" ", $text);
 		$output = '';
-		$i=0;
-		while(1)
+		$i = 0;
+		while (1)
 		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
+			$length = (strlen($output) + strlen($words[$i]));
+			if ($length > $maxchar)
 			{
 				break;
 			}
@@ -742,7 +742,7 @@ 
 function implode_with_key($glue, $array) {
     if (!empty($array)) {
         $string = '';
-        foreach($array as $key => $value) {
+        foreach ($array as $key => $value) {
             if (empty($value)) {
                 $value = 'null';
             }
@@ -764,13 +764,13 @@ 
 {
     $file_size = intval($file_size);
     if ($file_size >= 1073741824) {
-        $file_size = round($file_size / 1073741824 * 100) / 100 . 'G';
-    } elseif($file_size >= 1048576) {
-        $file_size = round($file_size / 1048576 * 100) / 100 . 'M';
-    } elseif($file_size >= 1024) {
-        $file_size = round($file_size / 1024 * 100) / 100 . 'k';
+        $file_size = round($file_size / 1073741824 * 100) / 100.'G';
+    } elseif ($file_size >= 1048576) {
+        $file_size = round($file_size / 1048576 * 100) / 100.'M';
+    } elseif ($file_size >= 1024) {
+        $file_size = round($file_size / 1024 * 100) / 100.'k';
     } else {
-        $file_size = $file_size . 'B';
+        $file_size = $file_size.'B';
     }
     return $file_size;
 }
@@ -779,18 +779,18 @@ 
 {
     $year	 = '0000';
     $month = $day = $hours = $minutes = $seconds = '00';
-    if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
+    if (isset($array['Y']) && (isset($array['F']) || isset($array['M'])) && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
-        $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        $month = isset($array['F']) ? $array['F'] : $array['M'];
+        if (intval($month) < 10) $month = '0'.$month;
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10) $day = '0'.$day;
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10) $hours = '0'.$hours;
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10) $minutes = '0'.$minutes;
     }
-    if (checkdate($month,$day,$year)) {
+    if (checkdate($month, $day, $year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;
     }
     return $datetime;

Braces +31 added lines, -20 removed lines

@@ -351,8 +351,9 @@ 
     }
 
     $url = esc_url($url);
-    if ( empty($url) )
-        return $matches[0];
+    if ( empty($url) ) {
+            return $matches[0];
+    }
 
     return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -377,8 +378,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
     //$original_url = $url;
 
-    if ( '' == $url )
-        return $url;
+    if ( '' == $url ) {
+            return $url;
+    }
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
     $url = _deep_replace($strip, $url);
@@ -388,8 +390,9 @@ 
      * link starting with /, # or ? or a php file).
      */
     if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-        $url = 'http://' . $url;
+        ! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+            $url = 'http://' . $url;
+    }
 
     return Security::remove_XSS($url);
 
@@ -466,8 +469,9 @@ 
     $dest = $matches[2];
     $dest = 'http://' . $dest;
     $dest = esc_url($dest);
-    if ( empty($dest) )
-        return $matches[0];
+    if ( empty($dest) ) {
+            return $matches[0];
+    }
 
     // removed trailing [.,;:)] from URL
     if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -511,10 +515,11 @@ 
     $nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
     foreach ( $textarr as $piece ) {
 
-        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
-            $nested_code_pre++;
-        elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
-            $nested_code_pre--;
+        if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
+                    $nested_code_pre++;
+        } elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
+                    $nested_code_pre--;
+        }
 
         if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
             $r .= $piece;
@@ -723,15 +728,13 @@ 
 			if($length>$maxchar)
 			{
 				break;
-			}
-			else
+			} else
 			{
 				$output = $output." ".$words[$i];
 				$i++;
 			};
 		};
-	}
-	else
+	} else
 	{
 		$output = $text;
 		return $output;
@@ -782,13 +785,21 @@ 
     if (isset($array['Y']) && (isset($array['F']) || isset($array['M']))  && isset($array['d']) && isset($array['H']) && isset($array['i'])) {
         $year = $array['Y'];
         $month = isset($array['F'])?$array['F']:$array['M'];
-        if (intval($month) < 10 ) $month = '0'.$month;
+        if (intval($month) < 10 ) {
+            $month = '0'.$month;
+        }
         $day = $array['d'];
-        if (intval($day) < 10 ) $day = '0'.$day;
+        if (intval($day) < 10 ) {
+            $day = '0'.$day;
+        }
         $hours = $array['H'];
-        if (intval($hours) < 10 ) $hours = '0'.$hours;
+        if (intval($hours) < 10 ) {
+            $hours = '0'.$hours;
+        }
         $minutes = $array['i'];
-        if (intval($minutes) < 10 ) $minutes = '0'.$minutes;
+        if (intval($minutes) < 10 ) {
+            $minutes = '0'.$minutes;
+        }
     }
     if (checkdate($month,$day,$year)) {
         $datetime = $year.'-'.$month.'-'.$day.' '.$hours.':'.$minutes.':'.$seconds;

Indentation +27 added lines, -27 removed lines

@@ -693,8 +693,8 @@ 
  */
 function get_week_from_day($date) {
     if (!empty($date)) {
-       $time = api_strtotime($date,'UTC');
-       return date('W', $time);
+        $time = api_strtotime($date,'UTC');
+        return date('W', $time);
     } else {
         return date('W');
     }
@@ -712,31 +712,31 @@ 
 
 function substrwords($text,$maxchar,$end='...')
 {
-	if(strlen($text)>$maxchar)
-	{
-		$words=explode(" ",$text);
-		$output = '';
-		$i=0;
-		while(1)
-		{
-			$length = (strlen($output)+strlen($words[$i]));
-			if($length>$maxchar)
-			{
-				break;
-			}
-			else
-			{
-				$output = $output." ".$words[$i];
-				$i++;
-			};
-		};
-	}
-	else
-	{
-		$output = $text;
-		return $output;
-	}
-	return $output.$end;
+    if(strlen($text)>$maxchar)
+    {
+        $words=explode(" ",$text);
+        $output = '';
+        $i=0;
+        while(1)
+        {
+            $length = (strlen($output)+strlen($words[$i]));
+            if($length>$maxchar)
+            {
+                break;
+            }
+            else
+            {
+                $output = $output." ".$words[$i];
+                $i++;
+            };
+        };
+    }
+    else
+    {
+        $output = $text;
+        return $output;
+    }
+    return $output.$end;
 }
 
 function implode_with_key($glue, $array) {

main/tracking/lp_results_by_user.php

Braces +2 added lines, -1 removed lines

@@ -73,8 +73,9 @@
 //$form->addElement('submit','submit',get_lang('Filter'));
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['course_code']))
+if (!empty($_REQUEST['course_code'])) {
     $selected_course = $_REQUEST['course_code'];
+}
 if (!empty($selected_course)) {
     $selected_course = api_get_course_info($selected_course);
     $course_list = array($selected_course);

Indentation +102 added lines, -102 removed lines

@@ -16,34 +16,34 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	Display :: display_header(null);
-	api_not_allowed();
-	Display :: display_footer();
+    Display :: display_header(null);
+    api_not_allowed();
+    Display :: display_footer();
 }
 
 $export_to_csv = false;
 if (isset($_GET['export'])) {
-	$export_to_csv = true;
+    $export_to_csv = true;
 }
 
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 
 if ($global) {
-	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
-		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
+    $temp_course_list = CourseManager :: get_courses_list();
+    foreach($temp_course_list  as $temp_course_item) {
+        $course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
             'title' => $course_item['title'],
         );
-	}
+    }
 } else {
     $current_course['code'] = $_course['id'];
-	$course_list = array($current_course);
+    $course_list = array($current_course);
 }
 
 $new_course_select = array();
@@ -54,20 +54,20 @@ 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
 $form->addElement('select','course_code',get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+    $form->addElement('hidden','view','admin');
 } else {
-	//Get exam lists
+    //Get exam lists
     $course_id = api_get_course_int_id();
-	$t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
-	$sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
+    $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
+    $sqlExercices = "SELECT quiz.title,id FROM ".$t_quiz." AS quiz
 	                 WHERE c_id = $course_id AND active='1'
 	                 ORDER BY quiz.title ASC";
-	$resultExercices = Database::query($sqlExercices);
-	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
-		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
-	}
-	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
+    $resultExercices = Database::query($sqlExercices);
+    $exercise_list[0] = get_lang('All');
+    while($a_exercices = Database::fetch_array($resultExercices)) {
+        $exercise_list[$a_exercices['id']] = $a_exercices['title'];
+    }
+    $form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
 }
 
 //$form->addElement('submit','submit',get_lang('Filter'));
@@ -81,9 +81,9 @@ 
 }
 
 if (!$export_to_csv) {
-	Display :: display_header(get_lang('Reporting'));
-	echo '<div class="actions" style ="font-size:10pt;">';
-	if ($global) {
+    Display :: display_header(get_lang('Reporting'));
+    echo '<div class="actions" style ="font-size:10pt;">';
+    if ($global) {
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
@@ -93,81 +93,81 @@ 
                 &nbsp;'.get_lang('Print').'</a>
                 	</div>';
 
-		$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
+        $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
         if (api_is_platform_admin()) {
-		  $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
+            $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
         } else {
             $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
         }
-		$menu_items[] = get_lang('ExamTracking');
-		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
-				echo $item;
-				if($key!=$nb_menu_items-1) {
-					echo ' | ';
-				}
-			}
-			echo '<br />';
-		}
-	} else {
-	    echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
+        $menu_items[] = get_lang('ExamTracking');
+        $nb_menu_items = count($menu_items);
+        if($nb_menu_items>1) {
+            foreach($menu_items as $key=> $item) {
+                echo $item;
+                if($key!=$nb_menu_items-1) {
+                    echo ' | ';
+                }
+            }
+            echo '<br />';
+        }
+    } else {
+        echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
 		     <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
         echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
-		echo ' | '.get_lang('ExamTracking').'';
+        echo ' | '.get_lang('ExamTracking').'';
         echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
             '.Display::return_icon('excel.gif').'
             &nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
 
-	}
+    }
     echo '</div>';
-	echo '<br /><br />';
-	$form->display();
+    echo '<br /><br />';
+    $form->display();
 }
 $main_result = array();
 $session_id = 0;
 $user_list = array();
 // Getting course list
 foreach ($course_list  as $current_course ) {
-	$course_info = api_get_course_info($current_course['code']);
-	$_course = $course_info;
-
-	// Getting LP list
-	$list = new LearnpathList('', $current_course['code'], $session_id);
-	$lp_list = $list->get_flat_list();
-
-	// Looping LPs
-	$lps = array();
-	foreach ($lp_list as $lp_id =>$lp) {
-		$exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
-		$attempt_result = array();
-		// Looping Chamilo Exercises in LP
-		foreach ($exercise_list as $exercise) {
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
-				$exercise['path'],
-				$course_info['real_id'],
-				$session_id
-			);
-			// Looping Exercise Attempts
-			foreach ($exercise_stats as $stats) {
-				$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
-				$user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
-			}
-			$exercise_list_name[$exercise['id']] = $exercise['title'];
-		}
-		$lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
-		$lp_list_name[$lp_id] = $lp['lp_name'];
-	}
-	$main_result[$current_course['code']] = $lps;
+    $course_info = api_get_course_info($current_course['code']);
+    $_course = $course_info;
+
+    // Getting LP list
+    $list = new LearnpathList('', $current_course['code'], $session_id);
+    $lp_list = $list->get_flat_list();
+
+    // Looping LPs
+    $lps = array();
+    foreach ($lp_list as $lp_id =>$lp) {
+        $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
+        $attempt_result = array();
+        // Looping Chamilo Exercises in LP
+        foreach ($exercise_list as $exercise) {
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
+                $exercise['path'],
+                $course_info['real_id'],
+                $session_id
+            );
+            // Looping Exercise Attempts
+            foreach ($exercise_stats as $stats) {
+                $attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
+                $user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
+            }
+            $exercise_list_name[$exercise['id']] = $exercise['title'];
+        }
+        $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
+        $lp_list_name[$lp_id] = $lp['lp_name'];
+    }
+    $main_result[$current_course['code']] = $lps;
 }
 
 if (!empty($user_list)) {
     foreach($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
-		$user_list_name[$user_id] = api_get_person_name(
-			$user_data['firstname'],
-			$user_data['lastname']
-		);
+        $user_list_name[$user_id] = api_get_person_name(
+            $user_data['firstname'],
+            $user_data['lastname']
+        );
     }
 }
 $export_array =  array();
@@ -207,15 +207,15 @@ 
                         $html_result .= Display::tag('td', $result);
 
                         $html_result .= '</tr>';
-						$export_array[] = array(
-							$course_code,
-							$lp_list_name[$lp_id],
-							$exercise_list_name[$exercise_id],
-							$user_list_name[$user_id],
-							$attempt,
-							api_get_local_time($attempt_data['exe_date']),
-							$result,
-						);
+                        $export_array[] = array(
+                            $course_code,
+                            $lp_list_name[$lp_id],
+                            $exercise_list_name[$exercise_id],
+                            $user_list_name[$user_id],
+                            $attempt,
+                            api_get_local_time($attempt_data['exe_date']),
+                            $result,
+                        );
                         $attempt++;
                     }
                 }
@@ -226,30 +226,30 @@ 
 }
 
 if (!$export_to_csv) {
-	echo $html_result;
+    echo $html_result;
 }
 $filename = 'learning_path_results-'.date('Y-m-d-h:i:s').'.xls';
 if ($export_to_csv) {
     export_complete_report_csv($filename, $export_array);
-	exit;
+    exit;
 }
 
 function export_complete_report_csv($filename, $array)
 {
-	$header[] = array(
-		get_lang('Course'),
-		get_lang('LearningPath'),
-		get_lang('Exercise'),
-		get_lang('User'),
-		get_lang('Attempt'),
-		get_lang('Date'),
-		get_lang('Results'),
-	);
-	if (!empty($array)) {
-		$array = array_merge($header, $array);
-		Export :: arrayToCsv($array, $filename);
-	}
-	exit;
+    $header[] = array(
+        get_lang('Course'),
+        get_lang('LearningPath'),
+        get_lang('Exercise'),
+        get_lang('User'),
+        get_lang('Attempt'),
+        get_lang('Date'),
+        get_lang('Results'),
+    );
+    if (!empty($array)) {
+        $array = array_merge($header, $array);
+        Export :: arrayToCsv($array, $filename);
+    }
+    exit;
 
 }
 Display :: display_footer();

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 	$export_to_csv = true;
 }
 
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -34,7 +34,7 @@ 
 
 if ($global) {
 	$temp_course_list = CourseManager :: get_courses_list();
-	foreach($temp_course_list  as $temp_course_item) {
+	foreach ($temp_course_list  as $temp_course_item) {
 		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
         $course_list[] = array(
             'code' => $course_item['code'],
@@ -47,14 +47,14 @@ 
 }
 
 $new_course_select = array();
-foreach($course_list as $data) {
+foreach ($course_list as $data) {
     $new_course_select[$data['code']] = $data['title'];
 }
 
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
-$form->addElement('select','course_code',get_lang('Course'), $new_course_select);
+$form->addElement('select', 'course_code', get_lang('Course'), $new_course_select);
 if ($global) {
-	$form->addElement('hidden','view','admin');
+	$form->addElement('hidden', 'view', 'admin');
 } else {
 	//Get exam lists
     $course_id = api_get_course_int_id();
@@ -64,7 +64,7 @@ 
 	                 ORDER BY quiz.title ASC";
 	$resultExercices = Database::query($sqlExercices);
 	$exercise_list[0] = get_lang('All');
-	while($a_exercices = Database::fetch_array($resultExercices)) {
+	while ($a_exercices = Database::fetch_array($resultExercices)) {
 		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
 	}
 	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
@@ -87,7 +87,7 @@ 
 
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
                 '.Display::return_icon('csv.gif').'
-                &nbsp;'.get_lang('ExportAsCSV').'</a>' .
+                &nbsp;'.get_lang('ExportAsCSV').'</a>'.
                 '<a href="javascript: void(0);" onclick="javascript: window.print()">
                 '.Display::return_icon('printmgr.gif').'
                 &nbsp;'.get_lang('Print').'</a>
@@ -101,10 +101,10 @@ 
         }
 		$menu_items[] = get_lang('ExamTracking');
 		$nb_menu_items = count($menu_items);
-		if($nb_menu_items>1) {
-			foreach($menu_items as $key=> $item) {
+		if ($nb_menu_items > 1) {
+			foreach ($menu_items as $key=> $item) {
 				echo $item;
-				if($key!=$nb_menu_items-1) {
+				if ($key != $nb_menu_items - 1) {
 					echo ' | ';
 				}
 			}
@@ -128,7 +128,7 @@ 
 $session_id = 0;
 $user_list = array();
 // Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 
@@ -162,7 +162,7 @@ 
 }
 
 if (!empty($user_list)) {
-    foreach($user_list as $user_id) {
+    foreach ($user_list as $user_id) {
         $user_data = api_get_user_info($user_id);
 		$user_list_name[$user_id] = api_get_person_name(
 			$user_data['firstname'],
@@ -170,7 +170,7 @@ 
 		);
     }
 }
-$export_array =  array();
+$export_array = array();
 if (!empty($main_result)) {
 
     $html_result .= '<table  class="data_table">';
@@ -193,9 +193,9 @@ 
 
             foreach ($exercises as $exercise_id => $exercise_data) {
                 $users = $exercise_data['users'];
-                foreach($users as $user_id => $attempts) {
+                foreach ($users as $user_id => $attempts) {
                     $attempt = 1;
-                    foreach($attempts as $exe_id => $attempt_data) {
+                    foreach ($attempts as $exe_id => $attempt_data) {
                         $html_result .= '<tr colspan="">';
                         $html_result .= Display::tag('td', $course_code);
                         $html_result .= Display::tag('td', $lp_list_name[$lp_id]);
@@ -222,7 +222,7 @@ 
             }
         }
     }
-    $html_result .='</table>';
+    $html_result .= '</table>';
 }
 
 if (!$export_to_csv) {

main/tracking/logins_details.php

Spacing +25 added lines, -25 removed lines

@@ -75,13 +75,13 @@ 
     // check if uid is tutor of this group
     $courseId = api_get_course_int_id();
 
-    if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
+    if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) {
         if ($is_allowedToTrackEverybodyInCourse) {
             $sql = "SELECT u.firstname,u.lastname, u.email
                     FROM $TABLECOURSUSER cu , $TABLEUSER u
                     WHERE
                         cu.user_id = u.user_id AND
-                        cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
+                        cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
                         cu.c_id = '$courseId' AND
                         u.user_id = '$uInfo'";
         } else {
@@ -97,21 +97,21 @@ 
             $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]);
 
             echo "<tr><td>";
-            echo $informationsAbout . " : <br>";
+            echo $informationsAbout." : <br>";
             echo "<ul>\n"
-            . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n"
-            . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n"
-            . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n"
+            . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n"
+            . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n"
+            . "<li>".get_lang('Email')." : ".$res2."</li>\n"
             . "</ul>";
             echo "</td></tr>";
             /*             * ***** MENU ******* */
             echo "<tr>
                 <td>
-                [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
+                [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>]
         ";
             echo "  &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]
-                [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>]
+                [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>]
                 &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
         ";
             switch ($period) {
@@ -120,8 +120,8 @@ 
                     $previousReqDate = $reqdate - 7 * 86400;
                     $nextReqDate = $reqdate + 7 * 86400;
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>]
                 ";
                     break;
                 default :
@@ -132,8 +132,8 @@ 
                     $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate));
                     $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate));
                     echo "
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>]
-                    [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>]
+                    [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>]
                 ";
                     break;
             }
@@ -153,7 +153,7 @@ 
                         AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate'))
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
-                $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate);
+                $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate);
                 break;
             case "week" :
                 $sql = "SELECT access_date
@@ -165,24 +165,24 @@ 
                         GROUP BY DAYOFMONTH(access_date)
                         ORDER BY access_date ASC";
                 $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate)));
-                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) ));
-                $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate)
-                        . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate);
+                $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate))));
+                $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate)
+                        . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate);
                 break;
         }
         echo "<tr><td>";
         $results = StatsUtils::getManyResults1Col($sql);
         /*             * * display of the displayed period  ** */
         echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>";
-        echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>";
+        echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>";
         if (is_array($results)) {
             for ($j = 0; $j < sizeof($results); $j++) {
                 $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get());
                 echo "<tr>";
-                echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
+                echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
+                if ($j == (sizeof($results) - 1))
                     $limit = date("Y-m-d H:i:s", $nextReqDate);
                 else
                     $limit = $results[$j + 1];
@@ -192,8 +192,8 @@ 
                         FROM $TABLETRACK_ACCESS
                         WHERE access_user_id = $uInfo
                             AND access_tool IS NOT NULL
-                            AND access_date > '" . $results[$j] . "'
-                            AND access_date < '" . $limit . "'
+                            AND access_date > '".$results[$j]."'
+                            AND access_date < '" . $limit."'
                             AND c_id = $courseId
                         GROUP BY access_tool
                         ORDER BY access_tool ASC";
@@ -204,8 +204,8 @@ 
                     echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n";
                     for ($k = 0; $k < count($results2); $k++) {
                         echo "<tr>\n";
-                        echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n";
-                        echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n";
+                        echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n";
+                        echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n";
                         echo "</tr>";
                     }
                     echo "</table>\n";
@@ -215,7 +215,7 @@ 
             }
         } else {
             echo "<tr>";
-            echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>";
+            echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>";
             echo "</tr>";
         }
         echo "</table>";

Braces +5 added lines, -4 removed lines

@@ -182,10 +182,11 @@
                 echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>";
                 echo"</tr>";
                 // $limit is used to select only results between $results[$j] (current login) and next one
-                if ($j == ( sizeof($results) - 1 ))
-                    $limit = date("Y-m-d H:i:s", $nextReqDate);
-                else
-                    $limit = $results[$j + 1];
+                if ($j == ( sizeof($results) - 1 )) {
+                                    $limit = date("Y-m-d H:i:s", $nextReqDate);
+                } else {
+                                    $limit = $results[$j + 1];
+                }
                 // select all access to tool between displayed date and next displayed date or now() if
                 // displayed date is the last login date
                 $sql = "SELECT access_tool, count(access_tool)

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

main/tracking/course_log_groups.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 
 $action_links = '
 function action_formatter(cellvalue, options, rowObject) {
-    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
+    return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
     '\';
 }';
 
@@ -108,7 +108,7 @@ 
 $htmlHeadXtra[] = '
 <script>
 $(function() {
-    '.Display::grid_js('group_users',$url, $columns, $column_model, $extra_params, array(), $action_links, true).'
+    '.Display::grid_js('group_users', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';
 

main/tracking/course_log_tools.php

Indentation +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 
 // getting all the students of the course
 if (empty($session_id)) {
-	// Registered students in a course outside session.
+    // Registered students in a course outside session.
     $a_students = CourseManager:: get_student_list_from_course_code(
         api_get_course_id(),
         false,
@@ -89,7 +89,7 @@ 
         api_get_group_id()
     );
 } else {
-	// Registered students in session.
+    // Registered students in session.
     $a_students = CourseManager:: get_student_list_from_course_code(
         api_get_course_id(),
         true,

Spacing +5 added lines, -5 removed lines

@@ -65,8 +65,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
 }
 
@@ -134,10 +134,10 @@ 
 
 echo '<span style="float:right; padding-top:0px;">';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&id_session='.api_get_session_id().'&export=csv">
-	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+	'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</span>';
 echo '</div>';
@@ -250,7 +250,7 @@ 
             $quiz_avg_score = round(($quiz_avg_score / $studentCount), 2).'%';
             $url = api_get_path(
                     WEB_CODE_PATH
-                ) . 'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params;
+                ).'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params;
 
             echo '<tr><td>'.Display::url(
                     $quiz['title'],

main/tracking/courseLog.php

Indentation +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                            ) . "</div>'
                     );
                 }
             );

Spacing +13 added lines, -13 removed lines

@@ -111,7 +111,7 @@ 
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                         )."</div>'
                     );
                 }
             );
@@ -146,7 +146,7 @@ 
 $TABLETRACK_LINKS       = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS);
 $TABLETRACK_DOWNLOADS   = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 $TABLETRACK_ACCESS_2    = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-$TABLETRACK_EXERCISES 	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE);
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -156,8 +156,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview'));
 }
 
@@ -228,21 +228,21 @@ 
 if (!empty($sessionId)) {
     $actionsLeft .= Display::url(
         Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . 'attendance/index.php?' . api_get_cidreq() . '&action=calendar_logins'
+        api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins'
     );
 }
 
 $actionsRight = '<div class="pull-right">';
 $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
 $addional_param = '';
 if (isset($_GET['additional_profile_field'])) {
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
 }
 $users_tracking_per_page = '';
 if (isset($_GET['users_tracking_per_page'])) {
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
 }
 $actionsRight .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
      '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
@@ -266,7 +266,7 @@ 
 $course_name = get_lang('Course').' '.$courseInfo['name'];
 if ($session_id) {
     $titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id);
-    $titleCourse =  Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
+    $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name;
 } else {
     $titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name'];
 }
@@ -306,7 +306,7 @@ 
     $html .= '<ul class="session-list">';
     foreach ($sessionList as $session) {
         $url = api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id'].'&cidReq='.$courseInfo['code'];
-        $html .= Display::tag('li', $iconCourse . ' ' . Display::url($session['name'], $url));
+        $html .= Display::tag('li', $iconCourse.' '.Display::url($session['name'], $url));
     }
     $html .= '</ul>';
 }
@@ -321,12 +321,12 @@ 
     $form = new FormValidator(
         'reminder_form',
         'get',
-        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?' . api_get_cidreq(),
+        api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(),
         null,
         ['style' => 'margin-bottom: 10px'],
         FormValidator::LAYOUT_INLINE
     );
-    $options = array (
+    $options = array(
         2 => sprintf($getLangXDays, 2),
         3 => sprintf($getLangXDays, 3),
         4 => sprintf($getLangXDays, 4),
@@ -339,7 +339,7 @@ 
     );
     $el = $form->addSelect(
         'since',
-        Display::returnFontAwesomeIcon('warning') . get_lang('RemindInactivesLearnersSince'),
+        Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'),
         $options,
         ['class' => 'col-sm-3']
     );

main/tracking/course_log_resources.php

Spacing +6 added lines, -6 removed lines

@@ -45,8 +45,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
 }
 
@@ -76,21 +76,21 @@ 
 echo Display::return_icon('tools_na.png', get_lang('ResourcesTracking'), array(), ICON_SIZE_MEDIUM);
 echo '<span style="float:right; padding-top:0px;">';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).
 '</a>';
 
 $addional_param = '';
 if (isset($_GET['additional_profile_field'])) {
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
 }
 
 $users_tracking_per_page = '';
 if (isset($_GET['users_tracking_per_page'])) {
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
 }
 
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
-'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</span>';
 echo '</div>';

main/tracking/courseLogCSV.php

Braces +17 added lines, -9 removed lines

@@ -38,20 +38,27 @@ 
 
 $view = $_REQUEST['view'];
 
-if ($view == "0000001")
+if ($view == "0000001") {
     $nameTools = get_lang('SynthesisView');
-if ($view == "1000000")
+}
+if ($view == "1000000") {
     $nameTools = get_lang('CourseStats');
-if ($view == "0100000")
+}
+if ($view == "0100000") {
     $nameTools = get_lang('CourseAccess');
-if ($view == "0010000")
+}
+if ($view == "0010000") {
     $nameTools = get_lang('ToolsAccess');
-if ($view == "0001000")
+}
+if ($view == "0001000") {
     $nameTools = get_lang('LinksAccess');
-if ($view == "0000100")
+}
+if ($view == "0000100") {
     $nameTools = get_lang('DocumentsAccess');
-if ($view == "00000010")
+}
+if ($view == "00000010") {
     $nameTools = get_lang('ScormAccess');
+}
 
 $interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
 
@@ -79,8 +86,9 @@ 
       </div><br>
       "; */
 
-    if (!isset($view))
-        $view = "0000000";
+    if (!isset($view)) {
+            $view = "0000000";
+    }
 
 
     /* 	Reporting */

Spacing +50 added lines, -50 removed lines

@@ -53,13 +53,13 @@ 
 if ($view == "00000010")
     $nameTools = get_lang('ScormAccess');
 
-$interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
+$interbreadcrumb[] = array("url" => api_get_self()."?view=0000000", "name" => get_lang('ToolName'));
 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || api_is_drh();
 
 /* 	MAIN CODE */
 
-$title[0] = get_lang('StatsOfCourse') . " : " . $_course['official_code'];
+$title[0] = get_lang('StatsOfCourse')." : ".$_course['official_code'];
 
 
 $courseInfo = api_get_course_info($_course['official_code']);
@@ -91,40 +91,40 @@ 
         $sql = "SELECT $TABLECOURSUSER.user_i, $table_user.lastname, $table_user.firstname
                 FROM $TABLECOURSUSER, $table_user
                 WHERE
-                    $TABLECOURSUSER.c_id = '" . api_get_course_int_id() . "' AND
+                    $TABLECOURSUSER.c_id = '".api_get_course_int_id()."' AND
                     $TABLECOURSUSER.user_id = $table_user.user_id AND
-                    $TABLECOURSUSER.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
+                    $TABLECOURSUSER.relation_type<>".COURSE_RELATION_TYPE_RRHH."
                 ORDER BY $table_user.lastname";
         $results = StatsUtils::getManyResults3Col($sql);
 
         //BUGFIX: get visual code instead of real course code. Scormpaths use the visual code... (should be fixed in future versions)
-        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '" . api_get_course_id() . "'";
+        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '".api_get_course_id()."'";
         $_course['visual_code'] = StatsUtils::getOneResult($sql);
 
         if (is_array($results)) {
             $line = '';
-            $title_line = get_lang('Name') . ";" . get_lang('FirstAccess') . ";" . get_lang('LastAccess') . ";" . get_lang('Visited') . "\n";
+            $title_line = get_lang('Name').";".get_lang('FirstAccess').";".get_lang('LastAccess').";".get_lang('Visited')."\n";
 
             for ($j = 0; $j < count($results); $j++) {
                 // BEGIN % visited
                 // sum of all items (= multiple learningpaths + SCORM imported paths)
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " .
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv ".
                         "INNER JOIN $tbl_learnpath_view v
-                        ON iv.lp_view_id = v.id " .
+                        ON iv.lp_view_id = v.id ".
                         "WHERE
                         	v.c_id = $course_id AND
                         	iv.c_id = $course_id AND
-                		v.user_id = " . $results[$j][0];
+                		v.user_id = ".$results[$j][0];
                 $total_lpath_items = StatsUtils::getOneResult($sql);
 
                 // sum of all completed items (= multiple learningpaths + SCORM imported paths)
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " .
-                        "FROM $tbl_learnpath_item_view iv " .
-                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " .
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) ".
+                        "FROM $tbl_learnpath_item_view iv ".
+                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id ".
                         "WHERE
                         	v.c_id = $course_id AND
                         	iv.c_id = $course_id AND
-                        	v.user_id = " . $results[$j][0] . " " .
+                        	v.user_id = ".$results[$j][0]." ".
                         "AND (status = 'completed' OR status='passed')";
                 $total_lpath_items_completed = StatsUtils::getOneResult($sql);
 
@@ -135,23 +135,23 @@ 
                 // BEGIN first/last access
                 // first access
                 $sql = "SELECT access_date FROM $TABLETRACK_ACCESS_2
-                        WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath' AND access_session_id = '" . api_get_session_id() . "'
+                        WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath' AND access_session_id = '".api_get_session_id()."'
                         ORDER BY access_id ASC LIMIT 1";
                 $first_access = StatsUtils::getOneResult($sql);
                 $first_access = empty($first_access) ? "-" : date('d.m.y', strtotime($first_access));
 
                 // last access
-                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath'";
+                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath'";
                 $last_access = StatsUtils::getOneResult($sql);
                 $last_access = empty($last_access) ? "-" : date('d.m.y', strtotime($last_access));
                 // END first/last access
                 // BEGIN presentation of data
-                $line .= $results[$j][1] . " " . $results[$j][2] . ";" . $first_access . ";" . $last_access . ";" . $lpath_pct_completed . "\n";
+                $line .= $results[$j][1]." ".$results[$j][2].";".$first_access.";".$last_access.";".$lpath_pct_completed."\n";
 
                 // END presentation of data
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -163,9 +163,9 @@ 
 
         $sql = "SELECT count(*)
                 FROM $TABLECOURSUSER
-                WHERE c_id = '" . api_get_course_int_id() . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "";
+                WHERE c_id = '".api_get_course_int_id()."' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
         $count = StatsUtils::getOneResult($sql);
-        $title_line = get_lang('CountUsers') . " ; " . $count . "\n";
+        $title_line = get_lang('CountUsers')." ; ".$count."\n";
     }
 
     /* 	Access to this course */
@@ -183,7 +183,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('CountToolAccess') . " ; " . $count . "\n";
+        $line .= get_lang('CountToolAccess')." ; ".$count."\n";
 
         // last 31 days
         $sql = "SELECT count(*)
@@ -193,7 +193,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('Last31days') . " ; " . $count . "\n";
+        $line .= get_lang('Last31days')." ; ".$count."\n";
 
         // last 7 days
         $sql = "SELECT count(*)
@@ -203,7 +203,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('Last7days') . " ; " . $count . "\n";
+        $line .= get_lang('Last7days')." ; ".$count."\n";
 
         // today
         $sql = "SELECT count(*)
@@ -212,7 +212,7 @@ 
                     AND ( access_date > CURDATE() )
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
-        $line .= get_lang('ThisDay') . " ; " . $count . "\n";
+        $line .= get_lang('ThisDay')." ; ".$count."\n";
     }
 
     /* 	Tools */
@@ -221,7 +221,7 @@ 
         $tempView[2] = '0';
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('ToolTitleToolnameColumn') . ";" . get_lang('ToolTitleUsersColumn') . ";" . get_lang('ToolTitleCountColumn') . "\n";
+        $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n";
 
         $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool )
                 FROM $TABLETRACK_ACCESS
@@ -233,10 +233,10 @@ 
 
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][0] . "/" . get_lang($results[$j][0]) . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
+                $line .= $results[$j][0]."/".get_lang($results[$j][0]).";".$results[$j][1].";".$results[$j][2]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -258,14 +258,14 @@ 
 
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('LinksTitleLinkColumn') . ";" . get_lang('LinksTitleUsersColumn') . ";" . get_lang('LinksTitleCountColumn') . "\n";
+        $title_line = get_lang('LinksTitleLinkColumn').";".get_lang('LinksTitleUsersColumn').";".get_lang('LinksTitleCountColumn')."\n";
 
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][1] . "'>" . $results[$j][0] . ";" . $results[$j][2] . ";" . $results[$j][3] . "\n";
+                $line .= $results[$j][1]."'>".$results[$j][0].";".$results[$j][2].";".$results[$j][3]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -284,13 +284,13 @@ 
 
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('DocumentsTitleDocumentColumn') . ";" . get_lang('DocumentsTitleUsersColumn') . ";" . get_lang('DocumentsTitleCountColumn') . "\n";
+        $title_line = get_lang('DocumentsTitleDocumentColumn').";".get_lang('DocumentsTitleUsersColumn').";".get_lang('DocumentsTitleCountColumn')."\n";
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][0] . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
+                $line .= $results[$j][0].";".$results[$j][1].";".$results[$j][2]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -318,10 +318,10 @@ 
                 //echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."' class='specialLink'>$lp_title</a>";
                 if ($ar['id'] == $scormcontopen) { //have to list the students here
                     $contentId = $ar['id'];
-                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname " .
-                            "FROM  $tbl_learnpath_view sd " .
-                            "INNER JOIN $table_user u " .
-                            "ON u.user_id = sd.user_id " .
+                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname ".
+                            "FROM  $tbl_learnpath_view sd ".
+                            "INNER JOIN $table_user u ".
+                            "ON u.user_id = sd.user_id ".
                             "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id";
                     //error_log($sql2,0);
                     $result2 = Database::query($sql2);
@@ -333,28 +333,28 @@ 
                         while ($ar2 != '') {
 
                             if (isset($_REQUEST["scormstudentopen"]) && $ar2['user_id'] == $scormstudentopen) {
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
                             } else {
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
                             }
 
                             if ($ar2['user_id'] == $scormstudentopen) { //have to list the student's results
                                 $studentId = $ar2['user_id'];
-                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
-                                        "FROM $tbl_learnpath_item i " .
-                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
-                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
+                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
+                                        "FROM $tbl_learnpath_item i ".
+                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
+                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
                                         "WHERE 	i.c_id = $course_id AND
                                         		iv.c_id = $course_id AND
                                         		v.c_id = $course_id AND
                                 				v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id";
                                 $result3 = Database::query($sql3);
                                 $ar3 = Database::fetch_array($result3);
-                                $title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn');
+                                $title_line .= get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn');
                                 while ($ar3['status'] != '') {
                                     require_once '../lp/learnpathItem.class.php';
                                     $time = learnpathItem::getScormTimeFromParameter('php', $ar3['total_time']);
-                                    $line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time;
+                                    $line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time;
                                     $ar3 = Database::fetch_array($result3);
                                 }
                             }
@@ -374,23 +374,23 @@ 
      * Export to a CSV file
      * Force the browser to save the file instead of opening it.
      */
-    $len = strlen($title_line . $line);
+    $len = strlen($title_line.$line);
     header('Content-type: application/octet-stream');
     //header('Content-Type: application/force-download');
-    header('Content-length: ' . $len);
-    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv')));
+    header('Content-length: '.$len);
+    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0].'_'.$title[1].'.csv')));
     $filename = api_replace_dangerous_char($filename);
     if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-        header('Content-Disposition: filename= ' . $filename);
+        header('Content-Disposition: filename= '.$filename);
     } else {
-        header('Content-Disposition: attachment; filename= ' . $filename);
+        header('Content-Disposition: attachment; filename= '.$filename);
     }
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
         header('Pragma: ');
         header('Cache-Control: ');
         header('Cache-Control: public'); // IE cannot download from sessions without a cache
     }
-    header('Content-Description: ' . $filename);
+    header('Content-Description: '.$filename);
     header('Content-transfer-encoding: binary');
 
     echo api_html_entity_decode($title_line, ENT_COMPAT);