diff --git a/main/admin/course_add.php b/main/admin/course_add.php index cec154a527..fa80057915 100644 --- a/main/admin/course_add.php +++ b/main/admin/course_add.php @@ -1,5 +1,5 @@ user_id] = $obj->lastname.' '.$obj->firstname; + $teachers[$obj->user_id] = $obj->firstname.' '.$obj->lastname; } // Build the form $form = new FormValidator('update_course'); diff --git a/main/admin/user_list.php b/main/admin/user_list.php index b3aab1dacb..3d6aaa46f5 100644 --- a/main/admin/user_list.php +++ b/main/admin/user_list.php @@ -1,6 +1,6 @@ set_additional_parameters($parameters); $table->set_header(0, '', false); $table->set_header(1, get_lang('OfficialCode')); - $table->set_header(2, get_lang('LastName')); - $table->set_header(3, get_lang('FirstName')); + $table->set_header(2, get_lang('FirstName')); + $table->set_header(3, get_lang('LastName')); $table->set_header(4, get_lang('LoginName')); $table->set_header(5, get_lang('Email')); $table->set_header(6, get_lang('Status')); diff --git a/main/mySpace/coaches.php b/main/mySpace/coaches.php index 240df57819..683f34e6af 100644 --- a/main/mySpace/coaches.php +++ b/main/mySpace/coaches.php @@ -162,10 +162,10 @@ $resultCoachs = api_sql_query($sqlCoachs); echo '
- '.get_lang('LastName').' + '.get_lang('FirstName').' - '.get_lang('FirstName').' + '.get_lang('LastName').' '.get_lang('ConnectionTime').' @@ -179,8 +179,8 @@ echo ' '; -$a_header[]=get_lang('LastName'); $a_header[]=get_lang('FirstName'); +$a_header[]=get_lang('LastName'); $a_header[]=get_lang('ConnectionTime'); if(mysql_num_rows($resultCoachs)>0){ @@ -254,11 +254,11 @@ if(mysql_num_rows($resultCoachs)>0){ $i++; - $a_data[$i_id_coach]["lastname"]=$s_lastname; $a_data[$i_id_coach]["firstname"]=$s_firstname; + $a_data[$i_id_coach]["lastname"]=$s_lastname; $a_data[$i_id_coach]["connection_time"]=$s_connection_time; - echo ''; + echo ''; } diff --git a/main/mySpace/teachers.php b/main/mySpace/teachers.php index 22806009bd..aa305362bf 100644 --- a/main/mySpace/teachers.php +++ b/main/mySpace/teachers.php @@ -104,10 +104,10 @@ $resultFormateurs = api_sql_query($sqlFormateurs); echo '
'.$s_lastname.''.$s_firstname.''.$s_connection_time.'->->
'.$s_firstname.''.$s_lastname.''.$s_connection_time.'->->
- '.get_lang('LastName').' + '.get_lang('FirstName').' - '.get_lang('FirstName').' + '.get_lang('LastName').' '.get_lang('Email').' @@ -121,8 +121,8 @@ echo ' '; -$a_header[]=get_lang('LastName'); $a_header[]=get_lang('FirstName'); +$a_header[]=get_lang('LastName'); $a_header[]=get_lang('Email'); $a_data=array(); @@ -144,10 +144,10 @@ if(mysql_num_rows($resultFormateurs)>0){ if($i%20==0 && $i!=0){ echo ''; + echo ''; } diff --git a/main/user/user.php b/main/user/user.php index b58e7eceb4..2e4c6ebcd9 100644 --- a/main/user/user.php +++ b/main/user/user.php @@ -389,8 +389,8 @@ function get_user_data($from, $number_of_items, $column, $direction) $columns[] = 'u.user_id'; $columns[] = 'u.official_code'; - $columns[] = 'u.lastname'; $columns[] = 'u.firstname'; + $columns[] = 'u.lastname'; $columns[] = 'cu.role'; $columns[] = "''"; //placeholder for group-data $columns[] = "IF(cu.tutor_id = 1,'".get_lang('Tutor')."','')"; @@ -446,8 +446,8 @@ function get_user_data($from, $number_of_items, $column, $direction) $columns[] = 'u.user_id'; $columns[] = 'u.official_code'; - $columns[] = 'u.lastname'; $columns[] = 'u.firstname'; + $columns[] = 'u.lastname'; $columns[] = "''"; $columns[] = "''"; //placeholder for group-data $columns[] = "''"; @@ -487,8 +487,8 @@ function get_user_data($from, $number_of_items, $column, $direction) $columns[] = 'u.user_id'; } $columns[] = 'u.official_code'; - $columns[] = 'u.lastname'; $columns[] = 'u.firstname'; + $columns[] = 'u.lastname'; $columns[] = '""'; $columns[] = "''"; //placeholder for group-data if(api_is_allowed_to_edit()) @@ -525,8 +525,8 @@ function get_user_data($from, $number_of_items, $column, $direction) $columns[] = 'u.user_id'; } $columns[] = 'u.official_code'; - $columns[] = 'u.lastname'; $columns[] = 'u.firstname'; + $columns[] = 'u.lastname'; $columns[] = '""'; $columns[] = "''"; //placeholder for group-data if(api_is_allowed_to_edit()) @@ -628,8 +628,8 @@ $header_nr = 0; $table->set_header($header_nr++, '', false); } $table->set_header($header_nr++, get_lang('OfficialCode')); -$table->set_header($header_nr++, get_lang('LastName')); $table->set_header($header_nr++, get_lang('FirstName')); +$table->set_header($header_nr++, get_lang('LastName')); $table->set_header($header_nr++, get_lang('Role')); $table->set_header($header_nr++, get_lang('Group'),false); if( api_is_allowed_to_edit()) diff --git a/main/user/userInfo.php b/main/user/userInfo.php index 684e811a92..8deeb0e33e 100644 --- a/main/user/userInfo.php +++ b/main/user/userInfo.php @@ -97,8 +97,8 @@ $userIdViewer = $_user['user_id']; // id fo the user currently online //$userIdViewed = $_GET['userIdViewed']; // Id of the user we want to view $allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin; -$allowedToEditDef = $is_courseAdmin; -$is_allowedToTrack = $is_courseAdmin && $_configuration['tracking_enabled']; +$allowedToEditDef = api_is_allowed_to_edit(); +$is_allowedToTrack = api_is_allowed_to_edit() && $_configuration['tracking_enabled']; // Library connection include ("userInfoLib.php"); @@ -301,6 +301,7 @@ elseif ($displayMode == "viewContentEdit") } elseif ($displayMode == "viewMainInfoEdit") { + /*>>>>>>>>>>>> CATEGORIES MAIN INFO : EDIT <<<<<<<<<<<<*/ $mainUserInfo = get_main_user_info($userIdViewed, $courseCode);
- '.get_lang('LastName').' + '.get_lang('FirstName').' - '.get_lang('FirstName').' + '.get_lang('LastName').' '.get_lang('Email').' @@ -168,11 +168,11 @@ if(mysql_num_rows($resultFormateurs)>0){ $i++; - $a_data[$i_user_id]["lastname"]=$s_lastname; $a_data[$i_user_id]["firstname"]=$s_firstname; + $a_data[$i_user_id]["lastname"]=$s_lastname; $a_data[$i_user_id]["email"]=$s_email; - echo '
'.$s_lastname.''.$s_firstname.''.$s_email.'->->
'.$s_firstname.''.$s_lastname.''.$s_email.'->->