X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Faccept%2Fspots.pl;h=b8f4c861b0e41bbae5294186d0565a6accb9dbf1;hb=18f2934d60c7a702ac9eeca325914e4c346c0621;hp=1c06dbe337783e0c3cee68732f758a7d8e85a857;hpb=b2e852cfe75a418d97c147d3c03fe1e03b6b5779;p=spider.git diff --git a/cmd/accept/spots.pl b/cmd/accept/spots.pl index 1c06dbe3..b8f4c861 100644 --- a/cmd/accept/spots.pl +++ b/cmd/accept/spots.pl @@ -7,27 +7,8 @@ # my ($self, $line) = @_; -my $sort = 'accept'; +my $type = 'accept'; +my $sort = 'spots'; -return (0, $self->msg('filter5')) unless $line; - -my ($r, $filter, $fno, $user, $s) = $Spot::filterdef->parse($self, $line); -return (0, $filter) if $r; - -my $fn = "filter$fno"; - -$filter->{$fn} = {} unless exists $filter->{$fn}; -$filter->{$fn}->{$sort} = {} unless exists $filter->{$fn}->{$sort}; - -$filter->{$fn}->{$sort}->{user} = $user; -my $ref = eval $s; -return (0, $s, $@) if $@; - -$filter->{$fn}->{$sort}->{asc} = $s; -$r = $filter->write; -return (0, $r) if $r; - -$filter->{$fn}->{$sort}->{code} = $ref; -$filter->install; - -return (0, $self->msg('filter1', $fno, $filter->{name})); +my ($r, $filter, $fno) = $Spot::filterdef->cmd($self, $sort, $type, $line); +return (0, $r ? $filter : $self->msg('filter1', $fno, $filter->{name}));