X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=ccdc1f34d96c9189dce1919cfd8aa906b1951a11;hb=490d9c4cc048f00111f8979b20a34c5adaf22006;hp=15766456351c8f459ba37fb01523106a8937bade;hpb=5362383a5ec27d3bde7b97794450966906c1a42b;p=NDIRC.git

diff --git a/Scans.pm b/Scans.pm
index 1576645..ccdc1f3 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -29,12 +29,11 @@ our @EXPORT = qw/addScan addScanGroup sendScan/;
 
 sub addScan {
 	my ($id,$verbose) = @_;
-	DB();
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE 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 = ? 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,"type") VALUES (?,tick(),COALESCE(?,'-1'))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,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]);
@@ -51,12 +50,11 @@ sub addScan {
 }
 sub addScanGroup {
 	my ($id,$verbose) = @_;
-	DB();
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE type = 'group' AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
+		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE groupscan AND  scan_id = ? 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,"type",scan) VALUES (?,tick(),'group',COALESCE(?,'-1'))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (?,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");