X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=692bf98bf29150cebcaeff9c14cd5ba3c8356908;hb=e00a697bdb9f7c066b3e921d4f8ccc9bb9cf7485;hp=d21497bdc4222b870945eff5a6d5d97560321098;hpb=78ed3f6025103ec1c47c90725e37b417647d83c8;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index d21497bd..692bf98b 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -26,8 +26,8 @@
 package DXChannel;
 
 use Msg;
-use DXUtil;
 use DXM;
+use DXUtil;
 use DXDebug;
 use Carp;
 
@@ -59,6 +59,13 @@ use vars qw(%channels %valid);
   redirect => '0,Redirect messages to',
   lang => '0,Language',
   func => '9,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',
+  remotecmd => '9,doing rcmd,yesno',
+  pagelth => '0,Page Length',
+  pagedata => '9,Page Data Store',
 );
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -74,6 +81,8 @@ sub alloc
   $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};
   bless $self, $pkg; 
   return $channels{$call} = $self;
 }
@@ -144,8 +153,8 @@ sub send_now
 	
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> $sort $call $line\n") if $conn;
 	$conn->send_now("$sort$call|$line") if $conn;
+	dbg('chan', "-> $sort $call $line") if $conn;
   }
   $self->{t} = time;
 }
@@ -162,8 +171,8 @@ sub send              # this is always later and always data
 
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> D $call $line\n") if $conn;
 	$conn->send_later("D$call|$line") if $conn;
+	dbg('chan', "-> D $call $line") if $conn;
   }
   $self->{t} = time;
 }
@@ -182,20 +191,23 @@ sub send_file
   $self->send(@buf);
 }
 
-# just a shortcut for $dxchan->send(msg(...));
+# this will implement language independence (in time)
 sub msg
 {
   my $self = shift;
-  $self->send(DXM::msg(@_));
+  return DXM::msg($self->{lang}, @_);
 }
 
 # change the state of the channel - lots of scope for debugging here :-)
 sub state
 {
   my $self = shift;
-  $self->{oldstate} = $self->{state};
-  $self->{state} = shift;
-  dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+  if (@_) {
+    $self->{oldstate} = $self->{state};
+    $self->{state} = shift;
+    dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+  }
+  return $self->{state};
 }
 
 # disconnect this channel