Changeset 5209

Timestamp:

11/28/11 14:47:30 (12 years ago)

Author:

gustavo

Message:

Ticket #2347 - Erro na busca do F9 (Ao utlizar a busca do F9 no catalogo pessoal, não retorna dados. )

Location:

trunk/expressoMail1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (3 diffs)
• js/common_functions.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -268 +268 @@
         function quicksearchcontact($params)
         {
-            if($params['Type'] != "undefined" && $params['Type'] != null){
+            if(array_key_exists('Type', $params)){
                 return $this->quickSearch($params);
             }
@@ -351 +351 @@
             $DBService = ServiceLocator::getService('db');
             $results   = $DBService->search_contacts($params['search_for']);
-                        $DBService = ServiceLocator::getService('db');
+                        $results2 = array();
             $results2   = $DBService->search_groups($params['search_for']);
-            $results   = array_merge($results, $results2);
+            
+            if(is_array($results)){
+                if(is_array($results2)){
+                        $results   = array_merge($results, $results2);
+                }
+            }
+            else if(is_array($results2)){
+                $results = $results2;
+            }
             
             if(!$all)
@@ -362 +370 @@
                         
                         $results['search_for'] = $params['search_for'];
+                        
                         return $results;
         } 

trunk/expressoMail1_2/js/common_functions.js

@@ -611 +611 @@
             return false;
         }
-        if(Type === 'undefined')
+        if(Type == undefined)
             cExecute ("$this.ldap_functions.quicksearchcontact&search_for="+search_for+"&field="+field+"&ID="+ID, handler_emQuickSearch);
         else