Changeset 21 for trunk/instant_messenger/inc/class.Ujabber.inc.php

Timestamp:

05/02/07 09:15:15 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/instant_messenger/inc/class.Ujabber.inc.php (modified) (2 diffs)

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -255 +255 @@
                 
                 // vCard
-                $array_vcard['FN'] = trim($arr['FN']['0']['#']) ? $arr['FN']['0']['#']: $id;
-                $array_vcard['NICKNAME'] = trim($arr['NICKNAME']['0']['#']) ? $arr['NICKNAME']['0']['#'] : $pJid;
-                $array_vcard['ORGNAME'] = trim($arr['ORG']['0']['#']['ORGNAME']['0']['#']) ? $arr['ORG']['0']['#']['ORGNAME']['0']['#'] : "";
-                $array_vcard['ORGUNIT'] = trim($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) ? $arr['ORG']['0']['#']['ORGUNIT']['0']['#'] : "";           
-                $array_vcard['ROLE'] = trim($arr['ROLE']['0']['#']) ? $arr['ROLE']['0']['#'] : "";                              
-                $array_vcard['BDAY'] = trim($arr['BDAY']['0']['#']) ? $arr['BDAY']['0']['#'] : "";
-                $array_vcard['DESC'] = trim($arr['DESC']['0']['#']) ? $arr['DESC']['0']['#'] : "";
+                $array_vcard['FN'] = trim($arr['FN']['0']['#']) ? urldecode($arr['FN']['0']['#']): $id;
+                $array_vcard['NICKNAME'] = trim($arr['NICKNAME']['0']['#']) ? urldecode($arr['NICKNAME']['0']['#']) : $pJid;
+                $array_vcard['ORGNAME'] = trim($arr['ORG']['0']['#']['ORGNAME']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGNAME']['0']['#']) : "";
+                $array_vcard['ORGUNIT'] = trim($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) ? urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']) : "";                
+                $array_vcard['ROLE'] = trim($arr['ROLE']['0']['#']) ? urldecode($arr['ROLE']['0']['#']) : "";                           
+                $array_vcard['BDAY'] = trim($arr['BDAY']['0']['#']) ? urldecode($arr['BDAY']['0']['#']) : "";
+                $array_vcard['DESC'] = trim($arr['DESC']['0']['#']) ? urldecode($arr['DESC']['0']['#']) : "";
                 $array_vcard['JID'] = $pJid;
                 return $array_vcard;
@@ -277 +277 @@
                 $xmlVcard  = "<iq id='$id' type='set'>";
                 $xmlVcard .= "<vCard xmlns='vcard-temp'>";              
-                $xmlVcard .= "<FN>$pVcard[0]</FN>";
-                $xmlVcard .= "<NICKNAME>$pVcard[1]</NICKNAME>";                                                                  
+                $xmlVcard .= "<FN>".urlencode($pVcard[0])."</FN>";
+                $xmlVcard .= "<NICKNAME>".urlencode($pVcard[1])."</NICKNAME>";                                                                   
                 $xmlVcard .= "<ORG>";
-                $xmlVcard .= "<ORGNAME>$pVcard[2]</ORGNAME>";
-                $xmlVcard .= "<ORGUNIT>$pVcard[3]</ORGUNIT>";
+                $xmlVcard .= "<ORGNAME>".urlencode($pVcard[2])."</ORGNAME>";
+                $xmlVcard .= "<ORGUNIT>".urlencode($pVcard[3])."</ORGUNIT>";
                 $xmlVcard .= "</ORG>";
-                $xmlVcard .= "<ROLE>$pVcard[4]</ROLE>";
-                $xmlVcard .= "<BDAY>$pVcard[5]</BDAY>";
-                $xmlVcard .= "<DESC>$pVcard[6]</DESC>"; 
+                $xmlVcard .= "<ROLE>".urlencode($pVcard[4])."</ROLE>";
+                $xmlVcard .= "<BDAY>".urlencode($pVcard[5])."</BDAY>";
+                $xmlVcard .= "<DESC>".urlencode($pVcard[6])."</DESC>";  
                 $xmlVcard .= "</vCard></iq>";