From c1a76498be9dbf78753d51d2d9173abdcd4efd70 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Fri, 20 Feb 2009 20:59:00 +0100
Subject: [PATCH] Added support for new scan ids

---
 Scans.pm | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Scans.pm b/Scans.pm
index 17007c3..146efea 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -28,22 +28,17 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs/;
 
 sub addScan {
-	my ($id,$verbose, $quiet) = @_;
+	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = ? AND tick >= tick() - 168},undef,$id)){
+		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = LOWER(?) AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,tick(),COALESCE(?,-1))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (LOWER(?),tick(),COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
 					$ND::DBH->do('UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? ',undef,$user[0]);
 					$user[2] += 1;
-					if ($quiet){
-						$ND::server->command("msg $ND::target Added scan, points now $user[2]");
-					}
-					else{
-						$ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
-					}
+					$ND::server->command("notice $ND::nick Added scan, points now $user[2]");
 				}elsif ($verbose){
 					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
 				}
@@ -56,13 +51,13 @@ sub addScan {
 sub addScanGroup {
 	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE groupscan AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
+		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE groupscan AND  scan_id = LOWER(?) AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (?,tick(),true,COALESCE(?,-1))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (LOWER(?),tick(),true,COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
-					$ND::server->command("msg $ND::target Added scan group, at tick $user[3]. Points will be added after parsing");
+					$ND::server->command("notice $ND::nick Added scan group. Points will be added after parsing.");
 				}elsif ($verbose){
 					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
 				}
-- 
2.39.2