X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=4dde13ad5c0356862e3e8a4bf3c770b0347aa1aa;hb=0037f3ea50d01fe17985b479bc9f5d7a3ae03381;hp=7991aae940ed24668119b9a30b9ac43d7c998dbd;hpb=84bf6435f5e45ba548ecc79a986a2746515a0d1d;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 7991aae..4dde13a 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -16,11 +16,11 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Usermgm;
+package NDIRC::Usermgm;
 use strict;
 use warnings;
 use ND::DB;
-use ND::IRC::Access;
+use NDIRC::Access;
 require Exporter;
 
 our @ISA = qw/Exporter/;
@@ -196,9 +196,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 +235,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 +268,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{