X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=6495e7a7edde6ed7e9ff32ac5630e755d9053816;hb=3eb9538d135d9ff21d8ce7c0e0c6b3e6d7fb59a9;hp=5505610e9752b8520f6270733fdc0b1387185bc0;hpb=5d197c9f7aa2ea796d86aa5473f93956b24cf1b7;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 5505610e..6495e7a7 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -51,6 +51,7 @@ use vars qw(%channels %valid);
 		  consort => '9,Connection Type',
 		  'sort' => '9,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',
@@ -68,8 +69,29 @@ use vars qw(%channels %valid);
 		  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',
+		  delayed => '9,Delayed messages,parray',
+		  annfilter => '9,Announce Filter',
+		  wwvfilter => '9,WWV Filter',
+		  spotfilter => '9,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->{passwd};
+}
+
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -78,15 +100,18 @@ 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} = "";
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
@@ -203,6 +228,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 +250,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};
 }