Changeset 5120 for branches/2.3
- Timestamp:
- 10/26/11 16:03:46 (13 years ago)
- Location:
- branches/2.3/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/expressoMail1_2/inc/class.ScriptS.inc.php
r4932 r5120 17 17 var $continuebit; 18 18 var $sizebit; 19 var $a nyofbit;19 var $allofbit; 20 20 var $keepbit; 21 21 var $regexbit; … … 42 42 $this->continuebit = 1; 43 43 $this->sizebit = 2; 44 $this->a nyofbit = 4;44 $this->allofbit = 4; 45 45 $this->keepbit = 8; 46 46 $this->regexbit = 128; … … 276 276 $rule['continue'] = ($tmp1[8] & $this->continuebit); 277 277 $rule['gthan'] = ($tmp1[8] & $this->sizebit); 278 $rule['a nyof'] = ($tmp1[8] & $this->anyofbit);278 $rule['allof'] = ($tmp1[8] & $this->allofbit); 279 279 $rule['keep'] = ($tmp1[8] & $this->keepbit); 280 280 $rule['regexp'] = ($tmp1[8] & $this->regexbit); … … 306 306 307 307 // Condições para montagem das regras; 308 $anyall = "allof"; 309 if ($rule['anyof']) 310 $anyall = "anyof"; 308 $anyall = "anyof"; 309 if ($rule['allof']) 310 { 311 $anyall = "allof"; 312 } 313 311 314 if ($rule['regexp']) { 312 315 $regexused = 1; -
branches/2.3/expressoMail1_2/js/filter.js
r4851 r5120 315 315 "<tr><td colspan='2'><b>"+get_lang("Criteria")+":</b></td></tr><tr>"+ 316 316 "<td rowspan='4' width='20%'>"+get_lang('Find items')+":<br><select id='select_rules' name='select_rules'>"+ 317 "<option value=' 1'>"+get_lang("If any criterion is met")+"</option><option value='0'>"+get_lang("If all criteria is met")+"</option>"+317 "<option value='0'>"+get_lang("If any criterion is met")+"</option><option value='1'>"+get_lang("If all criteria is met")+"</option>"+ 318 318 "</select></td><td>"+get_lang('The field \"%1\" of the message it contains',get_lang('From'))+".: <input type='text' id='field1' name='field1' size='35' maxlength='200'></td>"+ 319 319 "</tr><tr><td>"+get_lang('The field \"%1\" of the message it contains', get_lang('To'))+".: <input type='text' id='field2' name='field2' size='35' maxlength='200'></td>"+
Note: See TracChangeset
for help on using the changeset viewer.