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 - Common Dokeos libraries (part 2): Fixing person name order to be dependable on the internationalization settings. Other minor corrections.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent bda4e3c0a0
commit 150163859a
7 changed files with 41 additions and 36 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. 23
      main/inc/lib/groupmanager.lib.php
  2. 5
      main/inc/lib/online.inc.php
  3. 4
      main/inc/lib/social.lib.php
  4. 12
      main/inc/lib/surveymanager.lib.php
  5. 2
      main/inc/lib/system_announcements.lib.php
  6. 18
      main/inc/lib/urlmanager.lib.php
  7. 13
      main/inc/lib/usermanager.lib.php

23
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -251,6 +251,10 @@ class GroupManager {
}
$counter++;
}
// A sanity check.
if (empty($forum_category_id)) {
$forum_category_id = 0;
}
$values['forum_category'] = $forum_category_id;
$values['allow_anonymous_group']['allow_anonymous'] = 0;
$values['students_can_edit_group']['students_can_edit'] = 0;
@ -1035,12 +1039,12 @@ class GroupManager {
public static function get_subscribed_users ($group_id) {
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_group_user = Database :: get_course_table(TABLE_GROUP_USER);
$order_clause = api_sort_by_first_name() ? ' ORDER BY `u`.`firstname`, `u`.`lastname`' : ' ORDER BY `u`.`lastname`, `u`.`firstname`';
$group_id = Database::escape_string($group_id);
$sql = "SELECT `ug`.`id`, `u`.`user_id`, `u`.`lastname`, `u`.`firstname`, `u`.`email`
FROM ".$table_user." u, ".$table_group_user." ug
WHERE `ug`.`group_id`='".$group_id."'
AND `ug`.`user_id`=`u`.`user_id`
ORDER BY UPPER(`u`.`lastname`), UPPER(`u`.`firstname`)";
FROM ".$table_user." u, ".$table_group_user." ug
WHERE `ug`.`group_id`='".$group_id."'
AND `ug`.`user_id`=`u`.`user_id`". $order_clause;
$db_result = api_sql_query($sql,__FILE__,__LINE__);
$users = array ();
while ($user = Database::fetch_object($db_result))
@ -1064,13 +1068,12 @@ class GroupManager {
public static function get_subscribed_tutors ($group_id,$id_only=false) {
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_group_tutor = Database :: get_course_table(TABLE_GROUP_TUTOR);
$order_clause = api_sort_by_first_name() ? ' ORDER BY `u`.`firstname`, `u`.`lastname`' : ' ORDER BY `u`.`lastname`, `u`.`firstname`';
$group_id = Database::escape_string($group_id);
$sql = "SELECT `tg`.`id`, `u`.`user_id`, `u`.`lastname`, `u`.`firstname`, `u`.`email`
FROM ".$table_user." u, ".$table_group_tutor." tg
WHERE `tg`.`group_id`='".$group_id."'
AND `tg`.`user_id`=`u`.`user_id`
ORDER BY UPPER(`u`.`lastname`), UPPER(`u`.`firstname`)";
FROM ".$table_user." u, ".$table_group_tutor." tg
WHERE `tg`.`group_id`='".$group_id."'
AND `tg`.`user_id`=`u`.`user_id`".$order_clause;
$db_result = api_sql_query($sql,__FILE__,__LINE__);
$users = array ();
while ($user = Database::fetch_object($db_result))
@ -1369,7 +1372,7 @@ class GroupManager {
$status = $this_user["status"];
//$role = $this_user["role"];
$tutor_id = $this_user["tutor_id"];
$full_name = $lastname.", ".$firstname;
$full_name = api_get_person_name($firstname, $lastname);
if ($lastname == "" || $firstname == '')
$full_name = $loginname;
$complete_user["user_id"] = $user_id;

5
main/inc/lib/online.inc.php
Unescape View File

@ -217,13 +217,12 @@ function GetFullUserName($uid)
$result = @api_sql_query($query,__FILE__,__LINE__);
if (count($result)>0)
{
$str = "";
$str = '';
while(list($firstname,$lastname)= Database::fetch_array($result))
{
$str = $lastname." ".$firstname;
$str = str_replace(' ', ' ', api_get_person_name($firstname, $lastname));
return $str;
}
}
}

4
main/inc/lib/social.lib.php
Unescape View File

@ -142,7 +142,7 @@ class UserFriend extends UserManager {
$sql.=' AND relation_type='.$id_group;
}
if (isset($search_name) && is_string($search_name)===true) {
$sql.=' AND friend_user_id IN (SELECT user_id FROM '.$tbl_my_user.' WHERE concat(firstName,lastName) like concat("%","'.Database::escape_string($search_name).'","%"));';
$sql.=' AND friend_user_id IN (SELECT user_id FROM '.$tbl_my_user.' WHERE '.(api_is_western_name_order() ? 'concat(firstName, lastName)' : 'concat(lastName, firstName)').' like concat("%","'.Database::escape_string($search_name).'","%"));';
}
$res=Database::query($sql,__FILE__,__LINE__);
while ($row=Database::fetch_array($res,'ASSOC')) {
@ -304,7 +304,7 @@ class UserFriend extends UserManager {
$user_info=array();
$user_info=api_get_user_info($userfriend_id);
$succes=get_lang('MessageSentTo');
$succes.= ' : '.$user_info['firstName'].' '.$user_info['lastName'];
$succes.= ' : '.api_get_person_name($user_info['firstName'], $user_info['lastName']);
if (isset($subject_message) && isset($content_message) && isset($userfriend_id)) {
$send_message = MessageManager::send_message(((int)$userfriend_id),Database::escape_string($subject_message), Database::escape_string($content_message));
if ($send_message) {

12
main/inc/lib/surveymanager.lib.php
Unescape View File

@ -1739,20 +1739,18 @@ function listAnswers($qid){
* Possible deprecated method
*/
function listUsers($survey_id, $dbname, $fields='id, user_id, firstname, lastname, email, organization') {
$tbl_survey_users = Database :: get_main_table(TABLE_MAIN_SURVEY_USER);
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
$sql = 'SELECT '.$fields.' FROM '.$tbl_survey_users.'
WHERE survey_id='.$survey_id.'
AND db_name="'.$dbname.'"
ORDER BY lastname, firstname ';
AND db_name="'.$dbname.
$order_clause;
$rs = api_sql_query($sql, __FILE__, __LINE__);
$users = array();
while($row = mysql_fetch_array($rs))
while ($row = mysql_fetch_array($rs)) {
$users[] = $row;
}
return $users;
}
/**
* Possible deprecated method

2
main/inc/lib/system_announcements.lib.php
Unescape View File

@ -392,7 +392,7 @@ class SystemAnnouncementManager
$result = api_sql_query($sql,__FILE__,__LINE__);
while($row = Database::fetch_array($result,'ASSOC'))
{
api_mail_html($row['firstname'].' '.$row['lastname'], $row['email'], api_html_entity_decode(stripslashes($title),ENT_QUOTES,$charset), api_html_entity_decode(stripslashes($content),ENT_QUOTES,$charset), $_user['firstName'].' '.$_user['lastName'], api_get_setting('emailAdministrator'), api_get_setting('emailAdministrator'));
api_mail_html(api_get_person_name($row['firstname'], $row['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), $row['email'], api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset), api_html_entity_decode(stripslashes($content), ENT_QUOTES, $charset), api_get_person_name($_user['firstName'], $_user['lastName'], null, PERSON_NAME_EMAIL_ADDRESS), api_get_setting('emailAdministrator'), api_get_setting('emailAdministrator'));
}
}
}

18
main/inc/lib/urlmanager.lib.php
Unescape View File

@ -171,20 +171,18 @@ class UrlManager
* */
function get_url_rel_user_data($access_url_id='')
{
$where ='';
$where = '';
$table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
if (!empty($access_url_id))
if (!empty($access_url_id)) {
$where ="WHERE $table_url_rel_user.access_url_id = ".Database::escape_string($access_url_id);
}
$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
$sql="SELECT u.user_id, lastname, firstname, username, access_url_id
FROM $tbl_user u
INNER JOIN $table_url_rel_user
ON $table_url_rel_user.user_id = u.user_id
$where
ORDER BY lastname,firstname,username";
FROM $tbl_user u
INNER JOIN $table_url_rel_user
ON $table_url_rel_user.user_id = u.user_id
$where".$order_clause;
$result=api_sql_query($sql,__FILE__,__LINE__);
$users=api_store_result($result);
return $users;

13
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1198,6 +1198,10 @@ class UserManager {
* @return array Array of fields => value for the given user
*/
public static function get_extra_user_data ($user_id, $prefix=false, $all_visibility = true, $splitmultiple=false) {
// A sanity check.
if (empty($user_id)) {
$user_id = 0;
}
$extra_data = array();
$t_uf = Database::get_main_table(TABLE_MAIN_USER_FIELD);
$t_ufv = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
@ -1271,6 +1275,10 @@ class UserManager {
*/
public static function get_extra_user_data_by_field ($user_id, $field_variable, $prefix=false, $all_visibility = true, $splitmultiple=false) {
// A sanity check.
if (empty($user_id)) {
$user_id = 0;
}
$extra_data = array();
$t_uf = Database::get_main_table(TABLE_MAIN_USER_FIELD);
$t_ufv = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
@ -1526,11 +1534,10 @@ class UserManager {
$sessions = array_merge($sessions , api_store_result($result));
if(api_is_allowed_to_create_course()) {
foreach($sessions as $enreg) {
$id_session = $enreg['id'];
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
FROM $tbl_session_course as session_course
INNER JOIN $tbl_course AS course
ON course.code = session_course.course_code
@ -1555,7 +1562,7 @@ class UserManager {
foreach($sessions as $enreg) {
$id_session = $enreg['id'];
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, IF(session_course.id_coach = ".$user_id.",'2', '5')
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, IF(session_course.id_coach = ".$user_id.",'2', '5')
FROM $tbl_session_course as session_course
INNER JOIN $tbl_course AS course
ON course.code = session_course.course_code

Write Preview
Loading…
Cancel
Save