- Timestamp:
- 05/31/11 16:20:43 (13 years ago)
- Location:
- branches/2.2/expressoMail1_2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/inc
-
Property
svn:ignore
set to
.class.ScriptS.inc.php.swp
.class.SieveS.inc.php.swp
-
Property
svn:ignore
set to
-
branches/2.2/expressoMail1_2/inc/class.ScriptS.inc.php
r4541 r4552 35 35 $this->username = $this->scriptfile; 36 36 37 $this->reply = "";38 $this->rules = "";39 $this->errstr = "";40 $this->size = "";37 $this->reply = ""; 38 $this->rules = ""; 39 $this->errstr = ""; 40 $this->size = ""; 41 41 42 42 $this->continuebit = 1; 43 $this->sizebit = 1;43 $this->sizebit = 2; 44 44 $this->anyofbit = 4; 45 45 $this->keepbit = 8; … … 254 254 $continue = 1; 255 255 $tmpSubject = ""; 256 257 $a = 0; 258 256 259 257 260 // Recebe os valores das regras; … … 278 281 $rule['unconditional'] = 0; 279 282 283 if( $a < 2 ) 284 { 285 error_log( print_r($tmp, true), 3, "/tmp/log" ); 286 287 error_log( print_r($rule, true), 3, "/tmp/log" ); 288 289 $a++; 290 } 291 292 280 293 if (!$rule['from'] && !$rule['to'] && !$rule['subject'] && !$rule['field'] && empty($rule['size']) && $rule['action']) { 281 294 $rule['unconditional'] = 1; … … 370 383 if ($rule['size'] != '') 371 384 { 372 if ( $rule['size'] == 0 && $rule['gthan'])385 if ( $rule['size'] == 0 && $rule['gthan'] ) 373 386 { 374 387 $xthan = " :over "; … … 381 394 } 382 395 383 if ($rule['size'] > 0) { 396 if ( $rule['size'] > 0 ) 397 { 384 398 $xthan = " :under "; 399 385 400 if ($rule['gthan']) 386 401 $xthan = " :over "; … … 427 442 $newruletext .= "discard;"; 428 443 } 429 if ($rule['keep']) 444 445 if ($rule['keep'] ) 446 { 430 447 $newruletext .= "\n\tfileinto \"INBOX\";"; 431 //if ($rule['keep']) $newruletext .= "\n\tkeep;"; 448 } 449 432 450 if (!$rule['unconditional']) 451 { 433 452 $newruletext .= "\n}"; 453 } 434 454 435 455 $continue = 0; -
branches/2.2/expressoMail1_2/js
-
Property
svn:ignore
set to
.filter.js.swp
.filters.js.swp
.filters.js.swo
.filter_old.js.swp
-
Property
svn:ignore
set to
-
branches/2.2/expressoMail1_2/js/filters.js
r4499 r4552 146 146 147 147 cfilterSh.prototype.vl_rule = function(rule,pos,type) 148 { 149 var fields = rule.split("&&"); 150 if(type == 'voip') 151 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>"; 152 else{ 153 var _criteria = " "; 154 if (fields[3].length > 0) 155 _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 156 if (fields[4].length > 0) 157 _criteria += "<b> "+get_lang("is to")+"</b>:"+fields[4]; 158 if (fields[5].length > 0) 159 _criteria += "<b> "+get_lang("subject is")+"</b>:"+fields[5]; 160 if (parseInt(fields[11]) >= 0) 161 { 162 if(fields[8] == "1") 163 _criteria += "<b> "+get_lang("size is over than")+"</b>:"+fields[11]; 164 else if(fields[8] != "0") 165 _criteria += "<b> "+get_lang("size is under than")+"</b>:"+fields[11]; 166 } 167 var _action = " "; 168 if (fields[6] == 'folder') 148 { 149 var fields = rule.split("&&"); 150 if(type == 'voip') 151 { 152 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>"; 153 } 154 else 155 { 156 var _criteria = " "; 157 if (fields[3].length > 0) 158 _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 159 if (fields[4].length > 0) 160 _criteria += "<b> "+get_lang("is to")+"</b>:"+fields[4]; 161 if (fields[5].length > 0) 162 _criteria += "<b> "+get_lang("subject is")+"</b>:"+fields[5]; 163 if ( parseInt( fields[11] ) > 0 ) 164 { 165 if( fields[8] == "2" || fields[8] == "10" ) 166 _criteria += "<b> "+get_lang("size is over than")+"</b>:"+fields[11]; 167 168 if( fields[8] == "0" || fields[8] == "8" ) 169 _criteria += "<b> "+get_lang("size is under than")+"</b>:"+fields[11]; 170 } 171 172 var _action = " "; 173 if (fields[6] == 'folder') 169 174 { 170 175 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]; 171 176 _action = get_lang("Store at")+" "+ lang_folder( _folderName ); 172 177 } 173 else if (fields[6] == 'address') 174 _action = get_lang("Forward to")+ " "+(fields[7]); 175 else 176 _action = get_lang(fields[6]); 177 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>"; 178 } 179 } 180 181 cfilterSh.prototype.vl_outOffice = function(outOffice){ 178 else if (fields[6] == 'address') 179 _action = get_lang("Forward to")+ " "+(fields[7]); 180 else 181 _action = get_lang(fields[6]); 182 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>"; 183 } 184 } 185 186 cfilterSh.prototype.vl_outOffice = function(outOffice) 187 { 182 188 var aux = outOffice.split("&&"); 183 189 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>";
Note: See TracChangeset
for help on using the changeset viewer.