From 583ea422d96a276927f5f928a7f05d04f9a1b399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eli=C3=A1n=20Hanisch?= Date: Sun, 6 Nov 2011 20:11:13 -0300 Subject: [PATCH] port changes from bantracker page. --- Bantracker/banlog.css | 13 ++ Bantracker/banlog.js | 118 +++++++++++++++++ Bantracker/bans.cgi | 286 +++++++++++++++++++++++++++++------------- Bantracker/bans.js | 78 ++++++++++++ Bantracker/bans.tmpl | 69 ++-------- bot.css | 4 + commoncgi.py | 10 +- 7 files changed, 425 insertions(+), 153 deletions(-) create mode 100644 Bantracker/banlog.css create mode 100644 Bantracker/banlog.js create mode 100644 Bantracker/bans.js diff --git a/Bantracker/banlog.css b/Bantracker/banlog.css new file mode 100644 index 0000000..190979a --- /dev/null +++ b/Bantracker/banlog.css @@ -0,0 +1,13 @@ +div.main { + text-align: left; + max-width: 500px; +} + +#hform > fieldset, #comment_form > fieldset { + max-width: 400px; +} + +.highlight { + background-color: yellow; +} + diff --git a/Bantracker/banlog.js b/Bantracker/banlog.js new file mode 100644 index 0000000..fae19ce --- /dev/null +++ b/Bantracker/banlog.js @@ -0,0 +1,118 @@ +RegExp.escape = function escape(text) { + if (!arguments.callee.sRE) { + var specials = [ + '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^' + ]; + arguments.callee.sRE = new RegExp( + '(\\' + specials.join('|\\') + ')', 'g' + ); + } + return text.replace(arguments.callee.sRE, '\\$1'); +} + +String.prototype.HalfHTMLEscape = function() { + return this.replace(/&/g, '&').replace(/>/g, '>').replace(/" +if not user and disable_anonymous: + print "Sorry, bantracker is not available for anonymous users
" print "Join #ubuntu-ops on irc.freenode.net to discuss bans" send_page('bans.tmpl') + sys.exit(0) # Log if form.has_key('log'): - cur.execute('SELECT log FROM bans WHERE id=%s', (form['log'].value,)) - log = cur.fetchall() - con.commit() - if form.has_key('mark'): - marked = form['mark'].value - lines = log[0][0].splitlines() - for line in lines: - if marked.lower() in line.lower(): - print '%s
' % q(line) - else: - print "%s
" % q(line) - else: - print q(log[0][0]).replace('\n', '
') - send_page('empty.tmpl') + log_id = form['log'].value + plain = False + mark = False + mark_value = '' + regex = False + regex_value = '' + + if form.has_key('plain') and form['plain'].value.lower() in ('1', 'true', 'on'): + plain = True + + if form.has_key('mark'): + mark = True + mark_value = form['mark'].value + if form.has_key('regex') and form['regex'].value in ('1', 'true', 'on'): + regex = True + regex_value = 'checked="checked"' + + con = sqlite.connect(db) + cur = con.cursor() + cur.execute("SELECT log FROM bans WHERE id=%s", log_id) + log = cur.fetchall() + con.commit() + con.close() + + if not log or not log[0] or not log[0][0]: + if plain: + print >> sys.stderr, '
No such log with ID: %s' % q(log_id) + send_page('empty.tmpl') + else: + print >> sys.stderr, 'No such log with ID: %s' % q(log_id) + send_page('log.tmpl') + + log = log[0][0] + + if not plain: + print '
' + print '
' % pagename + print '
' + print ' ' % q(log_id) + print ' ' + print ' ' % q(mark_value) + print ' ' % regex_value + print ' ' + print '
' + print ' ' + print '
' + print '
' + + pad = '
' + if plain: + pad = '' + print '
'
+    else:
+        print '
'
+
+    if mark:
+        if regex:
+            mark = re.compile(mark_value, re.I)
+        else:
+            escaped = re.escape(mark_value).replace('%', '.*')
+            mark = re.compile(escaped, re.I)
+
+    lines = log.splitlines()
+    for line in lines:
+        if plain:
+            print q(line)
+        elif mark:
+            if mark.search(line):
+                print ' %s%s' % (q(line), pad)
+            else:
+                print " %s%s" % (q(line), pad)
+        else:
+            print '  %s%s' % (q(line), pad)
+
+    if plain:
+        print '
' + send_page('empty.tmpl') + + print '

' + print '
' + print '
' % pagename + print '
' + print ' Add a comment' + print '
' + print ' ' % log_id + print ' ' + print '
' + print '
' + print '
' + + send_page('log.tmpl') # Main page # Process comments @@ -103,48 +182,63 @@ else: cookie['tz'] = tz print '
' + print '' % (zone, zone) + else: + print '' % (zone, zone) +print '' +print '' +print '
' print '' tz = pytz.timezone(tz) +haveQuery = form.has_key('query') or form.has_key('channel') or form.has_key('operator') + +def isOn(k): + default = not haveQuery + if not form.has_key(k): + return default + if form[k].value.lower() in ('on', '1', 'true', 'yes'): + return True + if form[k].value.lower() in ('off', '0', 'false', 'no'): + return False + return default + +def makeInput(name, label, before=False, type="checkbox", extra=''): + if before: + print '' % (name, label) + value = '' + if type == "checkbox": + if isOn(name): + value = ' checked="checked"' + else: + if form.has_key(name): + value = ' value="%s"' % form[name].value, + + print ' %s' \ + % (type, name, name, value, extra) + if not before: + print '' % (name, label) + print '
' + # Search form print '
' print '
' % pagename -print ' Search string (% is wildcard)
' +makeInput("channel", "Channel:", True, "text") +makeInput("operator", "Operator:", True, "text") +makeInput("query", "Search:", True, "text", extra="(% and _ are wildcards)") # Search fields print '
' -print ' Kicks
' -print ' Removed bans
' -print ' Bans
' +makeInput("kicks", "Kicks") +makeInput("bans", "Bans") +makeInput("oldbans", "Removed bans") print '
' print '
' -print ' Include mutes
' -print ' Include FloodBots
' +makeInput("mutes", "Include mutes") +makeInput("floodbots", "Include Floodbots") print '
' print '
' @@ -156,9 +250,9 @@ if not form.has_key('query'): if form.has_key('sort'): sort='&sort=' + form['sort'].value print '
·' - cur.execute('SELECT COUNT(id) FROM bans') - nump = int(math.ceil(int(cur.fetchall()[0][0]) / float(num_per_page))) - for i in range(nump): + cur.execute('SELECT COUNT(*) FROM bans') + nump = math.ceil(int(cur.fetchall()[0][0]) / float(num_per_page)) + for i in range(int(nump)): print '%d ·' % (pagename, i, sort, i+1) print '
' @@ -167,20 +261,27 @@ print '
 
' # Main bans table # Table heading -print '' -for h in [['Channel',0], ['Nick/Mask',1], ['Operator',2], ['Time',6]]: +print '
' +print '
' +print '' +print '' +for h in [['Channel',0, 45], ['Nick/Mask',1, 25], ['Operator',2, 0], ['Time',6, 15]]: # Negative integers for backwards searching try: v = int(form['sort'].value) if v < 10: h[1] += 10 except: pass - print '' % (pagename, h[1], h[0]) -print '' + print '' % (pagename, h[2], h[1], h[0]) +print '' +print '' +print '' +print '' +print '' # Select and filter bans -def getBans(id=None, mask=None, kicks=True, oldbans=True, bans=True, floods=True, operator=None, - channel=None): +def getBans(id=None, mask=None, kicks=True, oldbans=True, bans=True, floodbots=True, operator=None, + channel=None): sql = "SELECT channel, mask, operator, time, removal, removal_op, id FROM bans" args = [] where = [] @@ -190,7 +291,7 @@ def getBans(id=None, mask=None, kicks=True, oldbans=True, bans=True, floods=True if mask: where.append("mask LIKE %s") args.append('%' + mask + '%') - if not floods: + if not floodbots: where.append("operator NOT LIKE 'floodbot%%'") if operator: where.append("operator LIKE %s") @@ -242,16 +343,17 @@ if form.has_key('query'): bans = getBans(id=int(query)) start = 0; end = 1 else: - if "chan:" in query: - (query, chan) = getQueryTerm(query, "chan:") - if "oper:" in query: - (query, oper) = getQueryTerm(query, "oper:") + if form.has_key('channel'): + chan = form['channel'].value + if form.has_key('operator'): + oper = form['operator'].value + bans = getBans(mask=query, kicks=form.has_key('kicks'), - oldbans=form.has_key('oldbans'), - bans=form.has_key('bans'), - floods=form.has_key('floods'), - operator=oper, - channel=chan) + oldbans=form.has_key('oldbans'), + bans=form.has_key('bans'), + floodbots=form.has_key('floodbots'), + operator=oper, + channel=chan) if not form.has_key('mutes'): bans = filter(lambda x: filterMutes(x), bans) @@ -286,57 +388,67 @@ if form.has_key('sort'): # And finally, display them! i = 0 for b in bans[start:end]: - print '' + print '' + else: + print "" # Channel - print '' % b[0] + print '' % (b[6],'',b[0]) # Mask - print '' # Operator - print '' # Time - print '' # Log link - print '' % b[6] - print '' + print """""" % (b[6], b[6], pagename, b[6]) + + # ID + print '' % (b[6], b[6]) + print "" # Comments - print '' - print '' + else: + print "" cur.execute('SELECT who, comment, time FROM comments WHERE ban_id = %d', (b[6],)) comments = cur.fetchall() if len(comments) == 0: + print '' + print """ """ % pagename + print """
""" + print """ """ % b[6] + print """ """ + print """ """ + print """""" + print '' + i += 1 print '
%sLog
%sLogID
%s%s %s%s' % b[1] + print '%s' % (b[6], b[1]) # Ban removal if b[4]: print '
(Removed)' print'		%s' % b[2] + print '%s' % (b[6], b[2]) if b[4]: # Ban removal print u'
%s' % b[5] print '		%s' % pickle.loads(b[3]).astimezone(tz).strftime("%b %d %Y %H:%M:%S") + print '%s' % (b[6], pickle.loads(b[3]).astimezone(tz).strftime("%b %d %Y %H:%M:%S")) if b[4]: # Ban removal print '
%s' % pickle.loads(b[4]).astimezone(tz).strftime("%b %d %Y %H:%M:%S") print '		Show/Hide log
+ Show log inline + | full + %d
' + if i % 2: + print '
' + print '' % b[6] print '(No comments) ' else: + print '' % b[6] + print '' % b[6] for c in comments: - print q(c[1]) + print q(c[1]).replace('\n', '
') print u'
%s, %s
' % \ (c[0],pickle.loads(c[2]).astimezone(tz).strftime("%b %d %Y %H:%M:%S")) if user: print """Add comment""" % b[6] print """
' diff --git a/Bantracker/bans.js b/Bantracker/bans.js new file mode 100644 index 0000000..c6ee2c3 --- /dev/null +++ b/Bantracker/bans.js @@ -0,0 +1,78 @@ +window.addEventListener("load", function() { + sc = document.createElement("script"); + sc.setAttribute("type", "text/javascript"); + sc.setAttribute("src", "banlog.js"); + document.getElementsByTagName("head")[0].appendChild(sc); +}, false); + +s = null; +r = null; + +function getObj(name) { + if (document.getElementById) { + this.obj = document.getElementById(name); + this.style = document.getElementById(name).style; + } + else if (document.all) { + this.obj = document.all[name]; + this.style = document.all[name].style; + } + else if (document.layers) { + this.obj = document.layers[name]; + this.style = document.layers[name]; + } +} + +function toggle(item,prefix) { + var c = new getObj(prefix + '_' + item); + if ( c.style.display == 'inline' ) { + c.style.display = 'none'; + } else { + c.style.display = 'inline'; + } +} + +function showlog(item) { + if (s == item) { + c = new getObj('log'); + if( c.style.display == 'block' || c.style.display == '' ) { + c.style.display = 'none'; + document.getElementById("loglink-" + item).textContent = "inline"; + } else { + c.style.diaply = 'block'; + document.getElementById("loglink-" + item).textContent = "Hide"; + } + s = null; + } else { + loadlog(item); + } +} + +function loadlog(id) { + r = new XMLHttpRequest(); + var qobj = new getObj("query"); +/* + var objv = []; + for(var i in qobj) + objv.push(i); + alert(objv); +*/ + var reqUri = "bans.cgi?log=" + id; + if(qobj.obj.value && qobj.obj.value != '') + reqUri += "&mark=" + qobj.obj.value.split(' ').pop(); + reqUri += "&plain=1"; + r.onreadystatechange = printlog; + r.open("GET", reqUri, true); + r.send(null); + s = id; +} + +function printlog() { + if (r.readyState == 4) { + var c = new getObj('log'); + c.obj.innerHTML = r.responseText; + document.getElementById("loglink-" + s).textContent = "Hide"; + c.style.display = 'block'; + setupHighlight(); + } +} diff --git a/Bantracker/bans.tmpl b/Bantracker/bans.tmpl index 54fee8c..71dbf49 100644 --- a/Bantracker/bans.tmpl +++ b/Bantracker/bans.tmpl @@ -1,74 +1,21 @@ - + + + Ubottu bantracker - +

Ubottu Bantracker

+
%e -

+

+
%s -

+

©2006 Dennis Kaarsemaker
Edited by Terence Simpson

diff --git a/bot.css b/bot.css index 785683d..a4f02b9 100644 --- a/bot.css +++ b/bot.css @@ -6,6 +6,10 @@ body { font-size: 10px; } +tbody { + font-weight: normal; +} + div.home { margin: 20px auto; width: 300px; diff --git a/commoncgi.py b/commoncgi.py index e21ae3e..ea2497b 100644 --- a/commoncgi.py +++ b/commoncgi.py @@ -55,14 +55,14 @@ def send_page(template): fd = open(template) tmpl = fd.read() fd.close() - print tmpl[:tmpl.find('%e')] + sys.stdout.write(tmpl[:tmpl.find('%e')]) for e in errdata: - print e - print tmpl[tmpl.find('%e')+2:tmpl.find('%s')] + sys.stdout.write(e) + sys.stdout.write(tmpl[tmpl.find('%e')+2:tmpl.find('%s')]) # print tmpl[:tmpl.find('%s')] for d in data: - print d - print tmpl[tmpl.find('%s')+2:] + sys.stdout.write(d) + sys.stdout.write(tmpl[tmpl.find('%s')+2:]) sys.exit(0) def q(txt):