From 1844e63234a9642819142d0f7f837663ec1d940e Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Mon, 26 Jul 2021 23:04:04 +0200 Subject: [PATCH] Improve web page code. --- server.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/server.py b/server.py index caeeaa5..a7c432d 100644 --- a/server.py +++ b/server.py @@ -74,11 +74,10 @@ class MyHandler(http.server.BaseHTTPRequestHandler): def page(self, query): def write(subtitle, body): page = [ - '', - '\nBanTracker%s' % (' » %s' % subtitle if subtitle else ''), + '', '\nBanTracker%s' % (' » %s' % subtitle if subtitle else ''), '', - '', - '\n' + '', + '\n' ] + body + ['\n'] self.send_response(200) self.send_header("Content-type","text/html") @@ -116,7 +115,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler): body = [ '
' % h, '

Username:

', - '

Password:

', + '

Password:

', '', '
' ] @@ -129,7 +128,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler): query = utils.web.urlunquote(query) subtitle = '' body = [ - '
', + '
', '
' % q, '
', '' % base64string, @@ -157,9 +156,9 @@ class MyHandler(http.server.BaseHTTPRequestHandler): if not channels or channel in channels: body.extend([ '

#%d

' % bid, - '

#%d by %s' % (bid,h,q,utils.web.urlencode({'oper':oper}),oper), - 'in %s:' % (h,q,channel.split('#')[1],channel), - '+%s %s

' % (kind,h,q,utils.web.urlencode({'mask':mask}),mask), + '

#%d by %s' % (bid,h,q,utils.web.urlencode({'oper':oper}),oper), + 'in %s:' % (h,q,channel.split('#')[1],channel), + '+%s %s

' % (kind,h,q,utils.web.urlencode({'mask':mask}),mask), '

Begin at %s

' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at))) ]) was = float(begin_at) == float(end_at) @@ -174,7 +173,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler): else: body.extend(['

Removed after %s' % timeElapsed(float(removed_at)-float(begin_at)), 'on %s' % time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(removed_at))), - 'by %s

' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)]) + 'by %s

' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)]) c.execute("""SELECT full,log FROM nicks WHERE ban_id=?""",(bid,)) r = c.fetchall() if len(r): @@ -305,7 +304,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler): print('Found %s results' % len(ar)) body.extend([ '

Results %s

' % search, - '
', + '
', '', '' ]) @@ -315,11 +314,11 @@ class MyHandler(http.server.BaseHTTPRequestHandler): s = time.strftime('%Y-%m-%d %H:%M:%S GMT',time.gmtime(float(begin_at))) body.extend([ '', - '' % (h,q,bid,bid), - '' % (h,q,channel.split('#')[1],channel), - '' % (h,q,utils.web.urlencode({'oper':oper}),oper), + '' % (h,q,bid,bid), + '' % (h,q,channel.split('#')[1],channel), + '' % (h,q,utils.web.urlencode({'oper':oper}),oper), '' % kind, - '' % (h,q,utils.web.urlencode({'mask':mask}),mask), + '' % (h,q,utils.web.urlencode({'mask':mask}),mask), '' % s ]) if end_at and end_at != begin_at: @@ -333,7 +332,7 @@ class MyHandler(http.server.BaseHTTPRequestHandler): else: body.append('') if removed_by: - body.append('' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)) + body.append('' % (h,q,utils.web.urlencode({'removed_by':removed_by}),removed_by)) else: body.append('') # affected = ''
IDChannelOperatorTypeMaskBegin dateEnd dateRemovedRemoved by
%d%s%s%d%s%s+%s%s%s%s%s%s