Changeset 5335

Timestamp:

01/10/12 09:40:00 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #1776 - Sincronismo dos filtros com o trunk 2.4.

File:

• trunk/expressoMail1_2/js/filters.js (modified) (1 diff)

trunk/expressoMail1_2/js/filters.js

@@ -158 +158 @@
         
         cfilterSh.prototype.vl_rule = function(rule,pos,type)
-{
-        var fields = rule.split("&&");
-        if(type == 'voip')
-        {
-                return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','voip')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - " + fields[3] + " <b>" + get_lang("Subject") + ":</b> " + fields[5] + "</a>";
-        }
-        else
-        {
-                var _criteria = " "; 
-                if (fields[3].length > 0) 
-                        _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 
-                if (fields[4].length > 0) 
-                        _criteria += "<b>&nbsp;"+get_lang("is to")+"</b>:"+fields[4]; 
-                if (fields[5].length > 0) 
-                        _criteria += "<b>&nbsp;"+get_lang("subject is")+"</b>:"+fields[5]; 
-                if ( parseInt( fields[11] ) > 0 )
-                {
-                    if( fields[8] == "2" || fields[8] == "10" )
-                        _criteria += "<b>&nbsp;"+get_lang("size is over than")+"</b>:"+fields[11];
-
-                    if( fields[8] == "0" || fields[8] == "8" )
-                        _criteria += "<b>&nbsp;"+get_lang("size is under than")+"</b>:"+fields[11];
-                }
-
-                var _action = " "; 
-                if (fields[6] == 'folder') 
+        {
+                var fields = rule.split("&&");
+                if(type == 'voip')
                 {
-                    var _folderName = ( (fields[7].split(cyrus_delimiter))[1] != undefined ) ? (fields[7].split(cyrus_delimiter))[2] != undefined ? (fields[7].split(cyrus_delimiter))[2] : (fields[7].split(cyrus_delimiter))[1] : fields[7];
-                    _action = get_lang("Store at")+" "+ lang_folder( _folderName );
-                }
-                else if (fields[6] == 'address') 
-                        _action = get_lang("Forward to")+ " "+(fields[7]);
-                else 
-                        _action = get_lang(fields[6]); 
-                return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("if email") + " </b>" + _criteria + " - <b>" + get_lang("Action") + ":</b> " + _action + "</a>"; 
-        } 
-}
+                        return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','voip')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - " + fields[3] + " <b>" + get_lang("Subject") + ":</b> " + fields[5] + "</a>";
+                }
+                else
+            {
+                        var _criteria = " "; 
+                        if (fields[3].length > 0) 
+                                _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 
+                        if (fields[4].length > 0) 
+                                _criteria += "<b>&nbsp;"+get_lang("is to")+"</b>:"+fields[4]; 
+                        if (fields[5].length > 0) 
+                                _criteria += "<b>&nbsp;"+get_lang("subject is")+"</b>:"+fields[5]; 
+                        if ( parseInt( fields[11] ) > 0 )
+                        {
+                            if( fields[8] == "2" || fields[8] == "10" )
+                                _criteria += "<b>&nbsp;"+get_lang("size is over than")+"</b>:"+fields[11];
+        
+                            if( fields[8] == "0" || fields[8] == "8" )
+                                _criteria += "<b>&nbsp;"+get_lang("size is under than")+"</b>:"+fields[11];
+                }
+        
+                        var _action = " ";
+                        
+                        if (fields[6] == 'folder') 
+                        {
+                                var _folderName = ( (fields[7].split(cyrus_delimiter))[1] != undefined ) ? (fields[7].split(cyrus_delimiter))[2] != undefined ? (fields[7].split(cyrus_delimiter))[2] : (fields[7].split(cyrus_delimiter))[1] : fields[7];
+                    _action = get_lang("Store at") + " "+ lang_folder( _folderName );
+                        }
+                        else if (fields[6] == 'address') 
+                                _action = get_lang("Forward to")+ " "+(fields[7]);
+                        else 
+                                _action = get_lang(fields[6]); 
+                        
+                        return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("if email") + " </b>" + _criteria + " - <b>" + get_lang("Action") + ":</b> " + _action + "</a>"; 
+            } 
+        }
         
         cfilterSh.prototype.vl_outOffice = function(outOffice)
-        {
+        {
                 var aux = outOffice.split("&&");
                 return get_lang("Rule") + " - <a href='javascript:void(0)' onclick=filter.form_out()> " + "<b>" + get_lang("Status") + " : </b><font color='red'>" + (aux[4] == "off" ? get_lang("Disabled") : get_lang("Enabled")) + "</font></a>";