Changeset 4538 for sandbox/2.2.0.2/contactcenter/inc/class.ui_data.inc.php

Timestamp:

05/27/11 15:02:52 (13 years ago)

Author:

airton

Message:

Ticket #1934 - Parametrização das buscas LDAP no Contactcenter

File:

• sandbox/2.2.0.2/contactcenter/inc/class.ui_data.inc.php (modified) (4 diffs)

sandbox/2.2.0.2/contactcenter/inc/class.ui_data.inc.php

@@ -3172 +3172 @@
                         if (!is_array($data) || (!$data['search_for'] && !$full_search) || !is_array($data['fields']))
                         {
-                                echo serialize(array(
-                                        'msg'    => lang('Invalid parameters'),
-                                        'status' => 'abort'
-                                ));
-
-                                return array('error' => lang('Invalid parameters'));
+                            echo serialize(array(
+                                    'msg'    => lang('Invalid parameters'),
+                                    'status' => 'abort'
+                            ));
+
+                            return array('error' => lang('Invalid parameters'));
                         }
 
@@ -3211 +3211 @@
                         else
                         {
-                                $names = explode(' ', $data['search_for']);
-
-                                if (!is_array($names))
-                                {
-                                        if(!$full_search) {
-                                                echo serialize(array(
-                                                        'msg'    => lang('Invalid Search Parameter'),
-                                                        'status' => 'abort'
-                                                ));
-                                                exit;
-                                        }
-                                        else 
-                                                $names = array();
-
-                                }
+                            $names = explode(' ', $data['search_for']);
+
+                            if (!is_array($names))
+                            {
+                                    if(!$full_search) {
+                                            echo serialize(array(
+                                                    'msg'    => lang('Invalid Search Parameter'),
+                                                    'status' => 'abort'
+                                            ));
+                                            exit;
+                                    }
+                                    else 
+                                            $names = array();
+
+                            }
 
                                 if (!$external && $this->page_info['actual_catalog']['class'] != 'bo_people_catalog' &&
@@ -3287 +3287 @@
                                                         array_push($rules,array(
                                                                                         'field' => $this->aux_full_search($field,false),
-                                                                                        'type' => 'iLIKE',
-                                                                                        'value' => '%'.$value.'%'
+                                                                                        'type'  => 'LIKE and ~=',
+                                                                                        'value' => $name
                                                                                         ));
-                                        }
+                                                }
                                 
                                 }
@@ -3300 +3300 @@
                                                 array_push($rules, array(
                                                         'field' => $data['fields']['search'],
-                                                        'type'  => 'iLIKE',
-                                                        'value' => '%'.$name.'%'
+                                                        'type'  => 'LIKE and ~=',
+                                                        'value' => $name
                                                 ));
                                         }