X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXM.pm;h=64602a2683b48bb634dd79078bc328e5b6257b9a;hb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;hp=5c735fc7bf6190a89372cd1b435c8fe3532d20e7;hpb=1cf4bd14be226274d5deb05da8480ab91a5dac52;p=spider.git diff --git a/perl/DXM.pm b/perl/DXM.pm index 5c735fc7..64602a26 100644 --- a/perl/DXM.pm +++ b/perl/DXM.pm @@ -16,9 +16,7 @@ package DXM; -require Exporter; -@ISA = qw(Exporter); -@EXPORT = qw(msg); +use DXVars; %msgs = ( addr => 'Address set to: $_[0]', @@ -31,6 +29,8 @@ require Exporter; e1 => 'Invalid command', e2 => 'Error: $_[0]', e3 => '$_[0]: $_[1] not found', + e4 => 'Need at least a prefix or callsign', + e5 => 'Not Allowed', email => 'E-mail address set to: $_[0]', heres => 'Here set on $_[0]', hereu => 'Here unset on $_[0]', @@ -42,6 +42,7 @@ require Exporter; node => '$_[0] set as AK1A style Node', nodee1 => 'You cannot use this command whilst your target ($_[0]) is on-line', pr => '$_[0] de $main::mycall $main::cldate $main::ztime >', + priv => 'Privilege level changed on $_[0]', prx => '$main::$mycall >', talks => 'Talk flag set on $_[0]', talku => 'Talk flag unset on $_[0]', @@ -54,6 +55,8 @@ sub msg my $self = shift; my $s = $msgs{$self}; return "unknown message '$self'" if !defined $s; - return eval qq("$s"); + my $ans = eval qq{ "$s" }; + confess $@ if $@; + return $ans; }