Changeset 5131 for trunk/contactcenter/inc/class.abo_catalog.inc.php

Timestamp:

11/03/11 11:17:35 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo contactcenter.

File:

• trunk/contactcenter/inc/class.abo_catalog.inc.php (modified) (6 diffs)

trunk/contactcenter/inc/class.abo_catalog.inc.php

@@ -188 +188 @@
                 function init()
                 {
-                        $this->db =& $GLOBALS['phpgw']->db;
-                        $this->security =& CreateObject('contactcenter.security_manager');
+                        $this->db = $GLOBALS['phpgw']->db;
+                        $this->security = CreateObject('contactcenter.security_manager');
                 }
 
@@ -729 +729 @@
                                                 
                                         case 'iLIKE':
-                                                $return_t[] = 'UPPER( '.$associative_tree[$restrict_data['field']]['table'].'.'.
-                                                              $associative_tree[$restrict_data['field']]['field'].') LIKE UPPER(\''.$restrict_data['value'].'\')';
+                                                $return_t[] = 'UPPER( translate('.$associative_tree[$restrict_data['field']]['table'].'.'.
+                                                              $associative_tree[$restrict_data['field']]['field'].',\'áàâãäéèêëíìïóòôõöúùûüÁÀÂÃÄÉÈÊËÍÌÏÓÒÔÕÖÚÙÛÜçÇñÑ\',\'aaaaaeeeeiiiooooouuuuAAAAAEEEEIIIOOOOOUUUUcCnN\')) LIKE UPPER(translate(\''.$restrict_data['value'].'\', \'áàâãäéèêëíìïóòôõöúùûüÁÀÂÃÄÉÈÊËÍÌÏÓÒÔÕÖÚÙÛÜçÇñÑ\',\'aaaaaeeeeiiiooooouuuuAAAAAEEEEIIIOOOOOUUUUcCnN\'))';
                                                 break;
                                         
                                         case 'LIKE and ~=':
-                                                $return_t[] = 'UPPER( to_ascii('.$associative_tree[$restrict_data['field']]['table'].'.'.
-                                      $associative_tree[$restrict_data['field']]['field'].')) LIKE UPPER( to_ascii (\''."%".$restrict_data['value']."%".'\'))';
+                                        $return_t[] = 'UPPER(translate('.$associative_tree[$restrict_data['field']]['table'].'.'.
+                                      $associative_tree[$restrict_data['field']]['field'].',\'áàâãäéèêëíìïóòôõöúùûüÁÀÂÃÄÉÈÊËÍÌÏÓÒÔÕÖÚÙÛÜçÇñÑ\',\'aaaaaeeeeiiiooooouuuuAAAAAEEEEIIIOOOOOUUUUcCnN\')) LIKE UPPER(translate(\''."%".($restrict_data['value'])."%".'\', \'áàâãäéèêëíìïóòôõöúùûüÁÀÂÃÄÉÈÊËÍÌÏÓÒÔÕÖÚÙÛÜçÇñÑ\',\'aaaaaeeeeiiiooooouuuuAAAAAEEEEIIIOOOOOUUUUcCnN\'))';
                                                 break;
                                         
@@ -883 +883 @@
                         foreach($id_states as $id_state)
                         {
-                                $state =& CreateObject('contactcenter.so_state', $id_state['id_state']);
+                                $state = CreateObject('contactcenter.so_state', $id_state['id_state']);
                                 
                                 $result[$id_state['id_state']]['id_state']   = $state->get_id();
@@ -945 +945 @@
                         foreach($id_cities as $id_city)
                         {
-                                $city =& CreateObject('contactcenter.so_city', $id_city['id_city']);
+                                $city = CreateObject('contactcenter.so_city', $id_city['id_city']);
                                 
                                 $result[$id_city['id_city']]['id_city']      = $city->get_id();
@@ -1035 +1035 @@
                         }
 
-                        $city =& CreateObject('contactcenter.so_city');
+                        $city = CreateObject('contactcenter.so_city');
 
                         $city->set_id_country($city_info['id_country']);
@@ -1107 +1107 @@
                         }
 
-                        $state =& CreateObject('contactcenter.so_state');
+                        $state = CreateObject('contactcenter.so_state');
 
                         $state->set_id_country($state_info['id_country']);