put in input filter for ann and output filters for ann/wwv/spots

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 5505610e9752b8520f6270733fdc0b1387185bc0..3ccadeaf426e0864d355a76d095faa36d8ad54f8 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -29,6 +29,7 @@ use Msg;
 use DXM;
 use DXUtil;
 use DXDebug;
+use Filter;
 use Carp;
 
 use strict;
@@ -42,15 +43,16 @@ use vars qw(%channels %valid);
                  user => '9,DXUser ref',
                  startt => '0,Start Time,atime',
                  t => '9,Time,atime',
-                 pc50_t => '9,Last PC50 Time,atime',
+                 pc50_t => '5,Last PC50 Time,atime',
                  priv => '9,Privilege',
                  state => '0,Current State',
                  oldstate => '5,Last State',
                  list => '9,Dep Chan List',
                  name => '0,User Name',
-                 consort => '9,Connection Type',
-                 'sort' => '9,Type of Channel',
+                 consort => '5,Connection Type',
+                 'sort' => '5,Type of Channel',
                  wwv => '0,Want WWV,yesno',
+                 wx => '0,Want WX,yesno',
                  talk => '0,Want Talk,yesno',
                  ann => '0,Want Announce,yesno',
                  here => '0,Here?,yesno',
@@ -58,18 +60,45 @@ use vars qw(%channels %valid);
                  dx => '0,DX Spots,yesno',
                  redirect => '0,Redirect messages to',
                  lang => '0,Language',
-                 func => '9,Function',
+                 func => '5,Function',
                  loc => '9,Local Vars', # used by func to store local variables in
                  beep => '0,Want Beeps,yesno',
-                 lastread => '9,Last Msg Read',
-                 outbound => '9,outbound?,yesno',
+                 lastread => '5,Last Msg Read',
+                 outbound => '5,outbound?,yesno',
                  remotecmd => '9,doing rcmd,yesno',
                  pagelth => '0,Page Length',
                  pagedata => '9,Page Data Store',
                  group => '0,Access Group,parray',     # used to create a group of users/nodes for some purpose or other
-                 isolate => '9,Isolate network,yesno',
+                 isolate => '5,Isolate network,yesno',
+                 delayed => '5,Delayed messages,parray',
+                 annfilter => '5,Announce Filter',
+                 wwvfilter => '5,WWV Filter',
+                 spotfilter => '5,Spot Filter',
+                 inannfilter => '5,Input Ann Filter',
+                 inwwvfilter => '5,Input WWV Filter',
+                 inspotfilter => '5,Input Spot Filter',
+                 passwd => '9,Passwd List,parray',
                 );
 
+# object destruction
+sub DESTROY
+{
+       my $self = shift;
+       undef $self->{user};
+       undef $self->{conn};
+       undef $self->{loc};
+       undef $self->{pagedata};
+       undef $self->{group};
+       undef $self->{delayed};
+       undef $self->{annfilter};
+       undef $self->{wwvfilter};
+       undef $self->{spotfilter};
+       undef $self->{inannfilter};
+       undef $self->{inwwvfilter};
+       undef $self->{inspotfilter};
+       undef $self->{passwd};
+}
+
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -78,16 +107,25 @@ sub alloc
   
        die "trying to create a duplicate channel for $call" if $channels{$call};
        $self->{call} = $call;
+       $self->{priv} = 0;
        $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} = "";
+
+       # get the filters
+       $self->{spotfilter} = Filter::read_in('spots', $call, 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0);
+
        bless $self, $pkg; 
        return $channels{$call} = $self;
 }
@@ -203,6 +241,19 @@ sub msg
        return DXM::msg($self->{lang}, @_);
 }
 
+# stick a broadcast on the delayed queue (but only up to 20 items)
+sub delay
+{
+       my $self = shift;
+       my $s = shift;
+       
+       $self->{delayed} = [] unless $self->{delayed};
+       push @{$self->{delayed}}, $s;
+       if (@{$self->{delayed}} >= 20) {
+               shift @{$self->{delayed}};   # lose oldest one
+       }
+}
+
 # change the state of the channel - lots of scope for debugging here :-)
 sub state
 {
@@ -212,6 +263,12 @@ sub state
                $self->{state} = shift;
                $self->{func} = '' unless defined $self->{func};
                dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+
+               # if there is any queued up broadcasts then splurge them out here
+               if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'convers')) {
+                       $self->send (@{$self->{delayed}});
+                       delete $self->{delayed};
+               }
        }
        return $self->{state};
 }