Added support for "cancel" control messages to delete messages via NNTP.

exec/load/newsutil.js

@@ -156,6 +156,11 @@ function parse_news_header(hdr, line)
 			hdr.ftn_reply=data;
 			break;
 
+		/* NNTP control messages */
+		case "control":
+			hdr.control=data;
+			break;
+
 		default:
 			if(hdr.field_list==undefined)
 				hdr.field_list=new Array();

exec/nntpservice.js

@@ -666,6 +666,41 @@ while(client.socket.is_connected && !quit) {
 							    msgbase.close();
 							    delete msgbase;
 						    }
+
+						    msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
+							if(msgbase.open!=undefined && msgbase.open()==false)
+								continue;
+
+							/* NNTP Control Message? */
+							if(hdr.control!=undefined) {
+								var ctrl_msg = hdr.control.split(/\s+/);
+								var target;
+								if(ctrl_msg.length) {
+									switch(ctrl_msg[0].toLowerCase()) {
+										case "cancel":
+											target=msgbase.get_msg_header(ctrl_msg[1]);
+											if(target==null) {
+												log("!Invalid Message-ID: " + ctrl_msg[1]);
+												break;
+											}
+											if(logged_in && ((target.from_ext==user.number
+												&& msg_area.grp_list[g].sub_list[s].settings&SUB_DEL)
+												|| msg_area.grp_list[g].sub_list[s].is_operator)) {
+												if(msgbase.remove_msg(ctrl_msg[1])) {
+													posted=true;
+													log("Message deleted: " + ctrl_msg[1]);
+												} else
+													log("!ERROR " + msgbase.error + 
+														" deleting message: " + ctrl_msg[1]);
+												continue;
+											}
+											break;
+									}
+								}
+								log("!Invalid control message: " + hdr.control);
+								break;
+							}
+
 						    if(msg_area.grp_list[g].sub_list[s].settings&SUB_NAME
 							    && !(user.security.restrictions&(UFLAG_G|UFLAG_Q)))
 							    hdr.from=user.name;	// Use real names
@@ -674,19 +709,17 @@ while(client.socket.is_connected && !quit) {
 							else
 								hdr.attr&=~MSG_MODERATED;
 
-						    msgbase=new MsgBase(msg_area.grp_list[g].sub_list[s].code);
-							if(msgbase.open!=undefined && msgbase.open()==false)
-								continue;
 						    if(msgbase.save_msg(hdr,body)) {
 							    log(format("%s posted a message (%u chars, %u lines) on %s"
 									,user.alias, body.length, lines, newsgroups[n]));
-							    writeln("240 article posted ok");
 							    posted=true;
 								msgs_posted++;
 						    } else
 							    log(format("!ERROR saving mesage: %s",msgbase.last_error));
 					    }
-			if(!posted) {
+			if(posted)
+			    writeln("240 article posted ok");
+			else {
 				log("!post failure");
 				writeln("441 posting failed");
 			}