chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r11239] invert the firstname and lastname

Browse Source 
userInfo.php : fix a bug
skala
Julian Prud'homme 19 years ago
parent 3e27314502
commit 80b6a073e1
6 changed files with 27 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/admin/course_add.php
  2. 10
      main/admin/user_list.php
  3. 10
      main/mySpace/coaches.php
  4. 14
      main/mySpace/teachers.php
  5. 10
      main/user/user.php
  6. 5
      main/user/userInfo.php

4
main/admin/course_add.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: course_add.php 11050 2007-02-02 10:48:43Z elixir_julian $
// $Id: course_add.php 11239 2007-02-26 15:44:23Z elixir_julian $
/*
==============================================================================
Dokeos - elearning and course management software
@ -71,7 +71,7 @@ $res = api_sql_query($sql,__FILE__,__LINE__);
$teachers = array();
while($obj = mysql_fetch_object($res))
{
$teachers[$obj->user_id] = $obj->lastname.' '.$obj->firstname;
$teachers[$obj->user_id] = $obj->firstname.' '.$obj->lastname;
}
// Build the form
$form = new FormValidator('update_course');

10
main/admin/user_list.php
Unescape View File

@ -1,6 +1,6 @@
<?php
// $Id: user_list.php 10926 2007-01-26 14:34:47Z elixir_julian $
// $Id: user_list.php 11239 2007-02-26 15:44:23Z elixir_julian $
/*
==============================================================================
Dokeos - elearning and course management software
@ -192,8 +192,8 @@ function get_user_data($from, $number_of_items, $column, $direction)
$sql = "SELECT
user_id AS col0,
official_code AS col1,
lastname AS col2,
firstname AS col3,
firstname AS col2,
lastname AS col3,
username AS col4,
email AS col5,
IF(status=1,'".get_lang('Teacher')."','".get_lang('Student')."') AS col6,
@ -471,8 +471,8 @@ else
$table->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'));

10
main/mySpace/coaches.php
Unescape View File

@ -162,10 +162,10 @@ $resultCoachs = api_sql_query($sqlCoachs);
echo '<table class="data_table">
<tr>
<th>
'.get_lang('LastName').'
'.get_lang('FirstName').'
</th>
<th>
'.get_lang('FirstName').'
'.get_lang('LastName').'
</th>
<th>
'.get_lang('ConnectionTime').'
@ -179,8 +179,8 @@ echo '<table class="data_table">
</tr>
';
$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 '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td>'.$s_connection_time.'</td><td><a href="cours.php?type=coach&user_id='.$i_id_coach.'">-></a></td><td><a href="student.php?type=coach&user_id='.$i_id_coach.'">-></a></td></tr>';
echo '<tr class="'.$s_css_class.'"><td>'.$s_firstname.'</td><td>'.$s_lastname.'</td><td>'.$s_connection_time.'</td><td><a href="cours.php?type=coach&user_id='.$i_id_coach.'">-></a></td><td><a href="student.php?type=coach&user_id='.$i_id_coach.'">-></a></td></tr>';
}

14
main/mySpace/teachers.php
Unescape View File

@ -104,10 +104,10 @@ $resultFormateurs = api_sql_query($sqlFormateurs);
echo '<table class="data_table">
<tr>
<th>
'.get_lang('LastName').'
'.get_lang('FirstName').'
</th>
<th>
'.get_lang('FirstName').'
'.get_lang('LastName').'
</th>
<th>
'.get_lang('Email').'
@ -121,8 +121,8 @@ echo '<table class="data_table">
</tr>
';
$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 '<tr>
<th>
'.get_lang('LastName').'
'.get_lang('FirstName').'
</th>
<th>
'.get_lang('FirstName').'
'.get_lang('LastName').'
</th>
<th>
'.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 '<tr class="'.$s_css_class.'"><td>'.$s_lastname.'</td><td>'.$s_firstname.'</td><td><a href="mailto:'.$s_email.'">'.$s_email.'</a></td><td><a href="cours.php?user_id='.$i_user_id.'">-></a></td><td><a href="student.php?user_id='.$i_user_id.'">-></a></td></tr>';
echo '<tr class="'.$s_css_class.'"><td>'.$s_firstname.'</td><td>'.$s_lastname.'</td><td><a href="mailto:'.$s_email.'">'.$s_email.'</a></td><td><a href="cours.php?user_id='.$i_user_id.'">-></a></td><td><a href="student.php?user_id='.$i_user_id.'">-></a></td></tr>';
}

10
main/user/user.php
Unescape View File

@ -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())

5
main/user/userInfo.php
Unescape View File

@ -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);

Write Preview
Loading…
Cancel
Save