sql reformatting, plus a bugfix in do_status for clones

git-svn-id: http://svn.tabris.net/repos/srsv@3593 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.4.3/modules/serviceslibs/chanserv.pm b/branches/0.4.3/modules/serviceslibs/chanserv.pm
index 4a4a27b069c9f101e95013e8b944460f3dee1567..9eb5f83364f276053f749482709c89e31a54898f 100644 (file)
--- a/branches/0.4.3/modules/serviceslibs/chanserv.pm
+++ b/branches/0.4.3/modules/serviceslibs/chanserv.pm
@@ -512,8 +512,12 @@ sub init() {
        $drop_chantext = $dbh->prepare("DELETE FROM chantext WHERE chan=?");
        $drop_nicktext = $dbh->prepare("DELETE nicktext.* FROM nicktext WHERE nicktext.chan=?");
        $get_host = $dbh->prepare ("SELECT user.host from user where user.nick=?");
-       $get_host_inchan= $dbh->prepare ("SELECT clonedUsers.nick FROM user AS curUser JOIN user AS clonedUsers ON (curUser.host=clonedUsers.host) JOIN chanuser ON (chanuser.nickid=clonedUsers.id) WHERE clonedUsers.id!=curUser.id AND curUser.id=? AND chanuser.chan=? AND chanuser.joined=1");
-       $get_expired_bans = $dbh->prepare("SELECT channel, banmask, expiry, timeset FROM tmpban WHERE expiry < UNIX_TIMESTAMP()");
+       $get_host_inchan = $dbh->prepare ("SELECT clonedUsers.nick FROM user AS curUser
+               JOIN user AS clonedUsers ON (curUser.host=clonedUsers.host)
+               JOIN chanuser ON (chanuser.nickid=clonedUsers.id)
+               WHERE clonedUsers.id!=curUser.id AND curUser.id=? AND chanuser.chan=? AND chanuser.joined=1");
+       $get_expired_bans = $dbh->prepare("SELECT channel, banmask, expiry, timeset FROM tmpban
+               WHERE expiry < UNIX_TIMESTAMP()");
 
 }
 
@@ -3918,8 +3922,9 @@ sub do_status($$;$) {
                        my $cn = $chan->{CHAN};
 
                        tempban($chan, [ $mask, 60 ]);
-
                        ircd::kick(agent($chan), $cn, $nick, "No clones allowed in this channel.");
+
+                       return 0;
                }
        }