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

* Fix Via parsing 

* Use LIKE for real name lookup
This commit is contained in:
Bryan Ashby 2018-01-01 18:43:05 -07:00
parent 84a1f70fc2
commit b97f96ce18
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/ftn_mail_packet.js
View File

@ -397,10 +397,10 @@ function Packet(options) {
// We have to special case INTL/TOPT/FMPT as they don't contain // We have to special case INTL/TOPT/FMPT as they don't contain
// a ':' name/value separator like the rest of the kludge lines... because stupdity. // a ':' name/value separator like the rest of the kludge lines... because stupdity.
// //
let key = line.substr(0, 4); let key = line.substr(0, 4).trim();
let value; let value;
if( ['INTL', 'TOPT', 'FMPT' ].includes(key)) { if( ['INTL', 'TOPT', 'FMPT', 'Via' ].includes(key)) {
value = line.substr(4).trim(); value = line.substr(key.length).trim();
} else { } else {
const sepIndex = line.indexOf(':'); const sepIndex = line.indexOf(':');
key = line.substr(0, sepIndex).toUpperCase(); key = line.substr(0, sepIndex).toUpperCase();
@ -709,13 +709,14 @@ function Packet(options) {
case 'PATH' : case 'PATH' :
break; // skip & save for last break; // skip & save for last
case 'Via' :
case 'FMPT' : case 'FMPT' :
case 'TOPT' : case 'TOPT' :
case 'INTL' : case 'INTL' :
msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); // no sepChar msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); // no sepChar
break; break;
default : default :
msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]); msgBody += getAppendMeta(`\x01${k}`, message.meta.FtnKludge[k]);
break; break;
} }
@ -856,6 +857,7 @@ function Packet(options) {
switch(k) { switch(k) {
case 'PATH' : break; // skip & save for last case 'PATH' : break; // skip & save for last
case 'Via' :
case 'FMPT' : case 'FMPT' :
case 'TOPT' : case 'TOPT' :
case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break; // no sepChar case 'INTL' : appendMeta(`\x01${k}`, message.meta.FtnKludge[k], ''); break; // no sepChar

2
core/user.js
View File

@ -427,7 +427,7 @@ module.exports = class User {
WHERE id = ( WHERE id = (
SELECT user_id SELECT user_id
FROM user_property FROM user_property
WHERE prop_name='real_name' AND prop_value=? WHERE prop_name='real_name' AND prop_value LIKE ?
);`, );`,
[ realName ], [ realName ],
(err, row) => { (err, row) => {