Updated flag

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index 37a3174db5c48d9b6e935bbe61b7c040e235568d..9f0b1f7f450211bdaf9fadd5d8b3edb21401b84c 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";
@@ -87,7 +95,15 @@ sub flags {
 }
 
 sub flag {
-       my ($flag) = @_;
+       my ($msg, $command) = @_;
+
+       my ($flag);
+       if(defined $msg && $msg =~ /^(\w)$/){
+               $flag = $1;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command flag");
+               return;
+       }
 
        if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
                my $f = $ND::DBH->prepare(qq{
@@ -105,7 +121,16 @@ WHERE flag = ?;
 }
 
 sub laston {
-       my ($flag,$min) = @_;
+       my ($msg, $command) = @_;
+
+       my ($flag,$min);
+       if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
+               $flag = $1;
+               $min = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command flag [days] | lists users and the number of days since they were last seen. If days is specified it will only list users with at least that amount of idle time.");
+               return;
+       }
 
        if (officer()){
                my $f = $ND::DBH->prepare(qq{SELECT username,last
@@ -196,9 +221,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();
@@ -227,8 +260,16 @@ sub chattrG {
 }
 
 sub setHost {
-       my ($nick, $host) = @_;
-       DB();
+       my ($msg, $command) = @_;
+
+       my ($nick, $host);
+       if(defined $msg && $msg =~ /^(\S+) (\S+)$/){
+               $nick = $1;
+               $host = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .sethost nick host | % can be used for wildcards \%arro% will match barrow");
+               return;
+       }
        if (hc()){
                my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
                $f->execute($nick);
@@ -252,16 +293,25 @@ sub setHost {
 }
 
 sub setPNick {
-       my ($nick, $pnick) = @_;
-       DB();
+       my ($msg, $command) = @_;
+
+       my ($nick, $pnick);
+       if(defined $msg && $msg =~ /^(\S+) ([^.\s]+)$/){
+               $nick = $1;
+               $pnick = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command nick pnick | % can be used for wildcards \%arro% will match barrow");
+               return;
+       }
        if (hc()){
                my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
                $f->execute($nick);
                my ($uid,$nick) = $f->fetchrow();
                if ($f->rows == 1){
                        my ($username,$p_nick) = $ND::DBH->selectrow_array("SELECT username, pnick FROM users WHERE pnick ILIKE ? AND NOT (username ILIKE ?)",undef,$pnick,$nick);
-                       if ((not defined $username) && $ND::DBH->do("UPDATE users SET pnick = ? WHERE uid = ?",undef,$pnick,$uid) > 0){
-                               $ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s pnick to: $ND::B$pnick$ND::B");
+                       my $hostname = "$pnick.users.netgamers.org";
+                       if ((not defined $username) && $ND::DBH->do("UPDATE users SET pnick = ?, hostmask = ? WHERE uid = ?",undef,$pnick,$hostname,$uid) > 0){
+                               $ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s pnick to: $ND::B$pnick$ND::B and hostname to $ND::B$hostname$ND::B");
                        }elsif(defined $username){
                                $ND::server->command("msg $ND::target $ND::B$username$ND::B already exists with pnick $ND::B$p_nick$ND::B.");
                        }else{
@@ -277,8 +327,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);