Changeset 4906 for branches/2.3/expressoMail1_2

Timestamp:

08/05/11 14:33:32 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2186 - Pesquisa rápida de contatos com aspas

Location:

branches/2.3/expressoMail1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.3/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -84 +84 @@
                 $functions = new functions;
 
+//              $search_for     = utf8_encode($params['search_for']);
+  //Testa se a busca foi realizada com aspas
                 $search_for     = utf8_encode($params['search_for']);
+                $search_len = (strlen($search_for)) - 1;
+                $quote_status=false;
+
+                if((($search_for{0}) == "\"") && (($search_for{$search_len}) == "\"")){
+                    $search_for{0} = " ";
+                    $search_for{$search_len} = " ";
+                    $quote_status=true;
+                }
+
+
+
                 $field          = $params['field'];
                 $ID                     = $params['ID'];
@@ -133 +146 @@
                         else
                         {
-                                $filter="(& (phpgwAccountType=u)(cn=*$search_for*) (!(phpgwaccountvisible=-1)) )";
+                                if($quote_status){
+                                        $filter="(& (phpgwAccountType=u) (|(cn=* $search_for *)(cn=$search_for *)(cn=* $search_for)) (!(phpgwaccountvisible=-1)) )";
+                                }
+                                else{
+                                        $filter="(& (phpgwAccountType=u)(cn=*$search_for*) (!(phpgwaccountvisible=-1)) )";
+                                }
+                        //      $filter="(& (phpgwAccountType=u)(cn=*$search_for*) (!(phpgwaccountvisible=-1)) )";
                                 if($extendedinfo)
                                 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible","jpegPhoto", "uid", "employeeNumber", "ou");

branches/2.3/expressoMail1_2/js/common_functions.js

@@ -602 +602 @@
 
         if (search_for.length < preferences.search_characters_number){
-            alert(get_lang('Your search argument must be longer than %1 characters.', preferences.search_characters_number));
+            //alert(get_lang('Your search argument must be longer than %1 characters.', preferences.search_characters_number));
+            alert(get_lang('Your search argument must be longer than %1 characters. Use quotes to refine your search', preferences.search_characters_number));
             return false;
         }

branches/2.3/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -621 +621 @@
 Your message was sent to queue  expressoMail1_2 pt-br   Sua mensagem foi enviada com sucesso para a fila
 Your search argument must be longer than %1 characters. expressoMail1_2 pt-br   Seus argumentos para a pesquisa precisam ter mais que %1 dígitos.
+Your search argument must be longer than %1 characters. Use quotes to refine your search        expressoMail1_2 pt-br   Seus argumentos para a pesquisa precisam ter mais que %1 dígitos. Use aspas para refinar a sua pesquisa.
 Your session could not be verified.     expressoMail1_2 pt-br   Sua sessão expirou. Entre novamente no Expresso.
 Your Spam folder was empty.     expressoMail1_2 pt-br   Sua pasta Spam foi limpa.