Introduce a uid member for the context and use it intead of the host in commands

[NDIRC.git] / Commands / Channel.pm

diff --git a/Commands/Channel.pm b/Commands/Channel.pm
index 9207b0c4cadf71645339da18cab0eaec2756c1bc..f83969ea8f4594f69b3f790e015412c608672329 100644 (file)
--- a/Commands/Channel.pm
+++ b/Commands/Channel.pm
@@ -47,12 +47,12 @@ SELECT DISTINCT LOWER(flag) FROM users u
        JOIN groupmembers g USING (uid)
        JOIN channel_group_flags gf USING (gid)
        JOIN channel_flags f USING (flag)
-WHERE u.hostmask ILIKE $1 AND channel = $2 AND f.name = ANY($3);
+WHERE uid = $1 AND channel = $2 AND f.name = ANY($3);
                };
        if ($c->check_user_roles(qw/irc_masterop/)){
                $mode = substr $access[0], 0,1;
        }else{
-               ($mode) = $c->model->selectrow_array($mode,undef,$c->host,$c->channel,\@access);
+               ($mode) = $c->model->selectrow_array($mode,undef,$c->uid,$c->channel,\@access);
        }
        if ($mode){
                $c->command(mode => $c->channel, "$mod$mode", $msg);
@@ -73,17 +73,16 @@ sub invite
        if ($channel && $c->check_user_roles('irc_masterinvite')){
                push @channels,$channel;
        }else{
-               my @access = ('auto_invite');
-               push @access, 'invite' if $channel;
+               my @access = ('i');
+               push @access, 'I' if $channel;
                my $channels = $c->model->prepare(q{
 SELECT DISTINCT channel FROM users u
        JOIN groupmembers g USING (uid)
        JOIN channel_group_flags gf USING (gid)
-       JOIN channel_flags f USING (flag)
-WHERE u.hostmask ILIKE $1 AND COALESCE(channel = $2,TRUE)
-       AND (f.name = ANY($3) )
+WHERE uid = $1 AND COALESCE(channel = $2,TRUE)
+       AND (flag = ANY($3) )
                });
-               $channels->execute($c->host,$channel,\@access);
+               $channels->execute($c->uid,$channel,\@access);
                while (my ($channel) = $channels->fetchrow()){
                        push @channels,$channel;
                }
@@ -131,8 +130,8 @@ sub getpass
        my $password = generate_random_string 10;
        my $update = $dbh->do(q{
 UPDATE users SET password = MD5( ? )
-WHERE hostmask ILIKE ? AND password =''
-               },undef,$password,$c->host);
+WHERE uid  ? AND password =''
+               },undef,$password,$c->uid);
        if ($update > 0){
                $c->reply("Password set to: $password (you can change it on webbie)");
        }else{