1. added $actiondata to filter line to allow per action data such as no of hops

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index e72be8020ae7c3c49740d90df4c48555702b23c5..e3878ecf719f6fe2c8181a2d11c8323821d59c0f 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -70,6 +70,10 @@ use vars qw(%channels %valid);
                  group => '0,Access Group,parray',     # used to create a group of users/nodes for some purpose or other
                  isolate => '9,Isolate network,yesno',
                  delayed => '9,Delayed messages,parray',
+                 annfilter => '9,Announce Filter',
+                 wwvfilter => '9,WWV Filter',
+                 spotfilter => '9,Spot Filter',
+                 passwd => '9,Passwd List,parray',
                 );
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -81,14 +85,16 @@ sub alloc
        die "trying to create a duplicate channel for $call" if $channels{$call};
        $self->{call} = $call;
        $self->{conn} = $conn if defined $conn; # if this isn't defined then it must be a list
-       $self->{user} = $user if defined $user; 
+       if (defined $user) {
+               $self->{user} = $user;
+               $self->{lang} = $user->lang;
+               $user->new_group() if !$user->group;
+               $self->{group} = $user->group;
+       }
        $self->{startt} = $self->{t} = time;
        $self->{state} = 0;
        $self->{oldstate} = 0;
-       $self->{lang} = $user->{lang} if defined $user;
        $self->{lang} = $main::lang if !$self->{lang};
-       $user->new_group() if !$user->group;
-       $self->{group} = $user->group;
        $self->{func} = "";
        bless $self, $pkg; 
        return $channels{$call} = $self;