From bda4e3c0a066ce14fd6469c398acf31f907df070 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Sat, 5 Sep 2009 19:30:50 +0300 Subject: [PATCH] Bug #3646 and Issue #306 - Common Dokeos libraries: Fixing person name order to be dependable on the internationalization settings. Other minor corrections related to Bug #3384 and Bug #4318. --- main/inc/lib/blog.lib.php | 87 +++++++++---------- main/inc/lib/course.lib.php | 19 ++-- main/inc/lib/display.lib.php | 4 +- .../ajaxfilemanager/inc/class.manager.php | 6 +- .../ajaxfilemanager/inc/class.pagination.php | 2 +- main/inc/lib/fckeditor/repository.php | 2 +- .../document_processor.class.php | 2 +- .../tool_processors/link_processor.class.php | 2 +- .../tool_processors/quiz_processor.class.php | 2 +- 9 files changed, 64 insertions(+), 62 deletions(-) diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index 811abf3235..f3e233b824 100644 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -110,7 +110,7 @@ class Blog { while($user = Database::fetch_array($result)) { - $blog_members[$user['user_id']] = $user['lastname']." " . $user['firstname']; + $blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']); } return $blog_members; @@ -158,8 +158,6 @@ class Blog { // Subscribe the teacher to this blog Blog::set_user_subscribed((int)$this_blog_id,(int)$_user['user_id']); - - return void; } } @@ -188,8 +186,6 @@ class Blog { // Update course homepage link $sql = "UPDATE $tbl_tool SET name = '".Database::escape_string($title)."' WHERE link = 'blog/blog.php?blog_id=".Database::escape_string((int)$blog_id)."' LIMIT 1"; api_sql_query($sql, __FILE__, __LINE__); - - return void; } /** @@ -236,8 +232,6 @@ class Blog { // Delete from course homepage $sql = "DELETE FROM $tbl_tool WHERE link = 'blog/blog.php?blog_id=".(int)$blog_id."'"; api_sql_query($sql, __FILE__, __LINE__); - - return void; } /** @@ -316,8 +310,6 @@ class Blog { { Display::display_error_message(get_lang('UplNoFileUploaded')); } - - return void; } /** @@ -338,8 +330,6 @@ class Blog { // Create the post $sql = "UPDATE $tbl_blogs_posts SET title = '" . Database::escape_string($title)."', full_text = '" . Database::escape_string($full_text)."' WHERE post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."' LIMIT 1 ;"; api_sql_query($sql, __FILE__, __LINE__); - - return void; } /** @@ -371,8 +361,6 @@ class Blog { // Delete posts and attachments delete_all_blog_attachment($blog_id,$post_id); - - return void; } /** @@ -453,10 +441,6 @@ class Blog { } } } - - - - return void; } /** @@ -495,7 +479,6 @@ class Blog { // Finally, delete the selected comment to $sql = "DELETE FROM $tbl_blogs_comments WHERE comment_id = '".(int)$comment_id."'"; api_sql_query($sql, __FILE__, __LINE__); - return void; } /** @@ -569,8 +552,6 @@ class Blog { api_sql_query($sql, __FILE__, __LINE__); } - - return void; } /** @@ -652,8 +633,6 @@ class Blog { api_sql_query($sql, __FILE__, __LINE__); } - - return void; } /** @@ -671,8 +650,6 @@ class Blog { // Delete posts $sql = "DELETE FROM $tbl_blogs_tasks WHERE blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'"; api_sql_query($sql, __FILE__, __LINE__); - - return void; } /** @@ -689,8 +666,6 @@ class Blog { // Delete posts $sql = "DELETE FROM $tbl_blogs_tasks_rel_user WHERE blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."' AND user_id = '".(int)$user_id."'"; api_sql_query($sql, __FILE__, __LINE__); - - return void; } /** @@ -776,8 +751,6 @@ class Blog { VALUES ('".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')"; $result = api_sql_query($sql, __FILE__, __LINE__); } - - return void; } @@ -864,7 +837,7 @@ class Blog { echo ' "> '.$file_name_array['filename'].'
'; echo ''; } - echo '' . get_lang('Author') . ': ' . $blog_post['lastname'] . ' ' . $blog_post['firstname'] . ' - ' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . ''."\n"; + echo '' . get_lang('Author') . ': ' . api_get_person_name($blog_post['firstname'], $blog_post['lastname']) . ' - ' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . ''."\n"; echo ''."\n"; } } @@ -917,7 +890,7 @@ class Blog { global $dateFormatLong; // Put date in correct output format - $date_output = api_ucfirst(format_locale_date($dateFormatLong,strtotime($date_output))); + $date_output = format_locale_date($dateFormatLong,strtotime($date_output)); // Display the posts echo '' . get_lang('PostsOf') . ': ' . $date_output . ''; @@ -954,7 +927,7 @@ class Blog { // Prepare data $blog_post_text = make_clickable(stripslashes($blog_post['full_text'])); - $blog_post_date = api_ucfirst(format_locale_date($dateFormatLong,strtotime($blog_post['date_creation']))); + $blog_post_date = format_locale_date($dateFormatLong,strtotime($blog_post['date_creation'])); $blog_post_time = date('H:m',strtotime($blog_post['date_creation'])); $blog_post_actions = ""; @@ -993,7 +966,7 @@ class Blog { echo '
'; } - echo '' . get_lang('Author') . ': ' . $blog_post['lastname'] . ' ' . $blog_post['firstname'] . ' - ' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . ' - ' . get_lang('Rating') . ': '.Blog::display_rating('post',$blog_id,$post_id) . $rating_select . ''; + echo '' . get_lang('Author') . ': ' . api_get_person_name($blog_post['firstname'], $blog_post['lastname']) . ' - ' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . ' - ' . get_lang('Rating') . ': '.Blog::display_rating('post',$blog_id,$post_id) . $rating_select . ''; echo '' . $blog_post_actions . ''; echo ''; @@ -1167,7 +1140,7 @@ class Blog { // Prepare data $comment_text = make_clickable(stripslashes($comment['comment'])); - $blog_comment_date = api_ucfirst(format_locale_date($dateFormatLong,strtotime($comment['date_creation']))); + $blog_comment_date = format_locale_date($dateFormatLong,strtotime($comment['date_creation'])); $blog_comment_time = date('H:i',strtotime($comment['date_creation'])); $blog_comment_actions = ""; if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= ''; } @@ -1200,7 +1173,7 @@ class Blog { echo '
'; } - echo '' . get_lang('Author') . ': ' . $comment['lastname'] . ' ' . $comment['firstname'] . ' - ' . get_lang('Rating') . ': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']) . $rating_select . ''; + echo '' . get_lang('Author') . ': ' . api_get_person_name($comment['firstname'], $comment['lastname']) . ' - ' . get_lang('Rating') . ': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']) . $rating_select . ''; echo '' . $blog_comment_actions . ''; echo ''; @@ -1572,7 +1545,7 @@ class Blog { $delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"'; echo '', - '' . $assignment['firstname'] . ' ' . $assignment['lastname'] . '', + '' . api_get_person_name($assignment['firstname'], $assignment['lastname']) . '', ''.stripslashes($assignment['title']) . '', ''.stripslashes($assignment['description']) . '', '' . $assignment['target_date'] . '', @@ -1799,7 +1772,7 @@ class Blog { $select_user_list = ''; @@ -1980,7 +1953,7 @@ class Blog { while($user = Database::fetch_array($result)) { - $select_user_list .= ''; + $select_user_list .= ''; } $select_user_list .= ''; @@ -2198,7 +2171,7 @@ class Blog { { while($blog_post = Database::fetch_array($result)) { - echo ''.stripslashes($blog_post['title']) . ', ' . get_lang('WrittenBy') . ' ' . $blog_post['firstname'] . ' '.stripslashes($blog_post['lastname']) . '
'; + echo ''.stripslashes($blog_post['title']) . ', ' . get_lang('WrittenBy') . ' ' . stripslashes(api_get_person_name($blog_post['firstname'], $blog_post['lastname'])) . '
'; } } else @@ -2261,6 +2234,7 @@ class Blog { public static function display_form_user_subscribe ($blog_id) { // Init global $_course; + $is_western_name_order = api_is_western_name_order(); $currentCourse = $_course['sysCode']; $tbl_users = Database::get_main_table(TABLE_MAIN_USER); $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER); @@ -2285,8 +2259,13 @@ class Blog { // Set table headers $column_header[] = array ('', false, ''); - $column_header[] = array (get_lang('LastName'), true, ''); - $column_header[] = array (get_lang('FirstName'), true, ''); + if ($is_western_name_order) { + $column_header[] = array (get_lang('FirstName'), true, ''); + $column_header[] = array (get_lang('LastName'), true, ''); + } else { + $column_header[] = array (get_lang('LastName'), true, ''); + $column_header[] = array (get_lang('FirstName'), true, ''); + } $column_header[] = array (get_lang('Email'), true, ''); $column_header[] = array (get_lang('Register'), false, ''); @@ -2312,8 +2291,13 @@ class Blog { $a_infosUser = UserManager :: get_user_info_by_id($user['user_id']); $row = array (); $row[] = ''; - $row[] = $a_infosUser["lastname"]; - $row[] = $a_infosUser["firstname"]; + if ($is_western_name_order) { + $row[] = $a_infosUser["firstname"]; + $row[] = $a_infosUser["lastname"]; + } else { + $row[] = $a_infosUser["lastname"]; + $row[] = $a_infosUser["firstname"]; + } $row[] = Display::encrypted_mailto_link($a_infosUser["email"]); //Link to register users if($a_infosUser["user_id"] != $_SESSION['_user']['user_id']) @@ -2360,6 +2344,7 @@ class Blog { */ public static function display_form_user_unsubscribe ($blog_id) { global $_user; + $is_western_name_order = api_is_western_name_order(); // Init $tbl_users = Database::get_main_table(TABLE_MAIN_USER); @@ -2370,8 +2355,13 @@ class Blog { $properties["width"] = "100%"; //table column titles $column_header[] = array ('', false, ''); - $column_header[] = array (get_lang('LastName'), true, ''); - $column_header[] = array (get_lang('FirstName'), true, ''); + if ($is_western_name_order) { + $column_header[] = array (get_lang('FirstName'), true, ''); + $column_header[] = array (get_lang('LastName'), true, ''); + } else { + $column_header[] = array (get_lang('LastName'), true, ''); + $column_header[] = array (get_lang('FirstName'), true, ''); + } $column_header[] = array (get_lang('Email'), true, ''); $column_header[] = array (get_lang('TaskManager'), true, ''); $column_header[] = array (get_lang('UnRegister'), false, ''); @@ -2392,8 +2382,13 @@ class Blog { { $row = array (); $row[] = ''; - $row[] = $myrow["lastname"]; - $row[] = $myrow["firstname"]; + if ($is_western_name_order) { + $row[] = $myrow["firstname"]; + $row[] = $myrow["lastname"]; + } else { + $row[] = $myrow["lastname"]; + $row[] = $myrow["firstname"]; + } $row[] = Display::encrypted_mailto_link($myrow["email"]); $sql = "SELECT bt.title task diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 29d7ef1eac..f0071905db 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -1879,14 +1879,19 @@ class CourseManager { $tutor=Database::fetch_array($result_tutor); $emailto = $tutor['email']; $emailsubject = get_lang('NewUserInTheCourse').': '.$name_course; - $emailbody = get_lang('Dear').': '. $tutor['firstname'].' '.$tutor['lastname']."\n"; + $emailbody = get_lang('Dear').': '. api_get_person_name($tutor['firstname'], $tutor['lastname'])."\n"; $emailbody .=get_lang('MessageNewUserInTheCourse').': '.$name_course."\n"; $emailbody .=get_lang('UserName').': '.$student['username']."\n"; - $emailbody .=get_lang('LastName').': '.$student['lastname']."\n"; - $emailbody .=get_lang('FirstName').': '.$student['firstname']."\n"; + if (api_is_western_name_order()) { + $emailbody .=get_lang('FirstName').': '.$student['firstname']."\n"; + $emailbody .=get_lang('LastName').': '.$student['lastname']."\n"; + } else { + $emailbody .=get_lang('LastName').': '.$student['lastname']."\n"; + $emailbody .=get_lang('FirstName').': '.$student['firstname']."\n"; + } $emailbody .=get_lang('Email').': '.$student['email']."\n\n"; - $recipient_name = $tutor['firstname'].' '.$tutor['lastname']; - $sender_name = api_get_setting('administratorName').' '.api_get_setting('administratorSurname'); + $recipient_name = api_get_person_name($tutor['firstname'], $tutor['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); + $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'); @api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin); } @@ -1974,7 +1979,7 @@ class CourseManager { $sql_list="SELECT * FROM $users WHERE user_id=".$list_users['user_id']; $result = api_sql_query($sql_list,__FILE__,__LINE__); while ($row_user = Database::fetch_array($result)){ - $name_teacher=$row_user['firstname'].' '.$row_user['lastname']; + $name_teacher=api_get_person_name($row_user['firstname'], $row_user['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); $list[]=array($row_user['email']=>$name_teacher); } } @@ -1996,7 +2001,7 @@ class CourseManager { $sql_list="SELECT * FROM $users WHERE user_id=".$row_email["id_coach"]; $result_user = api_sql_query($sql_list,__FILE__,__LINE__); while ($row_emails = Database::fetch_array($result_user)) { - $name_tutor=$row_emails["firstname"].' '.$row_emails["lastname"]; + $name_tutor=api_get_person_name($row_emails["firstname"], $row_emails["lastname"], null, PERSON_NAME_EMAIL_ADDRESS); $mail_tutor=array($row_emails["email"]=>$name_tutor); } return $mail_tutor; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 0ec46f0d97..64e36d1098 100644 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -538,7 +538,7 @@ class Display { * @param string The name of the page (will be showed in the page title) * @param string Optional help file name */ - public static function display_header ($tool_name, $help = NULL) { + public static function display_header ($tool_name ='', $help = NULL) { $nameTools = $tool_name; global $_plugins,$lp_theme_css,$mycoursetheme,$user_theme,$platform_theme; global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $clarolineRepositoryWeb, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $language_file, $noPHP_SELF; @@ -689,6 +689,8 @@ class Display { } /** + * Ivan, 05-SEP-2009: Deprecated, see api_get_person_name(). + * * Display name and lastname in a specific order * @param string Firstname * @param string Lastname diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php index a3fb45bb53..9b6fd99a37 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php @@ -6,7 +6,7 @@ * @since 22/April/2007 * * Modify for Dokeos - * @author Juan Carlos Raña + * @author Juan Carlos Raña * @since 31/December/2008 */ @@ -94,12 +94,12 @@ class manager $folderInfo = $file->getFileInfo(); if(sizeof($folderInfo)) { - //for Dokeos in a name folder, replace num user by lastname and firstname + //for Dokeos in a name folder, replace num user by user names if(ereg('sf_user_', basename($this->currentFolderPath))) { $userinfo=Database::get_user_info_from_id(substr(basename($this->currentFolderPath), 8)); - $this->currentFolderInfo['name']=$userinfo['lastname'].', '.$userinfo['firstname']; + $this->currentFolderInfo['name']=api_get_person_name($userinfo['firstname'], $userinfo['lastname']); } else { diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.pagination.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.pagination.php index 2fc056b67a..102a5e51c5 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.pagination.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.pagination.php @@ -573,7 +573,7 @@ class pagination $output .= ""; $output .= sprintf(PAGINATION_ITEMS_PER_PAGE, $itemPerPage); $output .= ""; - $output .= " "; + $output .= " "; } $output .= "

"; diff --git a/main/inc/lib/fckeditor/repository.php b/main/inc/lib/fckeditor/repository.php index 8013e3891a..dca9402a32 100644 --- a/main/inc/lib/fckeditor/repository.php +++ b/main/inc/lib/fckeditor/repository.php @@ -61,7 +61,7 @@ if (api_is_in_course()) { $new_user_dir = api_get_path(SYS_PATH).'courses/'.$_course['path'].'/document/shared_folder/sf_user_'.api_get_user_id().'/'; @mkdir($new_user_dir); chmod($new_user_dir,$permissions_for_new_directories); - $doc_id = add_document($_course, '/shared_folder/sf_user_'.api_get_user_id(), 'folder', 0, $_user['firstName'].' '.$_user['lastName']); + $doc_id = add_document($_course, '/shared_folder/sf_user_'.api_get_user_id(), 'folder', 0, api_get_person_name($_user['firstName'], $_user['lastName'])); api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'FolderCreated', api_get_user_id()); api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', api_get_user_id()); } diff --git a/main/inc/lib/search/tool_processors/document_processor.class.php b/main/inc/lib/search/tool_processors/document_processor.class.php index 41177decef..ef4f53774f 100644 --- a/main/inc/lib/search/tool_processors/document_processor.class.php +++ b/main/inc/lib/search/tool_processors/document_processor.class.php @@ -89,7 +89,7 @@ class document_processor extends search_processor { $item_result = api_sql_query ($sql); if ($row = Database::fetch_array ($item_result)) { $user_data = api_get_user_info($row['insert_user_id']); - $author = $user_data['firstName'] .' '. $user_data['lastName']; + $author = api_get_person_name($user_data['firstName'], $user_data['lastName']); } } diff --git a/main/inc/lib/search/tool_processors/link_processor.class.php b/main/inc/lib/search/tool_processors/link_processor.class.php index 0dd0ad998c..30bd7408a3 100644 --- a/main/inc/lib/search/tool_processors/link_processor.class.php +++ b/main/inc/lib/search/tool_processors/link_processor.class.php @@ -103,7 +103,7 @@ class link_processor extends search_processor { $item_result = api_sql_query ($sql); if ($row = Database::fetch_array ($item_result)) { $user_data = api_get_user_info($row['insert_user_id']); - $author = $user_data['firstName'] .' '. $user_data['lastName']; + $author = api_get_person_name($user_data['firstName'], $user_data['lastName']); } return array($thumbnail, $image, $name, $author, $url); diff --git a/main/inc/lib/search/tool_processors/quiz_processor.class.php b/main/inc/lib/search/tool_processors/quiz_processor.class.php index 404ced517b..ddec0005a7 100644 --- a/main/inc/lib/search/tool_processors/quiz_processor.class.php +++ b/main/inc/lib/search/tool_processors/quiz_processor.class.php @@ -122,7 +122,7 @@ class quiz_processor extends search_processor { $item_result = api_sql_query ($sql); if ($item_result !== FALSE && $row = Database::fetch_array ($item_result)) { $user_data = api_get_user_info($row['insert_user_id']); - $author = $user_data['firstName'] .' '. $user_data['lastName']; + $author = api_get_person_name($user_data['firstName'], $user_data['lastName']); } }