Changeset 1342 for branches/1.2/expressoMail1_2/index.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/index.php (modified) (5 diffs)

branches/1.2/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');
@@ -76 +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,
@@ -105 +99 @@
                 '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'],
-                '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_important_flag'                                    => $current_config['expressoMail_enable_important_flag']
 
 
@@ -171 +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");
@@ -185 +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,",