X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=a38e595b77fba09411b5811b82c9f27112b3426a;hb=e053b73d5ae0ca68e4f40463450fe2fae0ae737a;hp=8939b801e9fc2beb29498b4689c154521da7e55d;hpb=3726b0b1cb45a00a301acea4daa19647d82489e2;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 8939b80..a38e595 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -16,130 +16,33 @@
 #   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/;
 
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost deactivateUser/;
+our @EXPORT = qw/addPoints setPNick/;
 
-sub addUser {
-	my ($nick,$host) = @_;
-	DB();
-	if (hc()){
-		unless (defined $host){
-			my @nicks = $ND::server->nicks_get_same($nick);
-			if (@nicks){
-				$nicks[1]->{host} =~ /.*@(.*)/;
-				$host = $1;
-			}else{
-				$host = "$nick.users.netgamers.org";
-			}
-		}
-		my ($username,$hostname) = $ND::DBH->selectrow_array("SELECT username, hostmask FROM users WHERE username ILIKE ? OR hostmask ILIKE ?",undef,$nick,$host);
-		if ((not defined $username) && $ND::DBH->do("INSERT INTO users (username,hostmask,password) VALUES(?,?,'')"
-				,undef,$nick,$host)){
-			$ND::server->command("msg $ND::target Added $ND::B$nick$ND::B with host: $ND::B$host$ND::B");
-		}elsif(defined $username){
-			$ND::server->command("msg $ND::target $ND::B$username$ND::B already exists with host: $ND::B$hostname$ND::B.");
-
-		}else{
-			$ND::server->command("msg $ND::target Something went wrong when trying to add $ND::B$nick$ND::B with host: $ND::B$host$ND::B, most likely duplicate user name");
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only HCs are allowed to check that");
-	}
-}
-sub whois {
-	my ($nick) = @_;
-	DB();
-	if (officer()){
-		my $f = $ND::DBH->prepare("SELECT username, hostmask, concat(flag) FROM users u LEFT OUTER JOIN (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g ON g.uid = u.uid  WHERE username ILIKE ? GROUP BY username,hostmask");
-		$f->execute($nick);
-		while (my @row = $f->fetchrow()){
-			$ND::server->command("msg $ND::target $row[0] flags: ($row[2]) host: $row[1]");
-		}
-		if ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only officers are allowed to check that");
-	}
-}
-
-sub flags {
-	my ($nick) = @_;
-	DB();
-	unless ($1){
-		my ($flags) = $ND::DBH->selectrow_array("SELECT TRIM(', ' FROM concat(flag||':'||groupname||', ')) FROM groups");
-		$ND::server->command("msg $ND::target $flags");
-	}elsif (hc()){
-		my $f = $ND::DBH->prepare("SELECT username, concat(flag), TRIM(', ' FROM concat(groupname||', ')) FROM users u LEFT OUTER JOIN (SELECT uid,flag,groupname FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g ON g.uid = u.uid  WHERE username ILIKE ? GROUP BY username,hostmask");
-		$f->execute($nick);
-		while (my @row = $f->fetchrow()){
-			$ND::server->command("msg $ND::target Flags for $row[0] on: $ND::target: $row[1]| (Global: $row[2])");
-		}
-		if ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only HCs are allowed to check that");
-	}
-}
-
-sub flag {
-	my ($flag) = @_;
-
-	if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
-		my $f = $ND::DBH->prepare(qq{
-SELECT TRIM(', ' FROM concat(username||', ')) FROM
-	(SELECT uid, username FROM users ORDER BY username) u NATURAL JOIN groupmembers gm 
-	JOIN groups g ON g.gid = gm.gid
-WHERE flag = ?;
-			});
-		if (my ($users) = $ND::DBH->selectrow_array($f,undef,$flag)){
-			$ND::server->command("msg $ND::target Users with flag $ND::B$flag$ND::B: $users");
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only officers are allowed to check that");
-	}
-}
-
-sub laston {
-	my ($flag,$min) = @_;
+sub addPoints {
+	my ($msg, $t) = @_;
 
-	if (officer()){
-		my $f = $ND::DBH->prepare(qq{SELECT username,last
-			FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
-			});
-		$min = 0 unless defined $min;
-		$f->execute($flag,$min);
-		my $text;
-		while (my $user = $f->fetchrow_hashref){
-			$user->{last} = '?' unless defined $user->{last};
-			$text .= "$user->{username}($user->{last}) ";
-		}
-		$ND::server->command("msg $ND::target Users(days) with flag $ND::B$flag$ND::B: $text");
+	my ($nick, $points);
+	if(defined $msg && $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/){
+		$nick = $1;
+		$points = $2;
 	}else{
-		$ND::server->command("msg $ND::target Only officers are allowed to check that");
+		$ND::server->command("notice $ND::nick syntax: .$t nick [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.");
+		return;
 	}
-}
-
-sub addPoints {
-	my ($t,$nick,$p) = @_;
-	DB();
 	if (   ($t eq "d" && dc())
 		|| ($t eq "a" && bc())
 		|| ($t eq "h" && officer())
 		|| ($t eq "s" && scanner())){
-		my $points = 1;
-		if ($p){
-			$points = $p;
-		}
+		$points = 1 unless $points;
 		if ($points*$points > 400){
 			$ND::server->command("msg $ND::target Values between -20 and 20 please");
 			return;
@@ -172,50 +75,28 @@ sub addPoints {
 	}
 }
 
-sub chattrG {
-	my ($nick, $flags) = @_;
-	DB();
-	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();
-		if ($f->rows == 1){
-			my $add = 1;
-			$flags =~ /^(-)/;
-			my $update;
-			if ($1 eq "-"){
-				$update = $ND::DBH->prepare("DELETE FROM groupmembers WHERE uid = ? AND gid = (SELECT gid FROM groups WHERE flag = ?)");
-			}else{
-				$update = $ND::DBH->prepare("INSERT INTO groupmembers (uid,gid) VALUES(?,(SELECT gid FROM groups WHERE flag = ?))");
-			}
-			while ($flags =~ m/(\w)/g){ 
-				$update->execute($user[0],$1);
-			}
-			$update = $ND::DBH->prepare("SELECT concat(flag) FROM (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g WHERE uid = ? ");
-			my @flags = $ND::DBH->selectrow_array($update,undef,$user[0]);
-			$ND::server->command("msg $ND::target Global flags for $user[1] are now: $flags[0]");
-		}elsif ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}else{
-			$ND::server->command("msg $ND::target More than 1 user matched, please refine the search");
-		}
-		$f->finish;
-	}
-}
+sub setPNick {
+	my ($msg, $command) = @_;
 
-sub setHost {
-	my ($nick, $host) = @_;
-	DB();
+	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,$hostname) = $ND::DBH->selectrow_array("SELECT username, hostmask FROM users WHERE hostmask ILIKE ? AND NOT (username ILIKE ?)",undef,$host,$nick);
-			if ((not defined $username) && $ND::DBH->do("UPDATE users SET hostmask = ? WHERE uid = ?",undef,$host,$uid) > 0){
-				$ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s host to: $ND::B$host$ND::B");
+			my ($username,$p_nick) = $ND::DBH->selectrow_array("SELECT username, pnick FROM users WHERE pnick ILIKE ? AND NOT (username ILIKE ?)",undef,$pnick,$nick);
+			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 host: $ND::B$hostname$ND::B.");
+				$ND::server->command("msg $ND::target $ND::B$username$ND::B already exists with pnick $ND::B$p_nick$ND::B.");
 			}else{
 				$ND::server->command("msg $ND::target Couldn't update $ND::B$username${ND::B}'s host");
 			}
@@ -228,28 +109,4 @@ sub setHost {
 	}
 }
 
-sub deactivateUser {
-	my ($nick) = @_;
-	DB();
-	if (hc()){
-		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
-		$f->execute($nick);
-		my ($uid,$username) = $f->fetchrow();
-		if ($f->rows == 1){
-			my $updated = $ND::DBH->do("UPDATE users SET hostmask = ?, password = '' WHERE uid = ?",undef,$username,$uid);
-			if ($updated > 0){
-				my $groups = $ND::DBH->do("DELETE FROM groupmembers WHERE uid = ?",undef,$uid);
-				$ND::server->command("msg $ND::target $ND::B$username$ND::B has been deactivated.");
-			}else{
-				$ND::server->command("msg $ND::target Something went wrong when trying to modify $ND::B$username$ND::B");
-			}
-		}elsif ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}else{
-			$ND::server->command("msg $ND::target More than 1 user matched, please refine the search");
-		}
-		$f->finish;
-	}
-}
-
 1;