}
# get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
$spotted = uc $f[0];
$freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
$freq = $f[0];
$spotted = uc $f[1];
} else {
- return (1, $self->msg('dx2'));
+ return (1, $self->msg('dx3'));
}
# make line the rest of the line
return (1, @out) unless $valid;
my @bad;
-if (@bad = BadWords::check($line)) {
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
return (1, $self->msg('e17', @bad));
}