cleanups in tempban code

git-svn-id: http://svn.tabris.net/repos/srsv@3572 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 2c76bc333705eff6ee41d3677df61fc08c651176..09a17e3c6afbe86110cbda83551702b2a87dcb92 100644 (file)
--- a/branches/0.4.3/modules/serviceslibs/chanserv.pm
+++ b/branches/0.4.3/modules/serviceslibs/chanserv.pm
@@ -565,11 +565,7 @@ sub tempban($$$@) {
        #kickban($chan, $user, undef, 'No clones allowed in this channel.');
        my $reason = join(' ', @argz);
        $reason =~ s/^\:// if $reason;
-       #sub kickban($$$$;$;$) {
-       #my ($chan, $user, $mask, $reason) = @_;
        kickban ($chan, $user, $mask, $reason, undef, $expiry);
-       #sub kickban($$$$;$;$;) {
-       #my ($chan, $user, $mask, $reason, $noflush, $expiry) = @_;
 }
 sub clones_exist ($$) {
        my ($user, $chan) = @_;
@@ -3593,7 +3589,7 @@ sub make_banmask($$;$) {
        return $type."$nick!$ident\@$vhost";
 }
 
-sub kickban($$$$;$;$;) {
+sub kickban($$$$;$$) {
        my ($chan, $user, $mask, $reason, $noflush, $expiry) = @_;
        my $cn = $chan->{CHAN};
        my $nick;
@@ -3609,15 +3605,16 @@ sub kickban($$$$;$;$;) {
        unless($mask) {
                $mask = make_banmask($chan, $user);
        }
-       
+
        enforcer_join($chan) if (get_user_count($chan) <= 1);
        ircd::setmode($agent, $cn, '+b', $mask);
-       if (!$expiry) {
-               $get_bantime -> execute ($cn);
-               ($expiry) = $get_bantime -> fetchrow_array();
+       if (!defined($expiry)) {
+               $get_bantime->execute($cn);
+               ($expiry) = $get_bantime->fetchrow_array();
+               $get_bantime->finish();
        }
        if ($expiry) {
-               $add_tempban->execute ($cn, $mask, $expiry);
+               $add_tempban->execute($cn, $mask, $expiry);
        }
        ircd::flushmodes() unless $noflush;
        ircd::kick($agent, $cn, $nick, $reason) if ($nick);