chamilo / chamilo-lms

main/mySpace/current_courses.php

Indentation +208 added lines, -208 removed lines

@@ -12,7 +12,7 @@ 
 $filename = 'reporting.xls';
 
 if (!api_is_allowed_to_create_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $user_id = api_get_user_id();
@@ -23,226 +23,226 @@ 
 $session_id = 0;
 
 if (!empty($my_courses)) {
-	foreach ($my_courses as $course) {
-		$course_code = $course['code'];
-		$course_id = $course['real_id'];
-		$course_info = api_get_course_info($course_code);
-
-		//Only show open courses
-		if ($course_info['visibility'] == 0) {
-			continue;
-		}
-
-		$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
-		$teacher_list =  array();
-
-		if (!empty($teachers)) {
-			foreach($teachers as $teacher) {
-				$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
-			}
-		}
-
-		$tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
-
-		//Cleaning students only REAL students
-		$students = array();
-		foreach ($tmp_students  as $student) {
-			$user_info = api_get_user_info($student['user_id']);
-			if ($user_info['status'] != STUDENT) {
-				continue;
-			}
-			$students[] = $student['user_id'];
-		}
-
-		$t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
-		$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
+    foreach ($my_courses as $course) {
+        $course_code = $course['code'];
+        $course_id = $course['real_id'];
+        $course_info = api_get_course_info($course_code);
+
+        //Only show open courses
+        if ($course_info['visibility'] == 0) {
+            continue;
+        }
+
+        $teachers = CourseManager::get_teacher_list_from_course_code($course_code);
+        $teacher_list =  array();
+
+        if (!empty($teachers)) {
+            foreach($teachers as $teacher) {
+                $teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
+            }
+        }
+
+        $tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
+
+        //Cleaning students only REAL students
+        $students = array();
+        foreach ($tmp_students  as $student) {
+            $user_info = api_get_user_info($student['user_id']);
+            if ($user_info['status'] != STUDENT) {
+                continue;
+            }
+            $students[] = $student['user_id'];
+        }
+
+        $t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
+        $sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
 				   WHERE c_id = $course_id AND lp.session_id = 0";
-		$rs_lp 	= Database::query($sql_lp);
-		$t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
-		$t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-
-		$total_tools_list = Tracking::get_tools_most_used_by_course(
-			$course_id,
-			$session_id
-		);
-
-		$total_tools = 0;
-		foreach($total_tools_list as $tool) {
-			$total_tools += $tool['count_access_tool'];
-		}
-
-		if (Database :: num_rows($rs_lp) > 0) {
-			while ($learnpath = Database :: fetch_array($rs_lp)) {
-				$lp_id = $learnpath['id'];
-
-				$lp_items =
-				$array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
-
-				$array[$i]['teachers'] = '';
-				if (!empty($teacher_list)) {
-					$array[$i]['teachers'] = implode(', ', $teacher_list);
-				}
-
-				$array[$i]['course_name'] = $course['title'];
-				$count_students_accessing = 0;
-				$count_students_complete_all_activities = 0;
-				$count_students_complete_all_activities_at_50 = 0;
-				$total_time_spent = 0;
-				$total_average_progress = 0;
-
-				if (!empty($students)) {
-					foreach ($students  as $student_id) {
-						$avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-						$myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
-						$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-
-						if (intval($avg_progress_in_course) == 100) {
-							$count_students_complete_all_activities++;
-						}
-						if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
-							$count_students_complete_all_activities_at_50 ++;
-						}
-						$total_average_progress +=$avg_progress_in_course;
-
-						$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
-						$total_time_spent += $time_spent;
-						if (!empty($time_spent)) {
-							$count_students_accessing++;
-						}
-					}
-					//$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
-				}
-
-				$student_count = count($students);
-
-				$array[$i]['count_students'] = $student_count;
-				$array[$i]['count_students_accessing'] = 0;
-				$array[$i]['count_students_accessing_percentage'] = 0;
-				$array[$i]['count_students_complete_all_activities_at_50'] = 0;
-				$array[$i]['count_students_complete_all_activities'] = 0;
-				$array[$i]['average_percentage_activities_completed_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				//$array[$i]['tools_used'] = 0;
-				$array[$i]['learnpath_docs'] = 0;
-				$array[$i]['learnpath_exercises'] = 0;
-				$array[$i]['learnpath_links'] = 0;
-				$array[$i]['learnpath_forums'] = 0;
-				$array[$i]['learnpath_assignments'] = 0;
-
-				//registering the number of each category of
-				//items in learning path
-				$sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
+        $rs_lp 	= Database::query($sql_lp);
+        $t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
+        $t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+
+        $total_tools_list = Tracking::get_tools_most_used_by_course(
+            $course_id,
+            $session_id
+        );
+
+        $total_tools = 0;
+        foreach($total_tools_list as $tool) {
+            $total_tools += $tool['count_access_tool'];
+        }
+
+        if (Database :: num_rows($rs_lp) > 0) {
+            while ($learnpath = Database :: fetch_array($rs_lp)) {
+                $lp_id = $learnpath['id'];
+
+                $lp_items =
+                $array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
+
+                $array[$i]['teachers'] = '';
+                if (!empty($teacher_list)) {
+                    $array[$i]['teachers'] = implode(', ', $teacher_list);
+                }
+
+                $array[$i]['course_name'] = $course['title'];
+                $count_students_accessing = 0;
+                $count_students_complete_all_activities = 0;
+                $count_students_complete_all_activities_at_50 = 0;
+                $total_time_spent = 0;
+                $total_average_progress = 0;
+
+                if (!empty($students)) {
+                    foreach ($students  as $student_id) {
+                        $avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+                        $myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
+                        $avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+
+                        if (intval($avg_progress_in_course) == 100) {
+                            $count_students_complete_all_activities++;
+                        }
+                        if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
+                            $count_students_complete_all_activities_at_50 ++;
+                        }
+                        $total_average_progress +=$avg_progress_in_course;
+
+                        $time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
+                        $total_time_spent += $time_spent;
+                        if (!empty($time_spent)) {
+                            $count_students_accessing++;
+                        }
+                    }
+                    //$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
+                }
+
+                $student_count = count($students);
+
+                $array[$i]['count_students'] = $student_count;
+                $array[$i]['count_students_accessing'] = 0;
+                $array[$i]['count_students_accessing_percentage'] = 0;
+                $array[$i]['count_students_complete_all_activities_at_50'] = 0;
+                $array[$i]['count_students_complete_all_activities'] = 0;
+                $array[$i]['average_percentage_activities_completed_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                //$array[$i]['tools_used'] = 0;
+                $array[$i]['learnpath_docs'] = 0;
+                $array[$i]['learnpath_exercises'] = 0;
+                $array[$i]['learnpath_links'] = 0;
+                $array[$i]['learnpath_forums'] = 0;
+                $array[$i]['learnpath_assignments'] = 0;
+
+                //registering the number of each category of
+                //items in learning path
+                $sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
 						    WHERE c_id = $course_id AND lpi.lp_id = $lp_id
 						    ORDER BY item_type";
-				$res_lpi = Database::query($sql_lpi);
-				while ($row_lpi = Database::fetch_array($res_lpi)) {
-					switch($row_lpi['item_type']) {
-						case 'document':
-							$array[$i]['learnpath_docs']++;
-							break;
-						case 'quiz':
-							$array[$i]['learnpath_exercises']++;
-							break;
-						case 'link':
-							$array[$i]['learnpath_links']++;
-							break;
-						case 'forum':
-						case 'thread':
-							$array[$i]['learnpath_forums']++;
-							break;
-						case 'student_publication':
-							$array[$i]['learnpath_assignments']++;
-							break;
-					}
-				}
-				// Count announcements
-				$array[$i]['total_announcements'] = 0;
-				$sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
-				$res_news = Database::query($sql_news);
-				while ($row_news = Database::fetch_array($res_news)) {
-					$array[$i]['total_announcements'] = $row_news[0];
-				}
-
-				//@todo don't know what means this value
-				$count_students_complete_all_activities_at_50 = 0;
-
-				if (!empty($student_count)) {
-					$array[$i]['count_students_accessing'] = $count_students_accessing;
-					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
-					$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
-					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
-					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
-					$array[$i]['total_time_spent'] = 0;
-					$array[$i]['average_time_spent_per_student'] = 0;
-
-					if (!empty($total_time_spent)) {
-						$array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
-						$array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
-					}
-					//$array[$i]['tools_used'] = $total_tools;
-				}
-				$i++;
-			}
-		}
-	}
+                $res_lpi = Database::query($sql_lpi);
+                while ($row_lpi = Database::fetch_array($res_lpi)) {
+                    switch($row_lpi['item_type']) {
+                        case 'document':
+                            $array[$i]['learnpath_docs']++;
+                            break;
+                        case 'quiz':
+                            $array[$i]['learnpath_exercises']++;
+                            break;
+                        case 'link':
+                            $array[$i]['learnpath_links']++;
+                            break;
+                        case 'forum':
+                        case 'thread':
+                            $array[$i]['learnpath_forums']++;
+                            break;
+                        case 'student_publication':
+                            $array[$i]['learnpath_assignments']++;
+                            break;
+                    }
+                }
+                // Count announcements
+                $array[$i]['total_announcements'] = 0;
+                $sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
+                $res_news = Database::query($sql_news);
+                while ($row_news = Database::fetch_array($res_news)) {
+                    $array[$i]['total_announcements'] = $row_news[0];
+                }
+
+                //@todo don't know what means this value
+                $count_students_complete_all_activities_at_50 = 0;
+
+                if (!empty($student_count)) {
+                    $array[$i]['count_students_accessing'] = $count_students_accessing;
+                    $array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
+                    $array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
+                    $array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
+                    $array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
+                    $array[$i]['total_time_spent'] = 0;
+                    $array[$i]['average_time_spent_per_student'] = 0;
+
+                    if (!empty($total_time_spent)) {
+                        $array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
+                        $array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
+                    }
+                    //$array[$i]['tools_used'] = $total_tools;
+                }
+                $i++;
+            }
+        }
+    }
 }
 
 $headers = array(
-	get_lang('LearningPath'),
-	get_lang('Teachers'),
-	get_lang('Courses'),
-	get_lang('NumberOfStudents'),
-	get_lang('NumberStudentsAccessingCourse'),
-	get_lang('PercentageStudentsAccessingCourse'),
-	get_lang('NumberStudentsCompleteAllActivities'),
-	get_lang('PercentageStudentsCompleteAllActivities'),
-	get_lang('AverageOfActivitiesCompletedPerStudent'),
-	get_lang('TotalTimeSpentInTheCourse'),
-	get_lang('AverageTimePerStudentInCourse'),
-	get_lang('NumberOfDocumentsInLearnpath'),
-	get_lang('NumberOfExercisesInLearnpath'),
-	get_lang('NumberOfLinksInLearnpath'),
-	get_lang('NumberOfForumsInLearnpath'),
-	get_lang('NumberOfAssignmentsInLearnpath'),
-	get_lang('NumberOfAnnouncementsInCourse'),
+    get_lang('LearningPath'),
+    get_lang('Teachers'),
+    get_lang('Courses'),
+    get_lang('NumberOfStudents'),
+    get_lang('NumberStudentsAccessingCourse'),
+    get_lang('PercentageStudentsAccessingCourse'),
+    get_lang('NumberStudentsCompleteAllActivities'),
+    get_lang('PercentageStudentsCompleteAllActivities'),
+    get_lang('AverageOfActivitiesCompletedPerStudent'),
+    get_lang('TotalTimeSpentInTheCourse'),
+    get_lang('AverageTimePerStudentInCourse'),
+    get_lang('NumberOfDocumentsInLearnpath'),
+    get_lang('NumberOfExercisesInLearnpath'),
+    get_lang('NumberOfLinksInLearnpath'),
+    get_lang('NumberOfForumsInLearnpath'),
+    get_lang('NumberOfAssignmentsInLearnpath'),
+    get_lang('NumberOfAnnouncementsInCourse'),
 );
 
 if (isset($_GET['export'])) {
-	global $charset;
+    global $charset;
     $spreadsheet = new PHPExcel();
     $spreadsheet->setActiveSheetIndex(0);
     $worksheet = $spreadsheet->getActiveSheet();
 
-	$line = 0;
-	$column = 0; //skip the first column (row titles)
-
-	foreach ($headers as $header) {
-		$worksheet->setCellValueByColumnAndRow($column, $line, $header);
-		$column++;
-	}
-	$line++;
-	foreach ($array as $row) {
-		$column = 0;
-		foreach ($row as $item) {
+    $line = 0;
+    $column = 0; //skip the first column (row titles)
+
+    foreach ($headers as $header) {
+        $worksheet->setCellValueByColumnAndRow($column, $line, $header);
+        $column++;
+    }
+    $line++;
+    foreach ($array as $row) {
+        $column = 0;
+        foreach ($row as $item) {
             $worksheet->setCellValueByColumnAndRow(
                 $column,
                 $line,
                 html_entity_decode(strip_tags($item))
             );
-			$column++;
-		}
-		$line++;
-	}
-	$line++;
+            $column++;
+        }
+        $line++;
+    }
+    $line++;
 
     $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
     $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
     $writer->save($file);
     DocumentManager::file_send_for_download($file, true, $filename);
-	exit;
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
@@ -253,20 +253,20 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 
 foreach ($array as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		//$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        //$table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 
 echo '<div class="actions">';

main/exercise/hotpotatoes_exercise_result.class.php

Indentation +136 added lines, -136 removed lines

@@ -14,15 +14,15 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 * @param string $document_path
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     * @param string $document_path
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -34,7 +34,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -111,25 +111,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -148,7 +148,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -157,25 +157,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -183,40 +183,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			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-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            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-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -225,36 +225,36 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
+            $column++;
             if (api_is_western_name_order()) {
-    			$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
-    			$column++;
+                $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
+                $column++;
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('LastName'));
                 $column++;
             } else {
@@ -263,14 +263,14 @@ 
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
                 $worksheet->setCellValueByColumnAndRow(
                     $column,
                     $line,
@@ -280,27 +280,27 @@ 
                         $charset
                     )
                 );
-				$column++;
-			}
-		}
+                $column++;
+            }
+        }
 
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('EndDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
+        $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->setCellValueByColumnAndRow(
@@ -325,38 +325,38 @@ 
                     $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
+            $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
-			$column++;
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

main/inc/lib/tracking.lib.php

Indentation +849 added lines, -849 removed lines

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

main/user/subscribe_user.php

Indentation +197 added lines, -197 removed lines

@@ -27,7 +27,7 @@ 
 
 // Access restriction
 if (!api_is_allowed_to_edit()) {
-	 api_not_allowed(true);
+        api_not_allowed(true);
 }
 
 $tool_name = get_lang("SubscribeUserToCourse");
@@ -37,7 +37,7 @@ 
 $courseInfo = api_get_course_info();
 
 if ($type == COURSEMANAGER) {
-	$tool_name = get_lang("SubscribeUserToCourseAsTeacher");
+    $tool_name = get_lang("SubscribeUserToCourseAsTeacher");
 }
 
 //extra entries in breadcrumb
@@ -50,7 +50,7 @@ 
         "url" => "subscribe_user.php?type=".$type.'&'.api_get_cidreq(),
         "name" => $tool_name
     );
-	$tool_name = get_lang('SearchResults');
+    $tool_name = get_lang('SearchResults');
 }
 
 $sessionId = api_get_session_id();
@@ -130,10 +130,10 @@ 
 
 // Build table
 $table = new SortableTable(
-	'subscribe_users',
-	'get_number_of_users',
-	'get_user_data',
-	($is_western_name_order xor $sort_by_first_name) ? 3 : 2
+    'subscribe_users',
+    'get_number_of_users',
+    'get_user_data',
+    ($is_western_name_order xor $sort_by_first_name) ? 3 : 2
 );
 $parameters['keyword'] = $keyword;
 $parameters['type'] = $type;
@@ -220,18 +220,18 @@ 
  */
 function get_number_of_users()
 {
-	// Database table definition
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definition
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
 
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
 
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
-		if (api_get_session_id() != 0) {
-			$sql = "SELECT COUNT(u.id)
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] === 'teacher') {
+        if (api_get_session_id() != 0) {
+            $sql = "SELECT COUNT(u.id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -399,11 +399,11 @@ 
     $count_user = 0;
 
     if ($res) {
-       $row = Database::fetch_row($res);
-       $count_user = $row[0];
+        $row = Database::fetch_row($res);
+        $count_user = $row[0];
     }
 
-	return $count_user;
+    return $count_user;
 }
 /**
  * Get the users to display on the current page.
@@ -413,17 +413,17 @@ 
     $url_access_id = api_get_current_access_url_id();
     $course_code = api_get_course_id();
     $sessionId = api_get_session_id();
-	$courseId = api_get_course_int_id();
+    $courseId = api_get_course_int_id();
 
-	// Database table definitions
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definitions
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
     // adding teachers
-	$is_western_name_order = api_is_western_name_order();
+    $is_western_name_order = api_is_western_name_order();
 
     if (api_get_setting('show_email_addresses') === 'true') {
         $select_fields = "u.id              AS col0,
@@ -447,10 +447,10 @@ 
                 u.active               AS col4,
                 u.user_id              AS col5";
     }
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
-		// adding a teacher through a session
-		if (!empty($sessionId)) {
-			$sql = "SELECT $select_fields
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
+        // adding a teacher through a session
+        if (!empty($sessionId)) {
+            $sql = "SELECT $select_fields
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -460,13 +460,13 @@ 
                     INNER JOIN  $tbl_url_rel_user as url_rel_user
                     ON (url_rel_user.user_id = u.user_id) ";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) &&
-				!empty($_GET['subscribe_user_filter_value']) &&
-				api_get_setting('ProfilingFilterAddingUsers') == 'true'
-			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) &&
+                !empty($_GET['subscribe_user_filter_value']) &&
+                api_get_setting('ProfilingFilterAddingUsers') == 'true'
+            ) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -480,47 +480,47 @@ 
             }
 
             $sql .=	" AND access_url_id = $url_access_id";
-		} else {
-		     // adding a teacher NOT through a session
-			$sql = "SELECT $select_fields
+        } else {
+                // adding a teacher NOT through a session
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
                     ON u.user_id = cu.user_id AND c_id = '".$courseId."'";
 
-				// applying the filter of the additional user profile fields
-				if (isset($_GET['subscribe_user_filter_value']) &&
-					!empty($_GET['subscribe_user_filter_value']) &&
-					api_get_setting('ProfilingFilterAddingUsers') == 'true'
-				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+                // applying the filter of the additional user profile fields
+                if (isset($_GET['subscribe_user_filter_value']) &&
+                    !empty($_GET['subscribe_user_filter_value']) &&
+                    api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                ) {
+                    $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                    $sql .=	"
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-				}
-
-				// adding a teacher NOT trough a session on a portal with multiple URLs
-				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
-						$sql = "SELECT $select_fields
+                } else	{
+                    $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+                }
+
+                // adding a teacher NOT trough a session on a portal with multiple URLs
+                if (api_is_multiple_url_enabled()) {
+                    if ($url_access_id !=-1) {
+                        $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id and c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -528,16 +528,16 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	} else {
-		// adding a student
-		if (!empty($sessionId)) {
-			$sql = "SELECT $select_fields
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    } else {
+        // adding a student
+        if (!empty($sessionId)) {
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
@@ -572,7 +572,7 @@ 
                 $sql .=  "AND access_url_id = $url_access_id";
             }
 
-		} else {
+        } else {
             $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
@@ -580,10 +580,10 @@ 
                     	u.user_id = cu.user_id AND
                     	c_id ='".$courseId."'";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -591,28 +591,28 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			//showing only the courses of the current Chamilo access_url_id
+            //showing only the courses of the current Chamilo access_url_id
 
-			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
-					$sql = "SELECT $select_fields
+            if (api_is_multiple_url_enabled()) {
+                if ($url_access_id !=-1) {
+                    $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -622,18 +622,18 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	}
-
-	// adding additional WHERE statements to the SQL for the search functionality
-	if (isset($_REQUEST['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    }
+
+    // adding additional WHERE statements to the SQL for the search functionality
+    if (isset($_REQUEST['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 					firstname LIKE '%".$keyword."%' OR
 					lastname LIKE '%".$keyword."%' OR
 					email LIKE '%".$keyword."%' OR
@@ -642,39 +642,39 @@ 
 					)
 				";
 
-		if (api_get_setting('ProfilingFilterAddingUsers') === 'true') {
-			// we also want to search for users who have something in
-			// their profile fields that matches the keyword
-			$additional_users = search_additional_profile_fields($keyword);
-		}
-
-		// getting all the users of the course (to make sure that we do not
-		// display users that are already in the course)
-		if (!empty($sessionId)) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $sessionId);
-		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-		}
-	}
-
-	$sql .=" AND u.status != ".ANONYMOUS." ";
-
-	// Sorting and pagination (used by the sortable table)
-	$sql .= " ORDER BY col$column $direction ";
+        if (api_get_setting('ProfilingFilterAddingUsers') === 'true') {
+            // we also want to search for users who have something in
+            // their profile fields that matches the keyword
+            $additional_users = search_additional_profile_fields($keyword);
+        }
+
+        // getting all the users of the course (to make sure that we do not
+        // display users that are already in the course)
+        if (!empty($sessionId)) {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $sessionId);
+        } else {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
+
+    $sql .=" AND u.status != ".ANONYMOUS." ";
+
+    // Sorting and pagination (used by the sortable table)
+    $sql .= " ORDER BY col$column $direction ";
     $from = (int) $from;
     $number_of_items = (int) $number_of_items;
-	$sql .= " LIMIT $from, $number_of_items";
+    $sql .= " LIMIT $from, $number_of_items";
 
-	$res = Database::query($sql);
-	$users = array ();
-	while ($user = Database::fetch_row($res)) {
-		$users[] = $user;
-	}
+    $res = Database::query($sql);
+    $users = array ();
+    while ($user = Database::fetch_row($res)) {
+        $users[] = $user;
+    }
 
-	return $users;
+    return $users;
 }
 /**
 * Returns a mailto-link
@@ -683,7 +683,7 @@ 
 */
 function email_filter($email)
 {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 /**
  * Build the reg-column of the table
@@ -699,10 +699,10 @@ 
     }
     $user_id = (int) $user_id;
 
-	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.
+    $result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.
         get_lang("reg").'</a>';
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -716,7 +716,7 @@ 
  */
 function active_filter($active, $url_params, $row)
 {
-	$_user = api_get_user_info();
+    $_user = api_get_user_info();
     if ($active == '1') {
         $action = 'AccountActive';
         $image = 'accept';
@@ -725,15 +725,15 @@ 
     if ($active == '0') {
         $action = 'AccountInactive';
         $image = 'error';
-	}
+    }
     $result = '';
     if ($row['0'] <> $_user['user_id']) {
-	// you cannot lock yourself out otherwise you could disable all the accounts
-	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
-	}
+    // you cannot lock yourself out otherwise you could disable all the accounts
+    // including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -751,30 +751,30 @@ 
  */
 function search_additional_profile_fields($keyword)
 {
-	// database table definitions
-	$table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // database table definitions
+    $table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tableExtraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
     $keyword = Database::escape_string($keyword);
-	// getting the field option text that match this keyword (for radio buttons and checkboxes)
-	$sql = "SELECT * FROM $table_user_field_options
+    // getting the field option text that match this keyword (for radio buttons and checkboxes)
+    $sql = "SELECT * FROM $table_user_field_options
 	        WHERE display_text LIKE '%".$keyword."%'";
-	$result_profiling = Database::query($sql);
-	while ($profiling_field_options = Database::fetch_array($result_profiling)) {
-		$profiling_field_options_exact_values[] = $profiling_field_options;
-	}
+    $result_profiling = Database::query($sql);
+    while ($profiling_field_options = Database::fetch_array($result_profiling)) {
+        $profiling_field_options_exact_values[] = $profiling_field_options;
+    }
     $profiling_field_options_exact_values_sql = '';
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
-		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
-	}
+    foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
+        $profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
+    }
 
     $extraFieldType = ExtraField::USER_FIELD_TYPE;
 
-	// getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
-	// or all the users who have entered the keyword in a free-form field
-	$sql = "SELECT
+    // getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
+    // or all the users who have entered the keyword in a free-form field
+    $sql = "SELECT
 	            user.user_id as col0,
 	            user.official_code as col1,
 	            user.lastname as col2,
@@ -788,13 +788,13 @@ 
                 user_values.field_id = e.id AND
                 e.extra_field_type = $extraFieldType AND
                 (value LIKE '%".$keyword."%'".$profiling_field_options_exact_values_sql.")";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $additional_users = array();
-	while ($profiled_users = Database::fetch_array($result)) {
-		$additional_users[$profiled_users['col0']] = $profiled_users;
-	}
+    while ($profiled_users = Database::fetch_array($result)) {
+        $additional_users[$profiled_users['col0']] = $profiled_users;
+    }
 
-	return $additional_users;
+    return $additional_users;
 }
 
 /**
@@ -806,44 +806,44 @@ 
  */
 function display_extra_profile_fields_filter()
 {
-	// getting all the additional user profile fields
+    // getting all the additional user profile fields
     $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
-	$return = '<option value="">'.get_lang('SelectFilter').'</option>';
-
-	// looping through the additional user profile fields
-	foreach ($extra as $id => $field_details) {
-		// $field_details[2] contains the type of the additional user profile field
-		switch ($field_details[2]) {
-			// text fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXT:
-				break;
-			// text area fields cannot be used as a filter
-			case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
-				break;
-			case ExtraFieldModel::FIELD_TYPE_RADIO:
-			case ExtraFieldModel::FIELD_TYPE_SELECT:
-			case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
-				$return .= '<optgroup label="'.$field_details[3].'">';
-				foreach ($field_details[9] as $option_id => $option_details) {
-					if (isset($_GET['subscribe_user_filter_value']) &&
+    $return = '<option value="">'.get_lang('SelectFilter').'</option>';
+
+    // looping through the additional user profile fields
+    foreach ($extra as $id => $field_details) {
+        // $field_details[2] contains the type of the additional user profile field
+        switch ($field_details[2]) {
+            // text fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXT:
+                break;
+            // text area fields cannot be used as a filter
+            case ExtraFieldModel::FIELD_TYPE_TEXTAREA:
+                break;
+            case ExtraFieldModel::FIELD_TYPE_RADIO:
+            case ExtraFieldModel::FIELD_TYPE_SELECT:
+            case ExtraFieldModel::FIELD_TYPE_SELECT_MULTIPLE:
+                $return .= '<optgroup label="'.$field_details[3].'">';
+                foreach ($field_details[9] as $option_id => $option_details) {
+                    if (isset($_GET['subscribe_user_filter_value']) &&
                         $_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]
                     ) {
-						$selected = 'selected="selected"';
-					} else {
-						$selected = false;
-					}
-					$return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
-				}
-				$return .= '</optgroup>';
-				break;
-		}
-	}
-
-	$html = '<form class="form-inline" id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?'.api_get_cidreq().'">';
-	$html .= '<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
-	$html .= '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
-	$html .= '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
-	$html .= '</form>';
+                        $selected = 'selected="selected"';
+                    } else {
+                        $selected = false;
+                    }
+                    $return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
+                }
+                $return .= '</optgroup>';
+                break;
+        }
+    }
+
+    $html = '<form class="form-inline" id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?'.api_get_cidreq().'">';
+    $html .= '<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
+    $html .= '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
+    $html .= '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
+    $html .= '</form>';
 
     return $html;
 }

main/exercise/hotspot_actionscript.as.php

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 
 // Query db for answers
 if ($answer_type==HOT_SPOT_DELINEATION) {
-	$sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type = 'delineation' ORDER BY iid";
 } else {
-	$sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." ORDER BY iid";
 }
 $result = Database::query($sql);
@@ -77,37 +77,37 @@ 
     $hotSpot['iid'] = $hotspot['iid'];
     $hotSpot['answer'] = $hotspot['answer'];
 
-	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' )
-	{
+    // Square or rectancle
+    if ($hotspot['hotspot_type'] == 'square' )
+    {
         $hotSpot['type'] = 'square';
-	}
-	// Circle or ovale
-	if ($hotspot['hotspot_type'] == 'circle')
-	{
+    }
+    // Circle or ovale
+    if ($hotspot['hotspot_type'] == 'circle')
+    {
         $hotSpot['type'] = 'circle';
-	}
-	// Polygon
-	if ($hotspot['hotspot_type'] == 'poly')
-	{
+    }
+    // Polygon
+    if ($hotspot['hotspot_type'] == 'poly')
+    {
         $hotSpot['type'] = 'poly';
-	}
-	// Delineation
-	if ($hotspot['hotspot_type'] == 'delineation')
-	{
+    }
+    // Delineation
+    if ($hotspot['hotspot_type'] == 'delineation')
+    {
         $hotSpot['type'] = 'delineation';
-	}
-	// No error
-	if ($hotspot['hotspot_type'] == 'noerror')
-	{
+    }
+    // No error
+    if ($hotspot['hotspot_type'] == 'noerror')
+    {
         $hotSpot['type'] = 'noerror';
-	}
+    }
 
-	// This is a good answer, count + 1 for nmbr of clicks
-	if ($hotspot['hotspot_type'] > 0)
-	{
-		$nmbrTries++;
-	}
+    // This is a good answer, count + 1 for nmbr of clicks
+    if ($hotspot['hotspot_type'] > 0)
+    {
+        $nmbrTries++;
+    }
 
     $hotSpot['coord'] = $hotspot['hotspot_coordinates'];