diff options
| author | fukachan <fukachan> | 2004-03-04 12:21:34 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-03-04 12:21:34 +0000 |
| commit | 924cb395cedeb12fa7c80dd1ad2c5cb16beb6370 (patch) | |
| tree | e77caa63c5bd74c34fdb9b4734bf37c7110b71c1 /fml | |
| parent | f1869133bca5db834e57303c8ae6796f3e4de81d (diff) | |
| download | fml8-924cb395cedeb12fa7c80dd1ad2c5cb16beb6370.tar.gz fml8-924cb395cedeb12fa7c80dd1ad2c5cb16beb6370.tar.bz2 fml8-924cb395cedeb12fa7c80dd1ad2c5cb16beb6370.zip | |
prepare and use command mail specific definitions.
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/lib/FML/Restriction/Base.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Restriction/Command.pm | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/fml/lib/FML/Restriction/Base.pm b/fml/lib/FML/Restriction/Base.pm index 719a1c5a..76a265e8 100644 --- a/fml/lib/FML/Restriction/Base.pm +++ b/fml/lib/FML/Restriction/Base.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Base.pm,v 1.27 2004/01/21 03:41:27 fukachan Exp $ +# $FML: Base.pm,v 1.28 2004/02/04 14:41:47 fukachan Exp $ # package FML::Restriction::Base; @@ -91,6 +91,7 @@ Of cource, "user@domain", described above. my $domain_regexp = '[-A-Za-z0-9\.]+'; my $user_regexp = '[-A-Za-z0-9\._\+]+'; my $command_regexp = '[-A-Za-z0-9_]+'; +my $commail_regexp = '[-A-Za-z0-9_:]+'; # allow e.g. last:3 my $file_regexp = '[-A-Za-z0-9_]+'; my $dir_regexp = '[-A-Za-z0-9_]+'; my $option_regexp = '[-A-Za-z0-9]+'; @@ -121,8 +122,11 @@ my %basic_variable = # unix command switch 'command_line_options' => $option_regexp, + # command mail + 'command_mail_substr' => $commail_regexp, + # misc - 'language' => $option_regexp, + 'language' => $option_regexp, ); diff --git a/fml/lib/FML/Restriction/Command.pm b/fml/lib/FML/Restriction/Command.pm index 2d73d9f3..62623ebb 100644 --- a/fml/lib/FML/Restriction/Command.pm +++ b/fml/lib/FML/Restriction/Command.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Command.pm,v 1.9.4.1 2004/03/04 04:07:54 fukachan Exp $ +# $FML: Command.pm,v 1.10 2004/03/04 04:30:15 fukachan Exp $ # package FML::Restriction::Command; @@ -95,7 +95,7 @@ sub command_regexp_match for my $x (@$data) { next DATA unless $x; - unless ($safe->regexp_match('command', $x)) { + unless ($safe->regexp_match('command_mail_substr', $x)) { $r = 0; last DATA; } |