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

Bug #3646 and Issue #306 - User profile and Platform administrator's tools (Part 5): Fixing person name order and sorting to be dependable on the internationalization settings.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 6fd0b54690
commit ed64d52dac
5 changed files with 327 additions and 310 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. 25
      main/admin/course_information.php
  2. 8
      main/admin/session_add.php
  3. 36
      main/admin/session_list.php
  4. 6
      main/auth/lost_password.lib.php
  5. 4
      main/auth/my_progress.php

25
main/admin/course_information.php
Unescape View File

@ -103,6 +103,7 @@ $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$sql = "SELECT *,cu.status as course_status FROM $table_course_user cu, $table_user u WHERE cu.user_id = u.user_id AND cu.course_code = '".$code."'";
$res = api_sql_query($sql,__FILE__,__LINE__);
$is_western_name_order = api_is_western_name_order();
if (mysql_num_rows($res) > 0)
{
$users = array ();
@ -110,8 +111,16 @@ if (mysql_num_rows($res) > 0)
{
$user = array ();
$user[] = $obj->official_code;
$user[] = $obj->firstname;
$user[] = $obj->lastname;
if ($is_western_name_order)
{
$user[] = $obj->firstname;
$user[] = $obj->lastname;
}
else
{
$user[] = $obj->lastname;
$user[] = $obj->firstname;
}
$user[] = Display :: encrypted_mailto_link($obj->email, $obj->email);
$user[] = $obj->course_status == 5 ? get_lang('Student') : get_lang('Teacher');
$user[] = '<a href="user_information.php?user_id='.$obj->user_id.'">'.Display::return_icon('synthese_view.gif',get_lang('UserInfo')).'</a>';
@ -121,8 +130,16 @@ if (mysql_num_rows($res) > 0)
$table->set_additional_parameters(array ('code' => $code));
$table->set_other_tables(array('usage_table','class_table'));
$table->set_header(0,get_lang('OfficialCode'), true);
$table->set_header(1,get_lang('FirstName'), true);
$table->set_header(2,get_lang('LastName'), true);
if ($is_western_name_order)
{
$table->set_header(1,get_lang('FirstName'), true);
$table->set_header(2,get_lang('LastName'), true);
}
else
{
$table->set_header(1,get_lang('LastName'), true);
$table->set_header(2,get_lang('FirstName'), true);
}
$table->set_header(3,get_lang('Email'), true);
$table->set_header(4,get_lang('Status'), true);
$table->set_header(5,'', false);

8
main/admin/session_add.php
Unescape View File

@ -163,7 +163,8 @@ $rs = api_sql_query($sql, __FILE__, __LINE__);
$count_users = Database::result($rs, 0, 0);
if (intval($count_users)<50) {
$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;
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -171,8 +172,7 @@ if (intval($count_users)<50) {
if ($access_url_id != -1){
$sql = 'SELECT username, lastname, firstname FROM '.$tbl_user.' user
INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id)
WHERE access_url_id = '.$access_url_id.' AND status=1
ORDER BY lastname, firstname, username';
WHERE access_url_id = '.$access_url_id.' AND status=1'.$order_clause;
}
}
@ -182,7 +182,7 @@ if (intval($count_users)<50) {
<select name="coach_username" value="true" style="width:250px;">
<option value="0"><?php get_lang('None'); ?></option>
<?php foreach($Coaches as $enreg): ?>
<option value="<?php echo $enreg['username']; ?>" <?php if($sent && $enreg['user_id'] == $id_coach) echo 'selected="selected"'; ?>><?php echo $enreg['firstname'].' '.$enreg['lastname'].' ('.$enreg['username'].')'; ?></option>
<option value="<?php echo $enreg['username']; ?>" <?php if($sent && $enreg['user_id'] == $id_coach) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
<?php endforeach; ?>
</select>
<?php

36
main/admin/session_list.php
Unescape View File

@ -67,8 +67,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
} else {
$limit = 20;
$from = $page * $limit;
$limit=20;
$from=$page * $limit;
//if user is crfp admin only list its sessions
if(!api_is_platform_admin()) {
@ -85,11 +85,11 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$and=" AND id_coach=user_id";
}
if (isset($_REQUEST['active']) && !isset($_REQUEST['inactive']) ){
if(isset($_REQUEST['active']) && !isset($_REQUEST['inactive']) ){
$and .= ' AND ( (session.date_start <= CURDATE() AND session.date_end >= CURDATE()) OR session.date_start="0000-00-00" ) ';
$cond_url = '&amp;active='.Security::remove_XSS($_REQUEST['active']);
}
if (!isset($_REQUEST['active']) && isset($_REQUEST['inactive']) ){
if(!isset($_REQUEST['active']) && isset($_REQUEST['inactive']) ){
$and .= ' AND ( (session.date_start > CURDATE() OR session.date_end < CURDATE()) AND session.date_start<>"0000-00-00" ) ';
$cond_url = '&amp;inactive='.Security::remove_XSS($_REQUEST['inactive']);
}
@ -136,9 +136,9 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$recorset = Database::fetch_array($result_rows);
$num = $recorset['total_rows'];
$result = api_sql_query($query,__FILE__,__LINE__);
$Sessions = api_store_result($result);
$nbr_results = sizeof($Sessions);
$result=api_sql_query($query,__FILE__,__LINE__);
$Sessions=api_store_result($result);
$nbr_results=sizeof($Sessions);
$tool_name = get_lang('SessionList');
Display::display_header($tool_name);
//api_display_tool_title($tool_name);
@ -149,13 +149,13 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
if(isset($_GET['action'])) {
Display::display_normal_message(stripslashes($_GET['message']),false);
}
?>
?>
<div class="actions">
<?php
echo '<div style="float:right;">
<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_add.php">'.Display::return_icon('view_more_stats.gif',get_lang('AddSession')).get_lang('AddSession').'</a>
</div>';
</div>';
?>
<form method="POST" action="session_list.php">
<input type="text" name="keyword" value="<?php echo Security::remove_XSS($_GET['keyword']); ?>"/>
@ -171,8 +171,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
echo get_lang('NoSearchResults');
echo ' </div>';
} else {
if ($num > $limit) {
if ($page) {
if($num>$limit){
if($page) {
?>
<a href="<?php echo api_get_self(); ?>?page=<?php echo $page-1; ?>&sort=<?php echo $sort; ?>&keyword=<?php echo $_REQUEST['keyword']; ?><?php echo @$cond_url; ?>"><?php echo get_lang('Previous'); ?></a>
<?php
@ -220,11 +220,11 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
<tr class="<?php echo $i?'row_odd':'row_even'; ?>">
<td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]" value="<?php echo $enreg['id']; ?>"></td>
<td><a href="resume_session.php?id_session=<?php echo $enreg['id']; ?>"><?php echo api_htmlentities($enreg['name'],ENT_QUOTES,$charset); ?></a></td>
<td><a href="session_course_list.php?id_session=<?php echo $enreg['id']; ?>"><?php echo $nb_courses; ?> cours</a></td>
<td><?php echo api_htmlentities($enreg['date_start'],ENT_QUOTES,$charset); ?></td>
<td><?php echo api_htmlentities($enreg['date_end'],ENT_QUOTES,$charset); ?></td>
<td><?php echo api_htmlentities($enreg['firstname'],ENT_QUOTES,$charset).' '.api_htmlentities($enreg['lastname'],ENT_QUOTES,$charset); ?></td>
<td><a href="resume_session.php?id_session=<?php echo $enreg['id']; ?>"><?php echo api_htmlentities($enreg['name'],ENT_QUOTES,$charset); ?></a></td>
<td><a href="session_course_list.php?id_session=<?php echo $enreg['id']; ?>"><?php echo $nb_courses; ?> cours</a></td>
<td><?php echo api_htmlentities($enreg['date_start'],ENT_QUOTES,$charset); ?></td>
<td><?php echo api_htmlentities($enreg['date_end'],ENT_QUOTES,$charset); ?></td>
<td><?php echo api_htmlentities(api_get_person_name($enreg['firstname'], $enreg['lastname']),ENT_QUOTES,$charset); ?></td>
<td>
<a href="add_users_to_session.php?page=session_list.php&id_session=<?php echo $enreg['id']; ?>"><?php Display::display_icon('add_user_big.gif', get_lang('SubscribeUsersToSession')); ?></a>
<a href="add_courses_to_session.php?page=session_list.php&id_session=<?php echo $enreg['id']; ?>"><?php Display::display_icon('synthese_view.gif', get_lang('SubscribeCoursesToSession')); ?></a>
@ -250,8 +250,8 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
<?php
if ($num > $limit) {
if ($page)
if($num>$limit) {
if($page)
{
?>

6
main/auth/lost_password.lib.php
Unescape View File

@ -10,7 +10,7 @@
function get_email_headers()
{
global $charset;
$emailHeaders = "From: \"".addslashes(api_get_setting('administratorSurname')." ".api_get_setting('administratorName'))."\" <".api_get_setting('emailAdministrator').">\n";
$emailHeaders = "From: \"".addslashes(api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS))."\" <".api_get_setting('emailAdministrator').">\n";
$emailHeaders .= "Reply-To: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "Return-Path: ".api_get_setting('emailAdministrator')."\n";
$emailHeaders .= "X-Sender: ".api_get_setting('emailAdministrator')."\n";
@ -85,7 +85,7 @@ function send_password_to_user($user)
$emailBody = get_lang('YourAccountParam')." ".$portal_url."\n\n$userAccountList";
// SEND MESSAGE
$emailTo = $user[0]["email"];
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1) {
@ -116,7 +116,7 @@ function handle_encrypted_password($user)
$emailBody .= "-----------------------------------------------\n".$userAccountList."\n-----------------------------------------------\n\n";
$emailBody .=get_lang('PasswordEncryptedForSecurity');
$emailBody .="\n\n".get_lang('Formula').",\n".get_lang('PlataformAdmin');
$sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname');
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator');
if (@api_mail('', $emailTo, $emailSubject, $emailBody, $sender_name,$email_admin)==1)

4
main/auth/my_progress.php
Unescape View File

@ -190,12 +190,12 @@ foreach($Courses as $enreg)
if($session_course_coach_id!=0)
{
$coach_infos = UserManager :: get_user_info_by_id($session_course_coach_id);
$a_infosCours['tutor_name'] = $coach_infos['firstname'].' '.$coach_infos['lastname'];
$a_infosCours['tutor_name'] = api_get_person_name($coach_infos['firstname'], $coach_infos['lastname']);
}
else if($session_coach_id!=0)
{
$coach_infos = UserManager :: get_user_info_by_id($session_coach_id);
$a_infosCours['tutor_name'] = $coach_infos['firstname'].' '.$coach_infos['lastname'];
$a_infosCours['tutor_name'] = api_get_person_name($coach_infos['firstname'], $coach_infos['lastname']);
}
}
} // end if(api_get_setting('use_session_mode')=='true')

Write Preview
Loading…
Cancel
Save