From 28b85c617253f927a97d6018cab2ba77dfd1ad12 Mon Sep 17 00:00:00 2001
From: "Rob Swindell (on Debian Linux)" <rob@synchro.net>
Date: Sat, 16 Mar 2024 23:03:52 -0700
Subject: [PATCH] Update netattr flag naming to match smbdefs.js
Eliminate some never-defined/used flags (copied from smb.html?)
---
xtrn/DDMsgReader/DDMsgReader.js | 31 ++++++++-----------------------
xtrn/slyvote/slyvote.js | 23 ++++++++---------------
2 files changed, 16 insertions(+), 38 deletions(-)
diff --git a/xtrn/DDMsgReader/DDMsgReader.js b/xtrn/DDMsgReader/DDMsgReader.js
index 4f48dc317e..d5dea0bd2b 100644
--- a/xtrn/DDMsgReader/DDMsgReader.js
+++ b/xtrn/DDMsgReader/DDMsgReader.js
@@ -20603,30 +20603,15 @@ function makeNetMsgAttrStr(pNetMsgAttrs, pIfEmptyString)
if (makeNetMsgAttrStr.attrStrs === undefined)
{
makeNetMsgAttrStr.attrStrs = [
- { attr: MSG_LOCAL, str: "FromLocal" },
- { attr: MSG_INTRANSIT, str: "Transit" },
- { attr: MSG_SENT, str: "Sent" },
- { attr: MSG_KILLSENT, str: "KillSent" },
- { attr: MSG_ARCHIVESENT, str: "ArcSent" },
- { attr: MSG_HOLD, str: "Hold" },
- { attr: MSG_CRASH, str: "Crash" },
- { attr: MSG_IMMEDIATE, str: "Now" },
- { attr: MSG_DIRECT, str: "Direct" }
+ { attr: NETMSG_LOCAL, str: "FromLocal" },
+ { attr: NETMSG_INTRANSIT, str: "Transit" },
+ { attr: NETMSG_SENT, str: "Sent" },
+ { attr: NETMSG_KILLSENT, str: "KillSent" },
+ { attr: NETMSG_HOLD, str: "Hold" },
+ { attr: NETMSG_CRASH, str: "Crash" },
+ { attr: NETMSG_IMMEDIATE, str: "Now" },
+ { attr: NETMSG_DIRECT, str: "Direct" }
];
- if (typeof(MSG_GATE) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_GATE, str: "Gate" });
- if (typeof(MSG_ORPHAN) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_ORPHAN, str: "Orphan" });
- if (typeof(MSG_FPU) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_FPU, str: "FPU" });
- if (typeof(MSG_TYPELOCAL) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_TYPELOCAL, str: "ForLocal" });
- if (typeof(MSG_TYPEECHO) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_TYPEECHO, str: "ForEcho" });
- if (typeof(MSG_TYPENET) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_TYPENET, str: "ForNetmail" });
- if (typeof(MSG_MIMEATTACH) === "number")
- makeNetMsgAttrStr.attrStrs.push({ attr: MSG_MIMEATTACH, str: "MimeAttach" });
}
var msgAttrStr = "";
diff --git a/xtrn/slyvote/slyvote.js b/xtrn/slyvote/slyvote.js
index 5ab614e137..9e70938427 100644
--- a/xtrn/slyvote/slyvote.js
+++ b/xtrn/slyvote/slyvote.js
@@ -336,21 +336,14 @@ var gAuxMsgAttrStrs = {
MSG_NODISP: "NoDisp"
};
var gNetMsgAttrStrs = {
- MSG_LOCAL: "FromLocal",
- MSG_INTRANSIT: "Transit",
- MSG_SENT: "Sent",
- MSG_KILLSENT: "KillSent",
- MSG_ARCHIVESENT: "ArcSent",
- MSG_HOLD: "Hold",
- MSG_CRASH: "Crash",
- MSG_IMMEDIATE: "Now",
- MSG_DIRECT: "Direct",
- MSG_GATE: "Gate",
- MSG_ORPHAN: "Orphan",
- MSG_FPU: "FPU",
- MSG_TYPELOCAL: "ForLocal",
- MSG_TYPEECHO: "ForEcho",
- MSG_TYPENET: "ForNetmail"
+ NETMSG_LOCAL: "FromLocal",
+ NETMSG_INTRANSIT: "Transit",
+ NETMSG_SENT: "Sent",
+ NETMSG_KILLSENT: "KillSent",
+ NETMSG_HOLD: "Hold",
+ NETMSG_CRASH: "Crash",
+ NETMSG_IMMEDIATE: "Now",
+ NETMSG_DIRECT: "Direct"
};
// An amount of milliseconds to wait after displaying an error message, etc.
--
GitLab