chamilo / chamilo-lms

main/session/session_course_user.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 SessionManager::protectSession($id_session);
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 $interbreadcrumb[] = array(
     'url' => 'resume_session.php?id_session='.$id_session,
     'name' => get_lang('SessionOverview'),
@@ -43,7 +43,7 @@ 
             FROM '.Database :: get_main_table(TABLE_MAIN_SESSION).'
             WHERE id='.$id_session;
     $rs = Database::query($sql);
-    if (Database::result($rs,0,0)!=$_user['user_id']) {
+    if (Database::result($rs, 0, 0) != $_user['user_id']) {
         api_not_allowed(true);
     }
 }
@@ -88,9 +88,9 @@ 
 
     foreach ($CourseList as $enreg_course) {
         $exists = false;
-        foreach($existingCourses as $existingCourse) {
+        foreach ($existingCourses as $existingCourse) {
             if ($enreg_course == $existingCourse['id']) {
-                $exists=true;
+                $exists = true;
             }
         }
 
@@ -110,7 +110,7 @@ 
     }
 
     foreach ($existingCourses as $existingCourse) {
-        if (!in_array($existingCourse['id'], $CourseList)){
+        if (!in_array($existingCourse['id'], $CourseList)) {
             $existingCourse = Database::escape_string($existingCourse['id']);
             $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (session_id,c_id,user_id)
                     VALUES ('$id_session','$existingCourse','$id_user')";
@@ -146,7 +146,7 @@ 
         WHERE srcru.user_id = $id_user AND session_id = $id_session";
 
 //all
-$sql_all="SELECT course.id, code, title, visual_code, src.session_id
+$sql_all = "SELECT course.id, code, title, visual_code, src.session_id
         FROM $tbl_course course
         INNER JOIN $tbl_session_rel_course  as src
         ON course.id = src.c_id AND session_id = $id_session";
@@ -163,9 +163,9 @@ 
 
 foreach ($CoursesAll as $course) {
     if (in_array($course['id'], $course_temp)) {
-        $nosessionCourses[$course['id']] = $course ;
+        $nosessionCourses[$course['id']] = $course;
     } else {
-        $sessionCourses[$course['id']] = $course ;
+        $sessionCourses[$course['id']] = $course;
     }
 }
 unset($Courses);
@@ -184,9 +184,9 @@ 
             <td width="45%" align="center">
                 <div id="ajax_list_courses_multiple">
                     <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
-                        foreach($nosessionCourses as $enreg) {
+                        foreach ($nosessionCourses as $enreg) {
                             ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES).'"'; if (in_array($enreg['code'], $CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
                         <?php
                         }
                         ?> </select></div> <?php
@@ -211,9 +211,9 @@ 
             <td width="45%" align="center">
                 <select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
             <?php
-            foreach($sessionCourses as $enreg) {
+            foreach ($sessionCourses as $enreg) {
                 ?>
-                <option value="<?php echo $enreg['id']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                <option value="<?php echo $enreg['id']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
             <?php
             }
             unset($sessionCourses);

Braces +4 added lines, -1 removed lines

@@ -186,7 +186,10 @@
                     <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
                         foreach($nosessionCourses as $enreg) {
                             ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
                         <?php
                         }
                         ?> </select></div> <?php

main/session/session_course_list.php

Indentation +26 added lines, -26 removed lines

@@ -30,26 +30,26 @@ 
 $result = Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'");
 
 if (!list($session_name)=Database::fetch_row($result)) {
-	header('Location: session_list.php');
-	exit;
+    header('Location: session_list.php');
+    exit;
 }
 
 if ($action == 'delete') {
-	$idChecked = $_REQUEST['idChecked'];
-	if (is_array($idChecked) && count($idChecked)>0) {
-		$my_temp = array();
-		foreach ($idChecked as $id){
-			$my_temp[]= Database::escape_string($id);// forcing the escape_string
-		}
-		$idChecked = $my_temp;
-		$idChecked="'".implode("','", $idChecked)."'";
-		$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
-		$nbr_affected_rows=Database::affected_rows($result);
-		Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
-		Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
-	}
-	header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
-	exit();
+    $idChecked = $_REQUEST['idChecked'];
+    if (is_array($idChecked) && count($idChecked)>0) {
+        $my_temp = array();
+        foreach ($idChecked as $id){
+            $my_temp[]= Database::escape_string($id);// forcing the escape_string
+        }
+        $idChecked = $my_temp;
+        $idChecked="'".implode("','", $idChecked)."'";
+        $result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
+        $nbr_affected_rows=Database::affected_rows($result);
+        Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
+        Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
+    }
+    header('Location: '.api_get_self().'?id_session='.$id_session.'&sort='.$sort);
+    exit();
 }
 
 $limit  = 20;
@@ -82,17 +82,17 @@ 
 $tableCourses = array();
 
 foreach ($Courses as $key=>$enreg) {
-	$course = array();
-	$course[] = '<input type="checkbox" name="idChecked[]" value="'.$enreg['id'].'">';
-	$course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
-	$course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
-	$course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
-		Display::return_icon('course_home.gif', get_lang('Course')).'</a>
+    $course = array();
+    $course[] = '<input type="checkbox" name="idChecked[]" value="'.$enreg['id'].'">';
+    $course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
+    $course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
+    $course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
+        Display::return_icon('course_home.gif', get_lang('Course')).'</a>
 			<a href="session_course_edit.php?id_session='.$id_session.'&page=session_course_list.php&course_code='.$enreg['code'].'">'.
-		Display::return_icon('edit.png', get_lang('Edit')).'</a>
+        Display::return_icon('edit.png', get_lang('Edit')).'</a>
 			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete')).'</a>';
-	$tableCourses[] = $course;
+        Display::return_icon('delete.png', get_lang('Delete')).'</a>';
+    $tableCourses[] = $course;
 }
 echo '<form method="post" action="'.api_get_self().'">';
 Display :: display_sortable_table($tableHeader, $tableCourses, array (), array ());

Spacing +19 added lines, -19 removed lines

@@ -8,7 +8,7 @@ 
 require_once '../inc/global.inc.php';
 
 // setting the section (for the tabs)
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 $id_session = intval($_GET['id_session']);
 SessionManager::protectSession($id_session);
@@ -16,8 +16,8 @@ 
 // Database Table Definitions
 $tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
 $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_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
 if (empty($id_session)) {
     api_not_allowed();
@@ -25,26 +25,26 @@ 
 
 $page   = intval($_GET['page']);
 $action = $_REQUEST['action'];
-$sort   = in_array($_GET['sort'],array('title','nbr_users'))?$_GET['sort']:'title';
+$sort   = in_array($_GET['sort'], array('title', 'nbr_users')) ? $_GET['sort'] : 'title';
 
 $result = Database::query("SELECT name FROM $tbl_session WHERE id='$id_session'");
 
-if (!list($session_name)=Database::fetch_row($result)) {
+if (!list($session_name) = Database::fetch_row($result)) {
 	header('Location: session_list.php');
 	exit;
 }
 
 if ($action == 'delete') {
 	$idChecked = $_REQUEST['idChecked'];
-	if (is_array($idChecked) && count($idChecked)>0) {
+	if (is_array($idChecked) && count($idChecked) > 0) {
 		$my_temp = array();
-		foreach ($idChecked as $id){
-			$my_temp[]= Database::escape_string($id);// forcing the escape_string
+		foreach ($idChecked as $id) {
+			$my_temp[] = Database::escape_string($id); // forcing the escape_string
 		}
 		$idChecked = $my_temp;
-		$idChecked="'".implode("','", $idChecked)."'";
+		$idChecked = "'".implode("','", $idChecked)."'";
 		$result = Database::query("DELETE FROM $tbl_session_rel_course WHERE session_id='$id_session' AND c_id IN($idChecked)");
-		$nbr_affected_rows=Database::affected_rows($result);
+		$nbr_affected_rows = Database::affected_rows($result);
 		Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE session_id='$id_session' AND c_id IN($idChecked)");
 		Database::query("UPDATE $tbl_session SET nbr_courses=nbr_courses-$nbr_affected_rows WHERE id='$id_session'");
 	}
@@ -59,14 +59,14 @@ 
 		FROM $tbl_session_rel_course, $tbl_course c
 		WHERE c_id = c.id AND session_id='$id_session'
 		ORDER BY $sort
-		LIMIT $from,".($limit+1);
-$result=Database::query($sql);
-$Courses=Database::store_result($result);
-$tool_name = api_htmlentities($session_name,ENT_QUOTES,$charset).' : '.get_lang('CourseListInSession');
+		LIMIT $from,".($limit + 1);
+$result = Database::query($sql);
+$Courses = Database::store_result($result);
+$tool_name = api_htmlentities($session_name, ENT_QUOTES, $charset).' : '.get_lang('CourseListInSession');
 
 //$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList'));
-$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".Security::remove_XSS($_REQUEST['id_session']),"name" => get_lang('SessionOverview'));
+$interbreadcrumb[] = array('url' => "session_list.php", "name" => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".Security::remove_XSS($_REQUEST['id_session']), "name" => get_lang('SessionOverview'));
 
 Display::display_header($tool_name);
 echo Display::page_header($tool_name);
@@ -84,18 +84,18 @@ 
 foreach ($Courses as $key=>$enreg) {
 	$course = array();
 	$course[] = '<input type="checkbox" name="idChecked[]" value="'.$enreg['id'].'">';
-	$course[] = api_htmlentities($enreg['title'],ENT_QUOTES,$charset);
+	$course[] = api_htmlentities($enreg['title'], ENT_QUOTES, $charset);
 	$course[] = '<a href="session_course_user_list.php?id_session='.$id_session.'&course_code='.$enreg['code'].'">'.$enreg['nbr_users'].' '.get_lang('Users').'</a>';
 	$course[] = '<a href="'.api_get_path(WEB_COURSE_PATH).$enreg['code'].'/?id_session='.$id_session.'">'.
 		Display::return_icon('course_home.gif', get_lang('Course')).'</a>
 			<a href="session_course_edit.php?id_session='.$id_session.'&page=session_course_list.php&course_code='.$enreg['code'].'">'.
 		Display::return_icon('edit.png', get_lang('Edit')).'</a>
-			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.
+			<a href="'.api_get_self().'?id_session='.$id_session.'&sort='.$sort.'&action=delete&idChecked[]='.$enreg['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;">'.
 		Display::return_icon('delete.png', get_lang('Delete')).'</a>';
 	$tableCourses[] = $course;
 }
 echo '<form method="post" action="'.api_get_self().'">';
-Display :: display_sortable_table($tableHeader, $tableCourses, array (), array ());
+Display :: display_sortable_table($tableHeader, $tableCourses, array(), array());
 echo '<select name="action">
 	<option value="delete">'.get_lang('UnsubscribeCoursesFromSession').'</option>
 	</select>

main/session/session_category_list.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 }
 
 //$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
     $interbreadcrumb[] = array("url" => 'session_category_list.php', "name" => get_lang('ListSessionCategory'));
@@ -76,7 +76,7 @@ 
         $where .= " AND access_url_id = ".api_get_current_access_url_id()." ";
     }
 
-    $table_access_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+    $table_access_url_rel_session = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
     $query = "SELECT sc.*, (
                 SELECT count(id) FROM $tbl_session s
                 INNER JOIN $table_access_url_rel_session us

main/session/add_students_to_session.php

Spacing +2 added lines, -2 removed lines

@@ -14,12 +14,12 @@
 
 // setting breadcrumbs
 //$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Setting the name of the tool
 $tool_name = get_lang('SubscribeStudentsToSession');
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 $form_sent  = 0;

Indentation +7 added lines, -7 removed lines

@@ -70,13 +70,13 @@
         <tr>
             <td align="center">
                 <?php
-                 echo Display::select(
-                     'sessions[]',
-                     $sessionList,
-                     '',
-                     array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
-                     false
-                 );
+                    echo Display::select(
+                        'sessions[]',
+                        $sessionList,
+                        '',
+                        array('style'=>'width:100%', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
+                        false
+                    );
                 ?>
             </td>
             <td align="center">

main/session/index.php

Indentation +7 added lines, -7 removed lines

@@ -233,7 +233,7 @@ 
 
 //If session is not active we stop de script
 if (!api_is_allowed_to_session_edit()) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 $entityManager = Database::getManager();
@@ -353,7 +353,7 @@ 
                             if ($exercise_info->start_time != '0000-00-00 00:00:00') {
                                 $allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
                                 if ($now < $allowed_time) {
-                                      continue;
+                                        continue;
                                 }
                             }
                             $exercise_info->exercise = Display::url(
@@ -583,11 +583,11 @@ 
 		window.location.href=ui.tab;
     });
 <?php
-     //Displays js code to use a jqgrid
-     echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
-     echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
-     echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
-     echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
+        //Displays js code to use a jqgrid
+        echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
+        echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
+        echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
+        echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
 
     if (!api_is_anonymous()) {
         echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);

Spacing +42 added lines, -42 removed lines

@@ -16,7 +16,7 @@ 
     api_not_allowed();
 }
 
-$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']): null;
+$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 
 $sessionField = new ExtraFieldValue('session');
 $valueAllowVisitors = $sessionField->get_values_by_handler_and_field_variable($session_id, 'allow_visitors');
@@ -31,7 +31,7 @@ 
 $this_section = SECTION_COURSES;
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
-$course_id  = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
 
 $_SESSION['id_session'] = $session_id;
 
@@ -245,12 +245,12 @@ 
     $sessionCourses = $session->getCourses();
     $sessionCourse = $sessionCourses[0]->getCourse();
 
-    $courseUrl = $sessionCourse->getDirectory() . '/index.php?';
+    $courseUrl = $sessionCourse->getDirectory().'/index.php?';
     $courseUrl .= http_build_query([
         'id_session' => $session->getId()
     ]);
 
-    header('Location: ' . api_get_path(WEB_COURSE_PATH) . $courseUrl);
+    header('Location: '.api_get_path(WEB_COURSE_PATH).$courseUrl);
     exit;
 }
 
@@ -258,7 +258,7 @@ 
 
 $session_select = array();
 foreach ($session_list as $item) {
-    $session_select[$item['id']] =  $item['name'];
+    $session_select[$item['id']] = $item['name'];
 }
 
 // Session list form
@@ -280,7 +280,7 @@ 
 $my_real_array = $new_exercises = array();
 $now = time();
 foreach ($final_array as $session_data) {
-    $my_course_list = isset($session_data['data']) ? $session_data['data']: array();
+    $my_course_list = isset($session_data['data']) ? $session_data['data'] : array();
     if (!empty($my_course_list)) {
         foreach ($my_course_list as $my_course_code=>$course_data) {
             $courseInfo = api_get_course_info($my_course_code);
@@ -318,8 +318,8 @@ 
                             foreach ($result_list as $exercise_result) {
                                 $platform_score = ExerciseLib::show_score($exercise_result['exe_result'], $exercise_result['exe_weighting']);
                                 $my_score = 0;
-                                if(!empty($exercise_result['exe_weighting']) && intval($exercise_result['exe_weighting']) != 0) {
-                                    $my_score = $exercise_result['exe_result']/$exercise_result['exe_weighting'];
+                                if (!empty($exercise_result['exe_weighting']) && intval($exercise_result['exe_weighting']) != 0) {
+                                    $my_score = $exercise_result['exe_result'] / $exercise_result['exe_weighting'];
                                 }
                                 $position = ExerciseLib::get_exercise_result_ranking(
                                     $my_score,
@@ -332,12 +332,12 @@ 
 
                                 $exercise_info->exercise = Display::url(
                                     $exercise_info->exercise,
-                                    api_get_path(WEB_CODE_PATH) . "exercise/result.php?cidReq=$my_course_code&id={$exercise_result['exe_id']}&id_session=$session_id&show_headers=1",
-                                    array('target'=>SESSION_LINK_TARGET,'class'=>'exercise-result-link')
+                                    api_get_path(WEB_CODE_PATH)."exercise/result.php?cidReq=$my_course_code&id={$exercise_result['exe_id']}&id_session=$session_id&show_headers=1",
+                                    array('target'=>SESSION_LINK_TARGET, 'class'=>'exercise-result-link')
                                 );
 
-                                $my_real_array[]= array(
-                                    'status'      => Display::return_icon('quiz.gif', get_lang('Attempted'),'', ICON_SIZE_SMALL),
+                                $my_real_array[] = array(
+                                    'status'      => Display::return_icon('quiz.gif', get_lang('Attempted'), '', ICON_SIZE_SMALL),
                                     'date'        => $start_date,
                                     'course'      => $course_data['name'],
                                     'exercise'    => $exercise_info->exercise,
@@ -358,11 +358,11 @@ 
                             }
                             $exercise_info->exercise = Display::url(
                                 $exercise_info->exercise,
-                                api_get_path(WEB_CODE_PATH) . "exercise/overview.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id",
+                                api_get_path(WEB_CODE_PATH)."exercise/overview.php?cidReq=$my_course_code&exerciseId={$exercise_info->id}&id_session=$session_id",
                                 array('target'=>SESSION_LINK_TARGET)
                             );
 
-                            $new_exercises[]= array(
+                            $new_exercises[] = array(
                                 'status'      => Display::return_icon('star.png', get_lang('New'), array('width'=>ICON_SIZE_SMALL)),
                                 'date'        => $start_date,
                                 'course'      => $course_data['name'],
@@ -386,7 +386,7 @@ 
     $my_real_array = array_merge($new_exercises, $my_real_array);
 }
 
-$start = $end = $start_only = $end_only ='';
+$start = $end = $start_only = $end_only = '';
 
 if (!empty($session_info['access_start_date']) && $session_info['access_start_date'] != '0000-00-00') {
     $start = api_convert_and_format_date($session_info['access_start_date'], DATE_FORMAT_SHORT);
@@ -424,11 +424,11 @@ 
     get_lang('Title'), get_lang('NumberOfPublishedExercises'), get_lang('NumberOfPublishedLps')
 );
 $column_model_courses = array(
-    array('name'=>'title',              'index'=>'title',               'width'=>'400px',  'align'=>'left',  'sortable'=>'true'),
+    array('name'=>'title', 'index'=>'title', 'width'=>'400px', 'align'=>'left', 'sortable'=>'true'),
     //array('name'=>'recent_lps',         'index'=>'recent_lps',          'width'=>'10px',  'align'=>'left',  'sortable'=>'false'),
 //    array('name'=>'max_mutation_date',  'index'=>'max_mutation_date',   'width'=>'120px',  'align'=>'left',  'sortable'=>'true'),
-    array('name'=>'exercise_count',     'index'=>'exercise_count',      'width'=>'180px',  'align'=>'left',  'sortable'=>'true'),
-    array('name'=>'lp_count',           'index'=>'lp_count',            'width'=>'180px',  'align'=>'left',  'sortable'=>'true')
+    array('name'=>'exercise_count', 'index'=>'exercise_count', 'width'=>'180px', 'align'=>'left', 'sortable'=>'true'),
+    array('name'=>'lp_count', 'index'=>'lp_count', 'width'=>'180px', 'align'=>'left', 'sortable'=>'true')
 );
 
 $extra_params_courses['height'] = '100%';
@@ -452,10 +452,10 @@ 
     get_lang('LearningPaths')
 );
 
-$column_model   = array(
-    array('name'=>'date',   'index'=>'date',   'width'=>'120', 'align'=>'left', 'sortable'=>'true'),
+$column_model = array(
+    array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'true'),
     array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
-    array('name'=>'lp',     'index'=>'lp',     'width'=>'440', 'align'=>'left', 'sortable'=>'true')
+    array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true')
 );
 
 $extra_params = array();
@@ -501,11 +501,11 @@ 
     get_lang('LearningPaths')
 );
 
-$column_week_model  = array(
-    array('name'=>'week',     'index'=>'week',    'width'=>'40',  'align'=>'left', 'sortable'=>'false'),
-    array('name'=>'date',     'index'=>'date',    'width'=>'120', 'align'=>'left', 'sortable'=>'false'),
-    array('name'=>'course',   'index'=>'course',  'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
-    array('name'=>'lp',       'index'=>'lp',      'width'=>'440', 'align'=>'left', 'sortable'=>'true')
+$column_week_model = array(
+    array('name'=>'week', 'index'=>'week', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'date', 'index'=>'date', 'width'=>'120', 'align'=>'left', 'sortable'=>'false'),
+    array('name'=>'course', 'index'=>'course', 'width'=>'300', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
+    array('name'=>'lp', 'index'=>'lp', 'width'=>'440', 'align'=>'left', 'sortable'=>'true')
 );
 
 $extra_params_week = array();
@@ -517,7 +517,7 @@ 
     'groupField' => array('week'),
     'groupOrder' => array('desc'),
     'groupColumnShow' => 'false',
-    'groupText' => array('<b>' . get_lang('PeriodWeek') . ' {0}</b>')
+    'groupText' => array('<b>'.get_lang('PeriodWeek').' {0}</b>')
 );
 $extra_params_week['autowidth'] = 'true'; //use the width of the parent
 $extra_params_week['height'] = '100%';
@@ -534,15 +534,15 @@ 
         get_lang('BestResultInCourse'),
         get_lang('Ranking')
     );
-    $column_exercise_model  = array(
-        array('name'=>'status',     'index'=>'status',     'width'=>'40', 'align'=>'left',   'sortable'=>'false'),
-        array('name'=>'date',       'index'=>'date',       'width'=>'130','align'=>'left',   'sortable'=>'true'),
-        array('name'=>'course',     'index'=>'course',     'width'=>'200','align'=>'left',   'sortable'=>'true', 'wrap_cell' => 'true'),
-        array('name'=>'exercise',   'index'=>'exercise',   'width'=>'200','align'=>'left',   'sortable'=>'false'),
-        array('name'=>'attempt',    'index'=>'attempt',    'width'=>'60', 'align'=>'center', 'sortable'=>'true'),
-        array('name'=>'result',     'index'=>'result',     'width'=>'120','align'=>'center', 'sortable'=>'true'),
-        array('name'=>'best_result','index'=>'best_result','width'=>'140','align'=>'center', 'sortable'=>'true'),
-        array('name'=>'position',   'index'=>'position',   'width'=>'55', 'align'=>'center', 'sortable'=>'true')
+    $column_exercise_model = array(
+        array('name'=>'status', 'index'=>'status', 'width'=>'40', 'align'=>'left', 'sortable'=>'false'),
+        array('name'=>'date', 'index'=>'date', 'width'=>'130', 'align'=>'left', 'sortable'=>'true'),
+        array('name'=>'course', 'index'=>'course', 'width'=>'200', 'align'=>'left', 'sortable'=>'true', 'wrap_cell' => 'true'),
+        array('name'=>'exercise', 'index'=>'exercise', 'width'=>'200', 'align'=>'left', 'sortable'=>'false'),
+        array('name'=>'attempt', 'index'=>'attempt', 'width'=>'60', 'align'=>'center', 'sortable'=>'true'),
+        array('name'=>'result', 'index'=>'result', 'width'=>'120', 'align'=>'center', 'sortable'=>'true'),
+        array('name'=>'best_result', 'index'=>'best_result', 'width'=>'140', 'align'=>'center', 'sortable'=>'true'),
+        array('name'=>'position', 'index'=>'position', 'width'=>'55', 'align'=>'center', 'sortable'=>'true')
     );
     $extra_params_exercise['height'] = '100%';
     $extra_params_exercise['autowidth'] = 'true';
@@ -584,10 +584,10 @@ 
     });
 <?php
      //Displays js code to use a jqgrid
-     echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
-     echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
-     echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
-     echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
+     echo Display::grid_js('courses', '', $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
+     echo Display::grid_js('list_default', $url, $columns, $column_model, $extra_params, array(), '');
+     echo Display::grid_js('list_course', $url_by_course, $columns, $column_model, $extra_params_course, array(), '');
+     echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week, array(), '');
 
     if (!api_is_anonymous()) {
         echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);
@@ -608,7 +608,7 @@ 
         false,
         false
     );
-    if (!empty($reportingTab))  {
+    if (!empty($reportingTab)) {
         $reportingTab .= '<br />'.Tracking::show_course_detail(
                 api_get_user_id(),
                 $courseCode,
@@ -616,7 +616,7 @@ 
             );
     }
     if (empty($reportingTab)) {
-        $reportingTab  = Display::return_message(get_lang('NoDataAvailable'), 'warning');
+        $reportingTab = Display::return_message(get_lang('NoDataAvailable'), 'warning');
     }
 }
 

main/session/session_import_drh.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 $tool_name = get_lang('ImportSessionDrhList');
 
 //$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 set_time_limit(0);
 
@@ -27,7 +27,7 @@ 
 
 echo '<div class="actions">';
 echo '<a href="../session/session_list.php">'.
-    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 if (!empty($error_message)) {

main/session/resume_session.php

Indentation +20 added lines, -20 removed lines

@@ -155,7 +155,7 @@ 
     $sessionRepository = Database::getManager()->getRepository('ChamiloCoreBundle:Session');
     $courses = $sessionRepository->getCoursesOrderedByPosition($session);
 
-	foreach ($courses as $course) {
+    foreach ($courses as $course) {
         //select the number of users
         $sql = "SELECT count(*)
                 FROM $tbl_session_rel_user sru,
@@ -167,37 +167,37 @@ 
                     sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND
                     srcru.session_id = '".intval($sessionId)."'";
 
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
         $numberOfUsers = Database::result($rs, 0, 0);
 
-		// Get coachs of the courses in session
+        // Get coachs of the courses in session
 
-		$sql = "SELECT user.lastname, user.firstname, user.username
+        $sql = "SELECT user.lastname, user.firstname, user.username
                 FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
 				WHERE
 				    session_rcru.user_id = user.user_id AND
 				    session_rcru.session_id = '".intval($sessionId)."' AND
 				    session_rcru.c_id ='".intval($course->getId())."' AND
 				    session_rcru.status=2";
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		$coachs = array();
-		if (Database::num_rows($rs) > 0) {
-			while($info_coach = Database::fetch_array($rs)) {
+        $coachs = array();
+        if (Database::num_rows($rs) > 0) {
+            while($info_coach = Database::fetch_array($rs)) {
                 $coachs[] = api_get_person_name(
                         $info_coach['firstname'],
                         $info_coach['lastname']
                     ).' ('.$info_coach['username'].')';
-			}
-		} else {
-			$coach = get_lang('None');
-		}
+            }
+        } else {
+            $coach = get_lang('None');
+        }
 
-		if (count($coachs) > 0) {
-			$coach = implode('<br />',$coachs);
-		} else {
-			$coach = get_lang('None');
-		}
+        if (count($coachs) > 0) {
+            $coach = implode('<br />',$coachs);
+        } else {
+            $coach = get_lang('None');
+        }
 
         $orderButtons = null;
 
@@ -233,8 +233,8 @@ 
 
         $courseUrl = api_get_course_url($course->getCode(), $sessionId);
 
-		// hide_course_breadcrumb the parameter has been added to hide the name
-		// of the course, that appeared in the default $interbreadcrumb
+        // hide_course_breadcrumb the parameter has been added to hide the name
+        // of the course, that appeared in the default $interbreadcrumb
         $courseItem .= '
 		<tr>
 			<td class="title">'.Display::url(
@@ -260,7 +260,7 @@ 
 			</td>
 		</tr>';
         $count++;
-	}
+    }
     $courseListToShow .= $courseItem;
 }
 $courseListToShow .= '</table><br />';

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 $tool_name = get_lang('SessionOverview');
 
 //$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 $orig_param = '&origin=resume_session';
 
@@ -183,7 +183,7 @@ 
 
 		$coachs = array();
 		if (Database::num_rows($rs) > 0) {
-			while($info_coach = Database::fetch_array($rs)) {
+			while ($info_coach = Database::fetch_array($rs)) {
                 $coachs[] = api_get_person_name(
                         $info_coach['firstname'],
                         $info_coach['lastname']
@@ -194,7 +194,7 @@ 
 		}
 
 		if (count($coachs) > 0) {
-			$coach = implode('<br />',$coachs);
+			$coach = implode('<br />', $coachs);
 		} else {
 			$coach = get_lang('None');
 		}
@@ -217,7 +217,7 @@ 
         $downIcon = 'down.png';
         $downUrl = api_get_self().'?id_session='.$sessionId.'&course_id='.$course->getId().'&action=move_down';
 
-        if ($count +1 == count($courses)) {
+        if ($count + 1 == count($courses)) {
             $downIcon = 'down_na.png';
             $downUrl = '#';
         }
@@ -244,7 +244,7 @@ 
 			<td>'.$coach.'</td>
 			<td>'.$numberOfUsers.'</td>
 			<td>
-                <a href="'. $courseUrl . '">'.
+                <a href="'. $courseUrl.'">'.
                 Display::return_icon('course_home.gif', get_lang('Course')).'</a>
                 '.$orderButtons.'
                 <a href="session_course_user_list.php?id_session='.$sessionId.'&course_code='.$course->getCode().'">'.
@@ -309,7 +309,7 @@ 
             array('onclick' => "javascript:if(!confirm('".get_lang('ConfirmYourChoice')."')) return false;")
         );
 
-        $addUserToUrlLink= '';
+        $addUserToUrlLink = '';
         if ($multiple_url_is_on) {
             if ($user['access_url_id'] != $url_id) {
                 $userLink .= ' '.Display::return_icon(

main/session/add_users_to_session.php

Braces +11 added lines, -4 removed lines

@@ -98,9 +98,10 @@ 
         $cond_user_id = '';
 
         // Only for single & multiple
-        if (in_array($type, array('single','multiple')))
-        if (!empty($id_session)) {
+        if (in_array($type, array('single','multiple'))) {
+                if (!empty($id_session)) {
             $id_session = intval($id_session);
+        }
             // check id_user from session_rel_user table
             $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.'
                     WHERE session_id = "'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' ';
@@ -558,7 +559,10 @@ 
     echo $newLinks;
     ?>
 </div>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($addProcess)) echo '&add=true' ; ?>"  <?php if ($ajax_search) { echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($addProcess)) {
+    echo '&add=true' ;
+}
+?>"  <?php if ($ajax_search) { echo ' onsubmit="valide();"';}?>>
 <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
 if ($add_type=='multiple') {
@@ -613,7 +617,10 @@ 
               <?php
               foreach ($nosessionUsersList as $uid => $enreg) {
               ?>
-                  <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>>
+                  <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) {
+    echo 'selected="selected"';
+}
+?>>
                       <?php
                       $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
                       if ($showOfficialCode) {

Indentation +38 added lines, -38 removed lines

@@ -38,7 +38,7 @@ 
 $add_type = 'unique';
 
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
@@ -426,8 +426,8 @@ 
 
     if ($use_extra_fields) {
         $final_result = array();
-       	if (count($extra_field_result)>1) {
-	    for($i=0;$i<count($extra_field_result)-1;$i++) {
+            if (count($extra_field_result)>1) {
+        for($i=0;$i<count($extra_field_result)-1;$i++) {
                 if (is_array($extra_field_result[$i+1])) {
                     $final_result  = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
                 }
@@ -503,7 +503,7 @@ 
                 'official_code' => $user['official_code']
             ) ;
             unset($users[$uid]);
-	}
+    }
     }
     unset($users); //clean to free memory
 
@@ -547,12 +547,12 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
+    $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.$addProcess.'&add_type=unique">'.
         Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
+    $link_add_type_multiple = Display::url(Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'), '');
 } else {
-	$link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = Display::url(Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'), '');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 $link_add_group = Display::url(
     Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'),
@@ -580,17 +580,17 @@ 
 <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
 if ($add_type=='multiple') {
-	if (is_array($extra_field_list)) {
-		if (is_array($new_field_list) && count($new_field_list)>0 ) {
-			echo '<h3>'.get_lang('FilterUsers').'</h3>';
-			foreach ($new_field_list as $new_field) {
-				echo $new_field['name'];
-				$varname = 'field_'.$new_field['variable'];
+    if (is_array($extra_field_list)) {
+        if (is_array($new_field_list) && count($new_field_list)>0 ) {
+            echo '<h3>'.get_lang('FilterUsers').'</h3>';
+            foreach ($new_field_list as $new_field) {
+                echo $new_field['name'];
+                $varname = 'field_'.$new_field['variable'];
                 $fieldtype = $new_field['type'];
-				echo '&nbsp;<select name="'.$varname.'">';
-				echo '<option value="0">--'.get_lang('Select').'--</option>';
-				foreach	($new_field['data'] as $option) {
-					$checked='';
+                echo '&nbsp;<select name="'.$varname.'">';
+                echo '<option value="0">--'.get_lang('Select').'--</option>';
+                foreach	($new_field['data'] as $option) {
+                    $checked='';
                     if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
                         if (isset($_POST[$varname])) {
                             if ($_POST[$varname] == $option['tag']) {
@@ -611,11 +611,11 @@ 
                 $extraHidden = $fieldtype == ExtraField::FIELD_TYPE_TAG ? '<input type="hidden" name="field_id" value="'.$option['field_id'].'" />' : '';
                 echo $extraHidden;
                 echo '&nbsp;&nbsp;';
-			}
-			echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-			echo '<br /><br />';
-		}
-	}
+            }
+            echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+            echo '<br /><br />';
+        }
+    }
 }
 ?>
 <input type="hidden" name="form_sent" value="1" />
@@ -623,7 +623,7 @@ 
 
 <?php
 if (!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg); //main API
+    Display::display_normal_message($errorMsg); //main API
 }
 ?>
 <div id="multiple-add-session" class="row">
@@ -632,7 +632,7 @@ 
             <label><?php echo get_lang('UserListInPlatform') ?> </label>
             <?php
             if (!($add_type=='multiple')) {
-              ?>
+                ?>
               <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" />
               <div id="ajax_list_users_single" class="select-list-ajax"></div>
               <?php
@@ -641,21 +641,21 @@ 
             <div id="ajax_list_users_multiple">
             <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="form-control">
               <?php
-              foreach ($nosessionUsersList as $uid => $enreg) {
-              ?>
+                foreach ($nosessionUsersList as $uid => $enreg) {
+                ?>
                   <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>>
                       <?php
-                      $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
-                      if ($showOfficialCode) {
-                          $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
-                          $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
-                      }
-                      echo $personName;
-                      ?>
+                        $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
+                        if ($showOfficialCode) {
+                            $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
+                            $personName = $officialCode.api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')';
+                        }
+                        echo $personName;
+                        ?>
                   </option>
               <?php
-              }
-              ?>
+                }
+                ?>
             </select>
             </div>
                 <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id">
@@ -663,7 +663,7 @@ 
             <?php
             }
             unset($nosessionUsersList);
-           ?>
+            ?>
         </div>
     </div>
 
@@ -707,7 +707,7 @@ 
               <?php
             }
             if (!empty($addProcess)) {
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
             } else {
                 echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
             }

Spacing +37 added lines, -37 removed lines

@@ -102,13 +102,13 @@ 
         if (api_is_session_admin() &&
             api_get_setting('prevent_session_admins_to_manage_all_users') === 'true'
         ) {
-            $order_clause = " AND user.creator_id = " . api_get_user_id() . $order_clause;
+            $order_clause = " AND user.creator_id = ".api_get_user_id().$order_clause;
         }
 
         $cond_user_id = '';
 
         // Only for single & multiple
-        if (in_array($type, array('single','multiple')))
+        if (in_array($type, array('single', 'multiple')))
         if (!empty($id_session)) {
             $id_session = intval($id_session);
             // check id_user from session_rel_user table
@@ -118,11 +118,11 @@ 
             $user_ids = array();
             if (Database::num_rows($res) > 0) {
                 while ($row = Database::fetch_row($res)) {
-                    $user_ids[] = (int)$row[0];
+                    $user_ids[] = (int) $row[0];
                 }
             }
             if (count($user_ids) > 0) {
-                $cond_user_id = ' AND user.id NOT IN('.implode(",",$user_ids).')';
+                $cond_user_id = ' AND user.id NOT IN('.implode(",", $user_ids).')';
             }
         }
 
@@ -164,7 +164,7 @@ 
         }
 
         if (api_is_multiple_url_enabled()) {
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
             $access_url_id = api_get_current_access_url_id();
             if ($access_url_id != -1) {
                 switch ($type) {
@@ -215,10 +215,10 @@ 
 
         $rs = Database::query($sql);
         $i = 0;
-        if ($type=='single') {
+        if ($type == 'single') {
             while ($user = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                     $person_name = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') '.$user['official_code'];
                     if ($showOfficialCode) {
                         $officialCode = !empty($user['official_code']) ? $user['official_code'].' - ' : '? - ';
@@ -231,7 +231,7 @@ 
                 }
             }
 
-            $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            $xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
         } else {
             global $nosessionUsersList;
             $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
@@ -244,7 +244,7 @@ 
                 $return .= '<option value="'.$user['id'].'">'.$person_name.' </option>';
             }
             $return .= '</select>';
-            $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+            $xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
         }
     }
     return $xajax_response;
@@ -355,10 +355,10 @@ 
             $order_clause";
 
     if (api_is_multiple_url_enabled()) {
-        $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $access_url_id = api_get_current_access_url_id();
         if ($access_url_id != -1) {
-            $sql="SELECT u.id, lastname, firstname, username, session_id, official_code
+            $sql = "SELECT u.id, lastname, firstname, username, session_id, official_code
             FROM $tbl_user u
             INNER JOIN $tbl_session_rel_user
                 ON $tbl_session_rel_user.user_id = u.id AND
@@ -372,7 +372,7 @@ 
     $result = Database::query($sql);
     $users = Database::store_result($result);
     foreach ($users as $user) {
-        $sessionUsersList[$user['id']] = $user ;
+        $sessionUsersList[$user['id']] = $user;
     }
 
     $sessionUserInfo = SessionManager::getTotalUserCoursesInSession($id_session);
@@ -408,12 +408,12 @@ 
                     if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                         $use_extra_fields = true;
                         if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
-                            $extra_field_result[]= UserManager::get_extra_user_data_by_tags(
+                            $extra_field_result[] = UserManager::get_extra_user_data_by_tags(
                                 intval($_POST['field_id']),
                                 $_POST[$varname]
                             );
                         } else {
-                            $extra_field_result[]= UserManager::get_extra_user_data_by_value(
+                            $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                                 $new_field['variable'],
                                 $_POST[$varname]
                             );
@@ -426,10 +426,10 @@ 
 
     if ($use_extra_fields) {
         $final_result = array();
-       	if (count($extra_field_result)>1) {
-	    for($i=0;$i<count($extra_field_result)-1;$i++) {
-                if (is_array($extra_field_result[$i+1])) {
-                    $final_result  = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
+       	if (count($extra_field_result) > 1) {
+	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
+                if (is_array($extra_field_result[$i + 1])) {
+                    $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]);
                 }
             }
         } else {
@@ -437,14 +437,14 @@ 
         }
 
         if (api_is_multiple_url_enabled()) {
-            if (is_array($final_result) && count($final_result)>0) {
-                $where_filter = " AND u.id IN  ('".implode("','",$final_result)."') ";
+            if (is_array($final_result) && count($final_result) > 0) {
+                $where_filter = " AND u.id IN  ('".implode("','", $final_result)."') ";
             } else {
                 //no results
                 $where_filter = " AND u.id  = -1";
             }
         } else {
-            if (is_array($final_result) && count($final_result)>0) {
+            if (is_array($final_result) && count($final_result) > 0) {
                 $where_filter = " WHERE u.id IN  ('".implode("','", $final_result)."') ";
             } else {
                 //no results
@@ -453,7 +453,7 @@ 
         }
     }
     if (api_is_session_admin() && api_get_setting('prevent_session_admins_to_manage_all_users') === 'true') {
-        $order_clause = " AND u.creator_id = " . api_get_user_id() . $order_clause;
+        $order_clause = " AND u.creator_id = ".api_get_user_id().$order_clause;
     }
     if ($use_extra_fields) {
         $sql = "SELECT  u.id, lastname, firstname, username, session_id, official_code
@@ -475,7 +475,7 @@ 
                 $order_clause";
     }
     if (api_is_multiple_url_enabled()) {
-        $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $access_url_id = api_get_current_access_url_id();
         if ($access_url_id != -1) {
             $sql = "SELECT  u.id, lastname, firstname, username, session_id, official_code
@@ -492,7 +492,7 @@ 
     }
 
     $result = Database::query($sql);
-    $users = Database::store_result($result,'ASSOC');
+    $users = Database::store_result($result, 'ASSOC');
 
     foreach ($users as $uid => $user) {
         if ($user['session_id'] != $id_session) {
@@ -501,7 +501,7 @@ 
                 'ln' => $user['lastname'],
                 'un' => $user['username'],
                 'official_code' => $user['official_code']
-            ) ;
+            );
             unset($users[$uid]);
 	}
     }
@@ -517,7 +517,7 @@ 
           WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
 
     if (api_is_multiple_url_enabled()) {
-        $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $access_url_id = api_get_current_access_url_id();
         if ($access_url_id != -1) {
             $sql = "SELECT  u.id, lastname, firstname, username, session_id, official_code
@@ -533,11 +533,11 @@ 
     }
 
     $result = Database::query($sql);
-    $users = Database::store_result($result,'ASSOC');
+    $users = Database::store_result($result, 'ASSOC');
     foreach ($users as $uid => $user) {
         if ($user['session_id'] == $id_session) {
             $sessionUsersList[$user['id']] = $user;
-            if (array_key_exists($user['id'],$nosessionUsersList)) {
+            if (array_key_exists($user['id'], $nosessionUsersList)) {
                 unset($nosessionUsersList[$user['id']]);
             }
         }
@@ -555,7 +555,7 @@ 
 	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.$addProcess.'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 $link_add_group = Display::url(
-    Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'),
+    Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups'),
     api_get_path(WEB_CODE_PATH).'admin/usergroups.php'
 );
 
@@ -576,12 +576,12 @@ 
     echo $newLinks;
     ?>
 </div>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($addProcess)) echo '&add=true' ; ?>"  <?php if ($ajax_search) { echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($addProcess)) echo '&add=true'; ?>"  <?php if ($ajax_search) { echo ' onsubmit="valide();"'; }?>>
 <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
 <?php
-if ($add_type=='multiple') {
+if ($add_type == 'multiple') {
 	if (is_array($extra_field_list)) {
-		if (is_array($new_field_list) && count($new_field_list)>0 ) {
+		if (is_array($new_field_list) && count($new_field_list) > 0) {
 			echo '<h3>'.get_lang('FilterUsers').'</h3>';
 			foreach ($new_field_list as $new_field) {
 				echo $new_field['name'];
@@ -589,8 +589,8 @@ 
                 $fieldtype = $new_field['type'];
 				echo '&nbsp;<select name="'.$varname.'">';
 				echo '<option value="0">--'.get_lang('Select').'--</option>';
-				foreach	($new_field['data'] as $option) {
-					$checked='';
+				foreach ($new_field['data'] as $option) {
+					$checked = '';
                     if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
                         if (isset($_POST[$varname])) {
                             if ($_POST[$varname] == $option['tag']) {
@@ -631,7 +631,7 @@ 
         <div class="form-group">
             <label><?php echo get_lang('UserListInPlatform') ?> </label>
             <?php
-            if (!($add_type=='multiple')) {
+            if (!($add_type == 'multiple')) {
               ?>
               <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" class="form-control" />
               <div id="ajax_list_users_single" class="select-list-ajax"></div>
@@ -643,7 +643,7 @@ 
               <?php
               foreach ($nosessionUsersList as $uid => $enreg) {
               ?>
-                  <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>>
+                  <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>>
                       <?php
                       $personName = api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].') '.$enreg['official_code'];
                       if ($showOfficialCode) {
@@ -668,7 +668,7 @@ 
     </div>
 
     <div class="col-md-4">
-        <?php if ($add_type=='multiple') { ?>
+        <?php if ($add_type == 'multiple') { ?>
             <?php echo get_lang('FirstLetterUser'); ?> :
 
             <select id="first_letter_user" name="firstLetterUser" onchange = "change_select(this.value);" >

main/session/add_teachers_to_session.php

Indentation +7 added lines, -7 removed lines

@@ -70,13 +70,13 @@
     <tr>
         <td align="center">
             <?php
-             echo Display::select(
-                 'sessions[]',
-                 $sessionList,
-                 '',
-                 array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'sessions', 'size'=>'15px'),
-                 false
-             );
+                echo Display::select(
+                    'sessions[]',
+                    $sessionList,
+                    '',
+                    array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'sessions', 'size'=>'15px'),
+                    false
+                );
             ?>
         </td>
         <td align="center">

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 // setting breadcrumbs
 //$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
 
 // Setting the name of the tool
 $tool_name = get_lang('EnrollTrainersFromExistingSessions');
@@ -74,7 +74,7 @@ 
                  'sessions[]',
                  $sessionList,
                  '',
-                 array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'sessions', 'size'=>'15px'),
+                 array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'sessions', 'size'=>'15px'),
                  false
              );
             ?>