Changeset 1965

Timestamp:

02/03/10 14:45:36 (14 years ago)

Author:

wmerlotto

Message:

Ticket #900 - Adicionando funcionalidade de limpar a pasta Spam

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/connector.js (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• js/main.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (4 diffs)
• templates/default/main.css (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -2994 +2994 @@
         }
 
-        function empty_trash()
-        {
-                $folder = 'INBOX' . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+        function empty_folder($params)
+        {
+                $folder = 'INBOX' . $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server'][$params['clean_folder']];
                 $mbox_stream = $this->open_mbox($folder);
                 $return = imap_delete($mbox_stream,'1:*');

trunk/expressoMail1_2/js/connector.js

@@ -533 +533 @@
                         case 'getReturnExecuteForm':
                         case 'set_messages_flag':
-                        case 'empty_trash':
+                        case 'empty_folder':
                                 this.purgeCache();
                         default: // no cache

trunk/expressoMail1_2/js/draw_api.js

@@ -254 +254 @@
                         var trash = document.createElement("SPAN");
                         trash.id = 'empty_trash';
-                        trash.className = 'clean_trash';
+                        trash.className = 'clean_folder';
                         trash.style.cursor = 'pointer';
                         trash.onclick = function () {empty_trash_imap();};
                         trash.innerHTML = "["+get_lang("Clean")+"]";
-                        trash.title="Limpar lixeira";
+                        trash.title=get_lang("Empty trash");
                         trash.onmouseover = function() {trash.style.color="red";};
-                        trash.onmouseout= function() {trash.style.color="#666666";}; //#114FA4
+                        trash.onmouseout= function() {trash.style.color="#666666";};
                         document.getElementById("nINBOX/"+trashfolder+"tree_folders").appendChild(trash);
                 }
+                if(document.getElementById("nINBOX/"+spamfolder+"tree_folders"))
+                {
+                        var spam = document.createElement("SPAN");
+                        spam.id = 'empty_spam';
+                        spam.className = 'clean_folder';
+                        spam.style.cursor = 'pointer';
+                        spam.style.padding = '0 0 0 6px';
+                        spam.onclick = function () {empty_spam_imap();};
+                        spam.innerHTML = "["+get_lang("Clean")+"]";
+                        spam.title=get_lang("Empty Spam Folder");
+                        spam.onmouseover = function() {spam.style.color="red";};
+                        spam.onmouseout= function() {spam.style.color="#666666";};
+                        document.getElementById("nINBOX/"+spamfolder+"tree_folders").appendChild(spam);
+               }
 
                 // Draw right menu folders.

trunk/expressoMail1_2/js/main.js

@@ -2157 +2157 @@
         var realyEmptyTrash=confirm(get_lang('Do you really want to empty your trash folder?'));
         if (realyEmptyTrash)
-                cExecute ("$this.imap_functions.empty_trash", handler_empty_trash);
-}
+                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultTrashFolder", handler_empty_trash);
+}
+
+function empty_spam_imap(){
+        var handler_empty_spam = function(data){
+                Element('chk_box_select_all_messages').checked = false;
+                if(!verify_session(data))
+                        return;
+                if (get_current_folder() == 'INBOX'+cyrus_delimiter+spamfolder){
+                        draw_paging(0);
+                        kill_current_box();
+                }
+                tree_folders.getNodeById('INBOX'+cyrus_delimiter+spamfolder).alter({caption: get_lang("Spam")});
+                tree_folders.getNodeById('INBOX'+cyrus_delimiter+spamfolder)._refresh();
+                update_quota(get_current_folder());
+                if (data)
+                        write_msg(get_lang('Your Spam folder was empty.'));
+                else
+                        write_msg(get_lang('ERROR emptying your Spam folder.'));
+        }
+        var realyEmptySpam=confirm(get_lang('Do you really want to empty your spam folder?'));
+        if (realyEmptySpam)
+                cExecute ("$this.imap_functions.empty_folder&clean_folder="+"imapDefaultSpamFolder", handler_empty_spam);
+}
+
 
 function export_all_selected_msgs(){

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -103 +103 @@
 Download manual expressoMail1_2 pt-br   Baixar manual
 Do you confirm this import to your Calendar?    expressoMail1_2 pt-br   Confirma a importação para tua agenda do Expresso?
-Do you really want to empty your trash folder?  expressoMail1_2 pt-br   Você tem certeza que deseja apagar sua lixeira?
+Do you really want to empty your spam folder?   expressoMail1_2 pt-br   Você tem certeza que deseja limpar sua pasta Spam?
+Do you really want to empty your trash folder?  expressoMail1_2 pt-br   Você tem certeza que deseja limpar sua lixeira?
 Do you wanna receive an alert for new messages? expressoMail1_2 pt-br   Você quer receber um alerta para mensagens novas?
 Do you want to block this e-mail?       expressoMail1_2 pt-br   Você gostaria de bloquear este e-mail?
@@ -122 +123 @@
 E-mail rule     expressoMail1_2 pt-br   regra do email
 Emails of the account   expressoMail1_2 pt-br   Emails da conta
+Empty Spam Folder       expressoMail1_2 pt-br   Limpar pasta spam
 Empty Trash     expressoMail1_2 pt-br   Limpar lixeira
 ENABLED expressoMail1_2 pt-br   Habilitada
@@ -146 +148 @@
 Error moving or delete message: Message too large. Select one message by one.   expressoMail1_2 pt-br   Erro ao mover ou deletar mensagem: Mensagem muito grande. Selecione uma por vez.
 ERROR saving your message.      expressoMail1_2 pt-br   Ocorreu um ERRO ao salvar sua mensagem.
+ERROR emptying your Spam folder.        expressoMail1_2 pt-br   Ocorreu um ERRO ao limpar sua pasta Spam.
 Everytime you receive new messages you will be informed expressoMail1_2 pt-br   Cada vez que você receber novas mensagens que você será informado
 Exclusion       expressoMail1_2 pt-br   Exclusão
@@ -561 +564 @@
 Your search argument must be longer than %1 characters. expressoMail1_2 pt-br   Seus argumentos para a pesquisa precisam ter mais que %1 dígitos.
 Your session could not be verified.     expressoMail1_2 pt-br   Sua sessão expirou. Entre novamente no Expresso.
+Your Spam folder was empty.     expressoMail1_2 pt-br   Sua pasta Spam foi limpa.
 Your Trash folder was empty.    expressoMail1_2 pt-br   Sua pasta Lixeira foi limpa.
 zip mails to import     expressoMail1_2 pt-br   Arquivo .zip ou .eml:

trunk/expressoMail1_2/templates/default/main.css

@@ -414 +414 @@
          font-weight: bold;
 }
-.clean_trash {
+.clean_folder {
         cursor: pointer;
         white-space: nowrap;
-        color: #666666; /*#114FA4*/
+        color: #666666; 
         font-family: sans-serif;
         font-size: 9px;
         font-weight: bold;
+        padding-left:15px;
+        position:absolute;
 }
 .em_sidebox_menu {