From 6e8d81f6f2773b04c0d5c78449ec825b08155daa Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Fri, 31 Aug 2012 22:28:41 +0200
Subject: [PATCH] spamcounter works

---
 htdocs/application/models/pastes.php          | 10 ++++++++++
 htdocs/application/views/list_blocked_ips.php |  2 +-
 htdocs/application/views/list_ips.php         |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/application/models/pastes.php b/htdocs/application/models/pastes.php
index 1c25f2d..cf3990c 100755
--- a/htdocs/application/models/pastes.php
+++ b/htdocs/application/models/pastes.php
@@ -411,6 +411,8 @@ class Pastes extends CI_Model
 				$n++;
 			}
 		}
+
+		//pagination
 		$config['base_url'] = site_url($root);
 		$config['total_rows'] = $this->countPastes($ip_address);
 		$config['per_page'] = $amount;
@@ -420,6 +422,14 @@ class Pastes extends CI_Model
 		$config['uri_segment'] = $seg;
 		$this->pagination->initialize($config);
 		$data['pages'] = $this->pagination->create_links();
+
+		//total spam attempts
+		$this->db->select('SUM(spam_attempts) as sum');
+		$query = $this->db->get('blocked_ips');
+		$q = $query->result_array();
+		$data['total_spam_attempts'] = $q[0]['sum'];
+
+		//return
 		return $data;
 	}
 	
diff --git a/htdocs/application/views/list_blocked_ips.php b/htdocs/application/views/list_blocked_ips.php
index 16ea9c2..30adf33 100755
--- a/htdocs/application/views/list_blocked_ips.php
+++ b/htdocs/application/views/list_blocked_ips.php
@@ -1,5 +1,5 @@
 <?php $this->load->view('defaults/header');?>
-<h1><a href="<?php echo site_url('spamadmin'); ?>">Spamadmin</a> - blocked IP ranges</h1>
+<h1><a href="<?php echo site_url('spamadmin'); ?>">Spamadmin</a> - blacklist</h1>
 
 		<?php
 		function checkNum($num){
diff --git a/htdocs/application/views/list_ips.php b/htdocs/application/views/list_ips.php
index 69de6dd..c31fb3d 100755
--- a/htdocs/application/views/list_ips.php
+++ b/htdocs/application/views/list_ips.php
@@ -1,6 +1,6 @@
 <?php $this->load->view('defaults/header');?>
 <h1>Spamadmin</h1>
-<p>51 spam-pastes eaten so far. <a href="<?php echo site_url('spamadmin/blacklist'); ?>">View blocked IPs</a>.</p>
+<p><?php echo $total_spam_attempts; ?> spam-pastes eaten so far. <a href="<?php echo site_url('spamadmin/blacklist'); ?>">View blocked IPs</a>.</p>
 
 		<?php
 		function checkNum($num){