diff --git a/Bantracker/bans.cgi b/Bantracker/bans.cgi index fad1b99..c8a2037 100755 --- a/Bantracker/bans.cgi +++ b/Bantracker/bans.cgi @@ -65,7 +65,7 @@ if cookie.has_key('sess'): if not user: print "Sorry, bantracker has been shut down for anonymous users due to server load
" - print "Join #ubuntu-ops on irc.freenode.net to descuss bans" + print "Join #ubuntu-ops on irc.freenode.net to discuss bans" send_page('bans.tmpl') # Log diff --git a/Bantracker/plugin.py b/Bantracker/plugin.py index ea659e2..89227b3 100644 --- a/Bantracker/plugin.py +++ b/Bantracker/plugin.py @@ -419,8 +419,19 @@ class Bantracker(callbacks.Plugin): self(irc, m) return msg + def callPrecedence(self, irc): + before = [] + for cb in irc.callbacks: + if cb.name() == 'IRCLogin': + before.append(cb) + return (before, []) + def check_auth(self, irc, msg, args, cap='bantracker'): - if not msg.tagged('identified'): + hasIRCLogin = False + for cb in self.callPrecedence(irc)[0]: + if cb.name() == "IRCLogin": + hasIRCLogin = True + if hasIRCLogin and not msg.tagged('identified'): irc.error(conf.supybot.replies.incorrectAuthentication()) return False try: