Added support for "max_newsgroups_per_article" option (defaults to 5), for

SPAM article detection on import.

exec/newslink.js

@@ -52,6 +52,7 @@ var email_addresses = true;			// Include e-mail addresses in headers
 var import_amount = 0;				// Import a fixed number of messages per group
 var lines_per_yield = 5;			// Release time-slices ever x number of lines
 var yield_length = 1;				// Length of yield (in milliseconds)
+var max_newsgroups_per_article = 5;	// Used for spam-detection
 
 // Parse arguments
 for(i=0;i<argc;i++) {
@@ -183,6 +184,9 @@ while(!cfg_file.eof) {
 		case "yield_length":
 			yield_length=parseInt(str[1]);
 			break;
+		case "max_newsgroups_per_article":
+			max_newsgroups_per_article=parseInt(str[1]);
+			break;
 
 		default:
 			print("!UNRECOGNIZED configuration keyword: " + str[0]);
@@ -672,6 +676,16 @@ for(i in area) {
 			continue;
 		}
 
+		if(max_newsgroups_per_article && hdr.newsgroups!=undefined) {
+			var ngarray=hdr.newsgroups.split(',');
+			if(ngarray.length>max_newsgroups_per_article) {
+				var reason = format("Too many newsgroups (%d): %s",ngarray.length, hdr.newsgroups);
+				printf("!%s\r\n",reason);
+				system.spamlog("NNTP","NOT IMPORTED",reason,hdr.from,server,hdr.to);
+				continue;
+			}
+		}
+
 		if(hdr.to==newsgroup && hdr.newsgroups!=undefined)
 			hdr.to=hdr.newsgroups;
 
@@ -686,8 +700,8 @@ for(i in area) {
 			continue;
 
 		if(flags.indexOf('s')==-1 && system.trashcan("subject",hdr.subject)) {
-			printf("!BLOCKED subject: %s\r\n",hdr.subject);
 			var reason = format("Blocked subject (%s)",hdr.subject);
+			printf("!%s\r\n",reason);
 			system.spamlog("NNTP","NOT IMPORTED",reason,hdr.from,server,hdr.to);
 			continue;
 		}