Changeset 5134 for trunk/expressoMail1_2/preferences.php

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/preferences.php (modified) (8 diffs)

trunk/expressoMail1_2/preferences.php

@@ -40 +40 @@
                 else
                         $GLOBALS['phpgw']->template->set_var('checked_save_deleted_msg','');
+
+                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['default_fields_quick_search'])               
+                        $GLOBALS['phpgw']->template->set_var('checked_default_fields_quick_search','checked');
+                else
+                        $GLOBALS['phpgw']->template->set_var('checked_default_fields_quick_search','');
 
                 if($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['delete_trash_messages_after_n_days'])
@@ -129 +134 @@
                         $GLOBALS['phpgw']->template->set_var('text_signature','');
                 
-                if($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature']){
-                        $GLOBALS['phpgw']->template->set_var('type_signature_option_'.$GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'].'_selected','selected');
-                        $GLOBALS['phpgw']->template->set_var('type_signature_td_'.($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'] == 'html' ? 'text' : 'html'),'display:none');
-                }
-                else{
-                        $GLOBALS['phpgw']->template->set_var('type_signature_option_text_selected','selected');
-                        $GLOBALS['phpgw']->template->set_var('type_signature_td_html','display:none');
-                }
-
+
+                if($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['catalog_search']) 
+                {
+                    
+                }
+
+                
                 // BEGIN FCKEDITOR
                 $oFCKeditor = new FCKeditor('html_signature') ;
@@ -263 +266 @@
                 
                 
+                                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['default_fields_quick_search']) 
+                       $GLOBALS['phpgw']->preferences->change('expressoMail', 'default_fields_quick_search', $_POST['default_fields_quick_search']); 
+                else  
+                       $GLOBALS['phpgw']->preferences->add('expressoMail', 'default_fields_quick_search', $_POST['default_fields_quick_search']);     
+                
+                
                 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])
                         $GLOBALS['phpgw']->preferences->change('expressoMail','use_shortcuts',$_POST['use_shortcuts']);
@@ -300 +309 @@
                         $GLOBALS['phpgw']->preferences->add('expressoMail','signature',$_POST['signature']);
 
-                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'])
-                        $GLOBALS['phpgw']->preferences->change('expressoMail','type_signature',$_POST['type_signature']);
-                else
-                        $GLOBALS['phpgw']->preferences->add('expressoMail','type_signature',$_POST['type_signature']);
-
                 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'])
                         $GLOBALS['phpgw']->preferences->change('expressoMail','hide_folders',$_POST['check_menu']);
@@ -334 +338 @@
                         $GLOBALS['phpgw']->preferences->add('expressoMail','keep_archived_messages',$_POST['keep_archived_messages']);                  
 
+                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['default_fields_quick_search'])
+                        $GLOBALS['phpgw']->preferences->change('expressoMail','default_fields_quick_search',$_POST['default_fields_quick_search']);
+                else
+                        $GLOBALS['phpgw']->preferences->add('expressoMail','default_fields_quick_search',$_POST['default_fields_quick_search']);        
                 $GLOBALS['phpgw']->preferences->save_repository();
                 
@@ -376 +384 @@
         $GLOBALS['phpgw']->template->set_var('html_text',lang('Rich Text'));
         $GLOBALS['phpgw']->template->set_var('lang_config_signature',lang('Signature Configuration'));
-        $GLOBALS['phpgw']->template->set_var('lang_type_signature',lang('Signature type'));
         $GLOBALS['phpgw']->template->set_var('big',lang('Big'));
     //$GLOBALS['phpgw']->template->set_var('lang_use_signature_digital_cripto',lang('Possibilitar <b>assinar/criptografar</b> digitalmente a mensagem?'));
@@ -392 +399 @@
         $GLOBALS['phpgw']->template->set_var('lang_personal_catalog', lang('Personal Catalog')); 
         $GLOBALS['phpgw']->template->set_var('lang_all_catalog', lang('All Catalogs')); 
+        $GLOBALS['phpgw']->template->set_var('lang_default_fields_quick_search', lang('Show default fields in the quick search screen'));
         
         $GLOBALS['phpgw']->template->set_var('url_offline','offline.php');
@@ -427 +435 @@
                 $GLOBALS['phpgw']->template->set_var('checked_mainscreen_showmail','checked');
                 $GLOBALS['phpgw']->template->set_var('checked_show_name_print_messages','checked'); 
+                $GLOBALS['phpgw']->template->set_var('checked_default_fields_quick_search','checked'); 
                 $save_in_folder_selected = "INBOX".$e_server['imapDelimiter'].$specialFolders["Sent"];
         }