Changeset 3438

Timestamp:

10/29/10 10:29:44 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1289 - Criacao de regra para as mensagens c/mais de 0k nao é aceita

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.ScriptS.inc.php (modified) (3 diffs)
• js/filter.js (modified) (4 diffs)
• js/filters.js (modified) (1 diff)

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

@@ -40 +40 @@
                 
                 $this->continuebit      = 1;
-        $this->sizebit          = 2;
+        $this->sizebit          = 1;
         $this->anyofbit         = 4;
         $this->keepbit          = 8;
@@ -286 +286 @@
           $rule['unconditional']   = 0;
                   
-                  if (!$rule['from'] && !$rule['to'] && !$rule['subject'] && !$rule['field'] && !$rule['size'] && $rule['action']){
+                  if (!$rule['from'] && !$rule['to'] && !$rule['subject'] && !$rule['field'] && !($rule['size'] >= 0) && $rule['action']){
                          $rule['unconditional'] = 1;
                   }
@@ -359 +359 @@
                         $started = 1;
                     }
-                    if ($rule['size']) {
+                    if ($rule['size'] >= 0) {
                         $xthan = " :under ";
                         if ($rule['gthan']) $xthan = " :over ";

branches/2.2/expressoMail1_2/js/filter.js

@@ -4 +4 @@
                 if (form.value.length >= 300)
                 {
-                        alert(get_lang("You have exceeded the number of allowed characters"));
+                        alert(_lang("You have exceeded the number of allowed characters"));
                         return false;
                 }
@@ -307 +307 @@
                                                 "</tr><tr><td>"+get_lang('The field \"%1\" of the message it contains', get_lang('Subject'))+".: <input type='text' id='field3' name='field3' size='35' maxlength='200'></td>"+
                                                 "</tr><tr><td>"+get_lang('The size of the message is')+".: &nbsp<select id='select_size' name='select_size'>"+
-                                                "<option value='1'>"+get_lang("Greater than")+"</option><option value='0'>"+get_lang("Less than")+"</option>"+
+                                                "<option value='0'>"+get_lang("Less than")+"</option><option value='1'>"+get_lang("Greater than")+"</option>"+
                                                 "</select>&nbsp;<input type='text' id='field4' name='field4' size='8' maxlength='8'> Kb</td>"+
                                                 "</tr><tr><td colspan='2'><hr size='1' width='100%'><b>"+get_lang("Action")+":</b></td></tr>"+
@@ -612 +612 @@
                         }
                         var opts = "";
-                        if(Element("checkBox2").checked == true){opts += ",checkBox2";}
-                        if(Element("select_size").options[1].selected == true){opts += ",select_size=1";}
-                        if(Element("select_rules").options[1].selected == true){opts += ",select_rules=1";}
-                        for(var i=0; i < this.values.length; i++){if(this.values[i] == opts){mount_rule += i + "&&";}}
+                        if(Element("checkBox2").checked == true){
+                            opts += ",checkBox2";
+                        }
+                        if(Element("select_size").options[1].selected == true){
+                            opts += ",select_size=1";
+                        }
+                        if(Element("select_rules").options[1].selected == true){
+                            opts += ",select_rules=1";
+                        }
+                        for(var i=0; i < this.values.length; i++){
+                            if(this.values[i] == opts){
+                                mount_rule += i + "&&";
+                            }
+                        }
                         mount_rule += "&&&&";
-                        if(LTrim(Element("field4").value) != ""){
+                        if(LTrim(Element("field4").value) != "" && LTrim(Element("field4").value) >= 0){
                                 mount_rule += LTrim(Element("field4").value);
-                        }else{
-                                mount_rule += 0;
                         }
                         if(form[0] == "new")
@@ -766 +774 @@
                 var h_filter = function(data)
                 {
-                        if(data != "Ok"){alert("Erro : \n" + data);}
+                        if(data != "Ok"){alert("Erro : \n" + get_lang(data));}
                 }
                 var args   = "$this.ScriptS.rec_rules";

branches/2.2/expressoMail1_2/js/filters.js

@@ -159 +159 @@
                 if (fields[5].length > 0) 
                         _criteria += "<b>"+get_lang("subject is")+"</b>:"+fields[5]; 
-                if (parseInt(fields[11]) > 0) 
+                if (parseInt(fields[11]) >= 0)
                 { 
-                        if(fields[8] == "2") 
+                        if(fields[8] == "1")
                                 _criteria += "<b>"+get_lang("size is over than")+"</b>:"+fields[11]; 
                         else