chamilo / chamilo-lms

main/mySpace/progression.php

Spacing +4 added lines, -4 removed lines

@@ -16,14 +16,14 @@
 $this_section = SECTION_TRACKING;
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 Display :: display_header($nameTools);
 
 // Database Table Definitions
-$tbl_course 		= Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_user 			= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session 		= Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 $tbl_track_exercice = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 
 /*

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/mySpace/users.php

Spacing +11 added lines, -11 removed lines

@@ -20,14 +20,14 @@ 
 
 $this_section = SECTION_TRACKING;
 
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
-    $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
+    $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
 }
 
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
-    $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
+    $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
 }
 
 function get_count_users()
@@ -123,8 +123,8 @@ 
                 $courseId = $courseInfo['real_id'];
 
                 if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) {
-                    $avg_time_spent 	+= Tracking :: get_time_spent_on_the_course($student_id, $courseId, $_GET['id_session']);
-                    $my_average 		 = Tracking :: get_avg_student_score($student_id, $course_code);
+                    $avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $courseId, $_GET['id_session']);
+                    $my_average = Tracking :: get_avg_student_score($student_id, $course_code);
                     if (is_numeric($my_average)) {
                         $avg_student_score += $my_average;
                     }
@@ -163,7 +163,7 @@ 
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$_GET['id_session'].'">
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         } else {
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         }
         $row[] = $detailsLink;
@@ -183,7 +183,7 @@ 
 
 if (api_is_drh()) {
     $menu_items = array(
-        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
+        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
         Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#'),
         Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
         Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
@@ -200,7 +200,7 @@ 
 
 $actionsRight = Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), ICON_SIZE_MEDIUM), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
 $actionsRight .= Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), ICON_SIZE_MEDIUM), api_get_self().'?export=csv&keyword='.$keyword);
-$toolbar = Display::toolbarAction('toolbar-user', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-user', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 
 $table = new SortableTable(
     'tracking_student',
@@ -232,14 +232,14 @@ 
 
 if ($export_csv) {
     if ($is_western_name_order) {
-        $csv_header[] = array (
+        $csv_header[] = array(
             get_lang('FirstName'),
             get_lang('LastName'),
             get_lang('FirstLogin'),
             get_lang('LastConnexion')
         );
     } else {
-        $csv_header[] = array (
+        $csv_header[] = array(
             get_lang('LastName'),
             get_lang('FirstName'),
             get_lang('FirstLogin'),

main/mySpace/admin_view.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
 
 require_once '../inc/global.inc.php';
 
-$exportCSV  = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
-$display 	 = isset($_GET['display']) ? Security::remove_XSS($_GET['display']) : null;
+$exportCSV = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
+$display = isset($_GET['display']) ? Security::remove_XSS($_GET['display']) : null;
 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 // the section (for the tabs)
@@ -15,9 +15,9 @@ 
 $csv_content = array();
 $nameTools = get_lang('MySpace');
 
-$is_platform_admin 	= api_is_platform_admin();
+$is_platform_admin = api_is_platform_admin();
 $is_drh 			= api_is_drh();
-$is_session_admin 	= api_is_session_admin();
+$is_session_admin = api_is_session_admin();
 
 if ($exportCSV) {
     if ($display == 'user') {

main/mySpace/company_reports.php

Spacing +15 added lines, -15 removed lines

@@ -16,7 +16,7 @@ 
     api_not_allowed(true);
 }
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 $tool_name = get_lang('Report');
 
 $this_section = SECTION_TRACKING;
@@ -42,13 +42,13 @@ 
 
 //Column config
 $column_model = array(
-    array('name'=>'course',         'index'=>'title',       'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
-    array('name'=>'user',           'index'=>'user',        'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'email',          'index'=>'email',       'width'=>'100', 'align'=>'left','sortable'=>'false', 'wrap_cell' => 'true'),
-    array('name'=>'time',           'index'=>'time',        'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'certificate',    'index'=>'certificate', 'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress_100',   'index'=>'progress_100',       'width'=>'50',  'align'=>'left','sortable'=>'false'),
-    array('name'=>'progress',       'index'=>'progress',    'width'=>'50',  'align'=>'left','sortable'=>'false')
+    array('name'=>'course', 'index'=>'title', 'width'=>'180', 'align'=>'left', 'wrap_cell' => 'true'),
+    array('name'=>'user', 'index'=>'user', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'email', 'index'=>'email', 'width'=>'100', 'align'=>'left', 'sortable'=>'false', 'wrap_cell' => 'true'),
+    array('name'=>'time', 'index'=>'time', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'certificate', 'index'=>'certificate', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress_100', 'index'=>'progress_100', 'width'=>'50', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'progress', 'index'=>'progress', 'width'=>'50', 'align'=>'left', 'sortable'=>'false')
 );
 
 if (!empty($extra_fields)) {
@@ -67,7 +67,7 @@ 
 }
 
 if (api_is_student_boss()) {
-    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left','sortable'=>'false');
+    $column_model[] = array('name'=>'group', 'index'=>'group', 'width'=>'50', 'align'=>'left', 'sortable'=>'false');
     $columns[] = get_lang('Group');
 }
 
@@ -78,7 +78,7 @@ 
 
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('user_course_report',  $url, $columns, $column_model, $extra_params, array(), null, true).'
+    '.Display::grid_js('user_course_report', $url, $columns, $column_model, $extra_params, array(), null, true).'
     jQuery("#user_course_report").jqGrid("navGrid","#user_course_report_pager",{
         view:false,
         edit:false,
@@ -102,11 +102,11 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
@@ -119,7 +119,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -130,13 +130,13 @@ 
 }
 $content .= Display::url(
     get_lang("CompanyReportResumed"),
-    api_get_path(WEB_CODE_PATH) . "mySpace/company_reports_resumed.php",
+    api_get_path(WEB_CODE_PATH)."mySpace/company_reports_resumed.php",
     array(
         'class' => 'btn btn-success'
     )
 );
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReport') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReport').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);

main/mySpace/coaches.php

Indentation +77 added lines, -77 removed lines

@@ -19,7 +19,7 @@ 
 $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_student"])) {
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
 }
 
 Display :: display_header($nameTools);
@@ -41,26 +41,26 @@ 
  */
 
 if (isset($_POST['export'])) {
-	$order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+    $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 } else {
-	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+    $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 }
 
 if (isset($_GET["id_student"])) {
-	$id_student = intval($_GET["id_student"]);
-	$sql_coachs = "SELECT DISTINCT srcru.user_id as id_coach
+    $id_student = intval($_GET["id_student"]);
+    $sql_coachs = "SELECT DISTINCT srcru.user_id as id_coach
 		FROM $tbl_session_rel_course_rel_user as srcru
 		WHERE srcru.user_id='$id_student' AND srcru.status=2";
 } else {
-	if (api_is_platform_admin()) {
-		$sql_coachs = "SELECT DISTINCT
+    if (api_is_platform_admin()) {
+        $sql_coachs = "SELECT DISTINCT
 			srcru.user_id as id_coach, user_id, lastname, firstname
 			FROM $tbl_user, $tbl_session_rel_course_rel_user srcru
 			WHERE
 			 	srcru.user_id=user_id AND
 			 	srcru.status=2 ".$order_clause;
-	} else {
-		$sql_coachs = "SELECT DISTINCT user_id as id_coach, user.user_id, lastname, firstname
+    } else {
+        $sql_coachs = "SELECT DISTINCT user_id as id_coach, user.user_id, lastname, firstname
 			FROM
 			$tbl_user as user,
 			$tbl_session_rel_course_user as srcu,
@@ -74,13 +74,13 @@ 
 				srcu.user_id = user.user_id AND
 				srcu.status = 2
 				".$order_clause;
-	}
+    }
 }
 
 $result_coachs = Database::query($sql_coachs);
 
 if (api_is_western_name_order()) {
-	echo '<table class="data_table">
+    echo '<table class="data_table">
 	    <tr>
             <th>'.get_lang('FirstName').'</th>
             <th>'.get_lang('LastName').'</th>
@@ -89,7 +89,7 @@ 
             <th>'.get_lang('Students').'</th>
         </tr>';
 } else {
-	echo '<table class="data_table">
+    echo '<table class="data_table">
 	        <tr>
                 <th>'.get_lang('LastName').'</th>
                 <th>'.get_lang('FirstName').'</th>
@@ -100,79 +100,79 @@ 
 }
 
 if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
-	$header[] = get_lang('FirstName', '');
-	$header[] = get_lang('LastName', '');
+    $header[] = get_lang('FirstName', '');
+    $header[] = get_lang('LastName', '');
 } else {
-	$header[] = get_lang('LastName', '');
-	$header[] = get_lang('FirstName', '');
+    $header[] = get_lang('LastName', '');
+    $header[] = get_lang('FirstName', '');
 }
 $header[] = get_lang('ConnectionTime', '');
 
 if (Database::num_rows($result_coachs) > 0) {
-	while ($coachs = Database::fetch_array($result_coachs)) {
-		$id_coach = $coachs["id_coach"];
+    while ($coachs = Database::fetch_array($result_coachs)) {
+        $id_coach = $coachs["id_coach"];
 
-		if (isset($_GET["id_student"])) {
-			$sql_infos_coach = "SELECT lastname, firstname
+        if (isset($_GET["id_student"])) {
+            $sql_infos_coach = "SELECT lastname, firstname
             FROM $tbl_user
             WHERE user_id='$id_coach'";
-			$result_coachs_infos = Database::query($sql_infos_coach);
-			$lastname = Database::result($result_coachs_infos, 0, "lastname");
-			$firstname = Database::result($result_coachs_infos, 0, "firstname");
-		} else {
-			$lastname = $coachs["lastname"];
-			$firstname = $coachs["firstname"];
-		}
-
-		$sql_connection_time = "SELECT login_date, logout_date
+            $result_coachs_infos = Database::query($sql_infos_coach);
+            $lastname = Database::result($result_coachs_infos, 0, "lastname");
+            $firstname = Database::result($result_coachs_infos, 0, "firstname");
+        } else {
+            $lastname = $coachs["lastname"];
+            $firstname = $coachs["firstname"];
+        }
+
+        $sql_connection_time = "SELECT login_date, logout_date
         FROM $tbl_track_login
         WHERE login_user_id ='$id_coach' AND logout_date <> 'null'";
-		$result_connection_time = Database::query($sql_connection_time);
-
-		$nb_seconds = 0;
-		while ($connections = Database::fetch_array($result_connection_time)) {
-			$login_date = $connections["login_date"];
-			$logout_date = $connections["logout_date"];
-			$timestamp_login_date = strtotime($login_date);
-			$timestamp_logout_date = strtotime($logout_date);
-			$nb_seconds += ($timestamp_logout_date - $timestamp_login_date);
-		}
-
-		if ($nb_seconds == 0) {
-			$s_connection_time = '';
-		} else {
-			$s_connection_time = api_time_to_hms($nb_seconds);
-		}
-
-		if ($i % 2 == 0) {
-			$css_class = "row_odd";
-			if ($i % 20 == 0 && $i != 0) {
-				if (api_is_western_name_order()) {
-					echo '<tr>
+        $result_connection_time = Database::query($sql_connection_time);
+
+        $nb_seconds = 0;
+        while ($connections = Database::fetch_array($result_connection_time)) {
+            $login_date = $connections["login_date"];
+            $logout_date = $connections["logout_date"];
+            $timestamp_login_date = strtotime($login_date);
+            $timestamp_logout_date = strtotime($logout_date);
+            $nb_seconds += ($timestamp_logout_date - $timestamp_login_date);
+        }
+
+        if ($nb_seconds == 0) {
+            $s_connection_time = '';
+        } else {
+            $s_connection_time = api_time_to_hms($nb_seconds);
+        }
+
+        if ($i % 2 == 0) {
+            $css_class = "row_odd";
+            if ($i % 20 == 0 && $i != 0) {
+                if (api_is_western_name_order()) {
+                    echo '<tr>
 					    <th>'.get_lang('FirstName').'</th>
                         <th>'.get_lang('LastName').'</th>
                         <th>'.get_lang('ConnectionTime').'</th>
                         <th>'.get_lang('AdminCourses').'</th>
                         <th>'.get_lang('Students').'</th>
 					</tr>';
-				} else {
-					echo '<tr>
+                } else {
+                    echo '<tr>
 					    <th>'.get_lang('LastName').'</th>
                         <th>'.get_lang('FirstName').'</th>
                         <th>'.get_lang('ConnectionTime').'</th>
                         <th>'.get_lang('AdminCourses').'</th>
                         <th>'.get_lang('Students').'</th>
 					</tr>';
-				}
-			}
-		} else {
-			$css_class = "row_even";
-		}
+                }
+            }
+        } else {
+            $css_class = "row_even";
+        }
 
-		$i++;
+        $i++;
 
-		if (api_is_western_name_order()) {
-			echo '<tr class="'.$css_class.'">
+        if (api_is_western_name_order()) {
+            echo '<tr class="'.$css_class.'">
 			        <td>'.$firstname.'</td><td>'.$lastname.'</td><td>'.$s_connection_time.'</td>
 			        <td>
 			            <a href="course.php?type=coach&user_id='.$id_coach.'">
@@ -185,8 +185,8 @@ 
 			            </a>
 			            </td>
                     </tr>';
-		} else {
-			echo '<tr class="'.$css_class.'">
+        } else {
+            echo '<tr class="'.$css_class.'">
 			        <td>'.$lastname.'</td><td>'.$firstname.'</td>
 			        <td>'.$s_connection_time.'</td>
 			        <td>
@@ -197,25 +197,25 @@ 
                         '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>
                     </td>
                     </tr>';
-		}
-
-		if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
-			$data[$id_coach]["firstname"] = $firstname;
-			$data[$id_coach]["lastname"] = $lastname;
-		} else {
-			$data[$id_coach]["lastname"] = $lastname;
-			$data[$id_coach]["firstname"] = $firstname;
-		}
-		$data[$id_coach]["connection_time"] = $s_connection_time;
-	}
+        }
+
+        if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
+            $data[$id_coach]["firstname"] = $firstname;
+            $data[$id_coach]["lastname"] = $lastname;
+        } else {
+            $data[$id_coach]["lastname"] = $lastname;
+            $data[$id_coach]["firstname"] = $firstname;
+        }
+        $data[$id_coach]["connection_time"] = $s_connection_time;
+    }
 } else {
-	// No results
-	echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>';
+    // No results
+    echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>';
 }
 echo '</table>';
 
 if (isset($_POST['export'])){
-	export_csv($header, $data, 'coaches.csv');
+    export_csv($header, $data, 'coaches.csv');
 }
 
 echo "<br /><br />";

Spacing +13 added lines, -13 removed lines

@@ -16,10 +16,10 @@ 
 $nameTools = get_lang('Tutors');
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_student"])) {
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+	$interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students'));
 }
 
 Display :: display_header($nameTools);
@@ -27,14 +27,14 @@ 
 api_display_tool_title($nameTools);
 
 // Database Table Definitions
-$tbl_course 						= Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_course_user 					= Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-$tbl_user 							= Database :: get_main_table(TABLE_MAIN_USER);
-$tbl_session 						= Database :: get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_course 			= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_session_rel_user 				= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_track_login 					= Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_session_rel_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 
 /**
  * MAIN PART
@@ -214,7 +214,7 @@ 
 }
 echo '</table>';
 
-if (isset($_POST['export'])){
+if (isset($_POST['export'])) {
 	export_csv($header, $data, 'coaches.csv');
 }
 
@@ -222,8 +222,8 @@ 
 echo "
     <br /><br />
     <form method='post' action='coaches.php'>
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
-            " . get_lang('ExportExcel') . "
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
+            " . get_lang('ExportExcel')."
         </button>
     <form>
 ";

main/mySpace/user_import.php

Indentation +13 added lines, -13 removed lines

@@ -18,9 +18,9 @@ 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
- 	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+        $id_session = intval($_GET['id_session']);
+    $interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
+    $interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -42,7 +42,7 @@ 
         }
     }
 } else {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 set_time_limit(0);
@@ -87,18 +87,18 @@ 
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	Display::display_error_message(get_lang('ThisFieldIsRequired'));
+    Display::display_error_message(get_lang('ThisFieldIsRequired'));
 }
 
 if (count($errors) != 0) {
-	$error_message = '<ul>';
-	foreach ($errors as $index => $error_user) {
-		$error_message .= '<li><strong>'.$error_user['error'].'</strong>: ';
-		$error_message .= api_get_person_name($error_user['FirstName'], $error_user['LastName']);
-		$error_message .= '</li>';
-	}
-	$error_message .= '</ul>';
-	Display :: display_error_message($error_message, false);
+    $error_message = '<ul>';
+    foreach ($errors as $index => $error_user) {
+        $error_message .= '<li><strong>'.$error_user['error'].'</strong>: ';
+        $error_message .= api_get_person_name($error_user['FirstName'], $error_user['LastName']);
+        $error_message .= '</li>';
+    }
+    $error_message .= '</ul>';
+    Display :: display_error_message($error_message, false);
 }
 
 $form = new FormValidator('user_import');

Spacing +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@ 
 $tool_name = get_lang('ImportUserListXMLCSV');
 api_block_anonymous_users();
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
  	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+	$interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions'));
+	$interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -62,7 +62,7 @@ 
 
         if (count($errors) == 0) {
             if (!empty($id_session)) {
-                $tbl_session_rel_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+                $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
                 // Selecting all the courses from the session id requested.
                 $sql = "SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'";
                 $result = Database::query($sql);
@@ -103,10 +103,10 @@ 
 
 $form = new FormValidator('user_import');
 $form->addElement('hidden', 'formSent');
-$form->addElement('hidden', 'id_session',$id_session);
+$form->addElement('hidden', 'id_session', $id_session);
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
 $form->addRule('import_file', get_lang('ThisFieldIsRequired'), 'required');
-$allowed_file_types = array ('xml', 'csv');
+$allowed_file_types = array('xml', 'csv');
 $form->addRule('import_file', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')', 'filetype', $allowed_file_types);
 $form->addElement('radio', 'file_type', get_lang('FileType'), 'XML (<a href="../admin/example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
 $form->addElement('radio', 'file_type', null, 'CSV (<a href="../admin/example.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');

main/mySpace/course.php

Indentation +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 
 function count_courses()
 {
-	global $nb_courses;
-	return $nb_courses;
+    global $nb_courses;
+    return $nb_courses;
 }
 
 //checking if the current coach is the admin coach

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_session"]) && $_GET["id_session"] != "") {
     $interbreadcrumb[] = array("url" => "session.php", "name" => get_lang('Sessions'));
@@ -67,7 +67,7 @@ 
             $user_id = intval($_GET['user_id']);
             $user_info = api_get_user_info($user_id);
             $title = get_lang('AssignedCoursesTo').' '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
-            $courses  = CourseManager::get_course_list_of_user_as_course_admin($user_id);
+            $courses = CourseManager::get_course_list_of_user_as_course_admin($user_id);
         } else {
             $title = get_lang('YourCourseList');
             $courses = CourseManager::get_courses_followed_by_drh(api_get_user_id());
@@ -82,7 +82,7 @@ 
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),
+            Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
         );
         $menu_items[] = Display::url(
@@ -125,7 +125,7 @@ 
        
     }
     
-    $toolbar = Display::toolbarAction('toolbar-course', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+    $toolbar = Display::toolbarAction('toolbar-course', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 
     echo $toolbar;
     

main/mySpace/admin.php

Spacing +10 added lines, -10 removed lines

@@ -35,13 +35,13 @@ 
 }
 $sql = "SELECT user.user_id,lastname,firstname,email
         FROM $tbl_user as user, $tbl_admin as admin
-        WHERE admin.user_id=user.user_id" . $order_clause;
+        WHERE admin.user_id=user.user_id".$order_clause;
 $result_admins = Database::query($sql);
 
 if (api_is_western_name_order()) {
-    echo '<table class="data_table"><tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+    echo '<table class="data_table"><tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
 } else {
-    echo '<table class="data_table"><tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+    echo '<table class="data_table"><tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
 }
 
 if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -65,9 +65,9 @@ 
             $css_class = "row_odd";
             if ($i % 20 == 0 && $i != 0) {
                 if (api_is_western_name_order()) {
-                    echo '<tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+                    echo '<tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
                 } else {
-                    echo '<tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+                    echo '<tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
                 }
             }
         } else {
@@ -77,9 +77,9 @@ 
         $i++;
 
         if (api_is_western_name_order()) {
-            echo "<tr class=" . $css_class . "><td>$firstname</td><td>$lastname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
+            echo "<tr class=".$css_class."><td>$firstname</td><td>$lastname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
         } else {
-            echo "<tr class=" . $css_class . "><td>$lastname</td><td>$firstname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
+            echo "<tr class=".$css_class."><td>$lastname</td><td>$firstname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
         }
 
         if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -93,7 +93,7 @@ 
     }
 } else {
     // No results
-    echo '<tr><td colspan="3">' . get_lang('NoResults') . '</td></tr>';
+    echo '<tr><td colspan="3">'.get_lang('NoResults').'</td></tr>';
 }
 echo '</table>';
 
@@ -104,8 +104,8 @@ 
 echo "
     <br /><br />
     <form method='post' action='admin.php'>
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
-            " . get_lang('ExportExcel') . "
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
+            " . get_lang('ExportExcel')."
         </button>
     <form>
 ";

main/mySpace/teachers.php

Spacing +9 added lines, -9 removed lines

@@ -20,14 +20,14 @@ 
 
 $this_section = SECTION_TRACKING;
 
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
-    $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
+    $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
 }
 
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
-    $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
+    $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
 }
 
 function get_count_users()
@@ -122,8 +122,8 @@ 
                 $courseInfo = api_get_course_info($course_code);
                 $courseId = $courseInfo['real_id'];
                 if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) {
-                    $avg_time_spent 	+= Tracking :: get_time_spent_on_the_course($student_id, $courseId, $_GET['id_session']);
-                    $my_average 		 = Tracking :: get_avg_student_score($student_id, $course_code);
+                    $avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $courseId, $_GET['id_session']);
+                    $my_average = Tracking :: get_avg_student_score($student_id, $course_code);
                     if (is_numeric($my_average)) {
                         $avg_student_score += $my_average;
                     }
@@ -162,7 +162,7 @@ 
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$_GET['id_session'].'">
 				          '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         } else {
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
         }
         $row[] = $detailsLink;
@@ -181,7 +181,7 @@ 
 $actionsLeft = '';
 if (api_is_drh()) {
     $menu_items = array(
-        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
+        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
         Display::url(Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), 'student.php'),
         Display::url(Display::return_icon('teacher_na.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
         Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
@@ -208,7 +208,7 @@ 
 );
 
 
-$toolbar = Display::toolbarAction('toolbar-teachers', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-teachers', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 
 $table = new SortableTable(
     'tracking_teachers',