Changeset 2171 for trunk/contactcenter

Timestamp:

03/05/10 11:29:41 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #896 - Cadastro completo de contatos gera caracteres especiais

Location:

trunk/contactcenter

Files:

• inc/class.ui_data.inc.php (modified) (2 diffs)
• js/cc.js (modified) (1 diff)

trunk/contactcenter/inc/class.ui_data.inc.php

@@ -1396 +1396 @@
 
                                                 if($this->page_info['actual_catalog']['class']!='bo_global_ldap_catalog'){
-                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode($contact['names_ordered'])  : 'none';
+                                                        $contact['names_ordered'][0] = urldecode($contact['names_ordered'][0]);
+                                                        $final[3][$i][1] = $contact['names_ordered'] ? $contact['names_ordered']  : 'none';
                                                 }
                                                 else {
@@ -2086 +2087 @@
                                         case 'department':
                                         case 'web_page':
+                                        case 'pgp_key':
+
+                                                /* Do Nothing. This is just to make sure no invalid field is passed */
+                                                break;
+
                                         case 'alias':
                                         case 'given_names':
                                         case 'family_names':
                                         case 'names_ordered':
-                                        case 'pgp_key':
                                         case 'notes':
                                                 /* Do Nothing. This is just to make sure no invalid field is passed */
+                                                $data[$field] = rawurldecode($data[$field]);
                                                 break;
 

trunk/contactcenter/js/cc.js

@@ -621 +621 @@
         data['given_names']   = replaceComAnd(Element('cc_pd_given_names').value, replacer);
         data['family_names']  = replaceComAnd(Element('cc_pd_family_names').value, replacer);
-        data['names_ordered'] = replaceComAnd(data['given_names']+" "+data['family_names'], replacer);
+        data['names_ordered'] = replaceComAnd(Element('cc_pd_given_names').value+" "+Element('cc_pd_family_names').value, replacer);
         data['id_suffix']     = replaceComAnd(Element('cc_pd_suffix').value, replacer);;
         data['birthdate_0']   = replaceComAnd(Element('cc_pd_birthdate_0').value, replacer);