diff --git a/middlewares/auth.middleware.js b/middlewares/auth.middleware.js index 7a54f64..ee1e77b 100644 --- a/middlewares/auth.middleware.js +++ b/middlewares/auth.middleware.js @@ -32,14 +32,12 @@ module.exports = function (options) { return } - if (isException) { - req.session = { isException: true } - logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1) - next() - return - } - if (!sessionID) { + if (isException) { + logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1) + next() + return + } logger.DebugLog(`No session ID: ${req.url}`, 'auth', 1) renderLogin(req, res) return @@ -55,7 +53,8 @@ module.exports = function (options) { req.session = { user: user, - sessionID: sessionID + sessionID: sessionID, + isException: isException } logger.DebugLog(`ID #${user.id}: ${req.url}`, 'auth', 1) diff --git a/modules/api/api.js b/modules/api/api.js index 699ffbb..fc1be82 100644 --- a/modules/api/api.js +++ b/modules/api/api.js @@ -358,8 +358,20 @@ function GetApp () { app.post('/postfeedback', function (req, res) { logger.LogReq(req) - logger.Log('New feedback message', logger.GetColor('bluebg'), true) - utils.AppendToFile(utils.GetDateString() + ':\n' + JSON.stringify(req.body), msgFile) + if (req.body.fromLogin) { + logger.Log('New feedback message from Login page', logger.GetColor('bluebg'), true) + } else { + logger.Log('New feedback message from feedback page', logger.GetColor('bluebg'), true) + } + + const ip = req.headers['cf-connecting-ip'] || req.connection.remoteAddress + const user = req.session.user + + utils.AppendToFile(utils.GetDateString() + ':\n' + JSON.stringify({ + ...req.body, + userID: user ? user.id : 'no user', + ip: ip + }), msgFile) res.json({ success: true }) }) diff --git a/modules/main/views/main.ejs b/modules/main/views/main.ejs index 11d8f43..e7a6c4e 100755 --- a/modules/main/views/main.ejs +++ b/modules/main/views/main.ejs @@ -27,7 +27,7 @@
____ __ __
/ __/_____ __ / /__ _/ / ___
diff --git a/modules/stuff/stuff.js b/modules/stuff/stuff.js
index e113197..66d7bc3 100644
--- a/modules/stuff/stuff.js
+++ b/modules/stuff/stuff.js
@@ -39,7 +39,7 @@ function GetApp () {
}
// files in public dirs
- const listedFiles = p + 'files'
+ const listedFiles = './' + p + 'files'
app.set('view engine', 'ejs')
app.set('views', [
@@ -76,7 +76,7 @@ function GetApp () {
fp.pop()
fp = fp.join('/')
}
- const fpath = './public/files' + fp
+ const fpath = listedFiles + fp
if (!fs.existsSync(fpath)) {
res.render('nofile', {
missingFile: fpath,
@@ -151,7 +151,7 @@ function GetApp () {
app.get('/*', function (req, res) {
let parsedUrl = decodeURI(req.url)
let curr = listedFiles + '/' + parsedUrl.substring('/'.length, parsedUrl.length).split('?')[0]
- let relPath = curr.substring('./public/files'.length, curr.length)
+ let relPath = curr.substring(listedFiles.length, curr.length)
if (relPath[relPath.length - 1] !== '/') { relPath += '/' }
diff --git a/sharedViews/login.ejs b/sharedViews/login.ejs
index e67458d..94128d1 100644
--- a/sharedViews/login.ejs
+++ b/sharedViews/login.ejs
@@ -155,6 +155,7 @@
function ShowFeedback () {
const form = document.getElementById('form').style.display = "none";
const feedback = document.getElementById('feedback').style.display = "block";
+ document.getElementById('text').innerText = 'Ha szeretnél választ kapni kérdésedre írd be e-mailed, vagy kattints a lenti "IRC" linkre. Jelszót lehetőleg meglévő felhasználóktól kérj! E-mail esetén válasz spam-be is érkezhet!'
}
function HandleResp (resp) {
document.getElementById('sendButton').innerText = 'Login'