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 r18698] replace utf8_encode to mb_convert_encoding

Browse Source
skala
Carlos Vargas 16 years ago
parent c578cfe537
commit b85d41e1e8
5 changed files with 33 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/messages/inbox.php
  2. 24
      main/messages/message.class.php
  3. 21
      main/messages/new_message.php
  4. 4
      main/messages/outbox.php
  5. 6
      main/messages/view_message.php

4
main/messages/inbox.php
Unescape View File

@ -5,7 +5,7 @@
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Facultad de Matematicas, UADY (M<EFBFBD>xico)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores@dokeos.com>
@ -132,7 +132,7 @@ if ($request===false) {
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
echo '<div id="div_content_messages">&nbsp;&nbsp;';
api_display_tool_title(utf8_encode(get_lang('Inbox')));
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 '</div>';

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

@ -131,6 +131,7 @@ class MessageManager {
* @param string $direction
*/
public static function get_message_data ($from, $number_of_items, $column, $direction) {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request=api_is_xml_http_request();
$sql_query = "SELECT id as col0, user_sender_id as col1, title as col2, send_date as col3 FROM $table_message " .
@ -146,8 +147,8 @@ class MessageManager {
$message[0] = ($result[0]);
}
if ($request===true) {
$message[1] = utf8_encode(GetFullUserName(($result[1])));
$message[2] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.utf8_encode($result[2]).'</a>';
$message[1] = mb_convert_encoding(GetFullUserName($result[1]),'UTF-8',$charset);
$message[2] = '<a onclick="get_action_url_and_show_messages(1,'.$result[0].')" href="javascript:void(0)">'.mb_convert_encoding($result[2],'UTF-8',$charset).'</a>';
$message[4] = '<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="#../messages/inbox.php?rs=1&amp;action=deleteone&id='.$result[0].'" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
} else {
@ -248,6 +249,7 @@ class MessageManager {
* @return array
*/
public static function get_message_data_sent ($from, $number_of_items, $column, $direction) {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request=api_is_xml_http_request();
$sql_query = "SELECT id as col0, user_sender_id as col1, title as col2, send_date as col3 FROM $table_message " .
@ -263,8 +265,8 @@ class MessageManager {
$message[0] = ($result[0]);
}
if ($request===true) {
$message[1] = utf8_encode(GetFullUserName($result[1]));
$message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.utf8_encode($result[2]).'</a>';
$message[1] = mb_convert_encoding(GetFullUserName($result[1]),'UTF-8',$charset);
$message[2] = '<a onclick="show_sent_message('.$result[0].')" href="javascript:void(0)">'.mb_convert_encoding($result[2],'UTF-8',$charset).'</a>';
$message[4] = '&nbsp;&nbsp;<a onclick="delete_one_message_outbox('.$result[0].')" href="javascript:void(0)" >'.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).'</a>';
} else {
$message[1] = GetFullUserName($result[1]);
@ -292,6 +294,7 @@ class MessageManager {
return $result['number_messages'];
}
public static function show_message_box () {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
if (isset($_GET['id_send'])) {
$query = "SELECT * FROM $table_message WHERE user_sender_id=".api_get_user_id()." AND id=".$_GET['id_send']." AND msg_status=4;";
@ -327,10 +330,10 @@ class MessageManager {
<TABLE>
<TR>
<TD width="100%">
<TR> <h1>'.utf8_encode($row[5]).'</h1></TR>
<TR> <h1>'.mb_convert_encoding($row[5],'UTF-8',$charset).'</h1></TR>
</TD>
<TR>
<TD>'.utf8_encode(get_lang('From')).'&nbsp;<b>'.GetFullUserName($row[1]).'</b> '.utf8_encode(strtolower(get_lang('To'))).'&nbsp; <b>'.utf8_encode(GetFullUserName($row[2])).'</b> </TD>
<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>
@ -341,7 +344,7 @@ class MessageManager {
<TABLE height=209 width="100%" bgColor=#ffffff>
<TBODY>
<TR>
<TD vAlign=top>'.utf8_encode($row[6]).'</TD>
<TD vAlign=top>'.mb_convert_encoding($row[6],'UTF-8',$charset).'</TD>
</TR>
</TBODY>
</TABLE>
@ -351,6 +354,7 @@ class MessageManager {
</TABLE>';
}
public static function show_message_box_sent () {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
$query = "SELECT * FROM $table_message WHERE user_sender_id=".api_get_user_id()." AND id=".$_GET['id_send']." AND msg_status=4;";
$result = api_sql_query($query,__FILE__,__LINE__);
@ -375,10 +379,10 @@ class MessageManager {
<TABLE>
<TR>
<TD width="100%">
<TR> <h1>'.utf8_encode($row[5]).'</h1></TR>
<TR> <h1>'.mb_convert_encoding($row[5],'UTF-8',$charset).'</h1></TR>
</TD>
<TR>
<TD>'.utf8_encode(get_lang('From')).'&nbsp;<b>'.GetFullUserName($row[1]).'</b> '.utf8_encode(strtolower(get_lang('To'))).'&nbsp; <b>'.utf8_encode(GetFullUserName($row[2])).'</b> </TD>
<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>
@ -389,7 +393,7 @@ class MessageManager {
<TABLE height=209 width="100%" bgColor=#ffffff>
<TBODY>
<TR>
<TD vAlign=top>'.utf8_encode($row[6]).'</TD>
<TD vAlign=top>'.mb_convert_encoding($row[6],'UTF-8',$charset).'</TD>
</TR>
</TBODY>
</TABLE>

21
main/messages/new_message.php
Unescape View File

@ -1,11 +1,11 @@
<?php // $Id: new_message.php 18511 2009-02-16 02:22:11Z iflorespaz $
<?php // $Id: new_message.php 18698 2009-02-25 18:13:46Z cvargas1 $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2009 Dokeos SPRL
Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
Copyright (c) Facultad de Matematicas, UADY (México)
Copyright (c) Facultad de Matematicas, UADY (M<EFBFBD>xico)
Copyright (c) Evie, Free University of Brussels (Belgium)
Copyright (c) 2009 Isaac Flores Paz <isaac.flores.paz@gmail.com>
For a full list of contributors, see "credits.txt".
@ -119,6 +119,7 @@ function show_compose_to_any ($user_id) {
}
function show_compose_reply_to_message ($message_id, $receiver_id) {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
$query = "SELECT * FROM $table_message WHERE user_receiver_id=".$receiver_id." AND id='".$message_id."';";
$result = api_sql_query($query,__FILE__,__LINE__);
@ -129,19 +130,21 @@ function show_compose_reply_to_message ($message_id, $receiver_id) {
die();
}
echo get_lang('To').':&nbsp;<strong>'. GetFullUserName($row[1]).'</strong>';
$default['title'] =utf8_encode(get_lang('EnterTitle'));
$default['title'] =mb_convert_encoding(get_lang('EnterTitle'),'UTF-8',$charset);
$default['user_list'] = $row[1];
manage_form($default);
}
function show_compose_to_user ($receiver_id) {
global $charset;
echo get_lang('To').':&nbsp;<strong>'. GetFullUserName($receiver_id).'</strong>';
$default['title'] = utf8_encode(get_lang('EnterTitle'));
$default['title'] = mb_convert_encoding(get_lang('EnterTitle'),'UTF-8',$charset);
$default['user_list'] = $receiver_id;
manage_form($default);
}
function manage_form ($default, $select_from_user_list = null) {
global $charset;
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request=api_is_xml_http_request();
if ($request===true) {
@ -162,7 +165,7 @@ function manage_form ($default, $select_from_user_list = null) {
}
$form->addElement('hidden','user_list',0,array('id'=>'user_list'));
}
$form->add_textfield('title', utf8_encode(get_lang('Title')));
$form->add_textfield('title', mb_convert_encoding(get_lang('Title'),'UTF-8',$charset));
$form->add_html_editor('content', '',false,false);
if (isset($_GET['re_id'])) {
$form->addElement('hidden','re_id',$_GET['re_id']);
@ -232,14 +235,14 @@ if (!isset($_POST['compose'])) {
}
if (isset($_GET['re_id'])) {
$default['title'] = utf8_encode($_POST['title']);
$default['content'] = utf8_encode($_POST['content']);
$default['title'] = mb_convert_encoding($_POST['title'],'UTF-8',$charset);
$default['content'] = mb_convert_encoding($_POST['content'],'UTF-8',$charset);
//$default['user_list'] = $_POST['user_list'];
manage_form($default);
} else {
if ($restrict) {
$default['title'] = utf8_encode($_POST['title']);
$default['id_text_name'] = utf8_encode($_POST['id_text_name']);
$default['title'] = mb_convert_encoding($_POST['title'],'UTF-8',$charset);
$default['id_text_name'] = mb_convert_encoding($_POST['id_text_name'],'UTF-8',$charset);
$default['user_list'] = $_POST['user_list'];
manage_form($default);
} else {

4
main/messages/outbox.php
Unescape View File

@ -108,9 +108,9 @@ if( trim($info_delete_outbox[0])=='delete' ) {
/**************************************************************/
$table_message = Database::get_main_table(TABLE_MESSAGE);
echo '<div id="div_content_messages_sent">&nbsp;&nbsp;';
api_display_tool_title(utf8_encode(get_lang('Outbox')));
api_display_tool_title(mb_convert_encoding(get_lang('Outbox'),'UTF-8',$charset));
echo '<div class=actions>';
$language_variable=($request===true) ? utf8_encode(get_lang('MessageOutboxComment')) : get_lang('MessageOutboxComment');
$language_variable=($request===true) ? mb_convert_encoding(get_lang('MessageOutboxComment'),'UTF-8',$charset) : get_lang('MessageOutboxComment');
echo $language_variable;
echo '</div>';
echo '</div>';

6
main/messages/view_message.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: view_message.php 18670 2009-02-24 20:49:13Z cvargas1 $
<?php // $Id: view_message.php 18698 2009-02-25 18:13:46Z cvargas1 $
/*
==============================================================================
Dokeos - elearning and course management software
@ -59,7 +59,7 @@ if (isset($_GET['id_send']) || isset($_GET['id'])) {
} else {
$interbreadcrumb[]= array (
'url' => '#',
'name' => get_lang($nameTools)
'name' => get_lang('Messages')
);
$interbreadcrumb[]= array (
'url' => 'inbox.php',
@ -80,7 +80,7 @@ $request=api_is_xml_http_request();
if ($request===false) {
Display::display_header('');
}
api_display_tool_title(utf8_encode(get_lang('ReadMessage')));
api_display_tool_title(mb_convert_encoding(get_lang('ReadMessage'),'UTF-8',$charset));
if (isset($_GET['id_send'])) {
MessageManager::show_message_box_sent();
} else {

Write Preview
Loading…
Cancel
Save