Changeset 3441

Timestamp:

10/29/10 13:14:32 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1290 - Marcação de importante para mensagens na edição de filtros

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.ScriptS.inc.php (modified) (4 diffs)
• js/filter.js (modified) (3 diffs)
• js/filters.js (modified) (3 diffs)
• setup/phpgw_en.lang (modified) (1 diff)
• setup/phpgw_es-es.lang (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.ScriptS.inc.php

@@ -260 +260 @@
                 $rejectused = 0;
                 $notify = 0;
+                $flaggedused = 0;
                 $newscriptbody = "";
         $continue = 1;
@@ -384 +385 @@
                     $rejectused = 1;
                 }
-                
+                if (preg_match("/flagged/i",$rule['action']))
+                {
+                    $newruletext .= "addflag \"\\\\Flagged\";";
+                    $flaggedused = 1;
+                }
                 if (preg_match("/address/i",$rule['action']))
                 {
@@ -450 +455 @@
                         $newscripthead .= ",\"reject\"";
                 }
+                if($flaggedused){
+                        $newscripthead .= ",\"imapflags\"";
+                }
                 if($this->newout && $vacation['status'] == 'on'){
                     $newscripthead .= ",\"vacation\"";
@@ -481 +489 @@
                 unset($regexused);
                 unset($rejectused);
+                unset($flaggedused);
                 unset($newscripthead);
                 unset($newscriptbody);

branches/2.2/expressoMail1_2/js/filter.js

@@ -205 +205 @@
                                         document.getElementById("radio4").checked       = true;
                                         break;
+                                case "flagged":
+                                        document.getElementById("radio5").checked       = true;
+                                        break;
                         }
                         var mark_values = this.values[fields[8]].split(",");
@@ -318 +321 @@
                                                 "</tr><tr><td width='50%'><input type='radio' id='radio3' name='radio' value='reject'>"+get_lang('Send a rejection message')+".:</td>"+
                                                 "<td width='50%'><textarea id='field6' onkeypress='return charCounter(this);' name='field6' rows='3' cols='25'></textarea></td>"+
-                                                "</tr><tr><td colspan='2'><input type='radio' id='radio4' name='radio' value='discard'>"+get_lang('Erase the message')+"</td>"+
+                                                "</tr><tr id='tr_radio4'><td colspan='2'><input type='radio' id='radio4' name='radio' value='discard'>"+get_lang('Erase the message')+"</td>"+
+                                                "</tr><tr id='tr_radio5'><td colspan='2'><input type='radio' id='radio5' name='radio' value='important'>"+get_lang('Flag as important')+"</td>"+
                                                 "</tr></table></div><div id='div_vacation' style='display:none'>"+
                                                 "<table id='table_vacation' border='0' cellpading='0' cellspacing='0' width='100%'>"+
@@ -607 +611 @@
                                 v_checked = true;
                         }
+                        if(Element("radio5").checked){
+                                mount_rule += "flagged&&&&";
+                                v_checked = true;
+                        }
                         if(!v_checked){
                                 alert(get_lang("No option marked!"));

branches/2.2/expressoMail1_2/js/filters.js

@@ -43 +43 @@
                 form_buttons.style.position = "absolute";
                 form_buttons.style.display = "";
-                form_buttons.style.top = "320px";
+                form_buttons.style.top = "347px";
                 form_buttons.style.left = "5px";
                 form_buttons.style.width = "655px";
@@ -59 +59 @@
                 form_body.style.top = "5px";
                 form_body.style.width = "668px";
-                form_body.style.height = "310px";
+                form_body.style.height = "337px";
                 form_body.style.borderStyle = "outset";
                 form_body.style.borderColor = "black";
@@ -228 +228 @@
                 if(! this.filter_Sh[div.id]) {
                         div.style.width = "680px";
-                        div.style.height = "345px";
+                        div.style.height = "372px";
                         div.style.visibility = "hidden";
                         div.style.position = "absolute";

branches/2.2/expressoMail1_2/setup/phpgw_en.lang

@@ -128 +128 @@
 First   expressoMail1_2 en      First
 First Name      expressoMail1_2 en      First Name
+Flag as important       expressoMail1_2 en      Flag as important
 Flagged expressoMail1_2 en      Flagged
 Flags   expressoMail1_2 en      Flags

branches/2.2/expressoMail1_2/setup/phpgw_es-es.lang

@@ -97 +97 @@
 First   expressoMail1_2 es-es   Primera
 First Name      expressoMail1_2 pt-br   Primero nombre
+Flag as important       expressoMail1_2 es-es   Marcar como Importantes
 Folder  expressoMail1_2 es-es   Carpeta
 Folder Management       expressoMail1_2 es-es   Gerenciar Carpetas

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -178 +178 @@
 First   expressoMail1_2 pt-br   Primeira
 First Name      expressoMail1_2 pt-br   Primeiro Nome
+Flag as important       expressoMail1_2 pt-br   Marcar como Importante
 Flagged expressoMail1_2 pt-br   Importante
 Flags   expressoMail1_2 pt-br   Etiquetas