Skip to content
Snippets Groups Projects
Commit 0efc8162 authored by Eric Oulashin's avatar Eric Oulashin
Browse files

DDMsgReader: Deleted messages can now be un-marked for deletion from the... 

DDMsgReader: Deleted messages can now be un-marked for deletion from the message list with the U key (if the user has delete permissions). Also, the reader now honors the system setting for whether users can view deleted messages.
parent 8651f2af
No related branches found
No related tags found
2 merge requests!463MRC mods by Codefenix (2024-10-20),!203DDMsgReader: Deleted messages can now be un-marked for deletion from the message list with the U key (if the user has delete permissions). Also, the reader now honors the system setting for whether users can view deleted messages.
Pipeline #3191 passed
Stage: build
Show whitespace changes
Inline Side-by-side
xtrn/DDMsgReader/DDMsgReader.js
+ 389
− 201
View file @ 0efc8162
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
* 2022-07-09 Eric Oulashin Version 1.52 * 2022-07-09 Eric Oulashin Version 1.52
* Mouse click support for the bottom help lines in scrollable mode * Mouse click support for the bottom help lines in scrollable mode
* (thanks to help from Nelgin) * (thanks to help from Nelgin)
* 2022-07-18 Eric Oulashin Version 1.53
* Deleted messages can now be un-marked for deletion from the message
* list with the U key (if the user has delete permissions). Also, the reader now
* honors the system setting for whether users can view deleted messages.
*/ */
   
"use strict"; "use strict";
...@@ -151,8 +155,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a'); ...@@ -151,8 +155,8 @@ var ansiterm = require("ansiterm_lib.js", 'expand_ctrl_a');
   
   
// Reader version information // Reader version information
var READER_VERSION = "1.52"; var READER_VERSION = "1.53";
var READER_DATE = "2022-07-09"; var READER_DATE = "2022-07-18";
   
// Keyboard key codes for displaying on the screen // Keyboard key codes for displaying on the screen
var UP_ARROW = ascii(24); var UP_ARROW = ascii(24);
...@@ -749,8 +753,8 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs) ...@@ -749,8 +753,8 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs)
this.MessageIsLastFromUser = DigDistMsgReader_MessageIsLastFromUser; this.MessageIsLastFromUser = DigDistMsgReader_MessageIsLastFromUser;
this.DisplayEnhReaderError = DigDistMsgReader_DisplayEnhReaderError; this.DisplayEnhReaderError = DigDistMsgReader_DisplayEnhReaderError;
this.EnhReaderPromptYesNo = DigDistMsgReader_EnhReaderPromptYesNo; this.EnhReaderPromptYesNo = DigDistMsgReader_EnhReaderPromptYesNo;
this.PromptAndDeleteMessage = DigDistMsgReader_PromptAndDeleteMessage; this.PromptAndDeleteOrUndeleteMessage = DigDistMsgReader_PromptAndDeleteOrUndeleteMessage;
this.PromptAndDeleteSelectedMessages = DigDistMsgReader_PromptAndDeleteSelectedMessages; this.PromptAndDeleteOrUndeleteSelectedMessages = DigDistMsgReader_PromptAndDeleteOrUndeleteSelectedMessages;
this.GetExtdMsgHdrInfo = DigDistMsgReader_GetExtdMsgHdrInfo; this.GetExtdMsgHdrInfo = DigDistMsgReader_GetExtdMsgHdrInfo;
this.GetMsgInfoForEnhancedReader = DigDistMsgReader_GetMsgInfoForEnhancedReader; this.GetMsgInfoForEnhancedReader = DigDistMsgReader_GetMsgInfoForEnhancedReader;
this.GetLastReadMsgIdxAndNum = DigDistMsgReader_GetLastReadMsgIdxAndNum; this.GetLastReadMsgIdxAndNum = DigDistMsgReader_GetLastReadMsgIdxAndNum;
...@@ -762,7 +766,7 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs) ...@@ -762,7 +766,7 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs)
this.ToggleSelectedMessage = DigDistMsgReader_ToggleSelectedMessage; this.ToggleSelectedMessage = DigDistMsgReader_ToggleSelectedMessage;
this.MessageIsSelected = DigDistMsgReader_MessageIsSelected; this.MessageIsSelected = DigDistMsgReader_MessageIsSelected;
this.AllSelectedMessagesCanBeDeleted = DigDistMsgReader_AllSelectedMessagesCanBeDeleted; this.AllSelectedMessagesCanBeDeleted = DigDistMsgReader_AllSelectedMessagesCanBeDeleted;
this.DeleteSelectedMessages = DigDistMsgReader_DeleteSelectedMessages; this.DeleteOrUndeleteSelectedMessages = DigDistMsgReader_DeleteOrUndeleteSelectedMessages;
this.NumSelectedMessages = DigDistMsgReader_NumSelectedMessages; this.NumSelectedMessages = DigDistMsgReader_NumSelectedMessages;
this.ForwardMessage = DigDistMsgReader_ForwardMessage; this.ForwardMessage = DigDistMsgReader_ForwardMessage;
this.VoteOnMessage = DigDistMsgReader_VoteOnMessage; this.VoteOnMessage = DigDistMsgReader_VoteOnMessage;
...@@ -927,9 +931,13 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs) ...@@ -927,9 +931,13 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs)
abortedText: "\x01n\x01y\x01h\x01iAborted\x01n", abortedText: "\x01n\x01y\x01h\x01iAborted\x01n",
loadingPersonalMailText: "\x01n\x01cLoading %s...", loadingPersonalMailText: "\x01n\x01cLoading %s...",
msgDelConfirmText: "\x01n\x01h\x01yDelete\x01n\x01c message #\x01h%d\x01n\x01c: Are you sure", msgDelConfirmText: "\x01n\x01h\x01yDelete\x01n\x01c message #\x01h%d\x01n\x01c: Are you sure",
msgUndelConfirmText: "\x01n\x01h\x01yUndelete\x01n\x01c message #\x01h%d\x01n\x01c: Are you sure",
delSelectedMsgsConfirmText: "\x01n\x01h\x01yDelete selected messages: Are you sure", delSelectedMsgsConfirmText: "\x01n\x01h\x01yDelete selected messages: Are you sure",
undelSelectedMsgsConfirmText: "\x01n\x01h\x01yUndelete selected messages: Are you sure",
msgDeletedText: "\x01n\x01cMessage #\x01h%d\x01n\x01c has been marked for deletion.", msgDeletedText: "\x01n\x01cMessage #\x01h%d\x01n\x01c has been marked for deletion.",
msgUndeletedText: "\x01n\x01cMessage #\x01h%d\x01n\x01c has been unmarked for deletion.",
selectedMsgsDeletedText: "\x01n\x01cSelected messages have been marked for deletion.", selectedMsgsDeletedText: "\x01n\x01cSelected messages have been marked for deletion.",
selectedMsgsUndeletedText: "\x01n\x01cSelected messages have been unmarked for deletion.",
cannotDeleteMsgText_notYoursNotASysop: "\x01n\x01h\x01wCannot delete message #\x01y%d \x01wbecause it's not yours or you're not a sysop.", cannotDeleteMsgText_notYoursNotASysop: "\x01n\x01h\x01wCannot delete message #\x01y%d \x01wbecause it's not yours or you're not a sysop.",
cannotDeleteMsgText_notLastPostedMsg: "\x01n\x01h\x01g* \x01yCannot delete message #%d. You can only delete your last message in this area.\x01n", cannotDeleteMsgText_notLastPostedMsg: "\x01n\x01h\x01g* \x01yCannot delete message #%d. You can only delete your last message in this area.\x01n",
cannotDeleteAllSelectedMsgsText: "\x01n\x01y\x01h* Cannot delete all selected messages", cannotDeleteAllSelectedMsgsText: "\x01n\x01y\x01h* Cannot delete all selected messages",
...@@ -999,6 +1007,17 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs) ...@@ -999,6 +1007,17 @@ function DigDistMsgReader(pSubBoardCode, pScriptArgs)
}; };
if (user.is_sysop) if (user.is_sysop)
this.enhReaderKeys.validateMsg = "A"; this.enhReaderKeys.validateMsg = "A";
// Some key bindings for the message list (not necessarily all of them)
this.msgListKeys = {
deleteMessage: KEY_DEL,
undeleteMessage: "U",
batchDelete: CTRL_D,
editMsg: "E",
goToMsg: "G",
chgMsgArea: "C",
quit: "Q",
showHelp: "?"
};
   
// Whether or not to display avatars // Whether or not to display avatars
this.displayAvatars = true; this.displayAvatars = true;
...@@ -1570,13 +1589,15 @@ function msgNumToIdxFromMsgbase(pSubCode, pMsgNum) ...@@ -1570,13 +1589,15 @@ function msgNumToIdxFromMsgbase(pSubCode, pMsgNum)
// pMsgIndex: The index (0-based) of the message header // pMsgIndex: The index (0-based) of the message header
// pAttrib: Optional - An attribute to apply. If this is is not specified, // pAttrib: Optional - An attribute to apply. If this is is not specified,
// then the message header will be retrieved from the message base. // then the message header will be retrieved from the message base.
// pApply: Optional boolean - Whether or not to apply the attribute or remove it. Defaults to true.
// pSubBoardCode: Optional - An internal sub-board code. If not specified, then // pSubBoardCode: Optional - An internal sub-board code. If not specified, then
// this method will default to this.subBoardCode. // this method will default to this.subBoardCode.
function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoardCode) function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pApply, pSubBoardCode)
{ {
if (typeof(pMsgIndex) != "number") if (typeof(pMsgIndex) != "number")
return; return;
   
var applyAttr = (typeof(pApply) === "boolean" ? pApply : true);
var subCode = (typeof(pSubBoardCode) == "string" ? pSubBoardCode : this.subBoardCode); var subCode = (typeof(pSubBoardCode) == "string" ? pSubBoardCode : this.subBoardCode);
var msgbase = new MsgBase(subCode); var msgbase = new MsgBase(subCode);
if (msgbase.open()) if (msgbase.open())
...@@ -1588,7 +1609,10 @@ function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoar ...@@ -1588,7 +1609,10 @@ function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoar
{ {
if (this.msgSearchHdrs[this.subBoardCode].indexed.hasOwnProperty(pMsgIndex)) if (this.msgSearchHdrs[this.subBoardCode].indexed.hasOwnProperty(pMsgIndex))
{ {
if (applyAttr)
this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr = this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr | pAttrib; this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr = this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr | pAttrib;
else
this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr = this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].attr ^ pAttrib;
var msgOffsetFromHdr = this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].offset; var msgOffsetFromHdr = this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex].offset;
msgbase.put_msg_header(true, msgOffsetFromHdr, this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex]); msgbase.put_msg_header(true, msgOffsetFromHdr, this.msgSearchHdrs[this.subBoardCode].indexed[pMsgIndex]);
} }
...@@ -1614,13 +1638,20 @@ function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoar ...@@ -1614,13 +1638,20 @@ function DigDistMsgReader_RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoar
// pMsgIndex: The index (0-based) of the message header // pMsgIndex: The index (0-based) of the message header
// pAttrib: Optional - An attribute to apply. If this is is not specified, // pAttrib: Optional - An attribute to apply. If this is is not specified,
// then the message header will be retrieved from the message base. // then the message header will be retrieved from the message base.
function DigDistMsgReader_RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib) // pApply: Optional boolean - Whether or not to apply the attribute or remove it. Defaults to true.
function DigDistMsgReader_RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib, pApply)
{ {
if (typeof(pMsgIndex) != "number") if (typeof(pMsgIndex) != "number")
return; return;
   
if ((pMsgIndex >= 0) && (pMsgIndex < this.hdrsForCurrentSubBoard.length)) if ((pMsgIndex >= 0) && (pMsgIndex < this.hdrsForCurrentSubBoard.length))
{
var applyAttr = (typeof(pApply) === "boolean" ? pApply : true);
if (applyAttr)
this.hdrsForCurrentSubBoard[pMsgIndex].attr = this.hdrsForCurrentSubBoard[pMsgIndex].attr | pAttrib; this.hdrsForCurrentSubBoard[pMsgIndex].attr = this.hdrsForCurrentSubBoard[pMsgIndex].attr | pAttrib;
else
this.hdrsForCurrentSubBoard[pMsgIndex].attr = this.hdrsForCurrentSubBoard[pMsgIndex].attr ^ pAttrib;
}
} }
   
// For the DigDistMsgReader class: Refreshes a message header in the saved message // For the DigDistMsgReader class: Refreshes a message header in the saved message
...@@ -1630,12 +1661,14 @@ function DigDistMsgReader_RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib) ...@@ -1630,12 +1661,14 @@ function DigDistMsgReader_RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib)
// pMsgIndex: The index (0-based) of the message header // pMsgIndex: The index (0-based) of the message header
// pAttrib: Optional - An attribute to apply. If this is is not specified, // pAttrib: Optional - An attribute to apply. If this is is not specified,
// then the message header will be retrieved from the message base. // then the message header will be retrieved from the message base.
// pApply: Optional boolean - Whether or not to apply the attribute or remove it. Defaults to true.
// pSubBoardCode: Optional - An internal sub-board code. If not specified, then // pSubBoardCode: Optional - An internal sub-board code. If not specified, then
// this method will default to this.subBoardCode. // this method will default to this.subBoardCode.
function DigDistMsgReader_RefreshHdrInSavedArrays(pMsgIndex, pAttrib, pSubBoardCode) function DigDistMsgReader_RefreshHdrInSavedArrays(pMsgIndex, pAttrib, pApply, pSubBoardCode)
{ {
this.RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, pSubBoardCode); var applyAttr = (typeof(pApply) === "boolean" ? pApply : true);
this.RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib); this.RefreshSearchResultMsgHdr(pMsgIndex, pAttrib, applyAttr, pSubBoardCode);
this.RefreshHdrInSubBoardHdrs(pMsgIndex, pAttrib, applyAttr);
} }
   
// For the DigDistMsgReader class: Inputs search text from the user, then reads/lists // For the DigDistMsgReader class: Inputs search text from the user, then reads/lists
...@@ -3168,7 +3201,7 @@ function DigDistMsgReader_ListMessages_Traditional(pAllowChgSubBoard) ...@@ -3168,7 +3201,7 @@ function DigDistMsgReader_ListMessages_Traditional(pAllowChgSubBoard)
// DeleteMessage() method, which will prompt the user for // DeleteMessage() method, which will prompt the user for
// confirmation and delete the message if confirmed. // confirmation and delete the message if confirmed.
if (msgNum > 0) if (msgNum > 0)
this.PromptAndDeleteMessage(msgNum-1); this.PromptAndDeleteOrUndeleteMessage(msgNum-1, null, true);
   
// Refresh the top header on the screen for continuing to list // Refresh the top header on the screen for continuing to list
// messages. // messages.
...@@ -3289,14 +3322,14 @@ function DigDistMsgReader_ListMessages_Traditional(pAllowChgSubBoard) ...@@ -3289,14 +3322,14 @@ function DigDistMsgReader_ListMessages_Traditional(pAllowChgSubBoard)
console.crlf(); console.crlf();
if (this.NumSelectedMessages() > 0) if (this.NumSelectedMessages() > 0)
{ {
// The PromptAndDeleteSelectedMessages() method will prompt the user for confirmation // The PromptAndDeleteOrUndeleteSelectedMessages() method will prompt the user for confirmation
// to delete the message and then delete it if confirmed. // to delete the message and then delete it if confirmed.
this.PromptAndDeleteSelectedMessages(); this.PromptAndDeleteOrUndeleteSelectedMessages(null, true);
   
// In case all messages were deleted, if that's the case, show // In case all messages were deleted, if the user can't view deleted messages,
// an appropriate message and don't continue listing messages. // show an appropriate message and don't continue listing messages.
//if (this.NumMessages(true) == 0) //if (this.NumMessages(true) == 0)
if (!this.NonDeletedMessagesExist()) if (!this.NonDeletedMessagesExist() && !canViewDeletedMsgs())
{ {
continueOn = false; continueOn = false;
// Note: The following doesn't seem to be necessary, since // Note: The following doesn't seem to be necessary, since
...@@ -3506,7 +3539,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3506,7 +3539,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
// and the user would have pressed one of the additional quit keys set // and the user would have pressed one of the additional quit keys set
// up for the menu. So look at the menu's lastUserInput and do the // up for the menu. So look at the menu's lastUserInput and do the
// appropriate thing. // appropriate thing.
else if ((lastUserInputUpper == "Q") || (lastUserInputUpper == KEY_ESC)) // Quit else if ((lastUserInputUpper == this.msgListKeys.quit) || (lastUserInputUpper == KEY_ESC)) // Quit
{ {
continueOn = false; continueOn = false;
retObj.lastUserInput = "Q"; // So the reader will quit out retObj.lastUserInput = "Q"; // So the reader will quit out
...@@ -3573,7 +3606,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3573,7 +3606,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
} }
} }
// DEL key: Delete a message // DEL key: Delete a message
else if (lastUserInputUpper == KEY_DEL) else if (lastUserInputUpper == this.msgListKeys.deleteMessage)
{ {
if (this.CanDelete() || this.CanDeleteLastMsg()) if (this.CanDelete() || this.CanDeleteLastMsg())
{ {
...@@ -3581,14 +3614,14 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3581,14 +3614,14 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
console.print("\x01n"); console.print("\x01n");
console.clearline(); console.clearline();
   
// The PromptAndDeleteMessage() method will prompt the user for confirmation // The PromptAndDeleteOrUndeleteMessage() method will prompt the user for confirmation
// to delete the message and then delete it if confirmed. // to delete the message and then delete it if confirmed.
this.PromptAndDeleteMessage(this.lightbarListSelectedMsgIdx, { x: 1, y: console.screen_rows}); this.PromptAndDeleteOrUndeleteMessage(this.lightbarListSelectedMsgIdx, { x: 1, y: console.screen_rows}, true);
   
// In case all messages were deleted, if that's the case, show // In case all messages were deleted, if the user can't view deleted messages,
// an appropriate message and don't continue listing messages. // show an appropriate message and don't continue listing messages.
//if (this.NumMessages(true) == 0) //if (this.NumMessages(true) == 0)
if (!this.NonDeletedMessagesExist()) if (!this.NonDeletedMessagesExist() && !canViewDeletedMsgs())
continueOn = false; continueOn = false;
else else
{ {
...@@ -3600,7 +3633,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3600,7 +3633,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
} }
} }
// E: Edit a message // E: Edit a message
else if (lastUserInputUpper == "E") else if (lastUserInputUpper == this.msgListKeys.editMsg)
{ {
if (this.CanEdit()) if (this.CanEdit())
{ {
...@@ -3628,7 +3661,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3628,7 +3661,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
drawMenu = false; // No need to re-draw the menu drawMenu = false; // No need to re-draw the menu
} }
// G: Go to a specific message by # (highlight or place that message on the top) // G: Go to a specific message by # (highlight or place that message on the top)
else if (lastUserInputUpper == "G") else if (lastUserInputUpper == this.msgListKeys.goToMsg)
{ {
// Move the cursor to the bottom of the screen and // Move the cursor to the bottom of the screen and
// prompt the user for a message number. // prompt the user for a message number.
...@@ -3673,7 +3706,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3673,7 +3706,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
DisplayHelpLine(this.msgListLightbarModeHelpLine); DisplayHelpLine(this.msgListLightbarModeHelpLine);
} }
// C: Change to another message area (sub-board) // C: Change to another message area (sub-board)
else if (lastUserInputUpper == "C") else if (lastUserInputUpper == this.msgListKeys.chgMsgArea)
{ {
if (allowChgSubBoard && (this.subBoardCode != "mail")) if (allowChgSubBoard && (this.subBoardCode != "mail"))
{ {
...@@ -3711,7 +3744,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3711,7 +3744,7 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
else else
drawMenu = false; // No need to re-draw the menu drawMenu = false; // No need to re-draw the menu
} }
else if (lastUserInputUpper == "?") // Show help else if (lastUserInputUpper == this.msgListKeys.showHelp) // Show help
{ {
console.clear("\x01n"); console.clear("\x01n");
this.DisplayMsgListHelp(allowChgSubBoard, true); this.DisplayMsgListHelp(allowChgSubBoard, true);
...@@ -3760,6 +3793,8 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3760,6 +3793,8 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
} }
// Ctrl-D: Batch delete (for selected messages) // Ctrl-D: Batch delete (for selected messages)
else if (lastUserInputUpper == CTRL_D) else if (lastUserInputUpper == CTRL_D)
{
if (this.CanDelete() || this.CanDeleteLastMsg())
{ {
if (this.NumSelectedMessages() > 0) if (this.NumSelectedMessages() > 0)
{ {
...@@ -3767,14 +3802,14 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3767,14 +3802,14 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
console.print("\x01n"); console.print("\x01n");
console.clearline(); console.clearline();
   
// The PromptAndDeleteSelectedMessages() method will prompt the user for confirmation // The PromptAndDeleteOrUndeleteSelectedMessages() method will prompt the user for confirmation
// to delete the message and then delete it if confirmed. // to delete the message and then delete it if confirmed.
this.PromptAndDeleteSelectedMessages({ x: 1, y: console.screen_rows}); this.PromptAndDeleteOrUndeleteSelectedMessages({ x: 1, y: console.screen_rows}, true);
   
// In case all messages were deleted, if that's the case, show // In case all messages were deleted, if the user can't view deleted messages,
// an appropriate message and don't continue listing messages. // show an appropriate message and don't continue listing messages.
//if (this.NumMessages(true) == 0) //if (this.NumMessages(true) == 0)
if (!this.NonDeletedMessagesExist()) if (!this.NonDeletedMessagesExist() && !canViewDeletedMsgs())
continueOn = false; continueOn = false;
else else
{ {
...@@ -3792,7 +3827,33 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard) ...@@ -3792,7 +3827,33 @@ function DigDistMsgReader_ListMessages_Lightbar(pAllowChgSubBoard)
DisplayHelpLine(this.msgListLightbarModeHelpLine); DisplayHelpLine(this.msgListLightbarModeHelpLine);
} }
} }
}
// U: Undelete message(s)
else if (lastUserInputUpper == this.msgListKeys.undeleteMessage)
{
if (this.CanDelete() || this.CanDeleteLastMsg())
{
console.gotoxy(1, console.screen_rows);
console.print("\x01n");
console.clearline();
if (this.NumSelectedMessages() > 0)
{
// Multi-message undelete
this.PromptAndDeleteOrUndeleteSelectedMessages({ x: 1, y: console.screen_rows}, false);
}
else
{
// Single-message undelete
this.PromptAndDeleteOrUndeleteMessage(this.lightbarListSelectedMsgIdx, { x: 1, y: console.screen_rows}, false);
}
// Refresh the header & help line.
this.WriteMsgListScreenTopHeader();
DisplayHelpLine(this.msgListLightbarModeHelpLine);
}
}
// S: Sorting options // S: Sorting options
// TODO
else if (lastUserInputUpper == "S") else if (lastUserInputUpper == "S")
{ {
// Refresh the help line // Refresh the help line
...@@ -3885,7 +3946,7 @@ function DigDistMsgReader_CreateLightbarMsgListMenu() ...@@ -3885,7 +3946,7 @@ function DigDistMsgReader_CreateLightbarMsgListMenu()
// respond to these keys // respond to these keys
var additionalQuitKeys = "EeqQgGcCsS ?0123456789" + CTRL_A + CTRL_D; var additionalQuitKeys = "EeqQgGcCsS ?0123456789" + CTRL_A + CTRL_D;
if (this.CanDelete() || this.CanDeleteLastMsg()) if (this.CanDelete() || this.CanDeleteLastMsg())
additionalQuitKeys += KEY_DEL; additionalQuitKeys += ("uU" + KEY_DEL); // U: Undelete message
if (this.CanEdit()) if (this.CanEdit())
additionalQuitKeys += "E"; additionalQuitKeys += "E";
msgListMenu.AddAdditionalQuitKeys(additionalQuitKeys); msgListMenu.AddAdditionalQuitKeys(additionalQuitKeys);
...@@ -4213,10 +4274,11 @@ function DigDistMsgReader_PrintMessageInfo(pMsgHeader, pHighlight, pMsgNum, pRet ...@@ -4213,10 +4274,11 @@ function DigDistMsgReader_PrintMessageInfo(pMsgHeader, pHighlight, pMsgNum, pRet
// To access one of these, use brackets; i.e., msgHeader['to'] // To access one of these, use brackets; i.e., msgHeader['to']
if (highlight) if (highlight)
{ {
if (msgDeleted) // For any indicator character next to the message, prioritize selected, then deleted, then attachments
msgIndicatorChar = "\x01n\x01r\x01h\x01i" + this.colors.msgListHighlightBkgColor + "*\x01n"; if (this.MessageIsSelected(this.subBoardCode, msgNum-1))
else if (this.MessageIsSelected(this.subBoardCode, msgNum-1))
msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + this.colors.msgListHighlightBkgColor + CHECK_CHAR + "\x01n"; msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + this.colors.msgListHighlightBkgColor + CHECK_CHAR + "\x01n";
else if (msgDeleted)
msgIndicatorChar = "\x01n\x01r\x01h\x01i" + this.colors.msgListHighlightBkgColor + "*\x01n";
else if (msgHdrHasAttachmentFlag(pMsgHeader)) else if (msgHdrHasAttachmentFlag(pMsgHeader))
msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + this.colors.msgListHighlightBkgColor + "A\x01n"; msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + this.colors.msgListHighlightBkgColor + "A\x01n";
var fromName = pMsgHeader.from; var fromName = pMsgHeader.from;
...@@ -4243,10 +4305,11 @@ function DigDistMsgReader_PrintMessageInfo(pMsgHeader, pHighlight, pMsgNum, pRet ...@@ -4243,10 +4305,11 @@ function DigDistMsgReader_PrintMessageInfo(pMsgHeader, pHighlight, pMsgNum, pRet
} }
else else
{ {
if (msgDeleted) // For any indicator character next to the message, prioritize selected, then deleted, then attachments
msgIndicatorChar = "\x01n\x01r\x01h\x01i*\x01n"; if (this.MessageIsSelected(this.subBoardCode, msgNum-1))
else if (this.MessageIsSelected(this.subBoardCode, msgNum-1))
msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + CHECK_CHAR + "\x01n"; msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + CHECK_CHAR + "\x01n";
else if (msgDeleted)
msgIndicatorChar = "\x01n\x01r\x01h\x01i*\x01n";
else if (msgHdrHasAttachmentFlag(pMsgHeader)) else if (msgHdrHasAttachmentFlag(pMsgHeader))
msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + "A\x01n"; msgIndicatorChar = "\x01n" + this.colors.selectedMsgMarkColor + "A\x01n";
   
...@@ -4556,7 +4619,7 @@ function DigDistMsgReader_ReadMessageEnhanced(pOffset, pAllowChgArea) ...@@ -4556,7 +4619,7 @@ function DigDistMsgReader_ReadMessageEnhanced(pOffset, pAllowChgArea)
// expanded fields and saves the attributes with that header. // expanded fields and saves the attributes with that header.
var saveRetObj = applyAttrsInMsgHdrInMessagbase(this.subBoardCode, msgHeader.number, MSG_READ); var saveRetObj = applyAttrsInMsgHdrInMessagbase(this.subBoardCode, msgHeader.number, MSG_READ);
if (this.SearchTypePopulatesSearchResults() && saveRetObj.saveSucceeded) if (this.SearchTypePopulatesSearchResults() && saveRetObj.saveSucceeded)
this.RefreshHdrInSavedArrays(pOffset, MSG_READ); this.RefreshHdrInSavedArrays(pOffset, MSG_READ, true);
} }
   
// If not reading personal email and not doing a search, then update the // If not reading personal email and not doing a search, then update the
...@@ -4693,15 +4756,15 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA ...@@ -4693,15 +4756,15 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA
var promptPos = this.EnhReaderPrepLast2LinesForPrompt(); var promptPos = this.EnhReaderPrepLast2LinesForPrompt();
   
// Prompt the user for confirmation to delete the message. // Prompt the user for confirmation to delete the message.
// Note: this.PromptAndDeleteMessage() will check to see if the user // Note: this.PromptAndDeleteOrUndeleteMessage() will check to see if the user
// is a sysop or the message was posted by the user. // is a sysop or the message was posted by the user.
// If the message was deleted, then exit this read method // If the message was deleted and the user can't view deleted messages,
// and return KEY_RIGHT as the last keypress so that the // then exit this read method and return KEY_RIGHT as the last keypress
// calling method will go to the next message/sub-board. // so that the calling method will go to the next message/sub-board.
// Otherwise (if the message was not deleted), refresh the // Otherwise (if the message was not deleted), refresh the
// last 2 lines of the message on the screen. // last 2 lines of the message on the screen.
var msgWasDeleted = this.PromptAndDeleteMessage(pOffset, promptPos, true, this.msgAreaWidth, true); var msgWasDeleted = this.PromptAndDeleteOrUndeleteMessage(pOffset, promptPos, true, true, this.msgAreaWidth, true);
if (msgWasDeleted) if (msgWasDeleted && !canViewDeletedMsgs())
{ {
var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset); var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset);
continueOn = msgSearchObj.continueInputLoop; continueOn = msgSearchObj.continueInputLoop;
...@@ -4740,7 +4803,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA ...@@ -4740,7 +4803,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA
// TODO: Write this? Not sure yet if it makes much sense to // TODO: Write this? Not sure yet if it makes much sense to
// have batch delete in the reader interface. // have batch delete in the reader interface.
// Prompt the user for confirmation, and use // Prompt the user for confirmation, and use
// this.DeleteSelectedMessages() to mark the selected messages // this.DeleteOrUndeleteSelectedMessages() to mark the selected messages
// as deleted. // as deleted.
// Returns an object with the following properties: // Returns an object with the following properties:
// deletedAll: Boolean - Whether or not all messages were successfully marked // deletedAll: Boolean - Whether or not all messages were successfully marked
...@@ -4859,7 +4922,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA ...@@ -4859,7 +4922,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Scrollable(msgHeader, allowChgMsgA
//retObj.msgNotReadable = replyRetObj.msgWasDeleted; //retObj.msgNotReadable = replyRetObj.msgWasDeleted;
var msgWasDeleted = replyRetObj.msgWasDeleted; var msgWasDeleted = replyRetObj.msgWasDeleted;
//if (retObj.msgNotReadable) //if (retObj.msgNotReadable)
if (msgWasDeleted) if (msgWasDeleted && !canViewDeletedMsgs())
{ {
var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset); var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset);
continueOn = msgSearchObj.continueInputLoop; continueOn = msgSearchObj.continueInputLoop;
...@@ -5733,15 +5796,15 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg ...@@ -5733,15 +5796,15 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg
case this.enhReaderKeys.deleteMessage: // Delete message case this.enhReaderKeys.deleteMessage: // Delete message
console.crlf(); console.crlf();
// Prompt the user for confirmation to delete the message. // Prompt the user for confirmation to delete the message.
// Note: this.PromptAndDeleteMessage() will check to see if the user // Note: this.PromptAndDeleteOrUndeleteMessage() will check to see if the user
// is a sysop or the message was posted by the user. // is a sysop or the message was posted by the user.
// If the message was deleted, then exit this read method // If the message was deleted, then exit this read method
// and return KEY_RIGHT as the last keypress so that the // and return KEY_RIGHT as the last keypress so that the
// calling method will go to the next message/sub-board. // calling method will go to the next message/sub-board.
// Otherwise (if the message was not deleted), refresh the // Otherwise (if the message was not deleted), refresh the
// last 2 lines of the message on the screen. // last 2 lines of the message on the screen.
var msgWasDeleted = this.PromptAndDeleteMessage(pOffset); var msgWasDeleted = this.PromptAndDeleteOrUndeleteMessage(pOffset, null, true);
if (msgWasDeleted) if (msgWasDeleted && !canViewDeletedMsgs())
{ {
var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset); var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset);
continueOn = msgSearchObj.continueInputLoop; continueOn = msgSearchObj.continueInputLoop;
...@@ -5769,7 +5832,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg ...@@ -5769,7 +5832,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg
// TODO: Write this? Not sure yet if it makes much sense to // TODO: Write this? Not sure yet if it makes much sense to
// have batch delete in the reader interface. // have batch delete in the reader interface.
// Prompt the user for confirmation, and use // Prompt the user for confirmation, and use
// this.DeleteSelectedMessages() to mark the selected messages // this.DeleteOrUndeleteSelectedMessages() to mark the selected messages
// as deleted. // as deleted.
// Returns an object with the following properties: // Returns an object with the following properties:
// deletedAll: Boolean - Whether or not all messages were successfully marked // deletedAll: Boolean - Whether or not all messages were successfully marked
...@@ -5850,7 +5913,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg ...@@ -5850,7 +5913,7 @@ function DigDistMsgReader_ReadMessageEnhanced_Traditional(msgHeader, allowChgMsg
retObj.userReplied = replyRetObj.postSucceeded; retObj.userReplied = replyRetObj.postSucceeded;
//retObj.msgNotReadable = replyRetObj.msgWasDeleted; //retObj.msgNotReadable = replyRetObj.msgWasDeleted;
var msgWasDeleted = replyRetObj.msgWasDeleted; var msgWasDeleted = replyRetObj.msgWasDeleted;
if (msgWasDeleted) if (msgWasDeleted && !canViewDeletedMsgs())
{ {
var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset); var msgSearchObj = this.LookForNextOrPriorNonDeletedMsg(pOffset);
continueOn = msgSearchObj.continueInputLoop; continueOn = msgSearchObj.continueInputLoop;
...@@ -7865,7 +7928,10 @@ function DigDistMsgReader_ReadConfigFile() ...@@ -7865,7 +7928,10 @@ function DigDistMsgReader_ReadConfigFile()
(setting == "abortedText") || (setting == "abortedText") ||
(setting == "loadingPersonalMailText") || (setting == "loadingPersonalMailText") ||
(setting == "msgDelConfirmText") || (setting == "msgDelConfirmText") ||
(setting == "msgUndelConfirmText") ||
(setting == "selectedMsgsUndeletedText") ||
(setting == "msgDeletedText") || (setting == "msgDeletedText") ||
(setting == "msgUndeletedText") ||
(setting == "cannotDeleteMsgText_notYoursNotASysop") || (setting == "cannotDeleteMsgText_notYoursNotASysop") ||
(setting == "cannotDeleteMsgText_notLastPostedMsg") || (setting == "cannotDeleteMsgText_notLastPostedMsg") ||
(setting == "msgEditConfirmText") || (setting == "msgEditConfirmText") ||
...@@ -9549,7 +9615,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode) ...@@ -9549,7 +9615,7 @@ function DigDistMsgReader_DoPrivateReply(pMsgHdr, pMsgIdx, pReplyMode)
// refresh the header in the search results, if there are any search // refresh the header in the search results, if there are any search
// results. // results.
if (!console.noyes(bbs.text(DeleteMailQ).replace("%s", pMsgHdr.from))) if (!console.noyes(bbs.text(DeleteMailQ).replace("%s", pMsgHdr.from)))
retObj.msgWasDeleted = this.PromptAndDeleteMessage(pMsgIdx, null, null, null, false); retObj.msgWasDeleted = this.PromptAndDeleteOrUndeleteMessage(pMsgIdx, null, true, null, null, false);
} }
   
return retObj; return retObj;
...@@ -9686,7 +9752,7 @@ function DigDistMsgReader_DisplayEnhancedReaderHelp(pDisplayChgAreaOpt, pDisplay ...@@ -9686,7 +9752,7 @@ function DigDistMsgReader_DisplayEnhancedReaderHelp(pDisplayChgAreaOpt, pDisplay
keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.vote + " \x01g: \x01n\x01cVote on the message"); keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.vote + " \x01g: \x01n\x01cVote on the message");
keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.closePoll + " \x01g: \x01n\x01cClose a poll"); keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.closePoll + " \x01g: \x01n\x01cClose a poll");
} }
keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.showVotes + " \x01g: \x01n\x01cShow vote stats for the message"); keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.showVotes + " \x01g: \x01n\x01cShow vote (tally) stats for the message");
keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.quit + " \x01g: \x01n\x01cQuit back to the BBS"); keyHelpLines.push("\x01h\x01c" + this.enhReaderKeys.quit + " \x01g: \x01n\x01cQuit back to the BBS");
for (var idx = 0; idx < keyHelpLines.length; ++idx) for (var idx = 0; idx < keyHelpLines.length; ++idx)
{ {
...@@ -10282,7 +10348,7 @@ function DigDistMsgReader_EnhReaderPromptYesNo(pQuestion, pMessageLines, pTopLin ...@@ -10282,7 +10348,7 @@ function DigDistMsgReader_EnhReaderPromptYesNo(pQuestion, pMessageLines, pTopLin
return yesNoResponse; return yesNoResponse;
} }
   
// For the DigDistMsgReader class: Allows the user to delete a message. Checks // For the DigDistMsgReader class: Allows the user to delete or undelete a message. Checks
// whether the message was posted by the user and prompt for confirmation to // whether the message was posted by the user and prompt for confirmation to
// delete it. Checks for delete or delete_last permission. If the sub-board has // delete it. Checks for delete or delete_last permission. If the sub-board has
// delete_last permission enabled, this checks whether the message is the user's // delete_last permission enabled, this checks whether the message is the user's
...@@ -10292,16 +10358,16 @@ function DigDistMsgReader_EnhReaderPromptYesNo(pQuestion, pMessageLines, pTopLin ...@@ -10292,16 +10358,16 @@ function DigDistMsgReader_EnhReaderPromptYesNo(pQuestion, pMessageLines, pTopLin
// pOffset: The offset of the message to be deleted // pOffset: The offset of the message to be deleted
// pPromptLoc: Optional - An object containing x and y properties for the location // pPromptLoc: Optional - An object containing x and y properties for the location
// on the console of the prompt/error messages // on the console of the prompt/error messages
// pDelete: Optional boolean: If true (default), deletes messages; if false, undeletes messages.
// pClearPromptRowAtFirstUse: Optional - A boolean to specify whether or not to // pClearPromptRowAtFirstUse: Optional - A boolean to specify whether or not to
// clear the remainder of the prompt row the first // clear the remainder of the prompt row the first
// time text is written in that row. // time text is written in that row.
// pPromptRowWidth: Optional - The width of the prompt row (if pProptLoc is valid) // pPromptRowWidth: Optional - The width of the prompt row (if pProptLoc is valid)
// pConfirmDelete: Optional boolean - Whether or not to confirm deleting the // pConfirm: Optional boolean - Whether or not to confirm deleting/undeleting the message. Defaults to true.
// message. Defaults to true.
// //
// Return value: Boolean - Whether or not the message was deleted // Return value: Boolean - Whether or not the message was deleted
function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearPromptRowAtFirstUse, function DigDistMsgReader_PromptAndDeleteOrUndeleteMessage(pOffset, pPromptLoc, pDelete, pClearPromptRowAtFirstUse,
pPromptRowWidth, pConfirmDelete) pPromptRowWidth, pConfirm)
{ {
// Sanity checking // Sanity checking
if ((pOffset == null) || (typeof(pOffset) != "number")) if ((pOffset == null) || (typeof(pOffset) != "number"))
...@@ -10319,37 +10385,63 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10319,37 +10385,63 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
var promptLocValid = ((pPromptLoc != null) && (typeof(pPromptLoc) == "object") && var promptLocValid = ((pPromptLoc != null) && (typeof(pPromptLoc) == "object") &&
(typeof(pPromptLoc.x) == "number") && (typeof(pPromptLoc.y) == "number")); (typeof(pPromptLoc.x) == "number") && (typeof(pPromptLoc.y) == "number"));
   
var deleteMsg = (typeof(pDelete) === "boolean" ? pDelete : true);
var opSucceeded = false;
var msgNum = pOffset + 1; var msgNum = pOffset + 1;
var msgWasDeleted = false;
var msgHeader = this.GetMsgHdrByIdx(pOffset, false, msgbase); var msgHeader = this.GetMsgHdrByIdx(pOffset, false, msgbase);
// Only let the user delete one of their own messages or the user
// is a sysop. var errorMessage = "";
var cannotDeleteError = replaceAtCodesInStr(format(this.text.cannotDeleteMsgText_notYoursNotASysop, msgNum)); var continueOn = false;
var canDeleteMessage = false; if (deleteMsg)
{
// If it's already marked for deletion, then nothing needs to be done
if ((msgHeader.attr & MSG_DELETE) == MSG_DELETE)
opSucceeded = true;
else
{
// The message is not marked for deletion.
if (this.CanDelete()) if (this.CanDelete())
{ {
if (msgHeader != null) if (msgHeader != null)
canDeleteMessage = user.is_sysop || userHandleAliasNameMatch(msgHeader.from) || this.readingPersonalEmail; continueOn = user.is_sysop || userHandleAliasNameMatch(msgHeader.from) || this.readingPersonalEmail;
else else
canDeleteMessage = false; continueOn = false;
} }
else if (this.CanDeleteLastMsg()) else if (this.CanDeleteLastMsg())
{ {
canDeleteMessage = user.is_sysop || this.MessageIsLastFromUser(pOffset); continueOn = user.is_sysop || this.MessageIsLastFromUser(pOffset);
if (!canDeleteMessage) if (!continueOn)
cannotDeleteError = replaceAtCodesInStr(format(this.text.cannotDeleteMsgText_notLastPostedMsg, msgNum)); errorMessage = replaceAtCodesInStr(format(this.text.cannotDeleteMsgText_notLastPostedMsg, msgNum));
}
else
errorMessage = replaceAtCodesInStr(format(this.text.cannotDeleteMsgText_notYoursNotASysop, msgNum));
}
} }
if (canDeleteMessage) else
{ {
// Determine whether or not to delete the message. First, if we are to // Undeleting a message marked for deletion
if ((msgHeader.attr & MSG_DELETE) == MSG_DELETE)
continueOn = true;
else
opSucceeded = true; // No action needed
}
if (continueOn)
{
// Determine whether or not to delete/undelete the message. First, if we are to
// have the user confirm whether to delete the message, then ask the // have the user confirm whether to delete the message, then ask the
// user to confirm first. If we're not to have the user confirm, then // user to confirm first. If we're not to have the user confirm, then
// go ahead and delete the message. // go ahead and delete the message.
var deleteMsg = true; // True in case of not confirming deletion continueOn = true; // True in case of not confirming deletion
var confirmDeleteMsg = (typeof(pConfirmDelete) == "boolean" ? pConfirmDelete : true); var confirmOp = (typeof(pConfirm) == "boolean" ? pConfirm : true);
if (confirmDeleteMsg) if (confirmOp)
{ {
var delConfirmText = "\x01n" + replaceAtCodesInStr(format(this.text.msgDelConfirmText, msgNum)); var confirmText = "\x01n";
if (deleteMsg)
confirmText += replaceAtCodesInStr(format(this.text.msgDelConfirmText, msgNum));
else
confirmText += replaceAtCodesInStr(format(this.text.msgUndelConfirmText, msgNum));
if (promptLocValid) if (promptLocValid)
{ {
// If the caller wants to clear the remainder of the row where the prompt // If the caller wants to clear the remainder of the row where the prompt
...@@ -10358,7 +10450,7 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10358,7 +10450,7 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
{ {
// Adding 5 to the prompt text to account for the ? and "[X] " that // Adding 5 to the prompt text to account for the ? and "[X] " that
// will be added when console.noyes() is called // will be added when console.noyes() is called
var promptTxtLen = console.strlen(delConfirmText) + 5; var promptTxtLen = console.strlen(confirmText) + 5;
var numCharsRemaining = 0; var numCharsRemaining = 0;
if (typeof(pPromptRowWidth) == "number") if (typeof(pPromptRowWidth) == "number")
numCharsRemaining = pPromptRowWidth - promptTxtLen; numCharsRemaining = pPromptRowWidth - promptTxtLen;
...@@ -10372,36 +10464,51 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10372,36 +10464,51 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
// Move the cursor to the prompt location // Move the cursor to the prompt location
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
} }
deleteMsg = !console.noyes(delConfirmText); continueOn = !console.noyes(confirmText);
} }
// If we are to delete the message, then delete it. // If we are to delete/undelete the message, then do it.
if (continueOn)
{
if (deleteMsg) if (deleteMsg)
{ {
// TODO: Also, allow toggling the delete flag rather than always just //opSucceeded = msgbase.remove_msg(true, msgHeader.offset);
// marking the message for deletion. opSucceeded = msgbase.remove_msg(false, msgHeader.number);
// hdr.attr = hdr.attr ^ MSG_DELETE; // Will toggle the delete flag }
//msgWasDeleted = msgbase.remove_msg(true, msgHeader.offset); else
msgWasDeleted = msgbase.remove_msg(false, msgHeader.number); {
if (msgWasDeleted) var tmpMsgHdr = msgbase.get_msg_header(false, msgHeader.number, false);
if (tmpMsgHdr != null)
{
tmpMsgHdr.attr = tmpMsgHdr.attr ^ MSG_DELETE;
opSucceeded = msgbase.put_msg_header(false, msgHeader.number, tmpMsgHdr);
}
else
opSucceeded = false;
}
if (opSucceeded)
{ {
// Delete any vote response messages for this message // Delete/undelete any vote response messages for this message
var voteDelRetObj = deleteVoteMsgs(msgbase, msgHeader.number, msgHeader.id, (this.subBoardCode == "mail")); // Delete/undelete vote message headers
if (!voteDelRetObj.allVoteMsgsDeleted) var voteDelRetObj = toggleVoteMsgsDeleted(msgbase, msgHeader.number, msgHeader.id, deleteMsg, (this.subBoardCode == "mail"));
// In case there are search results or saved message headers, refresh the header in
// those arrays to enable the deleted attribute.
this.RefreshHdrInSavedArrays(pOffset, MSG_DELETE, deleteMsg);
if (!voteDelRetObj.allVoteMsgsAffected)
{ {
console.print("\x01n"); console.print("\x01n");
console.crlf(); console.crlf();
console.print("\x01y\x01h* Failed to delete all vote response messages for message " + msgNum + "\x01n"); console.print("\x01y\x01h* Failed to " + (deleteMsg ? "delete" : "undelete") + " all vote response messages for message " + msgNum + "\x01n");
console.crlf(); console.crlf();
console.pause(); console.pause();
} }
   
// In case there are search results or saved message headers, refresh the header in // Output a message saying the message has been marked for deletion/undeletion
// those arrays to enable the deleted attribute.
this.RefreshHdrInSavedArrays(pOffset, MSG_DELETE);
// Output a message saying the message has been marked for deletion
if (promptLocValid) if (promptLocValid)
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
if (deleteMsg)
console.print("\x01n" + replaceAtCodesInStr(format(this.text.msgDeletedText, msgNum))); console.print("\x01n" + replaceAtCodesInStr(format(this.text.msgDeletedText, msgNum)));
else
console.print("\x01n" + replaceAtCodesInStr(format(this.text.msgUndeletedText, msgNum)));
if (promptLocValid) if (promptLocValid)
console.inkey(K_NOSPIN|K_NOCRLF|K_NOECHO, ERROR_PAUSE_WAIT_MS); console.inkey(K_NOSPIN|K_NOCRLF|K_NOECHO, ERROR_PAUSE_WAIT_MS);
else else
...@@ -10413,10 +10520,12 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10413,10 +10520,12 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
} }
} }
else else
{
if (errorMessage.length > 0)
{ {
if (promptLocValid) if (promptLocValid)
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
console.print(cannotDeleteError); console.print(errorMessage);
if (promptLocValid) if (promptLocValid)
console.inkey(K_NOSPIN|K_NOCRLF|K_NOECHO, ERROR_PAUSE_WAIT_MS); console.inkey(K_NOSPIN|K_NOCRLF|K_NOECHO, ERROR_PAUSE_WAIT_MS);
else else
...@@ -10425,8 +10534,9 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10425,8 +10534,9 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
console.pause(); console.pause();
} }
} }
}
msgbase.close(); msgbase.close();
return msgWasDeleted; return opSucceeded;
} }
   
// For the DigDistMsgReader class: Allows the user to batch delete selected messages. // For the DigDistMsgReader class: Allows the user to batch delete selected messages.
...@@ -10435,44 +10545,58 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm ...@@ -10435,44 +10545,58 @@ function DigDistMsgReader_PromptAndDeleteMessage(pOffset, pPromptLoc, pClearProm
// Parameters: // Parameters:
// pPromptLoc: Optional - An object containing x and y properties for the location // pPromptLoc: Optional - An object containing x and y properties for the location
// on the console of the prompt/error messages // on the console of the prompt/error messages
// pDelete: Optional boolean: If true (default), deletes messages; if false, undeletes messages.
// pClearPromptRowAtFirstUse: Optional - A boolean to specify whether or not to // pClearPromptRowAtFirstUse: Optional - A boolean to specify whether or not to
// clear the remainder of the prompt row the first // clear the remainder of the prompt row the first
// time text is written in that row. // time text is written in that row.
// pPromptRowWidth: Optional - The width of the prompt row (if pProptLoc is valid) // pPromptRowWidth: Optional - The width of the prompt row (if pProptLoc is valid)
// pConfirmDelete: Optional boolean - Whether or not to confirm deleting the // pConfirm: Optional boolean - Whether or not to confirm deleting/undeleting the messages. Defaults to true.
// message. Defaults to true.
// //
// Return value: Boolean - Whether or not all messages were deleted // Return value: Boolean - Whether or not all messages were deleted
function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearPromptRowAtFirstUse, function DigDistMsgReader_PromptAndDeleteOrUndeleteSelectedMessages(pPromptLoc, pDelete, pClearPromptRowAtFirstUse,
pPromptRowWidth, pConfirmDelete) pPromptRowWidth, pConfirm)
{ {
var promptLocValid = ((pPromptLoc != null) && (typeof(pPromptLoc) == "object") && var promptLocValid = ((pPromptLoc != null) && (typeof(pPromptLoc) === "object") &&
(typeof(pPromptLoc.x) == "number") && (typeof(pPromptLoc.y) == "number")); (typeof(pPromptLoc.x) === "number") && (typeof(pPromptLoc.y) === "number"));
   
var allMsgsWereDeleted = false; var doDelete = (typeof(pDelete) === "boolean" ? pDelete : true);
var allMsgsOpSuccessful = false;
   
// If the user is allowed to delete all selected messages, then go ahead var errorMsg = ""; // In case anything goes wrong
// and let the user do it. var continueOn = true; // Whether or not to continue with deletion/undeletion, depending on user confirmation etc.
if (this.AllSelectedMessagesCanBeDeleted()) if (doDelete)
{
// If not all the messages can be deleted, then don't allow it.
continueOn = this.AllSelectedMessagesCanBeDeleted();
if (!this.AllSelectedMessagesCanBeDeleted())
{
continueOn = false;
errorMsg = replaceAtCodesInStr(this.text.cannotDeleteAllSelectedMsgsText);
}
}
if (continueOn)
{ {
// Determine whether or not to delete the message. First, if we are to // Determine whether or not to delete the message. First, if we are to
// have the user confirm whether to delete the message, then ask the // have the user confirm whether to delete the message, then ask the
// user to confirm first. If we're not to have the user confirm, then // user to confirm first. If we're not to have the user confirm, then
// go ahead and delete the message. // go ahead and delete the message.
var deleteMsgs = true; // True in case of not confirming deletion var confirmDoIt = (typeof(pConfirm) === "boolean" ? pConfirm : true);
var confirmDeleteMsgs = (typeof(pConfirmDelete) == "boolean" ? pConfirmDelete : true); if (confirmDoIt)
if (confirmDeleteMsgs)
{ {
if (promptLocValid) if (promptLocValid)
{ {
var delMsgsPromptText = replaceAtCodesInStr(this.text.delSelectedMsgsConfirmText); var promptText = "";
if (doDelete)
promptText = replaceAtCodesInStr(this.text.delSelectedMsgsConfirmText);
else
promptText = replaceAtCodesInStr(this.text.undelSelectedMsgsConfirmText);
// If the caller wants to clear the remainder of the row where the prompt // If the caller wants to clear the remainder of the row where the prompt
// text will be, then do it. // text will be, then do it.
if (pClearPromptRowAtFirstUse) if (pClearPromptRowAtFirstUse)
{ {
// Adding 5 to the prompt text to account for the ? and "[X] " that // Adding 5 to the prompt text to account for the ? and "[X] " that
// will be added when console.noyes() is called // will be added when console.noyes() is called
var promptTxtLen = console.strlen(delMsgsPromptText) + 5; var promptTxtLen = console.strlen(promptText) + 5;
var numCharsRemaining = 0; var numCharsRemaining = 0;
if (typeof(pPromptRowWidth) == "number") if (typeof(pPromptRowWidth) == "number")
numCharsRemaining = pPromptRowWidth - promptTxtLen; numCharsRemaining = pPromptRowWidth - promptTxtLen;
...@@ -10485,21 +10609,22 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm ...@@ -10485,21 +10609,22 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm
} }
// Move the cursor to the prompt location // Move the cursor to the prompt location
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
deleteMsgs = !console.noyes(delMsgsPromptText); continueOn = !console.noyes(promptText);
} }
} }
// If we are to delete the messages, then delete it. // If we are to delete/undelete the messages, then do so.
if (deleteMsgs) if (continueOn)
{ {
var deleteRetObj = this.DeleteSelectedMessages(); // TODO: Return status & error message
allMsgsWereDeleted = deleteRetObj.deletedAll; var deleteRetObj = this.DeleteOrUndeleteSelectedMessages(doDelete);
allMsgsOpSuccessful = deleteRetObj.opSuccessful;
// If all selected messages were successfully deleted, then output // If all selected messages were successfully deleted, then output
// a success message. Otherwise, output an error. // a success message. Otherwise, output an error.
var statusMsg = ""; var statusMsg = "";
if (deleteRetObj.deletedAll) if (deleteRetObj.opSuccessful)
statusMsg = "\x01n\x01cAll selected messages were deleted."; statusMsg = "\x01n\x01cAll selected messages were " + (doDelete ? "deleted." : "undeleted.");
else else
statusMsg = "\x01n\x01h\x01y* Failure to delete all selected messages"; statusMsg = "\x01n\x01h\x01y* Failure to " + (doDelete ? "delete" : "undelete") + " all selected messages";
if (promptLocValid) if (promptLocValid)
{ {
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
...@@ -10518,9 +10643,10 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm ...@@ -10518,9 +10643,10 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm
} }
} }
} }
else
// If there was an error, then display it
if (errorMsg.length > 0)
{ {
// The user is not allowed to delete all selected messages
if (promptLocValid) if (promptLocValid)
console.gotoxy(pPromptLoc); console.gotoxy(pPromptLoc);
console.print(replaceAtCodesInStr(this.text.cannotDeleteAllSelectedMsgsText)); console.print(replaceAtCodesInStr(this.text.cannotDeleteAllSelectedMsgsText));
...@@ -10532,7 +10658,8 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm ...@@ -10532,7 +10658,8 @@ function DigDistMsgReader_PromptAndDeleteSelectedMessages(pPromptLoc, pClearProm
console.pause(); console.pause();
} }
} }
return allMsgsWereDeleted;
return allMsgsOpSuccessful;
} }
   
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
...@@ -13108,33 +13235,43 @@ function DigDistMsgReader_AllSelectedMessagesCanBeDeleted() ...@@ -13108,33 +13235,43 @@ function DigDistMsgReader_AllSelectedMessagesCanBeDeleted()
} }
   
// For the DigDistMsgReader class: Marks the 'selected messages' (in // For the DigDistMsgReader class: Marks the 'selected messages' (in
// this.selecteMessages) as deleted. Returns an object with the following // this.selecteMessages) as deleted, or not deleted.
//
// Parameters:
// pDelete: Boolean - Whether or not the message should be marked deleted. Defaults to true.
// If false, the message will be marked not deleted (if it is marked as deleted).
//
// Return value: An object with the following
// properties: // properties:
// deletedAll: Boolean - Whether or not all messages were successfully marked // opSuccessful: Boolean - Whether or not all messages were successfully marked
// for deletion // for deletion
// failureList: An object containing indexes of messages that failed to get // failureList: An object containing indexes of messages that failed to get
// marked for deletion, indexed by internal sub-board code, then // marked for deletion, indexed by internal sub-board code, then
// containing messages indexes as properties. Reasons for failing // containing messages indexes as properties. Reasons for failing
// to mark messages deleted can include the user not having permission // to mark messages deleted can include the user not having permission
// to delete in a sub-board, failure to open the sub-board, etc. // to delete in a sub-board, failure to open the sub-board, etc.
function DigDistMsgReader_DeleteSelectedMessages() function DigDistMsgReader_DeleteOrUndeleteSelectedMessages(pDelete)
{ {
var retObj = { var retObj = {
deletedAll: true, opSuccessful: false,
failureList: {} failureList: {}
}; };
   
var markAsDeleted = (typeof(pDelete) === "boolean" ? pDelete : true);
var msgBase = null; var msgBase = null;
var msgHdr = null; var msgHdr = null;
var msgWasDeleted = false;
for (var subBoardCode in this.selectedMessages) for (var subBoardCode in this.selectedMessages)
{ {
msgBase = new MsgBase(subBoardCode); msgBase = new MsgBase(subBoardCode);
if (msgBase.open()) if (msgBase.open())
{ {
// Allow the user to delete the messages if they're the sysop, they're // If deleting messages, then check whether the user is the sysop, they're
// reading their personal mail, or the sub-board allows deleting messages. // reading their personal mail, or the sub-board allows deleting messages.
if (user.is_sysop || (subBoardCode == "mail") || ((msgBase.cfg.settings & SUB_DEL) == SUB_DEL)) var canContinue = true;
if (markAsDeleted)
canContinue = (user.is_sysop || (subBoardCode == "mail") || ((msgBase.cfg.settings & SUB_DEL) == SUB_DEL));
if (canContinue)
{ {
for (var msgIdx in this.selectedMessages[subBoardCode]) for (var msgIdx in this.selectedMessages[subBoardCode])
{ {
...@@ -13165,55 +13302,81 @@ function DigDistMsgReader_DeleteSelectedMessages() ...@@ -13165,55 +13302,81 @@ function DigDistMsgReader_DeleteSelectedMessages()
// the message index to the return object. // the message index to the return object.
if (msgHdr != null) if (msgHdr != null)
{ {
//msgWasDeleted = msgBase.remove_msg(true, msgHdr.offset); if (markAsDeleted)
msgWasDeleted = msgBase.remove_msg(false, msgHdr.number); {
// remove_msg() just marks a message for deletion
//retObj.opSuccessful = msgBase.remove_msg(true, msgHdr.offset);
retObj.opSuccessful = msgBase.remove_msg(false, msgHdr.number);
} }
else else
msgWasDeleted = false;
if (msgWasDeleted)
{ {
// Refresh the message header in the header arrays (if it // If the message is marked deleted, unmark it.
// exists there) and remove the message index from the if ((msgHdr.attr & MSG_DELETE) == MSG_DELETE)
// selectedMessages object {
this.RefreshHdrInSavedArrays(msgIdxNumber, MSG_DELETE, subBoardCode); var tmpMsgHdr = msgBase.get_msg_header(false, msgHdr.number, false);
delete this.selectedMessages[subBoardCode][msgIdx]; if (tmpMsgHdr != null)
{
// Delete any vote response messages that may exist for this message tmpMsgHdr.attr = tmpMsgHdr.attr ^ MSG_DELETE;
var voteDelRetObj = deleteVoteMsgs(msgBase, msgHdr.number, msgHdr.id, (subBoardCode == "mail")); retObj.opSuccessful = msgBase.put_msg_header(false, msgHdr.number, tmpMsgHdr);
// TODO: If the main messages was deleted, does it matter if vote response messages }
// are deleted? else
if (!voteDelRetObj.allVoteMsgsDeleted) retObj.opSuccessful = false;
}
else
retObj.opSuccessful = true; // No change necessary
}
}
else
retObj.opSuccessful = false;
if (retObj.opSuccessful)
{ {
retObj.deletedAll = false; // Refresh the message header in the header arrays (if it exists there) and
// remove the message index from the selectedMessages object. Also, delete
// or undelete any vote response messages that may exist for this message.
this.RefreshHdrInSavedArrays(msgIdxNumber, MSG_DELETE, markAsDeleted, subBoardCode);
var voteDelRetObj = toggleVoteMsgsDeleted(msgBase, msgHdr.number, msgHdr.id, markAsDeleted, (subBoardCode == "mail"));
if (!voteDelRetObj.allVoteMsgsAffected)
{
retObj.opSuccessful = false;
if (!retObj.failureList.hasOwnProperty(subBoardCode)) if (!retObj.failureList.hasOwnProperty(subBoardCode))
retObj.failureList[subBoardCode] = []; retObj.failureList[subBoardCode] = [];
retObj.failureList[subBoardCode].push(msgIdxNumber); retObj.failureList[subBoardCode].push(msgIdxNumber);
} }
// If deleting and the user can't view deleted messages, then remove the message from this.selectedMessages
if (markAsDeleted && !canViewDeletedMsgs())
delete this.selectedMessages[subBoardCode][msgIdx];
} }
else else
{ {
retObj.deletedAll = false; retObj.opSuccessful = false;
if (!retObj.failureList.hasOwnProperty(subBoardCode)) if (!retObj.failureList.hasOwnProperty(subBoardCode))
retObj.failureList[subBoardCode] = []; retObj.failureList[subBoardCode] = [];
retObj.failureList[subBoardCode].push(msgIdxNumber); retObj.failureList[subBoardCode].push(msgIdxNumber);
} }
} }
if (markAsDeleted)
{
// If the sub-board index array no longer has any properties (i.e., // If the sub-board index array no longer has any properties (i.e.,
// all messages in the sub-board were marked as deleted), then remove // all messages in the sub-board were marked as deleted) and the user
// the sub-board property from this.selectedMessages // can't view deleted messages, then remove the sub-board property from
if (Object.keys(this.selectedMessages[subBoardCode]).length == 0) // this.selectedMessages
if (Object.keys(this.selectedMessages[subBoardCode]).length == 0 && !canViewDeletedMsgs())
delete this.selectedMessages[subBoardCode]; delete this.selectedMessages[subBoardCode];
} }
}
else else
{
if (markAsDeleted && !canContinue)
{ {
// The user doesn't have permission to delete messages // The user doesn't have permission to delete messages
// in this sub-board. // in this sub-board.
// Create an entry in retObj.failureList indexed by the // Create an entry in retObj.failureList indexed by the
// sub-board code to indicate failure to delete all // sub-board code to indicate failure to delete all
// messages in the sub-board. // messages in the sub-board.
retObj.deletedAll = false; retObj.opSuccessful = false;
retObj.failureList[subBoardCode] = []; retObj.failureList[subBoardCode] = [];
} }
}
   
msgBase.close(); msgBase.close();
} }
...@@ -13223,7 +13386,7 @@ function DigDistMsgReader_DeleteSelectedMessages() ...@@ -13223,7 +13386,7 @@ function DigDistMsgReader_DeleteSelectedMessages()
// Create an entry in retObj.failureList indexed by the // Create an entry in retObj.failureList indexed by the
// sub-board code to indicate failure to delete all messages // sub-board code to indicate failure to delete all messages
// in the sub-board. // in the sub-board.
retObj.deletedAll = false; retObj.opSuccessful = false;
retObj.failureList[subBoardCode] = []; retObj.failureList[subBoardCode] = [];
} }
} }
...@@ -17022,25 +17185,26 @@ function numReadableMsgs(pMsgbase, pSubBoardCode) ...@@ -17022,25 +17185,26 @@ function numReadableMsgs(pMsgbase, pSubBoardCode)
return numMsgs; return numMsgs;
} }
   
// Deletes vote messages (messages that have voting response data for a message with // Marks or unmarks vote messages as deleted (messages that have voting response data for a message with
// a given message number). // a given message number).
// //
// Parameters: // Parameters:
// pMsgbase: A MessageBase object containing the messages to be deleted // pMsgbase: A MessageBase object containing the messages to be deleted
// pMsgNum: The number of the message for which vote messages should be deleted // pMsgNum: The number of the message for which vote messages should be deleted
// pMsgID: The ID of the message for which vote messages should be deleted // pMsgID: The ID of the message for which vote messages should be deleted
// pDoDelete: Boolean: If true, then mark for deletion. If false, then remove the deleted attribute.
// pIsMailSub: Boolean - Whether or not it's the personal email area // pIsMailSub: Boolean - Whether or not it's the personal email area
// //
// Return value: An object containing the following properties: // Return value: An object containing the following properties:
// numVoteMsgs: The number of vote messages for the given message number // numVoteMsgs: The number of vote messages for the given message number
// numVoteMsgsDeleted: The number of vote messages that were deleted // toggleVoteMsgsAffected: The number of vote messages that were deleted/undeleted
// allVoteMsgsDeleted: Boolean - Whether or not all vote messages were deleted // allVoteMsgsAffected: Boolean - Whether or not all vote messages were deleted/undeleted
function deleteVoteMsgs(pMsgbase, pMsgNum, pMsgID, pIsEmailSub) function toggleVoteMsgsDeleted(pMsgbase, pMsgNum, pMsgID, pDoDelete, pIsEmailSub)
{ {
var retObj = { var retObj = {
numVoteMsgs: 0, numVoteMsgs: 0,
numVoteMsgsDeleted: 0, toggleVoteMsgsAffected: 0,
allVoteMsgsDeleted: true allVoteMsgsAffected: true
}; };
   
if ((pMsgbase === null) || !pMsgbase.is_open) if ((pMsgbase === null) || !pMsgbase.is_open)
...@@ -17066,10 +17230,26 @@ function deleteVoteMsgs(pMsgbase, pMsgNum, pMsgID, pIsEmailSub) ...@@ -17066,10 +17230,26 @@ function deleteVoteMsgs(pMsgbase, pMsgNum, pMsgID, pIsEmailSub)
if (isVoteMsg && (msgHdrs[msgHdrsProp].thread_back == pMsgNum) || (msgHdrs[msgHdrsProp].reply_id == pMsgID)) if (isVoteMsg && (msgHdrs[msgHdrsProp].thread_back == pMsgNum) || (msgHdrs[msgHdrsProp].reply_id == pMsgID))
{ {
++retObj.numVoteMsgs; ++retObj.numVoteMsgs;
var msgWasDeleted = pMsgbase.remove_msg(false, msgHdrs[msgHdrsProp].number); var msgWasAffected = false;
retObj.allVoteMsgsDeleted = (retObj.allVoteMsgsDeleted && msgWasDeleted); if (pDoDelete)
if (msgWasDeleted) msgWasAffected = pMsgbase.remove_msg(false, msgHdrs[msgHdrsProp].number);
++retObj.numVoteMsgsDeleted; else
{
var tmpMsgHdr = pMsgbase.get_msg_header(false, msgHdrs[msgHdrsProp].number, false);
if (tmpMsgHdr != null)
{
if ((tmpMsgHdr.attr & MSG_DELETE) == MSG_DELETE)
{
tmpMsgHdr.attr = tmpMsgHdr.attr ^ MSG_DELETE;
msgWasAffected = pMsgbase.put_msg_header(false, msgHdrs[msgHdrsProp].number, tmpMsgHdr);
}
else
msgWasAffected = true; // No action needed
}
}
retObj.allVoteMsgsAffected = (retObj.allVoteMsgsAffected && msgWasAffected);
if (msgWasAffected)
++retObj.toggleVoteMsgsAffected;
} }
} }
} }
...@@ -18371,6 +18551,14 @@ function charStr(pChar, pNumTimes) ...@@ -18371,6 +18551,14 @@ function charStr(pChar, pNumTimes)
return str; return str;
} }
   
// Returns whether the logged-in user can view deleted messages.
function canViewDeletedMsgs()
{
var usersVDM = ((system.settings & SYS_USRVDELM) == SYS_USRVDELM);
var sysopVDM = ((system.settings & SYS_SYSVDELM) == SYS_SYSVDELM);
return (usersVDM || (user.is_sysop && sysopVDM));
}
// For debugging: Writes some text on the screen at a given location with a given pause. // For debugging: Writes some text on the screen at a given location with a given pause.
// //
// Parameters: // Parameters:
......
xtrn/DDMsgReader/readme.txt
+ 2
− 2
View file @ 0efc8162
Digital Distortion Message Reader Digital Distortion Message Reader
Version 1.52 Version 1.53
Release date: 2022-07-09 Release date: 2022-07-18
by by
......
xtrn/DDMsgReader/revision_history.txt
+ 4
− 0
View file @ 0efc8162
...@@ -5,6 +5,10 @@ Revision History (change log) ...@@ -5,6 +5,10 @@ Revision History (change log)
============================= =============================
Version Date Description Version Date Description
------- ---- ----------- ------- ---- -----------
1.53 2022-07-18 Deleted messages can now be un-marked for deletion from
the message list (if the user has delete permissions).
Also, the reader now honors the system setting for whether
users can view deleted messages.
1.52 2022-07-09 Mouse click support for the bottom help lines in scrolling 1.52 2022-07-09 Mouse click support for the bottom help lines in scrolling
mode (thanks to help from Nelgin) mode (thanks to help from Nelgin)
1.51 2022-07-05 Graphic is now only used when using the scrollable 1.51 2022-07-05 Graphic is now only used when using the scrollable
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment