From 8255be7ec806ffdcc7eca01a880459c4b2e4698f Mon Sep 17 00:00:00 2001 From: Gregory Soutade Date: Wed, 6 Sep 2017 07:43:55 +0200 Subject: [PATCH] Get GEO code for all visits (not only valid ones) --- plugins/display/ip_to_geo.py | 8 ++++---- plugins/post_analysis/ip_to_geo.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/display/ip_to_geo.py b/plugins/display/ip_to_geo.py index 7c52b57..6d27cd3 100644 --- a/plugins/display/ip_to_geo.py +++ b/plugins/display/ip_to_geo.py @@ -69,10 +69,10 @@ class IWLADisplayTopGeo(IPlugin): def FlagFilter(host, self): cc = None host_name = host.split(' ')[0] # hostname or ip - if host_name in self.valid_visitors.keys(): - cc = self.valid_visitors[host_name].get('country_code', None) + if host_name in self.visitors.keys(): + cc = self.visitors[host_name].get('country_code', None) else: - for visitor in self.valid_visitors.values(): + for visitor in self.visitors.values(): if visitor['remote_addr'] == host_name: cc = visitor.get('country_code', None) break @@ -84,7 +84,7 @@ class IWLADisplayTopGeo(IPlugin): display = self.iwla.getDisplay() geo = self.iwla.getMonthStats().get('geo', {}) geo = sorted(geo.items(), key=lambda t: t[1], reverse=True) - self.valid_visitors = self.iwla.getValidVisitors() + self.visitors = self.iwla.getCurrentVisits() # All in a page if self.create_geo_page: diff --git a/plugins/post_analysis/ip_to_geo.py b/plugins/post_analysis/ip_to_geo.py index a15e016..4b0cf86 100644 --- a/plugins/post_analysis/ip_to_geo.py +++ b/plugins/post_analysis/ip_to_geo.py @@ -71,7 +71,7 @@ class IWLAPostAnalysisIPToGeo(IPlugin): return True def hook(self): - visitors = self.iwla.getValidVisitors() + visitors = self.iwla.getCurrentVisits() month_stats = self.iwla.getMonthStats() geo = month_stats.get('geo', {})