chamilo / chamilo-lms

main/mySpace/current_courses.php

Indentation +209 added lines, -209 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,222 +23,222 @@ 
 $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).'newscorm/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).'newscorm/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) {
-			$worksheet->setCellValueByColumnAndRow($column, $line, html_entity_decode(strip_tags($item)));
-			$column++;
-		}
-		$line++;
-	}
-	$line++;
+    $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++;
 
     $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'));
@@ -249,20 +249,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/exercice/exercise_result.class.php

Indentation +151 added lines, -151 removed lines

@@ -9,7 +9,7 @@ 
 */
 class ExerciseResult
 {
-	private $results = array();
+    private $results = array();
     public $includeAllUsers = false;
     public $onlyBestAttempts = false;
 
@@ -46,7 +46,7 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		$return = array();
+        $return = array();
 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $TBL_TABLE_LP_MAIN = Database::get_course_table(TABLE_LP_MAIN);
@@ -66,9 +66,9 @@ 
             $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
-		if (empty($user_id)) {
+        if (empty($user_id)) {
             $user_id_and = null;
-			$sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
+            $sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
 			            official_code,
                         ce.title as extitle,
                         te.exe_result as exresult ,
@@ -91,9 +91,9 @@ 
                     te.status != 'incomplete' AND
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
                     ce.active <>-1";
-		} else {
+        } else {
             $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
-			// get only this user's results
+            // get only this user's results
             $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
                     official_code,
                     ce.title as extitle,
@@ -119,12 +119,12 @@ 
                         te.c_id = ce.c_id $user_id_and $session_id_and AND
                         ce.active <>-1 AND
                     ORDER BY userpart2, te.c_id ASC, ce.title ASC, te.exe_date DESC";
-		}
+        }
 
-		$results = array();
-		$resx = Database::query($sql);
+        $results = array();
+        $resx = Database::query($sql);
         $bestAttemptPerUser = array();
-		while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
             if ($this->onlyBestAttempts) {
                 if (!isset($bestAttemptPerUser[$rowx['excruid']])) {
                     $bestAttemptPerUser[$rowx['excruid']] = $rowx;
@@ -136,7 +136,7 @@ 
             } else {
                 $results[] = $rowx;
             }
-		}
+        }
 
         if ($this->onlyBestAttempts) {
             $results = $bestAttemptPerUser;
@@ -190,8 +190,8 @@ 
                     continue;
                 }
 
-				$return[$i] = array();
-				if (empty($user_id)) {
+                $return[$i] = array();
+                if (empty($user_id)) {
                     $return[$i]['official_code']   = $result['official_code'];
                     if (api_is_western_name_order()) {
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
@@ -200,15 +200,15 @@ 
                         $return[$i]['first_name']   = $results[$i]['userpart2'];
                         $return[$i]['last_name']    = $results[$i]['userpart1'];
                     }
-					$return[$i]['user_id']      = $results[$i]['excruid'];
-					$return[$i]['email']        = $results[$i]['exemail'];
-				}
-				$return[$i]['title'] = $result['extitle'];
-				$return[$i]['start_date'] = api_get_local_time($result['exstart']);
+                    $return[$i]['user_id']      = $results[$i]['excruid'];
+                    $return[$i]['email']        = $results[$i]['exemail'];
+                }
+                $return[$i]['title'] = $result['extitle'];
+                $return[$i]['start_date'] = api_get_local_time($result['exstart']);
                 $return[$i]['end_date'] = api_get_local_time($result['exdate']);
                 $return[$i]['duration'] = $result['duration'];
-				$return[$i]['result'] = $result['exresult'];
-				$return[$i]['max'] = $result['exweight'];
+                $return[$i]['result'] = $result['exresult'];
+                $return[$i]['max'] = $result['exweight'];
                 $return[$i]['status'] = $revised ? get_lang('Validated') : get_lang('NotValidated');
                 $return[$i]['lp_id'] = $result['orig_lp_id'];
                 $return[$i]['lp_name'] = $result['lp_name'];
@@ -221,8 +221,8 @@ 
 
                 $userWithResults[$result['excruid']] = 1;
                 $i++;
-			}
-		}
+            }
+        }
 
         if ($this->includeAllUsers) {
             $latestId = count($return);
@@ -265,18 +265,18 @@ 
             }
         }
 
-		$this->results = $return;
+        $this->results = $return;
 
-		return true;
-	}
+        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
-	 */
+    /**
+     * 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 = '',
         $user_id = null,
@@ -285,14 +285,14 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $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, $user_id, $export_filter, $exercise_id, $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'])) {
                 $data .= get_lang('FirstName').';';
@@ -316,28 +316,28 @@ 
         $data .= get_lang('Email').';';
         $data .= get_lang('Groups').';';
 
-		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);
-			foreach($extra_user_fields as $field) {
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
-			}
-		}
-
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
+        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);
+            foreach($extra_user_fields as $field) {
+                $data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
+            }
+        }
+
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
         $data .= get_lang('EndDate').';';
         $data .= get_lang('Duration'). ' ('.get_lang('MinMinutes').') ;';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
         $data .= get_lang('Status').';';
         $data .= get_lang('ToolLearnpath').';';
         $data .= get_lang('UserIsCurrentlySubscribed').';';
-		$data .= "\n";
+        $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)).';';
@@ -354,51 +354,51 @@ 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
             $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
 
-			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) {
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
-				}
-			}
+            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) {
+                    $data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
+                }
+            }
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['start_date']).';';
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['start_date']).';';
             $data .= str_replace("\r\n",'  ',$row['end_date']).';';
             $data .= str_replace("\r\n",'  ',$row['duration']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
             $data .= str_replace("\r\n",'  ',$row['status']).';';
             $data .= str_replace("\r\n",'  ',$row['lp_name']).';';
             $data .= str_replace("\r\n",'  ',$row['is_user_subscribed']).';';
-			$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');
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $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');
+        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,
@@ -407,35 +407,35 @@ 
         $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;
+            }
+        }
 
         $officialCodeInList = api_get_setting('show_official_code_exercise_result_list');
 
-		if ($with_column_user) {
+        if ($with_column_user) {
             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 {
@@ -451,17 +451,17 @@ 
             }
 
             $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
-		    $column++;
-		}
+            $column++;
+        }
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Groups'));
-	    $column++;
+        $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,
@@ -471,31 +471,31 @@ 
                         $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'));
-		$column++;
+        $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('ToolLearnpath'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('UserIsCurrentlySubscribed'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 if (api_is_western_name_order()) {
@@ -517,15 +517,15 @@ 
 
                 $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
-			}
+            }
 
             $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), 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) {
+            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,
@@ -535,12 +535,12 @@ 
                             $charset
                         )
                     );
-					$column++;
-				}
-			}
+                    $column++;
+                }
+            }
 
-			$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), 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']);
             $column++;
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
@@ -556,14 +556,14 @@ 
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['lp_name']);
             $column++;
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['is_user_subscribed']);
-			$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/exercice/hotpotatoes_exercise_result.class.php

Indentation +137 added lines, -137 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,37 +225,37 @@ 
         $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 {
@@ -264,36 +264,36 @@ 
                 $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) {
-				$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $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($column, $line, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -310,38 +310,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;
+    }
 }