Browse Source

[svn r20389] logic changes - replaced utf8_encode by mb_convert_encoding, in social network - (partial FS#3958)

Isaac Flores 16 years ago
parent
commit
cff6fdafcf

+ 1 - 1
main/social/contacts.inc.php

@@ -48,7 +48,7 @@ $image_path = UserManager::get_user_picture_path_by_id ($user_id,'web',false,tru
         <td width="100%" height="22" valign="top">
         <table width="100%" border="0" cellpadding="0" cellspacing="0" class="social-align-box">
           <tr>
-            <td width="100%" height="22" valign="top">&nbsp;&nbsp;<?php echo utf8_encode(get_lang('ContactsList')); ?></td>
+            <td width="100%" height="22" valign="top">&nbsp;&nbsp;<?php echo mb_convert_encoding(get_lang('ContactsList'),'UTF-8',$charset); ?></td>
               </tr>
         </table></td>
         </tr>

+ 1 - 1
main/social/group_contact.inc.php

@@ -73,7 +73,7 @@ for ($p=0;$p<count($list_groups);$p++) {
 	echo $friend_html; 
 		}  
 		else {
-			echo utf8_encode(get_lang('YouDontHaveContactsInThisGroup'));
+			echo mb_convert_encoding(get_lang('YouDontHaveContactsInThisGroup'),'UTF-8',$charset);
 		}
 		?>
 		</div>

+ 5 - 5
main/social/select_friend_response.php

@@ -32,7 +32,7 @@ for ($i=0;$i<$number_loop;$i++) {
     <td width="600" height="20" valign="top"><table width="100%" border="0"
 cellpadding="0" cellspacing="0" bgcolor="#9DACBF">
       <tr>
-        <td width="600" height="20" valign="top"><div align="left"><?php echo utf8_encode(get_lang('RequestContact')); ?></div></td>
+        <td width="600" height="20" valign="top"><div align="left"><?php echo mb_convert_encoding(get_lang('RequestContact'),'UTF-8',$charset); ?></div></td>
         </tr>
     </table></td>
   </tr>
@@ -65,7 +65,7 @@ width="100%" border="0" cellpadding="0" cellspacing="0">
                                 <?php 
                                 $user_id=$list_get_invitation[$i]['user_sender_id'];
                                 $user_info=api_get_user_info($user_id);
-                                echo utf8_encode($user_info['firstName']).' '.utf8_encode($user_info['lastName']);
+                                echo mb_convert_encoding($user_info['firstName'],'UTF-8',$charset) .' '.mb_convert_encoding($user_info['lastName'],'UTF-8',$charset);
                                 ?></td>
                                 </tr>
                             </table></td>
@@ -86,7 +86,7 @@ border="0" cellpadding="0" cellspacing="0">
                                 <td width="500" height="22" valign="top"><?php
                                 $title=get_lang($list_get_invitation[$i]['title']);
                                 $content=get_lang($list_get_invitation[$i]['content']);
-                                echo utf8_encode($title).' : '.utf8_encode($content);
+                                echo mb_convert_encoding($title,'UTF-8',$charset).' : '.mb_convert_encoding($content,'UTF-8',$charset);
                                 ?> </td>
                                 </tr>
                             </table></td>
@@ -106,8 +106,8 @@ border="0" cellpadding="0" cellspacing="0">
 cellpadding="0" cellspacing="0" bgcolor="#9DACBF">
               <tr>
                 <td width="600" height="25" valign="top"><div align="right">
-                  <input type="submit" name="btn_accepted" id="<?php echo "btn_accepted_".$user_id ?>" value="<?php echo utf8_encode(get_lang('Accept')); ?>" onclick="javascript:register_friend(this)"  />
-                  <input type="submit" name="btn_denied" id="<?php echo "btn_deniedst_".$user_id ?>" value="<?php echo utf8_encode(get_lang('Deny')); ?>" onclick="javascript:denied_friend(this)" />
+                  <input type="submit" name="btn_accepted" id="<?php echo "btn_accepted_".$user_id ?>" value="<?php echo mb_convert_encoding(get_lang('Accept'),'UTF-8',$charset); ?>" onclick="javascript:register_friend(this)"  />
+                  <input type="submit" name="btn_denied" id="<?php echo "btn_deniedst_".$user_id ?>" value="<?php echo mb_convert_encoding(get_lang('Deny'),'UTF-8',$charset); ?>" onclick="javascript:denied_friend(this)" />
                   </div></td>
                     </tr>
             </table></td>