Changeset 1610

Timestamp:

11/09/09 17:18:52 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #718 - Preferência: número mínimo de caracteres na pesquisa de contatos.

Location:

trunk/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (1 diff)
• index.php (modified) (1 diff)
• js/QuickCatalogSearch.js (modified) (1 diff)
• js/common_functions.js (modified) (1 diff)
• setup/phpgw_en.lang (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -165 +165 @@
 
 create_select_box('What is the maximum number of results in an e-mail search?','search_result_number',$default,'');
+
+$default =  array(
+    '1' => lang('unlimited'),
+    '2'     => '2',
+    '3'     => '3',
+    '4'     => '4',
+    '5'     => '5'
+);
+
+create_select_box('What is the minimum number of characters in searching contacts?','search_characters_number',$default,'what is the minimum number of characters in searching contacts');
 
 create_select_box('What is the height of the lines in the list of messages?','line_height',$default,'');

trunk/expressoMail1_2/index.php

@@ -71 +71 @@
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_digital'] : "0";
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['search_result_number'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['search_result_number'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['search_result_number'] : "50";
+    $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['search_characters_number'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['search_characters_number'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['search_characters_number'] : "4";
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['num_max_certs_to_cipher'] = $GLOBALS['phpgw_info']['server']['num_max_certs_to_cipher'] ?  $GLOBALS['phpgw_info']['server']['num_max_certs_to_cipher'] : "10";
     $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature_cripto'] : "0";

trunk/expressoMail1_2/js/QuickCatalogSearch.js

@@ -451 +451 @@
         emQuickCatalogSearch.prototype.searchCatalogList = function (itemSearch){
 
-                if(itemSearch && Element('search_for').value.length < 4){
-                        alert(get_lang('your search argument must be longer than 4 characters.'));
+                if(itemSearch && Element('search_for').value.length < preferences.search_characters_number){
+                        alert(get_lang('Your search argument must be longer than %1 characters.', preferences.search_characters_number));
                         Element('search_for').focus();
                         return false;

trunk/expressoMail1_2/js/common_functions.js

@@ -530 +530 @@
                 var search_for = emailList;
         
-        if (search_for.length < 4){
-                alert(get_lang('Your search argument must be longer than 4 characters.'));
-                return false;
+        if (search_for.length < preferences.search_characters_number){
+            alert(get_lang('Your search argument must be longer than %1 characters.', preferences.search_characters_number));
+            return false;
         }
         

trunk/expressoMail1_2/setup/phpgw_en.lang

@@ -197 +197 @@
 What is the maximum number of messages per page?        expressoMail1_2 en      What is the maximum number of messages per page?
 What is the maximum number of results in an e-mail search?      expressoMail1_2 en      What is the maximum number of results in an e-mail search?
+What is the minimum number of characters in searching contacts? expressoMail1_2 en      What is the minimum number of characters in searching contacts?
 Max size        expressoMail1_2 en      Max size
 Medium  expressoMail1_2 en      Medium