Changeset 1411

Timestamp:

09/15/09 10:00:47 (15 years ago)

Author:

rodsouza

Message:

Ticket #611 - Caracteres especiais codificados.

Location:

trunk/contactcenter

Files:

• inc/class.ui_data.inc.php (modified) (4 diffs)
• js/ccAux.js (modified) (1 diff)

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

@@ -1206 +1206 @@
                                         if ($index !== 'error'){
                                                 $final[3][$i][0] = $contact['companies']['company1']['company_name']?$contact['companies']['company1']['company_name']:'none';
-                                                $final[3][$i][1] = $contact['names_ordered'] ? $contact['names_ordered'] : 'none';
-                                                $final[3][$i][2] = $contact['companies']['company1']['title']?$contact['companies']['company1']['title']:'none';
+                                                $final[3][$i][1] = $contact['names_ordered'] ? urldecode( $contact['names_ordered'] ) : 'none';
+                                                $final[3][$i][2] = $contact['companies']['company1']['title']? urldecode( $contact['companies']['company1']['title'] ) :'none';
 
                                                 /* Select the correct Email and Telephone to be shown */
@@ -1255 +1255 @@
                                                 }
 
-                                                $final[3][$i][5] = $contact['alias']?$contact['alias']:'none';
+                                                $final[3][$i][5] = $contact['alias']? urldecode( $contact['alias'] ):'none';
                                                 $final[3][$i][6] = $ids[$i];
 
@@ -1830 +1830 @@
 
                         /* Verify Data and performs insertion/update */
-                        foreach($data as $field => $value)
+                        foreach($data as $field => &$value)
                         {
                                 if ($value == '' or is_null($value))
@@ -1847 +1847 @@
                                         case 'notes':
                                         case 'photo':
+                                                $value = urldecode( $value );
                                                 /* Do Nothing. This is just to make sure no invalid field is passed */
                                                 break;

trunk/contactcenter/js/ccAux.js

@@ -354 +354 @@
 function replaceComAnd(str, replacer)
 {
+        return escape( str );
         var oldPos = 0;
         var pos = 0;