From a038d24664f96950f5da6247233da9a838dc964c Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Fri, 31 Aug 2012 21:35:37 +0200
Subject: [PATCH] blacklist

---
 htdocs/application/config/routes.php          | 2 +-
 htdocs/application/controllers/spamadmin.php  | 2 +-
 htdocs/application/views/list_blocked_ips.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/application/config/routes.php b/htdocs/application/config/routes.php
index a615a37..196180d 100644
--- a/htdocs/application/config/routes.php
+++ b/htdocs/application/config/routes.php
@@ -53,7 +53,7 @@ $route['lists'] = 'main/lists';
 $route['lists/rss'] = 'main/lists/rss';
 $route['lists/:num'] = 'main/lists/$1';
 $route['spamadmin/:num'] = 'spamadmin/index';
-$route['spamadmin/blocked_ips'] = 'spamadmin/blocked_ips';
+$route['spamadmin/blacklist'] = 'spamadmin/blacklist';
 $route['spamadmin/:any'] = 'spamadmin/spam_detail';
 $route['about'] = 'main/about';
 
diff --git a/htdocs/application/controllers/spamadmin.php b/htdocs/application/controllers/spamadmin.php
index bf6de2b..0f3264d 100755
--- a/htdocs/application/controllers/spamadmin.php
+++ b/htdocs/application/controllers/spamadmin.php
@@ -72,7 +72,7 @@ class Spamadmin extends CI_Controller
 		$this->load->view('spam_detail', $data);
 	}
 	
-	function blocked_ips() 
+	function blacklist() 
 	{
 		$this->db->select('ip_address');
 		$this->db->order_by('blocked_at');
diff --git a/htdocs/application/views/list_blocked_ips.php b/htdocs/application/views/list_blocked_ips.php
index b421de2..28967ca 100755
--- a/htdocs/application/views/list_blocked_ips.php
+++ b/htdocs/application/views/list_blocked_ips.php
@@ -31,7 +31,7 @@
 			<td class="first"><?php echo $ip_range; ?></td>
 			<td><?php $p = explode(",", timespan($ip_address['blocked_at'], time())); echo $p[0]; ?> ago.</td>
 			<td><?php echo '43'; ?></td>
-			<td><a href="<?php echo site_url('spamadmin/blocked_ips/unblock/' . $ip_address['ip_address']) ?>">Unblock</a></td>
+			<td><a href="<?php echo site_url('spamadmin/blacklist/unblock/' . $ip_address['ip_address']) ?>">Unblock</a></td>
 		</tr>
 
 		<?php }?>