X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=5ad4b71f8a0102a4708cfc864323b4f8b50afc73;hb=fbc70113998582851b1830f42eca62acfcf03dd3;hp=1315e22408b2875ef6357fe05f46660fe2501990;hpb=ec80f6c0dba1fd56a63d591e89f6368d468912f7;p=NDIRC.git

diff --git a/Scans.pm b/Scans.pm
index 1315e22..5ad4b71 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -29,7 +29,6 @@ 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)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
@@ -51,7 +50,6 @@ 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)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
@@ -71,11 +69,18 @@ sub addScanGroup {
 }
 
 sub sendScan {
-	my ($target,$msg) = @_;
-	DB();
+	my ($msg, $command) = @_;
+	my ($target,$mess);
+	if (defined $msg && $msg =~ /^(\S+) (.*)$/){
+		$target = $1;
+		$mess = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: $command nick message");
+		return;
+	}
 	if (scanner()){
-		$ND::server->command("msg $target ".chr(2).$msg.chr(3)."4 (reply with /msg $ND::scanchan)");
-		$ND::server->command("msg $ND::target ${ND::C}3$1 << $2");
+		$ND::server->command("msg $target ".chr(2).$mess.chr(3)."4 (reply with /msg $ND::scanchan)");
+		$ND::server->command("msg $ND::target ${ND::C}3$target << $mess");
 	}
 }