Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server

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)

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 })
   })
 

modules/main/views/main.ejs

@@ -27,7 +27,7 @@
 	</p>
 
 	<h2>
-      <a href="http://qmining.frylabs.net">
+      <a href="https://qmining.frylabs.net">
         <pre>
    ____           __     __      
   / __/_____ __  / /__ _/ /  ___ 

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 += '/' }
 

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'