fixed sh/c/n

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 6ca2fc2c540a82a0ee31a6faa5ed6309f9cc198c..692bf98bf29150cebcaeff9c14cd5ba3c8356908 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -59,7 +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 
+  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)]
@@ -75,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;
 }
@@ -145,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;
 }
@@ -163,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;
 }
@@ -187,7 +195,7 @@ sub send_file
 sub msg
 {
   my $self = shift;
-  return DXM::msg(@_);
+  return DXM::msg($self->{lang}, @_);
 }
 
 # change the state of the channel - lots of scope for debugging here :-)