8 changed files with 22 additions and 25 deletions
--- a/awstats_data.py
+++ b/awstats_data.py
--- a/default_conf.py
+++ b/default_conf.py
@ -59,7 +59,7 @@ compress_output_files = ['html', 'css', 'js']
 locales_path = './locales'

 # Default locale (english)
-locale = 'en'
+locale = 'en_EN'

 # Don't keep requests of all visitors into database
 keep_requests = False
--- a/display.py
+++ b/display.py
@ -365,20 +365,20 @@ class DisplayHTMLPage(object):
        self.logger.debug('Write %s' % (filename))

        f = codecs.open(filename, 'w', 'utf-8')
-        f.write(u'<!DOCTYPE html>\n')
-        f.write(u'<html lang="{}">\n'.format(self.iwla.getConfValue('locale', 'en')))
-        f.write(u'<head>\n')
-        f.write(u'<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>\n')
-        f.write(u'<link rel="icon" type="image/png" href="/resources/icon/favicon.png"/>\n')
+        f.write(u'<!DOCTYPE html>')
+        f.write(u'<html>')
+        f.write(u'<head>')
+        f.write(u'<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />')
+        f.write(u'<link rel="icon" type="image/png" href="/resources/icon/favicon.png"/>')
        for css in self.css_path:
-            f.write(u'<link rel="stylesheet" href="/%s"/>\n' % (css))
+            f.write(u'<link rel="stylesheet" href="/%s"/>' % (css))
        if self.title:
-            f.write(u'<title>%s</title>\n' % (self.title))
-        f.write(u'</head><body>\n')
+            f.write(u'<title>%s</title>' % (self.title))
+        f.write(u'</head><body>')
        for block in self.blocks:
            block.build(f, filters=filters)
        if displayVersion:
-            f.write(u'<div style="text-align:center;width:100%%">Generated by <a href="%s">IWLA %s</a></div>\n' %
+            f.write(u'<div style="text-align:center;width:100%%">Generated by <a href="%s">IWLA %s</a></div>' %
                    ("http://indefero.soutade.fr/p/iwla", self.iwla.getVersion()))
        f.write(u'</body></html>')
        f.close()
--- a/iwla.py
+++ b/iwla.py
@ -605,11 +605,11 @@ class IWLA(object):
                        break
                    
    def _generateDisplay(self):
-        if self.args.disable_display: return
+        if self.args.dry_run or\
+           self.args.disable_display: return
        self._generateDisplayDaysStats()
        self._callPlugins(conf.DISPLAY_HOOK_DIRECTORY)
        self._generateDisplayWholeMonthStats()
-        if self.args.dry_run: return
        self.display.build(conf.DISPLAY_ROOT)
        self._compressFiles(conf.DISPLAY_ROOT)

--- a/misc/geoiplookup.py
+++ b/misc/geoiplookup.py
@ -24,7 +24,7 @@ import json

 def geoiplookup(ip):
    http = urllib3.PoolManager()
-    r = http.request('GET', f'http://ip-api.com/json/{ip}')
+    r = http.request('GET', f'https://api.geoiplookup.net/?query={ip}&json=true')

    if r.status != 200:
        raise Exception(r)
--- a/plugins/display/filter_users.py
+++ b/plugins/display/filter_users.py
@ -85,8 +85,8 @@ class IWLADisplayFilterUsers(IPlugin):
                isp = location.get('isp', '')
                str_location = ''
                city = location.get('city', unknown)
-                country = location.get('country', unknown)
-                if location.get('city', '') or location.get('country', ''):
+                country = location.get('countryname', unknown)
+                if location.get('city', '') or location.get('countryname'):
                    str_location = f'{city}/{country}'
                if isp:
                    if str_location: str_location += '<br/>'
--- a/plugins/display/visitor_ip.py
+++ b/plugins/display/visitor_ip.py
@ -59,9 +59,7 @@ class IWLADisplayVisitorIP(IPlugin):

    def processIP(self, host_name, ip):
        host_name = host_name.replace(ip, 'IP')
-        # IPv4
        ip = ip.replace('.', '-')
-        # IPv6
        ip = ip.replace(':', '-')
        host_name = host_name.replace(ip, 'IP')
        ip = ip.replace('-', '')
--- a/plugins/post_analysis/referers.py
+++ b/plugins/post_analysis/referers.py
@ -136,7 +136,6 @@ class IWLAPostAnalysisReferers(IPlugin):
            for r in super_hit['requests'][::-1]:
                if not self.iwla.isValidForCurrentAnalysis(r): break
                if not r['http_referer']: continue
-                if not self.iwla.hasBeenViewed(r): continue
                
                uri = r['extract_referer']['extract_uri']
                if self.own_domain_re.match(uri): continue