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 r18895] minor - logic changes -added function mb_convert_encoding - (partial FS#3751)

Browse Source
skala
Isaac Flores 17 years ago
parent dfa7965d8f
commit 244200971e
2 changed files with 19 additions and 19 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. 22
      main/messages/send_message.php
  2. 16
      main/messages/send_message_to_userfriend.inc.php

22
main/messages/send_message.php
Unescape View File

@ -40,20 +40,20 @@ $user_info=api_get_user_info($user_id);
<?php
if ($panel_id==2) {
?>
<td height="20"><?php echo get_lang('Info').' :'; ?></td>
<td height="20"><?php echo get_lang('SocialUserInformationAttach'); ?></td>
<td height="20"><?php echo get_lang('WriteToMessage') ?> :<br/><textarea id="txt_area_invite" rows="3" cols="25"></textarea></td>
<td height="20"><input type="button" value="<?php echo get_lang('SendInviteMessage'); ?>" onclick="action_database_panel('4','<?php echo $user_id;?>')" /></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('Info'),'UTF-8',$charset).' :'; ?></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('SocialUserInformationAttach'),'UTF-8',$charset); ?></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('WriteToMessage'),'UTF-8',$charset); ?> :<br/><textarea id="txt_area_invite" rows="3" cols="25"></textarea></td>
<td height="20"><input type="button" value="<?php echo mb_convert_encoding(get_lang('SendInviteMessage'),'UTF-8',$charset); ?>" onclick="action_database_panel('4','<?php echo $user_id;?>')" /></td>
<?php
}
?>
<?php
if ($panel_id==1) {
?>
<td height="20"><?php echo get_lang('To'); ?> &nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $user_info['firstName']; ?></td>
<td height="20"><?php echo get_lang('subject'); ?> :<br/><input id="txt_subject_id" type="text" style="width:200px;"></td>
<td height="20"><?php echo get_lang('Message'); ?> :<br/><textarea id="txt_area_invite" rows="3" cols="25"></textarea></td>
<td height="20"><input type="button" value="<?php echo get_lang('NewMessage'); ?>" onclick="hide_display_message()" />&nbsp;&nbsp;&nbsp; <input type="button" value="<?php echo get_lang('SendMessage'); ?>" onclick="action_database_panel('5','<?php echo $user_id;?>')" /></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('To'),'UTF-8',$charset); ?> &nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;<?php echo mb_convert_encoding($user_info['firstName'],'UTF-8',$charset); ?></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('subject'),'UTF-8',$charset); ?> :<br/><input id="txt_subject_id" type="text" style="width:200px;"></td>
<td height="20"><?php echo mb_convert_encoding(get_lang('Message'),'UTF-8',$charset); ?> :<br/><textarea id="txt_area_invite" rows="3" cols="25"></textarea></td>
<td height="20"><input type="button" value="<?php echo mb_convert_encoding(get_lang('NewMessage'),'UTF-8',$charset); ?>" onclick="hide_display_message()" />&nbsp;&nbsp;&nbsp; <input type="button" value="<?php echo get_lang('SendMessage'); ?>" onclick="action_database_panel('5','<?php echo $user_id;?>')" /></td>
<?php
}
?>
@ -61,11 +61,11 @@ if ($panel_id==1) {
if ($panel_id==3) {
?>
<dl>
<dd><a href="javascript:void(0)" onclick="change_panel('2','<?php echo $user_id; ?>')"><?php echo get_lang('SendInviteMessage')?></a></dd>
<dd><a href="javascript:void(0)" onclick="change_panel('1','<?php echo $user_id; ?>')"><?php echo get_lang('SendMessage');?></a></dd>
<dd><a href="main/social/index.php#remote-tab-5"><?php echo get_lang('SocialSeeContacts'); ?></a></dd>
<dd><a href="javascript:void(0)" onclick="change_panel('2','<?php echo $user_id; ?>')"><?php echo mb_convert_encoding(get_lang('SendInviteMessage'),'UTF-8',$charset); ?></a></dd>
<dd><a href="javascript:void(0)" onclick="change_panel('1','<?php echo $user_id; ?>')"><?php echo mb_convert_encoding(get_lang('SendMessage'),'UTF-8',$charset);?></a></dd>
</dl>
<?php
// <dd><a href="main/social/index.php#remote-tab-5"> echo mb_convert_encoding(get_lang('SocialSeeContacts'),'UTF-8',$charset);</a></dd>
}
?>
<?php

16
main/messages/send_message_to_userfriend.inc.php
Unescape View File

@ -48,11 +48,11 @@ if (api_get_setting('allow_message_tool')<>'true' && api_get_setting('allow_soci
<tr height="20">
<td><div class="message-top-title">
<table width="600" border="0" height="20">
<td width="450"><?php echo get_lang('SocialNetwork');?></td>
<td width="450"><?php echo mb_convert_encoding(get_lang('SocialNetwork'),'UTF-8',$charset);?></td>
<?php
if (!isset($_REQUEST['view'])) {
?>
<td width="150"><a href="javascript:void(0)" onclick="change_panel('3','<?php echo $userfriend_id; ?>')" ><?php echo Display::return_icon('folder_up.gif',get_lang('SeeMoreOptions')).'&nbsp;&nbsp;'.get_lang('MoreOptions')?></a></td>
<td width="150"><a href="javascript:void(0)" onclick="change_panel('3','<?php echo $userfriend_id; ?>')" ><?php echo Display::return_icon('folder_up.gif',mb_convert_encoding(get_lang('SeeMoreOptions'),'UTF-8',$charset)).'&nbsp;&nbsp;'.mb_convert_encoding(get_lang('SeeMoreOptions'),'UTF-8',$charset);?></a></td>
<?php
}
?>
@ -65,8 +65,8 @@ if (api_get_setting('allow_message_tool')<>'true' && api_get_setting('allow_soci
<div class="message-content-body-left">
<img class="message-image-info" src="<?php echo $info_path_friend['dir'].$info_path_friend['file']; ?>"/>
<dl>
<dd><?php echo get_lang('FirstName').' : '.$info_user_friend['firstName'] ?></dd>
<dd><?php echo get_lang('LastName').' : '.$info_user_friend['lastName'] ?></dd>
<dd><?php echo mb_convert_encoding(get_lang('FirstName'),'UTF-8',$charset).' : '.mb_convert_encoding($info_user_friend['firstName'],'UTF-8',$charset); ?></dd>
<dd><?php echo mb_convert_encoding(get_lang('LastName'),'UTF-8',$charset).' : '.mb_convert_encoding($info_user_friend['lastName'],'UTF-8',$charset); ?></dd>
</dl>
</div>
<div class="message-conten-body-right">
@ -75,21 +75,21 @@ if (api_get_setting('allow_message_tool')<>'true' && api_get_setting('allow_soci
<?php
if (!isset($_REQUEST['view'])) {
?>
<dd><a href="javascript:void(0)" onclick="change_panel('2','<?php echo $userfriend_id; ?>')"><?php echo get_lang('SendInviteMessage')?></a></dd>
<dd><a href="javascript:void(0)" onclick="change_panel('2','<?php echo $userfriend_id; ?>')"><?php echo mb_convert_encoding(get_lang('SendInviteMessage'),'UTF-8',$charset);?></a></dd>
<?php
}
?>
<?php
if (api_get_setting('allow_message_tool')=='true') {
?>
<dd><a href="javascript:void(0)" onclick="change_panel('1','<?php echo $userfriend_id; ?>')"><?php echo get_lang('SendMessage');?></a></dd>
<dd><a href="javascript:void(0)" onclick="change_panel('1','<?php echo $userfriend_id; ?>')"><?php echo mb_convert_encoding(get_lang('SendMessage'),'UTF-8',$charset);?></a></dd>
<?php
}
?>
<?php
if (!isset($_REQUEST['view'])) {
//<dd><a href="main/social/index.php#remote-tab-5"> echo get_lang('SocialSeeContacts'); </a></dd>
?>
<dd><a href="main/social/index.php#remote-tab-5"><?php echo get_lang('SocialSeeContacts'); ?></a></dd>
<?php
}
?>
@ -102,6 +102,6 @@ if (api_get_setting('allow_message_tool')<>'true' && api_get_setting('allow_soci
<tr height="22">
<td>
<div id="display_response_id" style="position:relative"></div>
<div class="message-bottom-title">&nbsp;Dokeos</div></td>
<div class="message-bottom-title">&nbsp;</div></td>
</tr>
</table>
Write Preview
Loading…
Cancel
Save