Changeset 6285 for sandbox/2.4.1-1/prototype

Timestamp:

05/23/12 16:26:07 (12 years ago)

Author:

airton

Message:

Ticket #2764 - Implementacao de alerta ao usuario para criterio atendido nos filtros de mensagens

Location:

sandbox/2.4.1-1/prototype/modules

Files:

• filters/edit-filter.ejs (modified) (1 diff)
• filters/filters.js (modified) (6 diffs)
• filters/interceptors/FilterMapping.php (modified) (5 diffs)
• mail/js/followupflag.js (modified) (1 diff)

sandbox/2.4.1-1/prototype/modules/filters/edit-filter.ejs

@@ -121 +121 @@
                                         %>
                                 </select>
+                                <input type="checkbox" name="actionType[]" value="alertMessage" class="alertMessage"/>
+                                <label><%= get_lang("Alert message filter by sender")%></label>
                         </fieldset>
                         <fieldset>

sandbox/2.4.1-1/prototype/modules/filters/filters.js

@@ +1 @@
+/* 
+ * Retorna as regras por remetente e que o usuário deseja ser avisado 
+ *
+ */
+function getFromAlertRules() { 
+        var filters = DataLayer.get("filter");
+        fromRules = [];
+        var alertMessage;
+        for (var index in filters) {
+                alertMessage = filters[index]['alertMessage'];          
+                for(var criterias in filters[index]['actions']) {
+                        if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true')
+                                fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter'];
+                }
+        }
+        return fromRules;
+}
+
 function outOfficeVerify() {    
         DataLayer.remove('filter', false);
@@ -173 +191 @@
 
 DataLayer.codec( "filter", "detail", {
-  
   decoder: function( form ){
-      if( form.vacation )
+          if( form.vacation )
           return {
                 criteria: [{ value: "vacation", operator: "", field: "vacation" }],
@@ -205 +222 @@
                         
                         !the_parameter ? the_parameter = form.actionParameter[i+1] : "";
+                        if (type == 'alertMessage') { 
+                                //if(!$('[value="alertMessage"]').parent().hasClass("hidden")){
+                                        type = 'addflag';
+                                        the_parameter = '$FilteredMessage';
+                                //}else{
+                                //      return;
+                                //}
+                        } 
                         if (type == 'fileinto') { 
                                 the_parameter = form.valueFileInto;
@@ -234 +259 @@
                 }),
                 enabled : true,
+                alertMessage: $('.alertMessage').is(':checked'),
                 //applyMessages: allMessages? !$.isEmptyObject( selectedMessages ) ?
                 //keys( selectedMessages ) : allMessages : ""
@@ -261 +287 @@
   },
   encoder:function( data ){
- 
       var tree1 = [], tree2 = [], tree3 = [];
 
@@ -293 +318 @@
 });
 
-
-
+fromRules = getFromAlertRules();
 
 var BASE_PATH = '../prototype/';

sandbox/2.4.1-1/prototype/modules/filters/interceptors/FilterMapping.php

@@ -217 +217 @@
                         $script_criteria .= ")"; 
 
-                        $script_action = " {\r\n ";
+                        //$script_action = " {\r\n ";
+                        /* Somente para controlar que o addFlag virá antes de qualquer ação. Modificar isso depois */
+                        $action_addFlag = '';
                         
                         if( is_array($action) )
@@ -223 +225 @@
                         {
                                 switch ($action[$k]['type']) {
+                                        case 'setflag':
+                                                $require_flag = true;
+                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
+                                                break;
+                                        case 'addflag': 
+                                                $require_flag = true;
+                                                $action_addFlag = "addflag \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                                break;
                                         case 'redirect':
                                                 break;
@@ -238 +248 @@
                                                 $vacation = true;
                                                 continue;
-                                        case 'setflag':
-                                                $require_flag = true;
-                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
-                                                break;
                                         case 'discard':
                                                 break;
                                 }
-                                if ($vacation == false) $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                if ($vacation == false && $action[$k]['type'] != 'addflag') $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
                         }
-                        $script_action .= "}";
                         
+                        /* ATENÇÃO: Colocar sempre o comando addflag antes de qualquer outro no caso de ações compostas no Sieve */
+                        if ($action_addFlag != '') $script_action = $action_addFlag . $script_action; 
+                        
+                        $script_action = "{\r\n " . $script_action . "}";
+                        $action_addFlag = '';
                         if($vacation == false)
                                 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n";
@@ -256 +266 @@
                         $script_match = "";
                         $script_criteria = "";  
+                        $script_action = "";
                         $data['applyMessages'] = "";                                                    
                 }
@@ -281 +292 @@
 
                 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data;
-                
+
                 return( $content );
         }

sandbox/2.4.1-1/prototype/modules/mail/js/followupflag.js

@@ -698 +698 @@
         
 }
+                
 $('#main_table').ready(function(){
-    alarmFollowupflagged();
+        handlerMessageFilter = function (data) {
+                alarmFollowupflagged(null, data);
+        }
+        /* Busca  nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */
+        cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter);
 });