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 r20301] logic changes - added function mb_convert_encoding -(partial FS#3958)

Browse Source
skala
Isaac Flores 17 years ago
parent 6cee7e3ec7
commit 00bec54b33
5 changed files with 55 additions and 52 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. 62
      main/inc/lib/message.lib.php
  2. 2
      main/messages/inbox.php
  3. 35
      main/messages/message.class.php
  4. 6
      main/messages/new_message.php
  5. 2
      main/social/contacts.inc.php

62
main/inc/lib/message.lib.php
Unescape View File

@ -25,32 +25,33 @@
include_once(api_get_path(LIBRARY_PATH).'/online.inc.php');
require_once '../messages/message.class.php';
function inbox_display() {
$charset = api_get_setting('platform_charset');
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request=api_is_xml_http_request();
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-2";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset).
"&nbsp
<br/><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToInbox').
mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).
"</a>";
} else {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset).
"&nbsp
<br/><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToInbox').
mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).
"</a>";
}
} else {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset) .
"&nbsp
<br/><a href=\"".
"inbox.php\">".
get_lang('BackToOutbox').
mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset).
"</a>";
}
@ -75,17 +76,17 @@ function inbox_display() {
$table = new SortableTable('messages', 'get_number_of_messages_mask', 'get_message_data_mask', 1);
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
if ($request===true) {
$title= utf8_encode(get_lang('Title'));
$action=utf8_encode(get_lang('Actions'));
$title= mb_convert_encoding(get_lang('Title'),'UTF-8',$charset);
$action=mb_convert_encoding(get_lang('Actions'),'UTF-8',$charset);
} else {
$title= get_lang('Title');
$action=get_lang('Actions');
}
$table->set_header(1, get_lang('Status'),false,array ('style' => 'width:30px;'));
$table->set_header(2, get_lang('From'),false);
$table->set_header(1,mb_convert_encoding(get_lang('Status'),'UTF-8',$charset) ,false,array ('style' => 'width:30px;'));
$table->set_header(2,mb_convert_encoding(get_lang('From'),'UTF-8',$charset) ,false);
$table->set_header(3,$title,false);
$table->set_header(4, get_lang('Date'),false,array ('style' => 'width:150px;'));
$table->set_header(4,mb_convert_encoding(get_lang('Date'),'UTF-8',$charset),false,array ('style' => 'width:150px;'));
$table->set_header(5,$action,false,array ('style' => 'width:100px;'));
echo '<div id="div_content_table_data">';
if ($request===true) {
@ -94,9 +95,9 @@ echo '<div id="div_content_table_data">';
$table->display();
echo '</form>';
if (get_number_of_messages_mask() > 0) {
echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.get_lang('SelectAll').'</a>&nbsp;&nbsp;&nbsp;';
echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.get_lang('UnSelectAll').'</a>&nbsp;&nbsp;&nbsp;';
echo '<input name="delete" type="button" value="'.get_lang('DeleteSelectedMessages').'" onclick="submit_form(\'inbox\')"/>';
echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.mb_convert_encoding(get_lang('SelectAll'),'UTF-8',$charset) .'</a>&nbsp;&nbsp;&nbsp;';
echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.mb_convert_encoding(get_lang('UnSelectAll'),'UTF-8',$charset) .'</a>&nbsp;&nbsp;&nbsp;';
echo '<input name="delete" type="button" value="'.mb_convert_encoding(get_lang('DeleteSelectedMessages'),'UTF-8',$charset).'" onclick="submit_form(\'inbox\')"/>';
}
} else {
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));
@ -113,31 +114,32 @@ function get_message_data_mask($from, $number_of_items, $column, $direction) {
function outbox_display() {
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request=api_is_xml_http_request();
global $charset;
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-3";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset).
"&nbsp
<br><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToOutbox').
mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset).
"</a>";
}else {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset).
"&nbsp
<br><a href=\"".
"../social/index.php?$redirect\">".
get_lang('BackToOutbox').
mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset).
"</a>";
}
} else {
$success= get_lang('SelectedMessagesDeleted').
$success= mb_convert_encoding(get_lang('SelectedMessagesDeleted'),'UTF-8',$charset) .
"&nbsp
</b>".
"<br><a href=\"".
"outbox.php\">".
get_lang('BackToOutbox').
mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset).
"</a>";
}
if (isset ($_REQUEST['action'])) {
@ -162,17 +164,17 @@ if (isset ($_REQUEST['action'])) {
// display sortable table with messages of the current user
$table = new SortableTable('messages', 'get_number_of_messages_send_mask', 'get_message_data_send_mask', 1);
if ($request===true) {
$title= utf8_encode(get_lang('Title'));
$action=utf8_encode(get_lang('Actions'));
$title= mb_convert_encoding(get_lang('Title'),'UTF-8',$charset);
$action=mb_convert_encoding(get_lang('Actions'),'UTF-8',$charset);
} else {
$title= get_lang('Title');
$action=get_lang('Actions');
$title=get_lang('Title');
$action=get_lang('Actions');
}
$table->set_header(0, '', false,array ('style' => 'width:20px;'));
$table->set_header(1, get_lang('Status'),false,array ('style' => 'width:30px;'));
$table->set_header(2, get_lang('To'),false);
$table->set_header(1, mb_convert_encoding(get_lang('Status'),'UTF-8',$charset),false,array ('style' => 'width:30px;'));
$table->set_header(2, mb_convert_encoding(get_lang('To'),'UTF-8',$charset),false);
$table->set_header(3, $title,false);
$table->set_header(4, get_lang('Date'),false,array ('style' => 'width:150px;'));
$table->set_header(4, mb_convert_encoding(get_lang('Date'),'UTF-8',$charset),false,array ('style' => 'width:150px;'));
$table->set_header(5,$action, false,array ('style' => 'width:100px;'));
echo '<div id="div_content_table_data_sent">';
if ($request===true) {
@ -181,9 +183,9 @@ echo '<div id="div_content_table_data_sent">';
$table->display();
echo '</form>';
if (get_number_of_messages_send_mask() > 0) {
echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.get_lang('SelectAll').'</a>&nbsp;&nbsp;&nbsp;';
echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.get_lang('UnSelectAll').'</a>&nbsp;&nbsp;&nbsp;';
echo '<input name="delete" type="button" value="'.get_lang('DeleteSelectedMessages').'" onclick="submit_form(\'outbox\')"/>';
echo '<a href="javascript:void(0)" onclick="selectall_cheks()">'.mb_convert_encoding(get_lang('SelectAll'),'UTF-8',$charset).'</a>&nbsp;&nbsp;&nbsp;';
echo '<a href="javascript:void(0)" onclick="unselectall_cheks()">'.mb_convert_encoding(get_lang('UnSelectAll'),'UTF-8',$charset).'</a>&nbsp;&nbsp;&nbsp;';
echo '<input name="delete" type="button" value="'.mb_convert_encoding(get_lang('DeleteSelectedMessages'),'UTF-8',$charset).'" onclick="submit_form(\'outbox\')"/>';
}
} else {
$table->set_form_actions(array ('delete' => get_lang('DeleteSelectedMessages')));

2
main/messages/inbox.php
Unescape View File

@ -158,7 +158,7 @@ $table_message = Database::get_main_table(TABLE_MESSAGE);
echo '<div id="div_content_messages">&nbsp;&nbsp;';
//api_display_tool_title(mb_convert_encoding(get_lang('Inbox'),'UTF-8',$charset));
echo '<div class=actions>';
echo '<a onclick="compose_and_show_message(\'show\',\'1\')" href="javascript:void(0)">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>';
echo '<a onclick="compose_and_show_message(\'show\',\'1\')" href="javascript:void(0)">'.Display::return_icon('message_new.png',mb_convert_encoding(get_lang('ComposeMessage'),'UTF-8',$charset)).mb_convert_encoding(get_lang('ComposeMessage'),'UTF-8',$charset).'</a>';
echo '</div>';
echo '</div>';
if (!isset($_GET['del_msg'])) {

35
main/messages/message.class.php
Unescape View File

@ -42,37 +42,37 @@ class MessageManager {
* Displays info stating that the message is sent successfully.
*/
public static function display_success_message($uid) {
global $charset;
if ($_SESSION['social_exist']===true) {
$redirect="#remote-tab-2";
if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') {
$success= get_lang('MessageSentTo').
$success=mb_convert_encoding(get_lang('MessageSentTo'),'UTF-8',$charset).
"&nbsp;<b>".
GetFullUserName($uid).
"</b>".
"<br><a href=\"".
"../social/index.php$redirect\">".
get_lang('BackToInbox').
mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).
"</a>";
}else {
$success= get_lang('MessageSentTo').
$success= mb_convert_encoding(get_lang('MessageSentTo'),'UTF-8',$charset).
"&nbsp;<b>".
GetFullUserName($uid).
"</b>".
"<br><a href=\"".
"../social/index.php$redirect\">".
get_lang('BackToInbox').
mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).
"</a>";
}
} else {
$success= get_lang('MessageSentTo').
$success= mb_convert_encoding(get_lang('MessageSentTo'),'UTF-8',$charset).
"&nbsp;<b>".
GetFullUserName($uid).
"</b>".
"<br><a href=\"".
"inbox.php\">".
get_lang('BackToInbox').
mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).
"</a>";
}
Display::display_confirmation_message($success, false);
@ -160,12 +160,12 @@ class MessageManager {
$message[2] = mb_convert_encoding(GetFullUserName($result[1]),'UTF-8',$charset);
$message[3] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",mb_convert_encoding($result[2],'UTF-8',$charset)).'</a>';
$message[5] = '<a onclick="reply_to_messages(\'show\','.$result[0].',\'\')" href="javascript:void(0)">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
'&nbsp;&nbsp;<a onclick="delete_one_message('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
'&nbsp;&nbsp;<a onclick="delete_one_message('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset)).'</a>';
} else {
$message[2] = GetFullUserName(($result[1]));
$message[3] = '<a href="view_message.php?id='.$result[0].'">'.$result[2].'</a>';
$message[5] = '<a href="new_message.php?re_id='.$result[0].'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
'&nbsp;&nbsp;<a delete_one_message('.$result[0].') href="#inbox.php?action=deleteone&id='.$result[0].'">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
'&nbsp;&nbsp;<a delete_one_message('.$result[0].') href="#inbox.php?action=deleteone&id='.$result[0].'">'.Display::return_icon('message_delete.png',mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset)).'</a>';
}
$message[4] = ($result[3]); //date stays the same
$message_list[] = $message;
@ -282,12 +282,12 @@ class MessageManager {
}
$message[2] = mb_convert_encoding(GetFullUserName($result[4]),'UTF-8',$charset);
$message[3] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.str_replace("\\","",mb_convert_encoding($result[2],'UTF-8',$charset)).'</a>';
$message[5] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
$message[5] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset)).'</a>';
} else {
$message[2] = GetFullUserName($result[4]);
$message[3] = '<a onclick="show_sent_message ('.$result[0].')" href="#../messages/view_message.php?id_send='.$result[0].'">'.$result[2].'</a>';
$message[5] = '<a href="new_message.php?re_id='.$result[0].'">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).'</a>'.
'&nbsp;&nbsp;<a href="outbox.php?action=deleteone&id='.$result[0].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
'&nbsp;&nbsp;<a href="outbox.php?action=deleteone&id='.$result[0].'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(mb_convert_encoding(get_lang('ConfirmDeleteMessage'),'UTF-8',$charset) ))."'".')) return false;">'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
}
$message[4] = $result[3]; //date stays the same
$message_list[] = $message;
@ -333,9 +333,10 @@ class MessageManager {
$reply = '<a onclick="reply_to_messages(\'show\','.$_GET['id'].',\'\')" href="javascript:void(0)">'.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).get_lang('ReplyToMessage').'</a>';
}
echo '<div class=actions>';
echo '<a onclick="close_div_show(\'div_content_messages\')" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',get_lang('BackToInbox')).get_lang('BackToInbox').'</a>';
echo '<a onclick="close_div_show(\'div_content_messages\')" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset)
).mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).'</a>';
echo $reply;
echo '<a onclick="delete_one_message('.$row[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''.get_lang('Delete').'</a>';
echo '<a onclick="delete_one_message('.$row[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset)).''.mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset).'</a>';
echo '</div><br />';
echo '
<table class="message_view_table" >
@ -351,7 +352,7 @@ class MessageManager {
<TD>'.mb_convert_encoding(get_lang('From'),'UTF-8',$charset).'&nbsp;<b>'.GetFullUserName($row[1]).'</b> '.mb_convert_encoding(strtolower(get_lang('To')),'UTF-8',$charset).'&nbsp; <b>'.mb_convert_encoding(GetFullUserName($row[2]),'UTF-8',$charset).'</b> </TD>
</TR>
<TR>
<TD >'.get_lang('Date').'&nbsp; '.$row[4].'</TD>
<TD >'.mb_convert_encoding(get_lang('Date'),'UTF-8',$charset).'&nbsp; '.$row[4].'</TD>
</TR>
</TR>
</TABLE>
@ -383,8 +384,8 @@ class MessageManager {
if ($row[1]==$user_con[$i])
$band=1;
echo '<div class=actions>';
echo '<a onclick="close_and_open_outbox()" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',get_lang('BackToOutbox')).get_lang('BackToOutbox').'</a>';
echo '<a onclick="delete_one_message_outbox('.$row[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''.get_lang('Delete').'</a>';
echo '<a onclick="close_and_open_outbox()" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset)).mb_convert_encoding(get_lang('BackToOutbox'),'UTF-8',$charset).'</a>';
echo '<a onclick="delete_one_message_outbox('.$row[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset)).''.mb_convert_encoding(get_lang('DeleteMessage'),'UTF-8',$charset).'</a>';
echo '</div><br />';
echo '
<table class="message_view_table" >
@ -400,7 +401,7 @@ class MessageManager {
<TD>'.mb_convert_encoding(get_lang('From'),'UTF-8',$charset).'&nbsp;<b>'.GetFullUserName($row[1]).'</b> '.mb_convert_encoding(strtolower(get_lang('To')),'UTF-8',$charset).'&nbsp; <b>'.mb_convert_encoding(GetFullUserName($row[2]),'UTF-8',$charset).'</b> </TD>
</TR>
<TR>
<TD >'.get_lang('Date').'&nbsp; '.$row[4].'</TD>
<TD >'.mb_convert_encoding(get_lang('Date'),'UTF-8',$charset).'&nbsp; '.$row[4].'</TD>
</TR>
</TR>
</TABLE>

6
main/messages/new_message.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: new_message.php 19975 2009-04-22 14:23:01Z pcool $
<?php // $Id: new_message.php 20301 2009-05-04 20:58:41Z iflorespaz $
/*
==============================================================================
Dokeos - elearning and course management software
@ -173,7 +173,7 @@ function manage_form ($default, $select_from_user_list = null) {
$form->addElement('hidden','re_id',Security::remove_XSS($_GET['re_id']));
$form->addElement('hidden','save_form','save_form');
}
$form->addElement('submit', 'compose', get_lang('Send'));
$form->addElement('submit', 'compose',mb_convert_encoding(get_lang('Send'),'UTF-8',$charset));
$form->setDefaults($default);
if ($form->validate()) {
$values = $form->exportValues();
@ -220,7 +220,7 @@ if ($request===false) {
//api_display_tool_title($nameTools);
echo '<div class=actions>';
echo '<a onclick="close_div_show(\'div_content_messages\')" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',get_lang('BackToInbox')).get_lang('BackToInbox').'</a>';
echo '<a onclick="close_div_show(\'div_content_messages\')" href="javascript:void(0)">'.Display::return_icon('folder_up.gif',mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset)).mb_convert_encoding(get_lang('BackToInbox'),'UTF-8',$charset).'</a>';
echo '</div>';
if (!isset($_POST['compose'])) {
if(isset($_GET['re_id'])) {

2
main/social/contacts.inc.php
Unescape View File

@ -37,7 +37,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
<td height="25" valign="top">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-subtitle-search">
<tr>
<td width="100%" height="25" valign="top" class="social-align-box">&nbsp;&nbsp;<?php echo get_lang('Search').'&nbsp;&nbsp; : &nbsp;&nbsp;'; ?><input class="social-search-image" type="text" class="search-image" id="id_search_image" name="id_search_image" value="" onkeyup="search_image_social(this)" /></td>
<td width="100%" height="25" valign="top" class="social-align-box">&nbsp;&nbsp;<?php echo mb_convert_encoding(get_lang('Search'),'UTF-8',$charset) .'&nbsp;&nbsp; : &nbsp;&nbsp;'; ?><input class="social-search-image" type="text" class="search-image" id="id_search_image" name="id_search_image" value="" onkeyup="search_image_social(this)" /></td>
</tr>
</table></td>
</tr>

Write Preview
Loading…
Cancel
Save