Fixing send message codification requires testing

skala
Julio Montoya 15 years ago
parent 92a7590475
commit 5214831b43
  1. 1
      main/messages/send_message.php
  2. 9
      main/social/invitations.php
  3. 4
      main/social/profile.php

@ -63,6 +63,7 @@ if ($panel_id == 2 || $panel_id == 4 ) {
</div>
<?php
}
//here we decode to utf8 because this page is called from an ajax popup
$subject_message = utf8_decode($subject_message);
$content_message = utf8_decode($content_message);

@ -139,6 +139,7 @@ echo '<div id="social-content">';
echo '<h2>'.get_lang('InvitationReceived').'</h2>';
foreach ($list_get_invitation as $invitation) {
$sender_user_id = $invitation['user_sender_id']
?>
<div id="<?php echo 'id_'.$sender_user_id ?>" class="invitation_confirm">
@ -147,9 +148,7 @@ echo '<div id="social-content">';
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
$user_info = api_get_user_info($sender_user_id);
$title = Security::remove_XSS($invitation['title']);
$title = api_convert_encoding($title,$charset);
$content = Security::remove_XSS($invitation['content']);
$content = api_convert_encoding($content,$charset);
$date = $invitation['send_date'];
?>
@ -163,7 +162,7 @@ echo '<div id="social-content">';
<td class="info">
<a class="profile_link" href="profile.php?u=<?php echo $sender_user_id;?>"><? echo api_get_person_name($user_info['firstName'], $user_info['lastName']);?></a>
<div>
<?php echo api_utf8_decode($title).' : '.api_utf8_decode($content);?>
<?php echo $title.' : '.$content;?>
</div>
<div>
<?php echo get_lang('DateSend').' : '.$date;?>
@ -194,8 +193,8 @@ echo '<div id="social-content">';
$friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92);
$user_info = api_get_user_info($sender_user_id);
$title = api_convert_encoding($invitation['title'], $charset);
$content = api_convert_encoding($invitation['content'],$charset);
$title = Security::remove_XSS($invitation['title']);
$content = Security::remove_XSS($invitation['content']);
$date = $invitation['send_date'];
?>
<table cellspacing="0" border="0">

@ -594,14 +594,14 @@ echo '<div id="social-content-right">';
if ($count_pending_invitations > 0) {
echo '<div>'.Display::return_icon('boxmygroups.jpg').'</div>';
echo '<div class="social-box-content1">';
echo '<div><h3>'.api_convert_encoding(get_lang('PendingInvitations'),$charset,'UTF-8').'</h3></div>';
echo '<div><h3>'.get_lang('PendingInvitations').'</h3></div>';
for ($i=0;$i<$count_pending_invitations;$i++) {
echo '<div id="dpending_'.$pending_invitations[$i]['user_sender_id'].'" class="friend_invitations">';
echo '<div style="float:left;width:60px;" >';
echo '<img style="margin-bottom:5px;" src="'.$list_get_path_web[$i]['dir'].'/'.$list_get_path_web[$i]['file'].'" width="60px">';
echo '</div>';
echo '<div style="padding-left:70px;">';
echo ' '.api_convert_encoding(substr($pending_invitations[$i]['content'],0,50),$charset,'UTF-8');
echo ' '.(substr($pending_invitations[$i]['content'],0,50));
echo '<br />';
echo '<a id="btn_accepted_'.$pending_invitations[$i]['user_sender_id'].'" onclick="register_friend(this)" href="javascript:void(0)">'.get_lang('SocialAddToFriends').'</a>';
echo '<div id="id_response">&nbsp;</div>';

Loading…
Cancel
Save