Changeset 5630

Timestamp:

03/05/12 17:21:15 (12 years ago)

Author:

airton

Message:

Ticket #2088 - Melhorias no filtro de mensagens do Expresso - Pequena adequacao para bloqueio de usuario

Location:

trunk

Files:

• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• prototype/modules/filters/filters.js (modified) (3 diffs)
• prototype/modules/filters/interceptors/FilterMapping.php (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -2436 +2436 @@
                 //var option_mark_as_important                  = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'flagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Important")+'.\');">'+get_lang("Important")+'</span>, ';
                 //var option_mark_as_normal                             = '<span class="message_options" onclick="proxy_mensagens.proxy_set_messages_flag(\'unflagged\','+info_msg.msg_number+');write_msg(\''+get_lang('Message marked as ')+get_lang("Normal")+'.\');">'+get_lang("Normal")+'</span> | ';
-                var block_user = '<span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick ="filter.new_rule(\''+info_msg.from.email+'\');">'+get_lang("Block Sender")+'</span> | ';     
+                var block_user = '<!--<script src="../prototype/modules/filters/filters.js"></script>--><span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick ="block_user_email("'+info_msg.from.email+'");">'+get_lang("Block Senderr")+'</span> | ';       
                 //var option_forward = '<span onclick="new_message(\'forward\',\''+ ID+'\');" onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options">'+get_lang("Forward")+'</span> | ';
                 var option_move = '<span onmouseover="this.className=\'reply_options_active\'" onmouseout="this.className=\'reply_options\'" class="reply_options" onclick=wfolders.makeWindow("'+ID+'","move_to");>'+get_lang("Move")+'</span> | ';
@@ -4754 +4754 @@
         var dn_em       = document.createElement("SPAN");
                 dn_em.id = "tt_d";
-                dn_em.onclick = function(){filter.new_rule(email);};
+                dn_em.onclick = function(){ block_user_email(email); /*filter.new_rule(email);*/ };
                 dn_em.setAttribute("title",get_lang("Block Sender"));
                 dn_em.style.cursor = "pointer";
-                dn_em.innerHTML = "<img align='top' src='./templates/"+template+"/images/deny.gif'>";
+                dn_em.innerHTML = "<script src='../prototype/modules/filters/filters.js'></script><img align='top' src='./templates/"+template+"/images/deny.gif'>";
         return dn_em;
 

trunk/prototype/modules/filters/filters.js

@@ -104 +104 @@
     for( var i = 0; i < filter.criteria.length; i++ ){
 
-        criterias.filter( '[value="' + filter.criteria[i].field + '"]' )
-        .siblings( '[name="criteriaOperator[]"]' ).val( filter.criteria[i].operator ).end()
-        .siblings( '[name="criteriaValue[]"]' ).val( filter.criteria[i].value );
+                criterias.filter( '[value="' + filter.criteria[i].field + '"]' )
+                .siblings( '[name="criteriaOperator[]"]' ).val( filter.criteria[i].operator ).end()
+                .siblings( '[name="criteriaValue[]"]' ).val( filter.criteria[i].value );
 
     }
@@ -246 +246 @@
 
 });
+
+
+
 
 var BASE_PATH = '../prototype/';
@@ -643 +646 @@
 // ------------------------------------------------------------    
 */ 
+
+function block_user_email(email) { 
+        //var id = "block_"+email;
+        var idd = email;
+        DataLayer.put( 'filter', idd, 
+                                        { name: email, isExact: false, 
+                                                criteria:{ 0: {value: email, operator: "=", field: "from"} },
+                                                /* To-do: Arrumar para popular a tela com o reject, pois não há essa opção na interface. */
+                                                actions: { 0: {parameter: "INBOX/Spam", type: "fileinto"}}, 
+                                                enabled: true, 
+                                                id: email,
+                                                block: true 
+                                        });
+        
+        DataLayer.commit("filter");
+}
+
 function list_filters(html){
         var filters = DataLayer.get("filter", true);

trunk/prototype/modules/filters/interceptors/FilterMapping.php

@@ -75 +75 @@
         public function formatSieveScript( $rules )
     {
+        
                 $require_fileinto = $require_flag = $require_reject = $require_vacation = $require_body = $require_imapflag = $vacation = $startswith = $endswith = false;
 
@@ -83 +84 @@
                 foreach( $rules as $name => $data )
                 {
-
+                        /* Usado na opção Bloquear usuário do ExpressoMail */
+                        if($data['block']) {
+                                ($i >0) ? $script_match = 'elsif anyof' : $script_match = 'if anyof';
+                                $script_match = $script_match . "(address :is \"from\" [\"" .$data['name'] . "\"]) {\r\n";  
+                                $script_match .= "fileinto \"INBOX/Spam\"; \r\n}\r\n";
+                                $script_rules .= $script_match;
+                                $script_match = "";
+                                $script_criteria = "";
+                                $require_fileinto = true;
+                                $i++;
+                                continue;
+                        }
+                        
                         if( $data['enabled'] == 'false' )
                                 continue;
@@ -384 +397 @@
         public function setRule( &$uri , &$params , &$criteria , $original  )
         {
-            if( !$this->rules )
+                if( !$this->rules )
                 $this->rules = $this->getRules();