Changeset 2894 for branches/2.0

Timestamp:

06/02/10 10:16:25 (14 years ago)

Author:

amuller

Message:

Ticket #820 - Remoção %%20 das strings

Location:

branches/2.0

Files:

• contactcenter/inc/class.ui_data.inc.php (modified) (6 diffs)
• expressoMail1_2/js/DropDownContacts.js (modified) (1 diff)

branches/2.0/contactcenter/inc/class.ui_data.inc.php

@@ -1841 +1841 @@
 
                         /* Verify Data and performs insertion/update */
-                        foreach($data as $field => &$value)
+                        foreach($data as $field => $value)
                         {
                                 if ($value == '' or is_null($value))
@@ -1848 +1848 @@
                                         continue;
                                 }
-                                
                                 switch($field)
                                 {
+                                        case 'names_ordered':
+                                                $data[$field] = urldecode($value);
                                         case 'alias':
                                         case 'given_names':
                                         case 'family_names':
-                                        case 'names_ordered':
                                         case 'pgp_key':
                                         case 'notes':                                   
-                                                $data[$field] = urldecode( $value );
+                                                $data[$field] = urldecode($data[$field]);
                                                 break;
                                         case 'id_status':
@@ -1931 +1931 @@
                                                                 if ($value['new_cities'][$type])
                                                                 {
-                                                                        $value['new_cities'][$type]['id_state'] = $id_state;
+                                                                        $data[$field]['new_cities'][$type]['id_state'] = $id_state;
                                                                 }
                                                         }
@@ -1967 +1967 @@
                         }
 
-                        $code = '$id = $this->bo->catalog->';
-
                         if (!is_null($id) and $id !== '')
                         {
-                                $code .= $code.'update_single_info($id, $data);';
+                                $id = $this->bo->catalog->update_single_info($id, $data);
                                 $result = array(
                                         'msg' => lang('Updated Successfully!'),
@@ -1979 +1977 @@
                         else
                         {
-                                $code .= 'add_single_entry($data);';
+                                $id = $this->bo->catalog->add_single_entry($data);
                                 $result = array(
                                         'msg' => lang('Entry Added Successfully!'),
@@ -1985 +1983 @@
                                 );
                         }
-                        
-                        eval($code);
 
                         if (!($id))

branches/2.0/expressoMail1_2/js/DropDownContacts.js

@@ -81 +81 @@
         for (var i=0; i<match_contacts.length; i++)
         {
+                match_contacts[i] = unescape(match_contacts[i]);
                 var aux = match_contacts[i].split("");
                 for(var j in aux){