Merge branch 'master' into new_config_format

exec/imapservice.js

@@ -889,8 +889,7 @@ var unauthenticated_command_handlers = {
 				client.socket.send("+\r\n");
 				line=client.socket.recvline(10240, 1800);
 				args=base64_decode(line).split(/\x00/);
-				if(!login(args[1],args[2])) {
-//					log(LOG_INFO, format("Attempted login: '%s', pw: '%s'", args[1], args[2]));
+				if(args === null || (!login(args[1],args[2]))) {
 					tagged(tag, "NO", "No AUTH for you.");
 					return;
 				}

exec/lbshell.js

@@ -707,6 +707,10 @@ while(bbs.online) {
 						handle_a_ctrlkey(x_prog);
 						continue;
 					}
+					if (xtrn_area.sec_list[curr_xtrnsec].prog_list[parseInt(x_prog)].number === undefined) {
+						console.beep();
+						continue;
+					}
 					stop_mouse();
 					clear_screen();
 

src/sbbs3/js_socket.c

@@ -337,8 +337,12 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s
 	int copied=0,ret;
 	char *estr;
 
-	if(p->session==-1)
+	if(p->session==-1) {
+		BOOL wr = FALSE;
+		if(!socket_check(p->sock, NULL, &wr, 0) || !wr)
+			return 0;
 		return sendsocket(p->sock, msg, len);
+	}
 	do {
 		// If we don't limit this, we occasionally get errors on large sends...
 		if((ret=cryptPushData(p->session, msg, len > 0x2000 ? 0x2000 : len, &copied))==CRYPT_OK) {

xtrn/DDMsgReader/DDMsgReader.js

@@ -53,6 +53,9 @@
  *                              honors the system setting for whether users can view deleted messages.
  * 2022-08-06 Eric Oulashin     Version 1.54
  *                              Users now have a personal twit list (configurable via Ctrl-U, user settings).
+ * 2022-09-23 Eric Oulashin     Version 1.55
+ *                              Refactored how email replies are done (passing the header to the appropriate
+ *                              functions, not using ungetstr() when prompting for the message subject)
  */
 "use strict";
@@ -157,8 +160,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a');
 // Reader version information
-var READER_VERSION = "1.54";
-var READER_DATE = "2022-08-06";
+var READER_VERSION = "1.55";
+var READER_DATE = "2022-09-23";
 // Keyboard key codes for displaying on the screen
 var UP_ARROW = ascii(24);
@@ -7769,7 +7772,7 @@ function DigDistMsgReader_SetMsgListPauseTextAndLightbarHelpLine()
 	                           + this.colors.lightbarMsgListHelpLineHotkeyColor + "@`Q`Q@"
 							   + this.colors.lightbarMsgListHelpLineParenColor + ")"
 	                           + this.colors.lightbarMsgListHelpLineGeneralColor + "uit, "
-	                           + this.colors.lightbarMsgListHelpLineHotkeyColor + "?  ";
+							   + this.colors.lightbarMsgListHelpLineHotkeyColor + "@`?`?@  ";
 	lbHelpLineLen += 15;
 	// Add spaces to the end of sLightbarModeHelpLine up until one char
@@ -9891,19 +9894,20 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
 			// message header.  Otherwise (i.e., on a networked sub-board), use
 			// username@from_net_addr.
 			var emailAddr = "";
+			if (typeof(pMsgHdr.from_net_addr) === "string" && pMsgHdr.from_net_addr.length > 0)
+			{
 				if (pMsgHdr.from_net_type == NET_INTERNET)
 					emailAddr = pMsgHdr.from_net_addr;
 				else
 					emailAddr = pMsgHdr.from + "@" + pMsgHdr.from_net_addr;
+			}
 			// Prompt the user to verify the receiver's email address
 			console.putmsg(bbs.text(Email), P_SAVEATR);
-			console.ungetstr(emailAddr);
-			emailAddr = console.getstr(60, K_LINE);
+			emailAddr = console.getstr(emailAddr, 60, K_LINE|K_EDIT);
 			if ((typeof(emailAddr) == "string") && (emailAddr.length > 0))
 			{
 				replyMode |= WM_NETMAIL;
-				console.ungetstr(pMsgHdr.subject);
-				retObj.sendSucceeded = bbs.netmail(emailAddr, replyMode);
+				retObj.sendSucceeded = bbs.netmail(emailAddr, replyMode, null, pMsgHdr);
 				console.pause();
 			}
 			else
@@ -9927,7 +9931,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
 			// sender.  Note that if the send failed, that could be because the
 			// user aborted the message.
 			console.crlf();
-			retObj.sendSucceeded = bbs.email(userNumber, replyMode, "", pMsgHdr.subject);
+			retObj.sendSucceeded = bbs.email(userNumber, replyMode, null, null, pMsgHdr);
 			console.pause();
 		}
 		else

xtrn/DDMsgReader/readme.txt

                       Digital Distortion Message Reader
-                                 Version 1.54
-                           Release date: 2022-08-06
+                                 Version 1.55
+                           Release date: 2022-09-23
 
                                      by
 

xtrn/DDMsgReader/revision_history.txt

@@ -5,6 +5,9 @@ Revision History (change log)
 =============================
 Version  Date         Description
 -------  ----         -----------
+1.55     2022-09-23   Refactored how email replies are done (passing the header
+                      to the appropriate functions, not using ungetstr() when
+                      prompting for the message subject)
 1.54     2022-08-06   Users now have a personal twit list, configurable via
                       user settings, with the Ctrl-U hotkey.
 1.53     2022-07-18   Deleted messages can now be un-marked for deletion from