X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=e24ee550f195e1460b4ffd676856cccc57b507ae;hb=f442c3c5bb7d67583c875ffbb5aeecc137d6928c;hp=6e0a05037b5e85184a139ad97ae04f0ab0b177ef;hpb=51bb1ae8ebc8e03ad042229fd12215ad63e5f6ef;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 6e0a050..e24ee55 100644
--- 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();
@@ -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);