Converted the .-user command

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index 2663e35e5f8f8e809bffc6a67479f490b554f2b3..e82bcd4d7710c24385d46259ca57ab092c8e3ba0 100644 (file)
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,38 +25,8 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips getFleet/;
+our @EXPORT = qw/whois flags flag laston addPoints chattrG setHost setPNick getShips getFleet/;
 
-sub addUser {
-       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";
-               my ($username,$hostname,$p_nick) = $ND::DBH->selectrow_array(q{SELECT username, hostmask,pnick
-                       FROM users WHERE username ILIKE ? OR hostmask ILIKE ? OR pnick ILIKE ?}
-                       ,undef,$nick,$host,$pnick);
-               if ((not defined $username) && $ND::DBH->do("INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')"
-                               ,undef,$nick,$host,$pnick)){
-                       $ND::server->command("msg $ND::target Added $ND::B$nick(/$pnick)$ND::B with host: $ND::B$host$ND::B");
-               }elsif(defined $username){
-                       $ND::server->command("msg $ND::target $ND::B$username ($p_nick)$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 ($pnick)$ND::B with host: $ND::B$host$ND::B, ".$ND::DBH->errstr);
-               }
-       }else{
-               $ND::server->command("msg $ND::target Only HCs are allowed to add users");
-       }
-}
 sub whois {
        my ($msg, $command) = @_;
 
@@ -201,14 +171,14 @@ sub getShips {
                                        WHERE mission = 'Full fleet' AND name <> 'Unit'
                                        ORDER BY planet,tick DESC,fid DESC) f  USING (planet) 
                                JOIN fleet_ships fs USING (fid)
-                       WHERE ship ILIKE ?
+                       WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
                        GROUP BY username ORDER BY amount DESC
                        });
                if ($command eq 'shipshome'){
                        $f = $ND::DBH->prepare(q{
 SELECT username,SUM(amount) AS amount
 FROM available_ships
-WHERE ship ILIKE ?
+WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
 GROUP BY username ORDER BY amount DESC
                        });
                }
@@ -422,35 +392,4 @@ sub setPNick {
        }
 }
 
-sub deactivateUser {
-       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);
-               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;