moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

This commit is contained in:
Bryan Ashby 2017-02-27 21:35:57 -07:00
parent c870b3523f 02d76f5573
commit 46b9c6b4eb
2 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/ftn_mail_packet.js
View File

@ -61,7 +61,7 @@ class PacketHeader {
this.prodData = 0x47694e45; // "ENiG"
this.capWord = 0x0001;
this.capWordValidate = ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff);
this.capWordValidate = ((this.capWord & 0xff) << 8) | ((this.capWord >> 8) & 0xff); // swap
this.prodCodeHi = 0xfe; // see above
this.prodRevHi = 0;
@ -91,14 +91,17 @@ class PacketHeader {
this.origNode = address.node;
// See FSC-48
if(address.point) {
// :TODO: disabled for now until we have separate packet writers for 2, 2+, 2+48, and 2.2
/*if(address.point) {
this.auxNet = address.origNet;
this.origNet = -1;
} else {
this.origNet = address.net;
this.auxNet = 0;
}
*/
this.origNet = address.net;
this.auxNet = 0;
this.origZone = address.zone;
this.origZone2 = address.zone;
@ -586,9 +589,9 @@ function Packet(options) {
if(messageBodyData.tearLine) {
msg.meta.FtnProperty.ftn_tear_line = messageBodyData.tearLine;
if(self.options.keepTearAndOrigin) {
msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
}
if(self.options.keepTearAndOrigin) {
msg.message += `\r\n${messageBodyData.tearLine}\r\n`;
}
}
if(messageBodyData.seenBy.length > 0) {
@ -602,9 +605,9 @@ function Packet(options) {
if(messageBodyData.originLine) {
msg.meta.FtnProperty.ftn_origin = messageBodyData.originLine;
if(self.options.keepTearAndOrigin) {
msg.message += `${messageBodyData.originLine}\r\n`;
}
if(self.options.keepTearAndOrigin) {
msg.message += `${messageBodyData.originLine}\r\n`;
}
}
//

37
mods/menu.hjson
View File

@ -66,22 +66,27 @@
VM1: {
submit: true
focus: true
argName: navSelect
// :TODO: need a good way to localize these ... Standard Orig->Lookup seems good.
items: [ "login", "apply", "log off" ]
items: [ "login", "apply", "forgot pw", "log off" ]
}
}
submit: {
*: [
{
value: { 1: 0 }
value: { navSelect: 0 }
action: @menu:login
}
{
value: { 1: 1 },
value: { navSelect: 1 },
action: @menu:newUserApplicationPre
}
{
value: { 1: 2 },
value: { navSelect: 2 }
action: @menu:forgotPassword
}
{
value: { navSelect: 3 },
action: @menu:logoff
}
]
@ -138,6 +143,28 @@
}
}
forgotPassword: {
desc: Forgot password
prompt: forgotPasswordPrompt
submit: [
{
value: { username: null }
action: @systemMethod:sendForgotPasswordEmail
extraArgs: { next: "forgotPasswordSubmitted" }
}
]
}
forgotPasswordSubmitted: {
desc: Forgot password
art: FORGOTPWSENT
options: {
cls: true
pause: true
}
next: @systemMethod:logoff
}
// :TODO: Prompt Yes/No for logoff confirm
fullLogoffSequence: {
desc: Logging Off
@ -2276,7 +2303,7 @@
}
////////////////////////////////////////////////////////////////////////
// File Area
// File Base
////////////////////////////////////////////////////////////////////////
fileBase: {