Browse files

Merge branch 'master' of https://github.com/jvehent/Postscreen-Stats

Conflicts:
	postscreen_stats.py

	modified:   postscreen_stats.py
  • Loading branch information...
2 parents 4f8462c + e01f281 commit ff439269729f79c3d88963a34a0db8f80e8b8d0e @jvehent committed Jan 15, 2012
Showing with 7 additions and 3 deletions.
  1. +7 −3 postscreen_stats.py
View
10 postscreen_stats.py
@@ -500,18 +500,18 @@ def action_filter(self,filter):
for action in sorted(ip_list[client].actions):
if ip_list[client].actions[action] > 0:
mapcode = mapcode + '<p>' + action + ": " + str(ip_list[client].actions[action]) + '''</p>' +
- ' '''
+ ' '''
if action in ('DNSBL'):
mapcode = mapcode + '<p>' + "DNSBL ranks: "
for rank in ip_list[client].dnsbl_ranks:
mapcode = mapcode + " " + str(rank) + ","
mapcode = mapcode + '''</p>' +
- ' '''
+ ' '''
if ip_list[client].geoloc.has_key('city'):
mapcode = mapcode + '<p>' + 'Location: ' + \
re.escape(str(ip_list[client].geoloc['city'])) + ", " + \
re.escape(str(ip_list[client].geoloc['country_code'])) + '''<p> ' +
- ' '''
+ ' '''
mapcode = mapcode + '''</div></div>';
var infowindow''' + str(incr) + ''' = new google.maps.InfoWindow({
@@ -538,7 +538,11 @@ def action_filter(self,filter):
<h1>Postscreen Map of Blocked IPs</h1>
<div id="map">
</div>
+<<<<<<< HEAD
<p>mapping ''' + str(len(blocked_clients)) + ''' blocked IPs</p>
+=======
+ <p>Mapped ''' + str(len(blocked_clients))) + ''' IPs</p>
+>>>>>>> e01f281cc299ebac9d7090e6fbeb9cac3820ed8d
<p>generated using <a href="https://github.com/jvehent/Postscreen-Stats">Postscreen-Stats</a> by <a href="http://1nw.eu/!j">Julien Vehent</a></p>
</body>
</html>

0 comments on commit ff43926

Please sign in to comment.