Changeset 21 for trunk/instant_messenger/js

Timestamp:

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

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/instant_messenger/js

Files:

• im_functions.js (modified) (1 diff)
• im_preferences.js (modified) (2 diffs)

trunk/instant_messenger/js/im_functions.js

@@ -240 +240 @@
                 if ( !_this.load_photo ){
 
-                        _this.vcard_user['VCARD_FN'] = data.VCARD_FN;
-                        _this.vcard_user['VCARD_NICKNAME'] = data.VCARD_NICKNAME;
-                        _this.vcard_user['VCARD_ORGNAME']  = data.VCARD_ORGNAME;
-                        _this.vcard_user['VCARD_ORGUNIT']  = data.VCARD_ORGUNIT;
-                        _this.vcard_user['VCARD_ROLE'] = data.VCARD_ROLE;
-                        _this.vcard_user['VCARD_BDAY'] = data.VCARD_BDAY;
-                        _this.vcard_user['VCARD_DESC'] = data.VCARD_DESC;
-                        _this.vcard_user['VCARD_JID']  = data.VCARD_JID;
+                        _this.vcard_user['VCARD_FN'] = decodeURI(data.VCARD_FN);
+                        _this.vcard_user['VCARD_NICKNAME'] = decodeURI(data.VCARD_NICKNAME);
+                        _this.vcard_user['VCARD_ORGNAME']  = decodeURI(data.VCARD_ORGNAME);
+                        _this.vcard_user['VCARD_ORGUNIT']  = decodeURI(data.VCARD_ORGUNIT);
+                        _this.vcard_user['VCARD_ROLE'] = decodeURI(data.VCARD_ROLE);
+                        _this.vcard_user['VCARD_BDAY'] = decodeURI(data.VCARD_BDAY);
+                        _this.vcard_user['VCARD_DESC'] = decodeURI(data.VCARD_DESC);
+                        _this.vcard_user['VCARD_JID']  = decodeURI(data.VCARD_JID);
 
                         im_win.get_photo_ldap(_this.vcard_user['VCARD_JID']);

trunk/instant_messenger/js/im_preferences.js

@@ -282 +282 @@
                 var _this = this;
                 IM.vcard_user['VCARD_FN'] = document.getElementById('FN').value;
-                _this.save_vcard = document.getElementById('FN').value + ";";
+                _this.save_vcard = url_encode(encodeURI(document.getElementById('FN').value)) + ";";
                 IM.vcard_user['VCARD_NICKNAME'] = document.getElementById('NICKNAME').value;
-                _this.save_vcard += document.getElementById('NICKNAME').value + ";";
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('NICKNAME').value)) + ";";
                 var nickname = document.getElementById('span_nickname').innerHTML;
                 document.getElementById('span_nickname').innerHTML = (IM.vcard_user['VCARD_NICKNAME']) ? "<b>&nbsp;" + IM.vcard_user['VCARD_NICKNAME'].substring(0,30) + "</b>" : nickname;
                 IM.vcard_user['VCARD_ORGNAME'] = document.getElementById('ORGNAME').value;
-                _this.save_vcard += document.getElementById('ORGNAME').value + ";";
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('ORGNAME').value)) + ";";
                 IM.vcard_user['VCARD_ORGUNIT'] = document.getElementById('ORGUNIT').value;
-                _this.save_vcard += document.getElementById('ORGUNIT').value + ";";
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('ORGUNIT').value)) + ";";
                 IM.vcard_user['VCARD_ROLE'] = document.getElementById('ROLE').value;
-                _this.save_vcard += document.getElementById('ROLE').value + ";";
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('ROLE').value)) + ";";
                 IM.vcard_user['VCARD_BDAY'] = document.getElementById('BDAY').value;
-                _this.save_vcard += document.getElementById('BDAY').value + ";";                
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('BDAY').value)) + ";";         
                 IM.vcard_user['VCARD_DESC'] = document.getElementById('DESC').value;
-                _this.save_vcard += document.getElementById('DESC').value;              
+                _this.save_vcard += url_encode(encodeURI(document.getElementById('DESC').value));               
                 var message_desc = document.getElementById('span_message').innerHTML;
                 document.getElementById('span_message').innerHTML = (IM.vcard_user['VCARD_DESC']) ? "<b>&nbsp;" + IM.vcard_user['VCARD_DESC'].substring(0,30) + "</b>" : message_desc ;
@@ -314 +314 @@
                 for(var i=0; i < IM.vcard_contacts.length; i++){
                         if(IM.vcard_contacts[i].jid == pJid){
-                                document.getElementById('_lbl_FN').innerHTML = IM.vcard_contacts[i].VCARD_FN;
-                                document.getElementById('_lbl_Nickname').innerHTML = IM.vcard_contacts[i].VCARD_NICKNAME;
-                                document.getElementById('_lbl_Orgunit').innerHTML = IM.vcard_contacts[i].VCARD_ORGUNIT;
-                                document.getElementById('_lbl_Role').innerHTML = IM.vcard_contacts[i].VCARD_ROLE;
-                                document.getElementById('_lbl_Birthday').innerHTML = IM.vcard_contacts[i].VCARD_BDAY;                                                                                                                           
+                                document.getElementById('_lbl_FN').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_FN);
+                                document.getElementById('_lbl_Nickname').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_NICKNAME);
+                                document.getElementById('_lbl_Orgunit').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_ORGUNIT);
+                                document.getElementById('_lbl_Role').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_ROLE);
+                                document.getElementById('_lbl_Birthday').innerHTML = decodeURI(IM.vcard_contacts[i].VCARD_BDAY);                                                                                                                                
                                 return;
                         }