updated addUser

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index 74793a0610387897626738274cf5123e95b522e2..e24ee550f195e1460b4ffd676856cccc57b507ae 100644 (file)
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -28,8 +28,16 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips/;
 
 sub addUser {
-       my ($nick,$pnick) = @_;
-       DB();
+       my ($msg, $command) = @_;
+
+       my ($nick,$pnick);
+       if(defined $msg && $msg =~ /^(\w+)(?: ([^.\s]+))?$/){
+               $nick = $1;
+               $pnick = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command nick [pnick] | nick must be alphanum characters, if no pnick is given then it will be set to nick");
+               return;
+       }
        if (hc()){
                $pnick = $nick unless $pnick;
                my $host = "$pnick.users.netgamers.org";
@@ -196,9 +204,17 @@ sub addPoints {
 }
 
 sub chattrG {
-       my ($nick, $flags) = @_;
-       DB();
-       if (hc() || ($flags =~ /^(\+|-)?x$/ && $ND::address eq 'Assassin.users.netgamers.org')){
+       my ($msg, $command) = @_;
+
+       my ($nick, $flags);
+       if(defined $msg && $msg =~ /^(\S+) ((\+|-)?\w+)$/){
+               $nick = $1;
+               $flags = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .chattr nick [-]flags | % can be used for wildcards \%arro% will match barrow, if a - is given then flags will be removed, otherwise added");
+               return;
+       }
+       if (hc()){# || ($flags =~ /^(\+|-)?x$/ && $ND::address eq 'Assassin.users.netgamers.org')){
                my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
                $f->execute($nick);
                my @user = $f->fetchrow();
@@ -263,7 +279,7 @@ sub setPNick {
        my ($msg, $command) = @_;
 
        my ($nick, $pnick);
-       if($msg =~ /^(\S+) ([^.\s]+)$/){
+       if(defined $msg && $msg =~ /^(\S+) ([^.\s]+)$/){
                $nick = $1;
                $pnick = $2;
        }else{
@@ -294,8 +310,15 @@ sub setPNick {
 }
 
 sub deactivateUser {
-       my ($nick) = @_;
-       DB();
+       my ($msg, $command) = @_;
+
+       my $nick;
+       if(defined $msg && $msg =~ /^(\S+)$/){
+               $nick = $1;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command user");
+               return;
+       }
        if (hc()){
                my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
                $f->execute($nick);