Don't add empty string flag when using +

[NDIRC.git] / Commands / Usermgm.pm

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 78c02b81d24431a0a9cf7b6d3156d72c59017fb8..74bb7eb655f63b6e63ba89d8d5039d6567f18db6 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -40,7 +40,7 @@ sub adduser
        my $host = "$pnick.users.netgamers.org";
        my ($username,$hostname,$p_nick) = $dbh->selectrow_array(q{
 SELECT username, hostmask,pnick
-FROM users WHERE username ILIKE ? OR hostmask ILIKE ? OR pnick ILIKE ?
+FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3
                },undef,$nick,$host,$pnick);
 
        if (defined $username){
@@ -92,7 +92,7 @@ sub chattr
 {
        my ($self,$c,$msg) = @_;
 
-       my ($nick, $flags) = $msg =~ /^(\S+) ((\+|-)?\w+)$/ or die 'ARGS';
+       my ($nick, $mode, $flags) = $msg =~ /^(\S+) (\+|-)?(\w+)$/ or die 'ARGS';
        my $dbh = $c->model;
 
        my $f = $dbh->prepare(q{SELECT uid,username FROM users WHERE username ILIKE ?});
@@ -100,7 +100,7 @@ sub chattr
        my $user = $f->fetchrow_hashref;
        if ($f->rows == 1){
                my $update;
-               if ($flags =~ /^(-)/){
+               if ($mode ~~ '-'){
                        $update = $dbh->prepare(q{
 DELETE FROM groupmembers WHERE uid = $1 AND gid = ANY($2)
                        });
@@ -351,7 +351,7 @@ SELECT uid,username,pnick,hostmask FROM users WHERE username ILIKE ?
                if($@){
                        if ($@ =~ /duplicate key value violates unique constraint/){
                                my ($username, $hostname) = $dbh->selectrow_array(q{
-SELECT username,hostmask FROM users WHERE hostmask ILIKE $1
+SELECT username,hostmask FROM users WHERE hostmask = $1
                                },undef,$host);
                                $c->reply("<c04>Problem</c>, <b>$username</b> already uses host <b>$hostname</b>.");
                        }else{
@@ -387,7 +387,7 @@ sub setpnick
                if($@){
                        if ($@ =~ /duplicate key value violates unique constraint/){
                                my ($username, $hostname, $pnick) = $dbh->selectrow_array(q{
-SELECT username,hostmask,pnick FROM users WHERE hostmask ILIKE $1 OR pnick ILIKE $2
+SELECT username,hostmask,pnick FROM users WHERE hostmask = $1 OR pnick = $2
                                },undef,$hostname, $pnick);
                                $c->reply("<c04>Problem</c>, <b>$username</b> already uses host <b>$hostname</b> and pnick <b>$pnick</b>.");
                        }else{