|
Lines 184-190
Link Here
|
| 184 |
|
184 |
|
| 185 |
It defaults to the regular expression: |
185 |
It defaults to the regular expression: |
| 186 |
|
186 |
|
| 187 |
/^From \S+ ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/ |
187 |
/^From \S+ ?(\S\S\S \S\S\S .?\d .?\d:\d\d:\d\d \d{4}|.?\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/ |
| 188 |
|
188 |
|
| 189 |
Some SpamAssassin programs such as sa-learn will use the configuration option |
189 |
Some SpamAssassin programs such as sa-learn will use the configuration option |
| 190 |
'mbox_format_from_regex' to override the default regular expression. |
190 |
'mbox_format_from_regex' to override the default regular expression. |
|
Lines 668-674
Link Here
|
| 668 |
$self->{opt_want_date} = 1 unless (defined $self->{opt_want_date}); |
668 |
$self->{opt_want_date} = 1 unless (defined $self->{opt_want_date}); |
| 669 |
$self->{opt_cache} = 0 unless (defined $self->{opt_cache}); |
669 |
$self->{opt_cache} = 0 unless (defined $self->{opt_cache}); |
| 670 |
#Changed Regex to include boundaries for Communigate Pro versions (5.2.x and later). per Bug 6413 |
670 |
#Changed Regex to include boundaries for Communigate Pro versions (5.2.x and later). per Bug 6413 |
| 671 |
$self->{opt_from_regex} = '^From \S+ ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)' unless (defined $self->{opt_from_regex}); |
671 |
$self->{opt_from_regex} = '^From \S+ ?(\S\S\S \S\S\S .?\d .?\d:\d\d:\d\d \d{4}|.?\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)' unless (defined $self->{opt_from_regex}); |
| 672 |
|
672 |
|
| 673 |
#STRIP LEADING AND TRAILING / FROM REGEX FOR OPTION |
673 |
#STRIP LEADING AND TRAILING / FROM REGEX FOR OPTION |
| 674 |
$self->{opt_from_regex} =~ s/^\///; |
674 |
$self->{opt_from_regex} =~ s/^\///; |
