Changeset 1342 for branches/1.2/expressoMail1_2/preferences.php

Timestamp:

08/19/09 11:10:14 (15 years ago)

Author:

niltonneto

Message:

Ticket #561 - Correção das diferenças entre versão publicada e branch 1.2

File:

• branches/1.2/expressoMail1_2/preferences.php (modified) (3 diffs)

branches/1.2/expressoMail1_2/preferences.php

@@ -133 +133 @@
                 else
                         $GLOBALS['phpgw']->template->set_var('font_size_option_11_selected','selected');
-            $c = CreateObject('phpgwapi.config','expressoMail1_2');
-            $c->read_repository();
-            $current_config = $c->config_data;
-                
-                if($current_config['enable_local_messages']!='True') {
-                        $GLOBALS['phpgw']->template->set_var('open_comment_local_messages_config',"<!--");
-                        $GLOBALS['phpgw']->template->set_var('close_comment_local_messages_config',"-->");
-                }
-                else {
-                        $GLOBALS['phpgw']->template->set_var('open_comment_local_messages_config'," ");
-                        $GLOBALS['phpgw']->template->set_var('close_comment_local_messages_config'," ");
-                }
-                
-                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
-                        $GLOBALS['phpgw']->template->set_var('use_local_messages_option_Yes_selected','selected');
-                else {
-                        $GLOBALS['phpgw']->template->set_var('use_local_messages_option_No_selected','');
-                        $GLOBALS['phpgw']->template->set_var('use_local_messages_option_Yes_selected','');
-                }
-                
-                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'])
-                        $GLOBALS['phpgw']->template->set_var('keep_archived_messages_option_Yes_selected','selected');
-                else {
-                        $GLOBALS['phpgw']->template->set_var('keep_archived_messages_option_No_selected','');
-                        $GLOBALS['phpgw']->template->set_var('keep_archived_messages_option_Yes_selected','');
-                }               
-                
         }
         else //Save Config
@@ -259 +232 @@
                 else
                         $GLOBALS['phpgw']->preferences->add('expressoMail','font_size',$_POST['font_size']);            
-                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])
-                        $GLOBALS['phpgw']->preferences->change('expressoMail','use_local_messages',$_POST['use_local_messages']);
-                else
-                        $GLOBALS['phpgw']->preferences->add('expressoMail','use_local_messages',$_POST['use_local_messages']);
-                        
-                if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'])
-                        $GLOBALS['phpgw']->preferences->change('expressoMail','keep_archived_messages',$_POST['keep_archived_messages']);
-                else
-                        $GLOBALS['phpgw']->preferences->add('expressoMail','keep_archived_messages',$_POST['keep_archived_messages']);                  
 
                 $GLOBALS['phpgw']->preferences->save_repository();
@@ -312 +276 @@
         $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_Would_you_like_to_keep_archived_messages_?',lang('Would you like to keep archived messages?'));
-        $GLOBALS['phpgw']->template->set_var('lang_Yes',lang('Yes'));
-        $GLOBALS['phpgw']->template->set_var('lang_No',lang('No'));
-        $GLOBALS['phpgw']->template->set_var('lang_Would_you_like_to_use_local_messages_?',lang('Would you like to use local messages?'));
         $GLOBALS['phpgw']->template->set_var('lang_use_signature',lang('Insert signature automatically in new messages?'));