Finish actionhandler and fix unregistered/hidden user handlign in logs db and messages

merge-requests/341/head
Thomas Lynch 1 year ago
parent 14a8d8cbee
commit a275b8620c
  1. 8
      models/forms/actionhandler.js
  2. 3
      views/pages/modlog.pug

@ -319,12 +319,10 @@ module.exports = async (req, res, next) => {
const modlog = {};
const logDate = new Date(); //all events current date
const message = req.body.log_message || null;
let logUser;
let logUser = null;
//could even do if (req.session.user) {...}, but might cause cross-board log username contamination
if (isStaffOrGlobal) {
logUser = req.session.user;
} else {
logUser = 'Unregistered User';
}
for (let i = 0; i < res.locals.posts.length; i++) {
const post = res.locals.posts[i];
@ -335,7 +333,7 @@ module.exports = async (req, res, next) => {
postLinks: [],
actions: modlogActions,
date: logDate,
showUser: !req.body.hide_name || logUser === 'Unregistered User' ? true : false,
showUser: !req.body.hide_name || logUser === null ? true : false,
message: message,
user: logUser,
ip: {
@ -633,7 +631,7 @@ module.exports = async (req, res, next) => {
}
return dynamicResponse(req, res, 200, 'message', {
'title': res.locals.__('Success'),
'title': __('Success'),
'messages': messages,
redirect,
});

@ -25,7 +25,8 @@ block content
tr
- const logDate = new Date(log.date);
td: time.reltime(datetime=logDate.toISOString()) #{logDate.toLocaleString(undefined, {hourCycle:'h23'})}
td(class=(!log.showUser ? 'em' : '')) #{log.showUser ? log.user : __('Hidden User')}
- const logUser = log.user || __('Unregistered User');
td(class=(!log.showUser ? 'em' : '')) #{log.showUser ? logUser : __('Hidden User')}
td #{log.actions.map(a => __(a))}
td
if log.showLinks

Loading…
Cancel
Save