Changeset 5134 for trunk/expressoMail1_2/js/filter.js

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/js/filter.js (modified) (13 diffs)

trunk/expressoMail1_2/js/filter.js

@@ -51 +51 @@
                         var handler_sieve = function(data)
                         {
-                                if(data.toString().indexOf('Error:') == 0) 
-                                {
-
+                                if (data.toString().indexOf('Error:') == 0) 
+                                {
                                         _this.criticalError = true;
                                         alert(get_lang('The filters service is out of service, try again later...'));
@@ -69 +68 @@
                                         }
                                 }
-                                if(typeof(data.vacation[0]) == 'undefined'){
-                                    _this.out_officeR = "";
-                                }
-                                else
-                                    _this.out_officeR = url_decode_s(data.vacation[0]);
+                                _this.out_officeR = data.vacation[0];
+                                _this.out_officeR = _this.out_officeR ? trim(_this.out_officeR.toString().replace("\n","")) : "";
+                                if(data.mode.length > 0){_this.mode_in = data.mode[0];}
                                 }
                                 catch(e){
                                         _this.criticalError = true;
-                                        alert(get_lang('==> The filters service is out of service, try again later...'));
-                                }
-                                if(data.mode.length > 0){_this.mode_in = data.mode[0];}
+                                        alert(get_lang('The filters service is out of service, try again later...'));
+                                }
                                 if (typeof(posHandler) == 'function')  
                                         posHandler(param);  
@@ -93 +89 @@
                 Element('form_body').innerHTML = "";
                 Element('form_buttons').style.display = '';
+                Element('Edit_form_buttons').style.display = 'none';
                 filters.mount_list();
                 this.ac_form = "";              
@@ -109 +106 @@
                 Element('form_body').innerHTML = "";
                 Element('form_body').innerHTML = this.forms_();
+                Element('Edit_form_buttons').style.display = '';
+                Element('form_buttons').style.display = 'none';
                 this.ind = pos;         
                 
@@ -221 +220 @@
                         var mark_values = this.values[fields[8]].split(",");
                         for(var i=0; i < mark_values.length; i++){
+                                if( mark_values[i] == "checkBox1" || mark_values[i] == "checkBox2"){
+                                        document.getElementById(mark_values[i]).checked = true;
+                                }
                                 if( mark_values[i] == "checkBox2"){
                                         document.getElementById(mark_values[i]).checked = true;
@@ -313 +315 @@
                          var form = "";
                                  form = "<div id='div_rule' style='display:none'><table id='table_rule' border='0' cellpading='0' cellspacing='0' width='100%'>"+
+                                                "<tr><td colspan='2'><input type='checkBox' id='checkBox1' name='checkb'>"+get_lang('Also check message against next rule') + "</td></tr>"+
+                                                //"<tr><td colspan='2'><input type='checkBox' id='checkBox2' onclick='filter.disable_radio3();' name='checkb'>"+get_lang('Keep a copy of the message at your Inbox')+ "</td><tr>"+
+                                                "<tr><td colspan='2'><hr size='1' width='100%'></td></tr><tr>"+
                                          "<tr><td colspan='2'><b>"+get_lang("Criteria")+":</b></td></tr><tr>"+
                                          "<td rowspan='4' width='20%'>"+get_lang('Find items')+":<br><select id='select_rules' name='select_rules'>"+
@@ -338 +343 @@
                                                 //"<tr><td colspan='3'><br>"+get_lang('Subject')+".: <input type='text' id='field7' name='field7' size='35' maxlength='200'/></td></tr>"+
                                                 "<tr><td colspan='3'><br>"+get_lang('With the following message')+".:</td>"+
-                                                "</tr><tr><td colspan='3'><textarea id='field8' onkeypress='return charCounter(this);' rows='8' cols='50'></textarea></td></tr></table></div>" +
+                                                "</tr><tr><td colspan='3'><textarea id='field8' rows='8' cols='50'></textarea></td></tr></table></div>" +
                                                 "<div id='div_voipFilter' style='display:none'>" +
                                                 "<br/><table id='table_voipFilter'>" +
                                                 "<tr><td>"+get_lang("Type the subject of the message for receiving a phone warning")+" .:"+
                                                 "</td></tr><tr><td><input type='text' id='field9' size='50' maxlength='200'>" +
-                                                "</td></tr><br/></table></div>" +
-                                                "<span align='right'><input type='button' value="+get_lang("Back")+" onclick='filter.form_m()'></span>"+
-                                                "<span align='right'><input type='button' value="+get_lang("Save")+" onclick='filter.saved_rules()'></span>";
+                                                "</td></tr><br/></table></div>";// +
+                                                //"<span align='right'><input type='button' value="+get_lang("Back")+" onclick='filter.form_m()'></span>"+
+                                                //"<span align='right'><input type='button' value="+get_lang("Save")+" onclick='filter.saved_rules()'></span>";
                 return form;
         }
@@ -487 +492 @@
                                 //Save outoffice in prefs:
                                 connector.loadScript("preferences");
-                                if(typeof(prefe) == 'undefined'){
-                                        setTimeout("filter.delete_r();",500);
-                                }
-                                else
                                         prefe.save("outoffice", _this.out_officeF);
                         }
@@ -573 +574 @@
                         }
 
-                        if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == "" && Element("field4").value == "")
+                        if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == "" && LTrim(Element("field4").value).length == 0)
                         {
                                 alert(get_lang("Define some criterion to the fields Sender, To and Subject with more than 3 characters!"));
                                 return false;
                         }
-
-                        if((LTrim(Element("field1").value).length <= 3) && (LTrim(Element("field2").value).length <= 3) && (LTrim(Element("field3").value).length <= 3 && Element("field4").value == "")){
+                        if((LTrim(Element("field1").value).length <= 3) && LTrim(Element("field1").value) != ""){
+                                alert(get_lang("Define some criterion to the fields Sender, To and Subject with more than 3 characters!"));
+                                return false;
+                        }if((LTrim(Element("field2").value).length <= 3) && LTrim(Element("field2").value) != ""){
+                                alert(get_lang("Define some criterion to the fields Sender, To and Subject with more than 3 characters!"));
+                                return false;
+                        }if((LTrim(Element("field3").value).length <= 3) && LTrim(Element("field3").value) != ""){
                                 alert(get_lang("Define some criterion to the fields Sender, To and Subject with more than 3 characters!"));
                                 return false;
@@ -649 +655 @@
                         }
                         var opts = "";
+                        if(Element("checkBox1").checked == true){
+                            opts += ",checkBox1";
+                        }
                         if(Element("checkBox2").checked == true){
                             opts += ",checkBox2";
@@ -691 +700 @@
                                 return false;
                         }
+                        else if(fld_men.value.length > 10000){
+                                alert(get_lang("Your message have %1 characters, the message needs to have less then 10000 characters",fld_men.value.length));
+                                return false;
+                        }
                         this.out_officeR = mount_rule;
                 }
@@ -740 +753 @@
                 
                 Element('form_buttons').style.display = '';
+                Element('Edit_form_buttons').style.display = 'none';
                 this.reload_rules();
         }
@@ -824 +838 @@
         }
 
-    connector.loadScript("preferences");
 // build object
    var filter;