Changeset 7225

Timestamp:

09/17/12 09:41:15 (12 years ago)

Author:

cristiano

Message:

Ticket #3105 - Problema com pesquisa F9 e catalagos externos

Location:

trunk/expressoMail1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (4 diffs)
• js/QuickCatalogSearch.js (modified) (1 diff)

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

@@ -340 +340 @@
         * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
         * @sponsor    Caixa Econômica Federal
-        * @author     Prognus Software Livre <airton@prognus.com.br | prognus@prognus.com.br>
+        * @author     ProgquickSearchAllnus Software Livre <airton@prognus.com.br | prognus@prognus.com.br>
         * @param      <array> <$param> <parametros vindos do cliente>
         * @return     <array> <$retorno> <Array com os usuários de todos os catálogos, de acordo com o parâmetro>
@@ -405 +405 @@
         * @return     <array> <$retorno> <Array com os usuários do Catálogo Global, de acordo com o parâmetro>
         */
-        function quickSearchGlobal($params, $all=false) 
+        function quickSearchGlobal($params, $all=false)
         {              
             include_once dirname(__FILE__). '/../../header.inc.php';
@@ -482 +482 @@
                                         $search = ldap_get_entries($this->ds, $sr);
                                         for ($j=0; $j<$search["count"]; $j++) {
-                                                $info_return[] = $search[$j];
+                                                $search[$j]['isExternal'] = true;
+                        $info_return[] = $search[$j];
                                         }
                                         $info_return["count"] = count($info_return)-1;
@@ -503 +504 @@
 
                         $info_return['search_for'] = $params['search_for'];
-
             return $info_return; 
         } 

trunk/expressoMail1_2/js/QuickCatalogSearch.js

@@ -710 +710 @@
                 }
                 verifyEmails(email, divs);
-                final_contact = "\""+nome +"\" <"+email+">";
+                final_contact = "\""+nome +"\" <"+email+"> ";
 
                 final_contact = final_contact.replace(/\/n/, ""); 
                 var index = parseInt(divs.split("_")[1])-1;
-                if(data_[index].type_contact == "G"){
+        if(typeof(data_[index].isExternal) != 'undefined' &&  data_[index].isExternal == true)
+            draw_email_box(final_contact, content.find(field_).filter("textarea:first"));
+        else if(data_[index].type_contact == "G"){
                         var ldap_id = preferences.expressoMail_ldap_identifier_recipient;
                         if(ldap_id){