Changeset 197 for trunk/expressoMail1_2/index.php

Timestamp:

03/05/08 08:46:58 (16 years ago)

Author:

niltonneto

Message:

Ticket #147: Revisão da internacionalização
Ticket #152: Melhoria no Fora de Escritório
Implementação da funcao write_msg com a opção de não apagar aviso.
Implementação da funcao clean_msg para limpar aviso.

File:

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

trunk/expressoMail1_2/index.php

@@ -4 +4 @@
                 'nonavbar' => False,
                 'currentapp' => 'expressoMail1_2',
-                'update_version'        => '1.2201',
+                'update_version'        => '1.2210',
                 'enable_nextmatchs_class' => True
         );
@@ -88 +88 @@
        // Set Imap Folder names options
 
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder']      = $current_config['expressoMail_trash_folder']  ? $current_config['expressoMail_trash_folder']  : lang("Trash");
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'] = $current_config['expressoMail_drafts_folder'] ? $current_config['expressoMail_drafts_folder'] : lang("Drafts");
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder']       = $current_config['expressoMail_spam_folder']   ? $current_config['expressoMail_spam_folder']   : lang("Spam");
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder']       = $current_config['expressoMail_sent_folder']   ? $current_config['expressoMail_sent_folder']   : lang("Sent");
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']   = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']     ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']             : lang("Trash");
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']       : lang("Drafts");
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam");
+    $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent");
 
     echo '<script> var special_folders = new Array(4);
-                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'"] = \'Trash\';
-                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'].'"] = \'Drafts\';
-                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder'].'"] = \'Spam\';
-                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder'].'"] = \'Sent\';
-
-       var trashfolder = "'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'";
-                       
-                      
-       </script>';
+        special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';
+    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';
+    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';
+    special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';
+    var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";
+    var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";
+    var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";
+    var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";                      
+    </script>';
 
     // End Set Imap Folder names options
@@ -129 +129 @@
         $GLOBALS['phpgw']->preferences->read_repository();
         if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail'] == null){
-                echo '<script>alert("Caro usurio, \ncomo esta  a primeira vez que voc esta acessando o ExpressoMail, suas preferncias devem ser salvas.\n Favor escolher suas preferncias e clicar no boto Salvar.")</script>';
+                echo '<script>alert("' . lang('Dear user,\nthis is your first time in the ExpressoMail, your preferences must be saved.\nPlease, choose your preferences and click on the button Save.') . '")</script>';
                 echo "<script>location.href='./preferences.php'</script>";
         }