X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=f6049236703af8b3a3b6ddbf187bd6126c3473cd;hb=23e3e6f8dc328ab0dd7f9ddae444126b0af12867;hp=e207b0df6da8515666e2e34720c9dbcbe72d3cc3;hpb=56acf117e704090501056412d10b62664ed94825;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index e207b0df..f6049236 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -37,9 +37,12 @@ use DB_File;
 use VE7CC;
 use Thingy;
 use Thingy::Dx;
+use Thingy::Hello;
+use Thingy::Bye;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
+			$maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -49,13 +52,15 @@ $scriptbase = "$main::root/scripts"; # the place where all users start scripts g
 $maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
 $maxbadcount = 3;				# no of bad words allowed before disconnection
 $msgpolltime = 3600;			# the time between polls for new messages 
+$default_pagelth = 20;			# the default page length 0 = unlimited
+$cmdimportdir = "$main::root/cmd_import"; # the base directory for importing command scripts 
+                                          # this does not exist as default, you need to create it manually
+
 
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -68,12 +73,11 @@ sub new
 	# routing, this must go out here to prevent race condx
 	my $pkg = shift;
 	my $call = shift;
-	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	my @rout = $main::routeroot->add_user($call, 1);
 
-	# ALWAYS output the user
+	
 	my $ref = Route::User::get($call);
 	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
-
 	return $self;
 }
 
@@ -97,7 +101,9 @@ sub start
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
 	$self->{priv} = $user->priv || 0;
 	$self->{lang} = $user->lang || $main::lang || 'en';
-	$self->{pagelth} = $user->pagelth || 20;
+	my $pagelth = $user->pagelth;
+	$pagelth = $default_pagelth unless defined $pagelth;
+	$self->{pagelth} = $pagelth;
 	($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
@@ -176,6 +182,11 @@ sub start
 		$user->lastoper($main::systime + ((int rand(10)) * 86400));
 	}
 
+	# ALWAYS output the user
+	my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+	$thing->broadcast($self);
+	$self->lasthello($main::systime);
+
 	# run a script send the output to the punter
 	my $script = new Script(lc $call) || new Script('user_default');
 	$script->run($self) if $script;
@@ -433,8 +444,10 @@ sub run_cmd
 	$args = "" unless defined $args;
 		
 	if ($cmd) {
-		# strip out // on command only
+		# strip out // and .. on command only
 		$cmd =~ s|//|/|g;
+		$cmd =~ s|^/||g;		# no leading / either
+		$cmd =~ s|[^-?\w/]||g;	# and no funny characters
 					
 		my ($path, $fcmd);
 			
@@ -450,7 +463,7 @@ sub run_cmd
 			
 		# first expand out the entry to a command
 		($path, $fcmd) = search($main::localcmd, $cmd, "pl");
-		($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
+		($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
 
 		if ($path && $cmd) {
 			dbg("path: $cmd cmd: $fcmd") if isdbg('command');
@@ -496,7 +509,7 @@ sub run_cmd
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	
 	foreach $dxchan (@dxchan) {
@@ -520,6 +533,8 @@ sub process
 			delete $nothereslug{$k};
 		}
 	}
+
+	import_cmd();
 }
 
 #
@@ -542,6 +557,9 @@ sub disconnect
 
 		# issue a pc17 to everybody interested
 		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+
+		my $thing = Thingy::Bye->new(user=>$call);
+		$thing->broadcast($self);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -552,6 +570,9 @@ sub disconnect
 	# send info to all logged in thingies
 	$self->tell_login('logoutu');
 
+	# remove any outstanding pings I have sent
+	Thingy::Ping::forget($call);
+	
 	Log('DXCommand', "$call disconnected");
 
 	$self->SUPER::disconnect;
@@ -584,7 +605,7 @@ sub broadcast
 	my $pkg = shift;			# ignored
 	my $s = shift;				# the line to be rebroadcast
 	
-    foreach my $dxchan (DXChannel->get_all()) {
+    foreach my $dxchan (DXChannel::get_all()) {
 		next unless $dxchan->{sort} eq 'U'; # only interested in user channels  
 		next if grep $dxchan == $_, @_;
 		$dxchan->send($s);			# send it
@@ -594,15 +615,7 @@ sub broadcast
 # gimme all the users
 sub get_all
 {
-	return grep {$_->{sort} eq 'U'} DXChannel->get_all();
-}
-
-# run a script for this user
-sub run_script
-{
-	my $self = shift;
-	my $silent = shift || 0;
-	
+	return grep {$_->{sort} eq 'U'} DXChannel::get_all();
 }
 
 #
@@ -632,32 +645,33 @@ sub search
 	my @parts = split '/', $short_cmd;
 	my $dirfn;
 	my $curdir = $path;
-	my $p;
-	my $i;
-	my @lparts;
 	
-	for ($i = 0; $i < @parts; $i++) {
-		my  $p = $parts[$i];
+	while (my $p = shift @parts) {
 		opendir(D, $curdir) or confess "can't open $curdir $!";
 		my @ls = readdir D;
 		closedir D;
-		my $l;
-		foreach $l (sort @ls) {
-			next if $l =~ /^\./;
-			if ($i < $#parts) {            	# we are dealing with directories
+
+		# if this isn't the last part
+		if (@parts) {
+			my $found;
+			foreach my $l (sort @ls) {
+				next if $l =~ /^\./;
 				if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
 					dbg("got dir: $curdir/$l\n") if isdbg('command');
 					$dirfn .= "$l/";
 					$curdir .= "/$l";
+					$found++;
 					last;
 				}
-			} else {			# we are dealing with commands
-				@lparts = split /\./, $l;                  
-				next if $lparts[$#lparts] ne $suffix;        # only look for .$suffix files
+			}
+			# only proceed if we find the directory asked for
+			return () unless $found;
+		} else {
+			foreach my $l (sort @ls) {
+				next if $l =~ /^\./;
+				next unless $l =~ /\.$suffix$/;
 				if ($p eq substr($l, 0, length $p)) {
-					pop @lparts; #  remove the suffix
-					$l = join '.', @lparts;
-					#		  chop $dirfn;               # remove trailing /
+					$l =~ s/\.$suffix$//;
 					$dirfn = "" unless $dirfn;
 					$cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
 					dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
@@ -890,7 +904,7 @@ sub broadcast_debug
 {
 	my $s = shift;				# the line to be rebroadcast
 	
-	foreach my $dxchan (DXChannel->get_all) {
+	foreach my $dxchan (DXChannel::get_all) {
 		next unless $dxchan->{enhanced} && $dxchan->{senddbg};
 		$dxchan->send_later('L', $s);
 	}
@@ -945,5 +959,79 @@ sub store_startup_script
 	return @out;
 }
 
+# Import any commands contained in any files in import_cmd directory
+#
+# If the filename has a recogisable callsign as some delimited part
+# of it, then this is the user the command will be run as. 
+#
+sub import_cmd
+{
+	# are there any to do in this directory?
+	return unless -d $cmdimportdir;
+	unless (opendir(DIR, $cmdimportdir)) {
+		dbg("can\'t open $cmdimportdir $!");
+		Log('err', "can\'t open $cmdimportdir $!");
+		return;
+	} 
+
+	my @names = readdir(DIR);
+	closedir(DIR);
+	my $name;
+	foreach $name (@names) {
+		next if $name =~ /^\./;
+
+		my $s = Script->new($name, $cmdimportdir);
+		if ($s) {
+
+			dbg("Run import cmd file $name");
+			Log('DXCommand', "Run import cmd file $name");
+			my @cat = split /[^A-Za-z0-9]+/, $name;
+			my ($call) = grep {is_callsign(uc $_)} @cat;
+			$call ||= $main::mycall;
+			$call = uc $call;
+			my @out;
+			
+			
+			$s->inscript(0);	# switch off script checks
+			
+			if ($call eq $main::mycall) {
+				@out = $s->run($main::me, 1);
+			} else {
+				my $dxchan = DXChannel::get($call);
+			    if ($dxchan) {
+					@out = $s->run($dxchan, 1);
+				} else {
+					my $u = DXUser->get($call);
+					if ($u) {
+						$dxchan = $main::me;
+						my $old = $dxchan->{call};
+						my $priv = $dxchan->{priv};
+						my $user = $dxchan->{user};
+						$dxchan->{call} = $call;
+						$dxchan->{priv} = $u->priv;
+						$dxchan->{user} = $u;
+						@out = $s->run($dxchan, 1);
+						$dxchan->{call} = $call;
+						$dxchan->{priv} = $priv;
+						$dxchan->{user} = $user;
+					} else {
+						Log('err', "Trying to run import cmd for non-existant user $call");
+						dbg( "Trying to run import cmd for non-existant user $call");
+					}
+				}
+			}
+			$s->erase;
+			for (@out) {
+				Log('DXCommand', "Import cmd $name/$call: $_");
+				dbg("Import cmd $name/$call: $_");
+			}
+		} else {
+			Log("Failed to open $cmdimportdir/$name $!");
+			dbg("Failed to open $cmdimportdir/$name $!");
+			unlink "$cmdimportdir/$name";
+		}
+	}
+}
+
 1;
 __END__