Bug #3646 and Issue #306 - Platform administrator's tools: Fixing person name order and sorting to be dependable on the internationalization settings, Part 2.

main/admin/course_add.php

@@ -60,14 +60,15 @@ $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAd
 global $_configuration;
 
 // Get all possible teachers
+$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 $table_user = Database :: get_main_table(TABLE_MAIN_USER);
-$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status=1 ORDER BY lastname,firstname";
+$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status=1".$order_clause;
 //filtering teachers when creating a course
 if ($_configuration['multiple_access_urls']==true){
 	$access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);   	
 	$sql = "SELECT u.user_id,lastname,firstname FROM $table_user as u
 			INNER JOIN $access_url_rel_user_table url_rel_user 
-			ON (u.user_id=url_rel_user.user_id) WHERE url_rel_user.access_url_id=".api_get_current_access_url_id()." AND status=1 ORDER BY lastname,firstname ";  
+			ON (u.user_id=url_rel_user.user_id) WHERE url_rel_user.access_url_id=".api_get_current_access_url_id()." AND status=1".$order_clause;  
 }
 
 $res = api_sql_query($sql,__FILE__,__LINE__);
@@ -75,7 +76,7 @@ $teachers = array();
 $teachers[0] = '-- '.get_lang('NoManager').' --';
 while($obj = mysql_fetch_object($res))
 {
-	$teachers[$obj->user_id] = $obj->lastname.' '.$obj->firstname;
+	$teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
 }
 
 

main/admin/course_edit.php

@@ -61,16 +61,17 @@ $course = Database::fetch_array($result,'ASSOC');
 
 // Get course teachers
 $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-$sql = "SELECT user.user_id,lastname,firstname FROM $table_user as user,$table_course_user as course_user WHERE course_user.status='1' AND course_user.user_id=user.user_id AND course_user.course_code='".$course_code."' ORDER BY lastname,firstname";
+$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+$sql = "SELECT user.user_id,lastname,firstname FROM $table_user as user,$table_course_user as course_user WHERE course_user.status='1' AND course_user.user_id=user.user_id AND course_user.course_code='".$course_code."'".$order_clause;
 $res = api_sql_query($sql,__FILE__,__LINE__);
 $course_teachers = array();
 while($obj = Database::fetch_object($res))
 {
-		$course_teachers[$obj->user_id] = $obj->lastname.' '.$obj->firstname;
+	$course_teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
 }
 
 // Get all possible teachers without the course teachers
-$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status='1' ORDER BY lastname,firstname";
+$sql = "SELECT user_id,lastname,firstname FROM $table_user WHERE status='1'".$order_clause;
 $res = api_sql_query($sql,__FILE__,__LINE__);
 $teachers = array();
 
@@ -78,7 +79,7 @@ $platform_teachers[0] = '-- '.get_lang('NoManager').' --';
 while($obj = Database::fetch_object($res))
 {
 	if(!array_key_exists($obj->user_id,$course_teachers)){
-		$teachers[$obj->user_id] = $obj->lastname.' '.$obj->firstname;
+		$teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
 	}
 
 
@@ -86,7 +87,7 @@ while($obj = Database::fetch_object($res))
 		$course['tutor_name']=$obj->user_id;
 	}
 	//We add in the array platform teachers
-	$platform_teachers[$obj->user_id] = $obj->lastname.' '.$obj->firstname;
+	$platform_teachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
 }
 
 //Case where there is no teacher in the course
@@ -165,7 +166,7 @@ $form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),
 // Set some default values
 
 $course_db_name = $course['db_name'];
-$course['title']=api_html_entity_decode($course['title'],ENT_QUOTES,$charset);
+$course['title'] = api_html_entity_decode($course['title'], ENT_QUOTES, $charset);
 $form->setDefaults($course);
 // Validate form
 if( $form->validate())

main/admin/course_import.php

@@ -75,7 +75,7 @@ function validate_data($courses) {
 		{
 			if (UserManager :: is_username_available($course['Teacher']))
 			{
-				$course['error'] = get_lang('UnknownTeacher');
+				$course['error'] = get_lang('UnknownTeacher').' ('.$course['Teacher'].')';
 				$errors[] = $course;
 			}
 		}
@@ -87,7 +87,7 @@ function validate_data($courses) {
 			$res = api_sql_query($sql, __FILE__, __LINE__);
 			if (mysql_num_rows($res) == 0)
 			{
-				$course['error'] = get_lang('UnkownCategory');
+				$course['error'] = get_lang('UnkownCategory').' ('.$course['CourseCategory'].')';
 				$errors[] = $course;
 			}
 		}
@@ -114,7 +114,7 @@ function save_data($courses)
 		}
 		$keys = define_course_keys($course['Code'], "", $_configuration['db_prefix']);
 		$user_table = Database::get_main_table(TABLE_MAIN_USER);
-		$sql = "SELECT user_id, CONCAT(lastname,' ',firstname) AS name FROM $user_table WHERE username = '".Database::escape_string($course['Teacher'])."'";
+		$sql = "SELECT user_id, ".(api_is_western_name_order(null, $course_language) ? "CONCAT(firstname,' ',lastname)" : "CONCAT(lastname,' ',firstname)")." AS name FROM $user_table WHERE username = '".Database::escape_string($course['Teacher'])."'";
 		$res = api_sql_query($sql,__FILE__,__LINE__);
 		$teacher = mysql_fetch_object($res);
 		$visual_code = $keys["currentCourseCode"];

main/admin/ldap_form_add_users_group.php

@@ -40,13 +40,17 @@ elseif(!empty($id_session))
 {
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
+$is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">' .
 		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
 		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
-		'<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-		'<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+		($is_western_name_order
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
+			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
+			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
 		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
 	  '</tr>'."\n";																																																					   
 while (list ($key, $val) = each($nom_form)) {
@@ -55,8 +59,16 @@ while (list ($key, $val) = each($nom_form)) {
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+	if ($is_western_name_order)
+	{
+		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+	}
+	else
+	{
+		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+	}
 	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
 	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
 	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';

main/admin/ldap_users_list.php

@@ -200,8 +200,16 @@ if (isset ($_POST['action']))
 
 $form = new FormValidator('advanced_search','get');
 $form->add_textfield('keyword_username',get_lang('LoginName'),false);
-$form->add_textfield('keyword_lastname',get_lang('LastName'),false);
-$form->add_textfield('keyword_firstname',get_lang('FirstName'),false);
+if (api_is_western_name_order())
+{
+	$form->add_textfield('keyword_firstname', get_lang('FirstName'), false);
+	$form->add_textfield('keyword_lastname', get_lang('LastName'), false);
+}
+else
+{
+	$form->add_textfield('keyword_lastname',get_lang('LastName'),false);
+	$form->add_textfield('keyword_firstname',get_lang('FirstName'),false);
+}
 if (isset($_GET['id_session'])) 
 	$form->addElement('hidden','id_session',$_GET['id_session']);
 
@@ -233,8 +241,16 @@ $table = new SortableTable('users', 'ldap_get_number_of_users', 'ldap_get_user_d
 $table->set_additional_parameters($parameters);
 $table->set_header(0, '', false);
 $table->set_header(1, get_lang('LoginName'));
-$table->set_header(2, get_lang('LastName'));
-$table->set_header(3, get_lang('FirstName'));
+if (api_is_western_name_order())
+{
+	$table->set_header(2, get_lang('FirstName'));
+	$table->set_header(3, get_lang('LastName'));
+}
+else
+{
+	$table->set_header(2, get_lang('LastName'));
+	$table->set_header(3, get_lang('FirstName'));
+}
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));
 //$table->set_column_filter(5, 'email_filter');

main/admin/resume_session.php

@@ -118,7 +118,7 @@ api_display_tool_title($tool_name);
 </tr>
 <tr>
 	<td><?php echo get_lang('GeneralCoach'); ?> :</td>
-	<td><?php echo $session['lastname'].' '.$session['firstname'].' ('.$session['username'].')' ?></td>
+	<td><?php echo api_get_person_name($session['firstname'], $session['lastname']).' ('.$session['username'].')' ?></td>
 </tr>
 <tr>
 	<td><?php echo get_lang('Date'); ?> :</td>
@@ -194,7 +194,7 @@ else {
 		if (empty($course['username'])) {
 			$coach = get_lang('None');
 		} else {
-			$coach = $course['lastname'].' '.$course['firstname'].' ('.$course['username'].')';
+			$coach = api_get_person_name($course['firstname'], $course['lastname']).' ('.$course['username'].')';
 		}
 
 		$orig_param = '&origin=resume_session';	
@@ -235,13 +235,12 @@ if($session['nbr_users']==0){
 else {
 
 	// classe development, obsolete for the moment
-
+	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 	$sql = 'SELECT '.$tbl_user.'.user_id, lastname, firstname, username
 			FROM '.$tbl_user.'
 			INNER JOIN '.$tbl_session_rel_user.'
 				ON '.$tbl_user.'.user_id = '.$tbl_session_rel_user.'.id_user
-				AND '.$tbl_session_rel_user.'.id_session = '.$id_session.'
-			ORDER BY lastname, firstname';
+				AND '.$tbl_session_rel_user.'.id_session = '.$id_session.$order_clause;
 
 	$result=api_sql_query($sql,__FILE__,__LINE__);
 	$users=api_store_result($result);
@@ -249,7 +248,7 @@ else {
 	foreach($users as $user){
 		echo '<tr>
 					<td width="90%">
-						<b>'.$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')</b>
+						<b>'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</b>
 					</td>
 					<td>
 						<a href="../mySpace/myStudents.php?student='.$user['user_id'].''.$orig_param.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;<a href="'.api_get_self().'?id_session='.$id_session.'&action=delete&user='.$user['user_id'].'" onclick="javascript:if(!confirm(\''.get_lang('ConfirmYourChoice').'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>

main/admin/session_add.php

@@ -18,7 +18,7 @@ require_once('../inc/global.inc.php');
 
 // including additional libraries
 require_once(api_get_path(LIBRARY_PATH).'sessionmanager.lib.php');
-require_once('../inc/lib/xajax/xajax.inc.php');
+require_once ('../inc/lib/xajax/xajax.inc.php');
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction ('search_coachs');
@@ -51,14 +51,16 @@ function search_coachs($needle)
 		$charset = api_get_setting('platform_charset');
 		$needle = api_convert_encoding($needle, $charset, 'utf-8');
 
+		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+
 		// search users where username or firstname or lastname begins likes $needle
 		$sql = 'SELECT username, lastname, firstname FROM '.$tbl_user.' user
 				WHERE (username LIKE "'.$needle.'%"
 				OR firstname LIKE "'.$needle.'%"
 				OR lastname LIKE "'.$needle.'%")
-				AND status=1
-				ORDER BY lastname, firstname, username
-				LIMIT 10'; 
+				AND status=1'.
+				$order_clause.
+				' LIMIT 10';
 
 		global $_configuration;	
 		if ($_configuration['multiple_access_urls']==true) {		
@@ -71,19 +73,19 @@ function search_coachs($needle)
 				WHERE access_url_id = '.$access_url_id.'  AND (username LIKE "'.$needle.'%"
 				OR firstname LIKE "'.$needle.'%"
 				OR lastname LIKE "'.$needle.'%")
-				AND status=1
-				ORDER BY lastname, firstname, username
-				LIMIT 10';			
+				AND status=1'.
+				$order_clause.
+				' LIMIT 10';			
 				
 			}
 		}		
 				
 		$rs = api_sql_query($sql, __FILE__, __LINE__);
 		while ($user = Database :: fetch_array($rs)) {
-			$return .= '<a href="#" onclick="fill_coach_field(\''.$user['username'].'\')">'.$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')</a><br />';
+			$return .= '<a href="javascript: void(0);" onclick="javascript: fill_coach_field(\''.$user['username'].'\')">'.api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')</a><br />';
 		}
 	}
-	$xajax_response -> addAssign('ajax_list_coachs','innerHTML',api_utf8_encode($return));
+	$xajax_response -> addAssign('ajax_list_coachs','innerHTML', api_utf8_encode($return));
 	return $xajax_response;
 }
 $xajax -> processRequests();
@@ -353,7 +355,7 @@ for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
 </form>
 <script type="text/javascript">
 
-function setDisable(select) {
+function setDisable(select){
 	document.form.day_start.disabled = (select.checked) ? true : false;
 	document.form.month_start.disabled = (select.checked) ? true : false;
 	document.form.year_start.disabled = (select.checked) ? true : false;

main/admin/session_course_edit.php

@@ -64,7 +64,8 @@ if ($_POST['formSent']) {
 	}
 }
 
-$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1' ORDER BY lastname,firstname,username";
+$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1'".$order_clause;
 
 $result=api_sql_query($sql,__FILE__,__LINE__);
 
@@ -110,7 +111,7 @@ foreach($coaches as $enreg)
 {
 ?>
 
-	<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && $enreg['user_id'] == $infos['id_coach']) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo $enreg['lastname'].' '.$enreg['firstname'].' ('.$enreg['username'].')'; ?></option>
+	<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && $enreg['user_id'] == $infos['id_coach']) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['lastname'], $enreg['firstname']).' ('.$enreg['username'].')'; ?></option>
 
 <?php
 }

main/admin/session_course_user_list.php

@@ -20,7 +20,7 @@ $id_session=intval($_GET['id_session']);
 $course_code=trim(stripslashes($_GET['course_code']));
 $page=intval($_GET['page']);
 $action=$_REQUEST['action'];
-$sort=in_array($_GET['sort'],array('lastname','firstname','username'))?$_GET['sort']:'lastname';
+$sort=in_array($_GET['sort'],array('lastname','firstname','username'))?$_GET['sort']:api_sort_by_first_name()?'firstname':'lastname';
 $idChecked = (is_array($_GET['idChecked']) ? $_GET['idChecked'] : (is_array($_POST['idChecked']) ? $_POST['idChecked'] : null));
 if (is_array($idChecked)) {
 	$my_temp = array(); 
@@ -50,8 +50,9 @@ if($action == 'delete') {
 
 $limit=20;
 $from=$page * $limit;
+$is_western_name_order = api_is_western_name_order();
 
-$result=api_sql_query("SELECT user_id,lastname,firstname,username FROM $tbl_session_rel_course_rel_user,$tbl_user WHERE user_id=id_user AND id_session='$id_session' AND course_code='".addslashes($course_code)."' ORDER BY $sort LIMIT $from,".($limit+1),__FILE__,__LINE__);
+$result=api_sql_query("SELECT user_id,".($is_western_name_order ? 'firstname,lastname' : 'lastname,firstname').",username FROM $tbl_session_rel_course_rel_user,$tbl_user WHERE user_id=id_user AND id_session='$id_session' AND course_code='".addslashes($course_code)."' ORDER BY $sort LIMIT $from,".($limit+1),__FILE__,__LINE__);
 $Users=api_store_result($result);
 
 $nbr_results=sizeof($Users);
@@ -93,8 +94,13 @@ if($nbr_results > $limit) {
 <table class="data_table" width="100%">
 <tr>
   <th>&nbsp;</th>
+  <?php if ($is_western_name_order) { ?>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname"><?php echo get_lang('FirstName');?></a></th>
+  <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname"><?php echo get_lang('LastName');?></a></th>
+  <?php } else { ?>
   <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=lastname"><?php echo get_lang('LastName');?></a></th>
   <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=firstname"><?php echo get_lang('FirstName');?></a></th>
+  <?php } ?>
   <th><a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=username"><?php echo get_lang('Login');?></a></th>
   <th><?php echo get_lang('Actions');?></th>
 </tr>
@@ -110,8 +116,13 @@ foreach($Users as $key=>$enreg) {
 
 <tr class="<?php echo $i?'row_odd':'row_even'; ?>">
   <td><input type="checkbox" name="idChecked[]" value="<?php echo $enreg['user_id']; ?>"></td>
+  <?php if ($is_western_name_order) { ?>
+  <td><?php echo api_htmlentities($enreg['firstname'],ENT_QUOTES,$charset); ?></td>
+  <td><?php echo api_htmlentities($enreg['lastname'],ENT_QUOTES,$charset); ?></td>
+  <?php } else { ?>
   <td><?php echo api_htmlentities($enreg['lastname'],ENT_QUOTES,$charset); ?></td>
   <td><?php echo api_htmlentities($enreg['firstname'],ENT_QUOTES,$charset); ?></td>
+  <?php } ?>
   <td><?php echo api_htmlentities($enreg['username'],ENT_QUOTES,$charset); ?></td>
   <td>
 	<a href="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&sort=<?php echo $sort; ?>&action=delete&idChecked[]=<?php echo $enreg['user_id']; ?>" onclick="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;"><?php Display::display_icon('delete.gif', get_lang('Delete')); ?></a>

main/admin/session_edit.php

@@ -60,7 +60,8 @@ if ($_POST['formSent']) {
 	}
 }
 
-$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1' ORDER BY lastname,firstname,username";
+$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
+$sql="SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE status='1'".$order_clause;
 
 if ($_configuration['multiple_access_urls']==true){
 	$table_access_url_rel_user= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);	
@@ -68,8 +69,7 @@ if ($_configuration['multiple_access_urls']==true){
 	if ($access_url_id != -1) {
 		$sql="SELECT DISTINCT u.user_id,lastname,firstname,username FROM $tbl_user u INNER JOIN $table_access_url_rel_user url_rel_user
 			ON (url_rel_user.user_id = u.user_id)
-			WHERE status='1' AND access_url_id = $access_url_id
-			ORDER BY lastname,firstname,username";
+			WHERE status='1' AND access_url_id = $access_url_id.$order_clause;
 	}
 }
 
@@ -109,7 +109,7 @@ if (!empty($return)) {
 foreach($Coaches as $enreg) {
 ?>
 
-	<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && $enreg['user_id'] == $infos['id_coach']) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo $enreg['lastname'].' '.$enreg['firstname'].' ('.$enreg['username'].')'; ?></option>
+	<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && $enreg['user_id'] == $infos['id_coach']) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
 
 <?php
 }

main/admin/session_list.php

@@ -286,8 +286,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
 		</div>
 	
 		<br />
-		<a href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'true');return false;"><?php echo get_lang('SelectAll') ?></a>&nbsp;-&nbsp;
-		<a href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'false');return false;"><?php echo get_lang('UnSelectAll') ?></a>
+		<a href="javascript: void(0);" onclick="javascript: selectAll('idChecked',<?php echo $x; ?>,'true');return false;"><?php echo get_lang('SelectAll') ?></a>&nbsp;-&nbsp;
+		<a href="javascript: void(0);" onclick="javascript: selectAll('idChecked',<?php echo $x; ?>,'false');return false;"><?php echo get_lang('UnSelectAll') ?></a>
 		<select name="action">
 		<option value="delete"><?php echo get_lang('DeleteSelectedSessions'); ?></option>
 		</select>

main/auth/ldap/authldap.php

@@ -516,6 +516,7 @@ function ldap_get_number_of_users()
 function ldap_get_user_data($from, $number_of_items, $column, $direction)
 {
 	$users = array();
+	$is_western_name_order = api_is_western_name_order();
 	if (isset($_GET['submit']))
 	{
 		$info = ldap_get_users();
@@ -532,8 +533,16 @@ function ldap_get_user_data($from, $number_of_items, $column, $direction)
 				//$user[] = $dn_array[0]; // uid is first key
 				$user[] = $info[$key]['uid'][0];
 				$user[] = $info[$key]['uid'][0];
-				$user[] = api_convert_encoding($info[$key]['givenname'][0], api_get_system_encoding(), 'UTF-8');
-				$user[] = api_convert_encoding($info[$key]['sn'][0], api_get_system_encoding(), 'UTF-8');
+				if ($is_western_name_order)
+				{
+					$user[] = api_convert_encoding($info[$key]['givenname'][0], api_get_system_encoding(), 'UTF-8');
+					$user[] = api_convert_encoding($info[$key]['sn'][0], api_get_system_encoding(), 'UTF-8');
+				}
+				else
+				{
+					$user[] = api_convert_encoding($info[$key]['sn'][0], api_get_system_encoding(), 'UTF-8');
+					$user[] = api_convert_encoding($info[$key]['givenname'][0], api_get_system_encoding(), 'UTF-8');
+				}
 				$user[] = $info[$key]['mail'][0];
 				$outab[] = $info[$key]['eduPersonPrimaryAffiliation'][0]; // Ici "student"
 				$users[] = $user;