diff --git a/.gitattributes b/.gitattributes
index d3c138141e12e8fd8d81a0db7118bbb14232bde9..5a62f584af9e018129653d8a8d817030636e839b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,7 +10,7 @@
*.txt text
*.TXT text
*.json text
-*.bat text
+*.bat text eol=crlf
*.mak text
*.mk text
makefile text
@@ -18,4 +18,8 @@ Makefile text
GNUmakefile text
*.bin -text
*.cnf -text
+*.ans text eol=crlf
+*.ANS text eol=crlf
+*.asc text eol=crlf
+*.msg text eol=crlf
diff --git a/src/sbbs3/js_msgbase.c b/src/sbbs3/js_msgbase.c
index c6d89ffd00c4a9cd8fbe883a2d7a3246c09097f8..3c7d80650aa40e807373c80da70332e4cdb4ce51 100644
--- a/src/sbbs3/js_msgbase.c
+++ b/src/sbbs3/js_msgbase.c
@@ -2578,6 +2578,7 @@ js_save_msg(JSContext *cx, uintN argc, jsval *arglist)
return JS_FALSE;
if(JS_RVAL(cx, arglist) == JSVAL_FALSE)
return JS_TRUE;
+ JS_SET_RVAL(cx, arglist, JSVAL_FALSE);
}
memset(&msg,0,sizeof(msg));
@@ -2727,6 +2728,7 @@ js_vote_msg(JSContext *cx, uintN argc, jsval *arglist)
return JS_FALSE;
if(JS_RVAL(cx, arglist) == JSVAL_FALSE)
return JS_TRUE;
+ JS_SET_RVAL(cx, arglist, JSVAL_FALSE);
}
memset(&msg, 0, sizeof(msg));
@@ -2794,6 +2796,7 @@ js_add_poll(JSContext *cx, uintN argc, jsval *arglist)
return JS_FALSE;
if(JS_RVAL(cx, arglist) == JSVAL_FALSE)
return JS_TRUE;
+ JS_SET_RVAL(cx, arglist, JSVAL_FALSE);
}
memset(&msg, 0, sizeof(msg));
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 702b016250d771cbd5b01bc6828f578b982b1218..286f5f23506b61335259f146a65e766ab01c4477 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -5608,8 +5608,8 @@ NO_SSH:
sbbs->putnodedat(cfg->node_num,&node);
continue;
}
- cfg->node_num = i; // correct the node number
}
+ cfg->node_num = i; // correct the node number
if(node.misc & NODE_RRUN) {
sbbs->getnodedat(cfg->node_num,&node,true);
node.misc &= ~NODE_RRUN;
diff --git a/xtrn/DDMsgReader/DDMsgReader.js b/xtrn/DDMsgReader/DDMsgReader.js
index 82bb36807c5caeeb0f6a2be0964fac6d8bebc880..8fb4bd86de1a1fd334596e0e9ab6d9877bb771d0 100644
--- a/xtrn/DDMsgReader/DDMsgReader.js
+++ b/xtrn/DDMsgReader/DDMsgReader.js
@@ -56,6 +56,9 @@
* 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)
+ * 2022-11-25 Eric Oulashin Version 1.56
+ * Fixed bug startup mode for scanning all groups for un-read messages to you where
+ * the reader was bringing up personal email instead.
*/
"use strict";
@@ -160,8 +163,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a');
// Reader version information
-var READER_VERSION = "1.55";
-var READER_DATE = "2022-09-23";
+var READER_VERSION = "1.56";
+var READER_DATE = "2022-11-25";
// Keyboard key codes for displaying on the screen
var UP_ARROW = ascii(24);
@@ -16811,7 +16814,7 @@ function parseLoadableModuleArgs(argv)
}
// 2 parameters: Whether or not all subs are being scanned (0 or 1), and the scan mode (numeric)
// (Scan Subs module)
- else if (argv.length == 2 && /^[0-1]$/.test(argv[0]) && allDigitsRegex.test(argv[1]) && isValidScanMode(+(argv[1])))
+ else if (argv.length == 2 && /^[0-1]$/.test(argv[0]) && allDigitsRegex.test(argv[1]))
{
argVals.loadableModule = true;
var scanAllSubs = (argv[0] == "1");
@@ -16852,7 +16855,7 @@ function parseLoadableModuleArgs(argv)
// 1. The sub-board internal code
// 2. The scan mode (numeric)
// 3. Optional: Search text (if any)
- else if ((argv.length == 2 || argv.length == 3) && subBoardCodeIsValid(arg1Lower) && allDigitsRegex.test(argv[1]) && isValidScanMode(+(argv[1])))
+ else if ((argv.length == 2 || argv.length == 3) && subBoardCodeIsValid(arg1Lower) && allDigitsRegex.test(argv[1]))
{
argVals.loadableModule = true;
var scanMode = +(argv[1]);
@@ -19002,25 +19005,6 @@ function getSubBoardsToScanArray(pScanScopeChar)
return subBoardsToScan;
}
-// Returns whether a number is a valid scan mode
-//
-// Parameters:
-// pNum: A number to test
-//
-// Return value: Boolean - Whether or not the given number is a valid scan mode
-function isValidScanMode(pNum)
-{
- if (typeof(pNum) !== "number")
- return false;
- // The scan modes are defined in sbbsdefs.js
- var validScanModes = [SCAN_READ, SCAN_CONST, SCAN_NEW, SCAN_BACK, SCAN_TOYOU,
- SCAN_FIND, SCAN_UNREAD, SCAN_MSGSONLY, SCAN_POLLS, SCAN_INDEX];
- var numIsValidScanMode = false;
- for (var i = 0; i < validScanModes.length && !numIsValidScanMode; ++i)
- numIsValidScanMode = (pNum === validScanModes[i]);
- return numIsValidScanMode;
-}
-
// Returns whether a user number is valid (only an actual, active user)
//
// Parameters:
diff --git a/xtrn/DDMsgReader/readme.txt b/xtrn/DDMsgReader/readme.txt
index 1fc31cc95344019e0ffe57e121549ee51c2c7d36..b4d4133dac7adc08108c4b070cb4d0373aa68079 100644
--- a/xtrn/DDMsgReader/readme.txt
+++ b/xtrn/DDMsgReader/readme.txt
@@ -1,6 +1,6 @@
Digital Distortion Message Reader
- Version 1.55
- Release date: 2022-09-23
+ Version 1.56
+ Release date: 2022-11-25
by
diff --git a/xtrn/DDMsgReader/revision_history.txt b/xtrn/DDMsgReader/revision_history.txt
index e139d9dd951d5104137aa7629e620e465f5d5e76..ae3688f53eb627934a527b82d2c88ff0d345752a 100644
--- a/xtrn/DDMsgReader/revision_history.txt
+++ b/xtrn/DDMsgReader/revision_history.txt
@@ -5,6 +5,9 @@ Revision History (change log)
=============================
Version Date Description
------- ---- -----------
+1.56 2022-11-25 Fixed bug startup mode for scanning all groups for un-read
+ messages to you where the reader was bringing up personal
+ email instead.
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)