Merge lp:~rww/ubuntu-bots/1307766 into lp:ubuntu-bots

[rww]

[Terence Simpson (tsimpson)]

review: Approve (bugfix)

=== modified file 'Bantracker/cgi/bans.cgi'
--- Bantracker/cgi/bans.cgi	2012-07-05 21:20:47 +0000
+++ Bantracker/cgi/bans.cgi	2014-04-15 04:51:13 +0000
@@ -304,6 +304,7 @@
 makeInput("kicks", "Kicks")
 makeInput("bans", "Bans")
 makeInput("oldbans", "Removed bans")
+makeInput("marks", "Marks")
 print '</div>'
     
 print '<div style="float:left">'
@@ -324,7 +325,7 @@
     send_page('bans.tmpl')
 
 # Select and filter bans
-def getBans(id=None, mask=None, kicks=True, oldbans=True, bans=True, floodbots=True, operator=None,
+def getBans(id=None, mask=None, kicks=True, oldbans=True, bans=True, marks=True, floodbots=True, operator=None,
             channel=None, limit=None, offset=0, withCount=False):
     sql = "SELECT channel, mask, operator, time, removal, removal_op, id FROM bans"
     args = []
@@ -343,6 +344,8 @@
     if channel:
         where.append("channel LIKE %s")
         args.append(channel)
+    if not marks:
+        where.append("id NOT IN (SELECT ban_id FROM comments WHERE comment LIKE '**MARK**%%')")
     if not kicks:
         where.append("mask LIKE '%%!%%'")
     if not (oldbans or bans):
@@ -424,6 +427,7 @@
     bans, ban_count = getBans(mask=query, kicks=isOn('kicks'),
                                oldbans=isOn('oldbans') or isOn('oldmutes'),
                                bans=isOn('bans') or isOn('mutes'),
+                               marks=isOn('marks'),
                                floodbots=isOn('floodbots'),
                                operator=oper,
                                channel=chan,