Changeset 485 for trunk/expressoMail1_2/index.php

Timestamp:

09/26/08 11:10:54 (16 years ago)

Author:

niltonneto

Message:

Quando os contatos dinâmicos estiverem habilitados para o usuário:

• Número máximo de contatos é carregado do array salvo na sessão, evitando a chamada AJAX ao

carregar módulo, que era invocada em preferences.js pela funçao get_number_of_contacts().

• Ao invés de usar a função JS init() para recarregar o autocompletar, que é muito pesado, apenas

atualizar a variavel "contacts" com os novos contatos dinãmicos adicionados, retornados pela
função que envia o email, verificando se os mesmos já não existem.

• Na função add_dynamic_contacts() foi usada uma RegExp? para limpar as "," duplicadas (que pode ocorrer) e os espaços em branco.

File:

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

trunk/expressoMail1_2/index.php

@@ -59 +59 @@
         $boemailadmin   = CreateObject('emailadmin.bo');
         $emailadmin_profile = $boemailadmin->getProfileList();
+    // Loading Admin Config Module
+    $c = CreateObject('phpgwapi.config','expressoMail1_2');
+    $c->read_repository();
+    $current_config = $c->config_data;    
+
         $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']);
         $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
@@ -64 +69 @@
         $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null;
         $_SESSION['phpgw_info']['expressomail']['user']['email'] = $GLOBALS['phpgw']->preferences->values['email'];
+        
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] = array(
                         'voip_enabled'                                          => $voip_enabled,
@@ -83 +89 @@
                 '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"
+                        '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"
                 
         );
@@ -115 +122 @@
         $GLOBALS['phpgw']->common->phpgw_footer();
     
-    // Loading Admin Config Module
-    $c = CreateObject('phpgwapi.config','expressoMail1_2');
-    $c->read_repository();
-    $current_config = $c->config_data;    
     $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] = $current_config['expressoMail_enable_log_messages'];
     // Begin Set Anti-Spam options.
@@ -127 +130 @@
         // End Set Anti-Spam options.
 
-        // Dynamic contact.
-        $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_Number_of_dynamic_contacts'] = $current_config['expressoMail_Number_of_dynamic_contacts'];
-
-       // Set Imap Folder names options
+    // Set Imap Folder names options
 
     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : lang("Trash");