soutade/iwla
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Main key for visits is now remote_ip and not remote_addr

Browse Source
This commit is contained in:
Gregory Soutade
2023-05-21 11:04:40 +02:00
parent 7507b8e77f
commit 7ef0911fa7
11 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/display/all_visits.py
View File

@@ -71,15 +71,14 @@ class IWLADisplayAllVisits(IPlugin):
table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', ''])
for super_hit in last_access:
address = super_hit['remote_addr']
row = [
address,
super_hit['remote_addr'],
super_hit['viewed_pages'][0],
super_hit['viewed_hits'][0],
super_hit['bandwidth'][0],
time.asctime(super_hit['last_access'])
]
table.appendRow(row, address)
table.appendRow(row, super_hit['remote_ip'])
page.appendBlock(table)
display.addPage(page)

6
plugins/display/all_visits_enlight.py
View File

@@ -71,9 +71,9 @@ class IWLADisplayAllVisitsEnlight(IPlugin):
return
for (idx, row) in enumerate(block.rows):
remote_addr = block.objects[idx]
if remote_addr is None or not remote_addr in visitors.keys(): continue
visitor = visitors[remote_addr]
remote_ip = block.objects[idx]
if remote_ip is None or not remote_ip in visitors.keys(): continue
visitor = visitors[remote_ip]
if visitor.get('enlight', False) or\
visitor.get('filtered', False):
block.setCellCSSClass(idx, 0, 'iwla_enlight')

5
plugins/display/filter_users.py
View File

@@ -105,7 +105,7 @@ class IWLADisplayFilterUsers(IPlugin):
referer = ''
uri = "%s%s" % (r.get('server_name', ''),
r['extract_request']['extract_uri'])
table.appendRow([generateHTMLLink(uri), time.asctime(r['time_decoded']), r['http_user_agent'], referer], filtered_user['remote_addr'])
table.appendRow([generateHTMLLink(uri), time.asctime(r['time_decoded']), r['http_user_agent'], referer], filtered_user['remote_ip'])
page.appendBlock(table)
display.addPage(page)
@@ -121,8 +121,7 @@ class IWLADisplayFilterUsers(IPlugin):
table = display.createBlock(DisplayHTMLBlockTable, title, [self.iwla._(u'Host'), self.iwla._(u'Pages'), self.iwla._(u'Hits'), self.iwla._(u'Last Access')])
table.setColsCSSClass(['', '', 'iwla_page', 'iwla_hit'])
for filtered_user in self.filtered_users[:10]:
ip_title = filtered_user['remote_ip']
table.appendRow([ip_title, filtered_user['viewed_pages'][0], filtered_user['viewed_hits'][0], time.asctime(hits[ip]['last_access'])], filtered_user['remote_addr'])
table.appendRow([filtered_user['remote_addr'], filtered_user['viewed_pages'][0], filtered_user['viewed_hits'][0], time.asctime(filtered_user['last_access'])], filtered_user['remote_ip'])
if len(self.filtered_users) > 10:
table.appendRow([self.iwla._(u'Others'), len(self.filtered_users)-10, '', ''])
table.setCellCSSClass(table.getNbRows()-1, 0, 'iwla_others')

6
plugins/display/ip_to_geo.py
View File

@@ -64,10 +64,10 @@ class IWLADisplayIPToGeo(IPlugin):
return True
@staticmethod # Needed to have unbound method
def FlagFilter(host, remote_addr, self):
if remote_addr is None or not remote_addr in self.visitors.keys():
def FlagFilter(host, remote_ip, self):
if remote_ip is None or not remote_ip in self.visitors.keys():
return None
visitor = self.visitors[remote_addr]
visitor = self.visitors[remote_ip]
cc = visitor.get('country_code', None)
if not cc: return None
icon = '<img alt="%s flag" src="/%s/flags/%s.png"/>' % (cc, self.icon_path, cc)

2
plugins/display/top_visitors.py
View File

@@ -82,7 +82,7 @@ class IWLADisplayTopVisitors(IPlugin):
total[1] -= super_hit['viewed_pages'][0]
total[2] -= super_hit['viewed_hits'][0]
total[3] -= super_hit['bandwidth'][0]
table.appendRow(row, super_hit['remote_addr'])
table.appendRow(row, super_hit['remote_ip'])
if total[1] or total[2] or total[3]:
total[0] = self.iwla._(u'Others')
total[4] = ''