Changeset 673 for trunk/expressoMail1_2/index.php

Timestamp:

02/06/09 16:53:27 (15 years ago)

Author:

niltonneto

Message:

Revisão 670 revertida para versionar 1.233 em TAGS.

File:

• trunk/expressoMail1_2/index.php (modified) (6 diffs)

trunk/expressoMail1_2/index.php

@@ -58 +58 @@
         }
 
-
-        //Local messages
-        $_SESSION['phpgw_info']['server']['expressomail']['enable_local_messages'] = $current_config['enable_local_messages'];
-
         // Get Data from ldap_manager and emailadmin.
         $ldap_manager = CreateObject('contactcenter.bo_ldap_manager');
@@ -77 +73 @@
         $_SESSION['phpgw_info']['expressomail']['user']['email'] = $GLOBALS['phpgw']->preferences->values['email'];
         
-        if($current_config['enable_local_messages']!='True')  {
-                $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] = 0;
-        }
-
+        
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = array(
                         'voip_enabled'                                          => $voip_enabled,
@@ -95 +88 @@
                 'type_signature'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['type_signature'],
                 'use_signature'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] : "0",
-                        'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",                 
+                'hide_folders'                                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0",                 
                 'save_in_folder'                                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1",
                 'line_height'                                           => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] : "30",
@@ -101 +94 @@
                 'use_shortcuts'                                         => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] : "0",
                 'auto_save_draft'                                       => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_save_draft'] : "0",
-                        'use_dynamic_contacts'                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0",
-                        'number_of_contacts'                            => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0",
-                        'use_cache'                                             => $current_config['expressoMail_enable_cache'],
-                        'notification_domains'                  => $current_config['expressoMail_notification_domains'],
-                'use_local_messages'                            => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'] : "0",                     
-                'keep_archived_messages'                        => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['keep_archived_messages'] : "0"
+                'use_dynamic_contacts'                                  => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0",
+                'number_of_contacts'                                    => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0",
+                'use_cache'                                             => $current_config['expressoMail_enable_cache'],
+                'notification_domains'                                  => $current_config['expressoMail_notification_domains'],
+                'remove_attachments_function'                           => $current_config['expressoMail_remove_attachments_function'],
+                'use_important_flag'                                    => $current_config['expressoMail_enable_important_flag']
+
+
                 
         );
@@ -167 +162 @@
 
     // End Set Imap Folder names options
-        //User info
-        echo "<script language='javascript'> var account_id = ".$GLOBALS['phpgw_info']['user']['account_id'].";</script>";
 
         $obj = createobject("expressoMail1_2.functions");
@@ -181 +174 @@
                                                         "js/InfoContact.js," .
                                                         "js/main.js," .
-                                                        "js/gears_init.js," .
-                                                        "js/local_messages.js," .
-                                                        "js/messages_proxy.js," .
                                                         "js/rich_text_editor.js," .
                                                         "js/wfolders.js,",