diff --git a/display.py b/display.py index c119712..bcecc3c 100644 --- a/display.py +++ b/display.py @@ -169,6 +169,7 @@ class DisplayHTMLPage(object): f.write('') f.write('') f.write('') + f.write('') if self.title: f.write('%s' % (self.title)) f.write('') diff --git a/iwla.py b/iwla.py index f9e9d62..1295259 100755 --- a/iwla.py +++ b/iwla.py @@ -144,6 +144,8 @@ class IWLA(object): def _appendHit(self, hit): remote_addr = hit['remote_addr'] + if not remote_addr: return + if not remote_addr in self.current_analysis['visits'].keys(): self._createVisitor(hit) return @@ -232,7 +234,7 @@ class IWLA(object): page = DisplayHTMLPage(title, filename) days = DisplayHTMLBlockTable('By day', ['Day', 'Visits', 'Pages', 'Hits', 'Bandwidth', 'Not viewed Bandwidth']) - days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwith', 'iwla_bandwith']) + days.setColsCSSClass(['', 'iwla_visit', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', 'iwla_bandwidth']) keys = self.current_analysis['days_stats'].keys() keys.sort() nb_visits = 0 @@ -391,7 +393,8 @@ class IWLA(object): if not self._decodeHTTPRequest(hit): return False for k in hit.keys(): - if hit[k] == '-': hit[k] = '' + if hit[k] == '-' or hit[k] == '*': + hit[k] = '' self._appendHit(hit) diff --git a/plugins/display/all_visits.py b/plugins/display/all_visits.py index 2e643f5..ef5e71c 100644 --- a/plugins/display/all_visits.py +++ b/plugins/display/all_visits.py @@ -22,7 +22,7 @@ class IWLADisplayAllVisits(IPlugin): page = DisplayHTMLPage(title, path) table = DisplayHTMLBlockTable('Last seen', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in last_access: address = super_hit['remote_addr'] diff --git a/plugins/display/top_visitors.py b/plugins/display/top_visitors.py index 8748f27..fa4eecf 100644 --- a/plugins/display/top_visitors.py +++ b/plugins/display/top_visitors.py @@ -21,7 +21,7 @@ class IWLADisplayTopVisitors(IPlugin): index = self.iwla.getDisplayIndex() table = DisplayHTMLBlockTable('Top visitors', ['Host', 'Pages', 'Hits', 'Bandwidth', 'Last seen']) - table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwith', '']) + table.setColsCSSClass(['', 'iwla_page', 'iwla_hit', 'iwla_bandwidth', '']) for super_hit in top_visitors: address = super_hit['remote_addr'] if display_visitor_ip and\ diff --git a/resources/css/iwla.css b/resources/css/iwla.css new file mode 100644 index 0000000..7566123 --- /dev/null +++ b/resources/css/iwla.css @@ -0,0 +1,63 @@ + +body +{ + font: 11px verdana, arial, helvetica, sans-serif; + background-color: #FFFFFF; +} + +.iwla_block +{ + display:block; + margin: 2em; +} + +.iwla_block_title { + font: 13px verdana, arial, helvetica, sans-serif; + font-weight: bold; + background-color: #CCCCDD; + text-align: center; + color: #000000; + width: 60%; +} + +.iwla_block_title > a +{ + font: 11px verdana, arial, helvetica, sans-serif; + font-weight: normal; + text-decoration: none; +} + +.iwla_block_value +{ + border-width : 0.2em; + border-color : #CCCCDD; + border-style : solid; +} + +/* .iwla_block_value table tr th */ +th +{ + padding : 0.5em; + background : #ECECEC; + font-weight: normal; + white-space: nowrap; +} + +td +{ + text-align:center; + vertical-align:middle; +} + +td:first-child +{ + text-align:left; + /* width : 100%; */ +} + +.iwla_visitor { background : #FFAA66; } +.iwla_visit { background : #F4F090; } +.iwla_page { background : #4477DD; } +.iwla_hit { background : #66DDEE; } +.iwla_bandwidth { background : #2EA495; } +.iwla_search { background : #F4F090; } \ No newline at end of file