X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FChannel.pm;h=d309ce00ae1ac4e533f08f66f90101db2fe28159;hp=ad627b3d835e37f9891c670405375faf70755db5;hb=1ccb344994c1b517c662da9f236cf1c640780177;hpb=ae37bc6b64270f8c65298a36fce1f4bad761231f

diff --git a/Commands/Channel.pm b/Commands/Channel.pm
index ad627b3..d309ce0 100644
--- a/Commands/Channel.pm
+++ b/Commands/Channel.pm
@@ -33,26 +33,25 @@ sub op
 {
 	my ($self,$c,$msg) = @_;
 
-	my ($access) = $self->name =~ /(op|voice)/;
+	$self->name =~ /(op|voice)/;
+	my @access = ($1);
 
-	my $where = "";
 	if ($msg =~ /^\s*$/){
 		$msg = $c->nick;
-		$where = "OR f.name = 'auto_$access'";
+		push @access, "auto_$access[0]";
 	}
 
-	my $mode = qq{
-SELECT DISTINCT c.name FROM users u
-	JOIN groupmembers g ON g.uid = u.uid
-	JOIN channel_group_flags gf ON g.gid = gf.group
-	JOIN channels c ON gf.channel = c.id
-	JOIN channel_flags f ON f.id = gf.flag
-WHERE u.hostmask ILIKE ? AND c.name = ? AND (f.name = '$access' $where);
+	my $mode = 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 channel = $2 AND f.name = ANY($3);
 		};
 	if ($c->check_user_roles(qw/irc_masterop/)){
 		$mode = 1;
 	}else{
-		($mode) = $c->model->selectrow_array($mode,undef,$c->host,$c->channel);
+		($mode) = $c->model->selectrow_array($mode,undef,$c->host,$c->channel,\@access);
 	}
 	if ($mode){
 		$c->server->command($self->name . " " . $c->channel . " $msg");
@@ -76,12 +75,11 @@ sub invite
 		my @access = ('auto_invite');
 		push @access, 'invite' if $channel;
 		my $channels = $c->model->prepare(q{
-SELECT DISTINCT c.name FROM users u
-	JOIN groupmembers g ON g.uid = u.uid
-	JOIN channel_group_flags gf ON g.gid = gf.group
-	JOIN channels c ON gf.channel = c.id
-	JOIN channel_flags f ON f.id = gf.flag
-WHERE u.hostmask ILIKE $1 AND COALESCE(c.name = $2,TRUE)
+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) )
 		});
 		$channels->execute($c->host,$channel,\@access);