Changeset 7756 for trunk

Timestamp:

01/15/13 15:59:29 (11 years ago)

Author:

douglasz

Message:

Ticket #2166 - F9 não funciona quando o LDAP externo está fora.

Location:

trunk/expressoMail1_2

Files:

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

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

@@ -346 +346 @@
         function quickSearchAll($params)
         {
-                
             $retorno_personal = $this->quickSearchPersonal($params);
             $retorno_global   = $this->quickSearchGlobal($params);
             //$retorno = $retorno_personal + $retorno_global;
-            $retorno = array_merge($retorno_personal, $retorno_global);
-                        
+            if ($retorno_global){
+                $retorno = array_merge($retorno_personal, $retorno_global);
+            }else{
+                $retorno = $retorno_personal;
+            }
+
                         $retorno['type_catalog'] = "A";
                         $retorno['search_for'] = $params['search_for'];
@@ -504 +507 @@
 
                         $info_return['search_for'] = $params['search_for'];
-            return $info_return; 
+            return $info_return;
         } 
         

trunk/expressoMail1_2/js/common_functions.js

@@ -622 +622 @@
         var handler_emQuickSearch = function(data)
         {
-
-                if ((!data.status) && (data.error == "many results")){
-                        alert(get_lang('More than %1 results. Please, try to refine your search.',data.maxResult));
-                        return false;
-                }
-
-                if (data.length > 0){
-                        if ((field != 'null') && (ID != 'null'))
-                        {
-                                QuickCatalogSearch.showList(data, quickSearchKeyBegin, quickSearchKeyEnd, ID, field);
-                        }
-                        else
-                        {
-                                QuickSearchUser.showList(data);
-                        }
-                }
-                else
-                        alert(get_lang('None result was found.'));
+        if (data){
+            if ((!data.status) && (data.error == "many results")){
+                alert(get_lang('More than %1 results. Please, try to refine your search.',data.maxResult));
+                return false;
+            }
+
+            if (data.length > 0){
+                if ((field != 'null') && (ID != 'null'))
+                {
+                    QuickCatalogSearch.showList(data, quickSearchKeyBegin, quickSearchKeyEnd, ID, field);
+                }
+                else
+                {
+                    QuickSearchUser.showList(data);
+                }
+            }
+            else
+                alert(get_lang('None result was found.'));
+        }else{
+            alert(get_lang('None result was found.'));
+        }
                 return true;
         }