- Timestamp:
- 03/05/12 16:58:15 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/filters/interceptors/FilterMapping.php
r5601 r5629 77 77 $require_fileinto = $require_flag = $require_reject = $require_vacation = $require_body = $require_imapflag = $vacation = $startswith = $endswith = false; 78 78 79 $script_rules = $script_header = $script_criteria = ""; 79 $script_rules = $script_header = $script_criteria = $vacation_action = ""; 80 80 81 $i = 0; 82 81 83 foreach( $rules as $name => $data ) 82 84 { 83 if( !$data['enabled'] ) 85 86 if( $data['enabled'] == 'false' ) 84 87 continue; 85 88 89 $vacation = false; 86 90 $criteria = $data['criteria']; 87 91 $action = $data['actions']; … … 119 123 break; 120 124 case 'vacation': 121 $require_vacation = true;122 $vacation = true;123 //$script_match = "vacation";124 125 continue; 125 126 default: … … 172 173 } 173 174 $script_criteria = substr($script_criteria,0,-2); 174 if ($vacation == false) 175 $script_criteria .= ")"; 176 else 177 $script_criteria = ""; 175 /* if ($vacation == false) */ 176 $script_criteria .= ")"; 177 178 178 $script_action = " {\r\n "; 179 179 for ($k=0; $k<count($action); $k++) … … 201 201 break; 202 202 } 203 /*if ($vacation == false)*/$script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";203 if ($vacation == false) $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n "; 204 204 } 205 205 206 /*if ($vacation == false)*/ $script_action .= "}"; 207 208 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n"; 206 $script_action .= "}"; 207 208 if($vacation != true) 209 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n"; 210 211 if($data['id'] != "vacation") 212 $i++; 209 213 $script_match = ""; 210 214 $script_criteria = ""; 211 $i++;215 212 216 } 213 217 … … 224 228 } 225 229 226 if( $vacation )230 if( $vacation_action ) 227 231 { 228 232 $script_rules .= "vacation" . $vacation_action . "\r\n"; … … 234 238 235 239 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data; 236 237 /* $content = ""; //fill script! */ 240 //$content = ""; 238 241 return( $content ); 239 242 } … … 388 391 $i = 0; 389 392 390 for( ; $this->rules[$i]&& $this->rules[$i]['id'] !== $params['id']; $i++ );391 392 $this->rules[$i] = $params;393 for( ; isset($this->rules[$i]) && $this->rules[$i]['id'] !== $params['id']; $i++ ); 394 395 $this->rules[$i] = array_merge( ( isset($this->rules[$i]) ? $this->rules[$i] : array() ), $params ); 393 396 394 397 $params = array( 'name' => $this->service->config['user'], … … 483 486 */ 484 487 public function listSieveRules( &$uri , &$params , &$criteria , $original ) 485 { 488 { 486 489 $return = $params = $this->parseSieveScript( $params[0]['content'] ); 487 490 return( $return );
Note: See TracChangeset
for help on using the changeset viewer.