Changeset 5654

Timestamp:

03/07/12 02:47:34 (11 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) (1 diff)
• prototype/modules/filters/filters.js (modified) (2 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -2438 +2438 @@
                 //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 = '<!--<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 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 Sender")+'</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> | ';

trunk/prototype/modules/filters/filters.js

@@ -652 +652 @@
         //var id = "block_"+email;
         var idd = email;
+        
+        var filters = DataLayer.get("filter", true);
+        for(var index in filters){
+                if(filters[index].name == email) {
+                        if(confirm("Esse usuário já está bloqueado! Deseja desbloquea-lo?")) {
+                                DataLayer.remove( 'filter', idd );
+                                DataLayer.commit("filter");
+                                alert("Bloqueio do usuario " + email + " removido!");
+                                return true;
+                        } else return true;
+                }
+        }
+        
         DataLayer.put( 'filter', idd, 
                                         { name: email, isExact: false, 
@@ -663 +676 @@
         
         DataLayer.commit("filter");
+        alert("Usuário " + email + " bloqueado!");
 }