From ef9a60fd7fd35c94f06378c09e70dc0722182394 Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Mon, 20 Apr 2020 14:53:49 +0200
Subject: [PATCH] Auth fix, stats script sorted output, login tip change

---
 middlewares/auth.middleware.js       |  6 ++++++
 qminingPublic/moodle-test-userscript |  2 +-
 serverStats.sh                       | 13 ++++++++-----
 sharedViews/login.ejs                |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/middlewares/auth.middleware.js b/middlewares/auth.middleware.js
index d11e606..62586ac 100644
--- a/middlewares/auth.middleware.js
+++ b/middlewares/auth.middleware.js
@@ -47,6 +47,12 @@ module.exports = function (options) {
     const user = GetUserBySessionID(userDB, sessionID, req)
 
     if (!user) {
+      if (isException) {
+        logger.DebugLog(`EXCEPTION: ${req.url}`, 'auth', 1)
+        req.session = { isException: true }
+        next()
+        return
+      }
       logger.DebugLog(`No user:${req.url}`, 'auth', 1)
       renderLogin(req, res)
       return
diff --git a/qminingPublic/moodle-test-userscript b/qminingPublic/moodle-test-userscript
index f8d4bf2..2c815c8 160000
--- a/qminingPublic/moodle-test-userscript
+++ b/qminingPublic/moodle-test-userscript
@@ -1 +1 @@
-Subproject commit f8d4bf2a414d2973582c08bfa8b8b8f19389b2e9
+Subproject commit 2c815c8d20b6c25a4214d6118760d993f2287f36
diff --git a/serverStats.sh b/serverStats.sh
index c24dee0..476e71c 100755
--- a/serverStats.sh
+++ b/serverStats.sh
@@ -15,7 +15,7 @@ G=''
 # YELLOW=''
 B=''
 P=''
-C=''
+C=''
 sep="${P}--------------------------------------------------------------------------------<=$NC"
 
 pcolumns () {
@@ -63,18 +63,21 @@ pcolumns () {
 
 function jsonStats () {
   dateind=$(date '+%Y/%m/%d')
-  b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}')
+  b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
   bc=$(cat "$1" | jq ".[\"$dateind\"] | length")
   b="\t${bc}\n${b}"
 
   dateind=$(date -d 'yesterday' '+%Y/%m/%d')
-  a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}')
+  a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
   ac=$(cat "$1" | jq ".[\"$dateind\"] | length")
   a="\t${ac}\n${a}"
 
   pcolumns $"$a" $"$b" | sed -E \
     -e "s,/getVeteranPw,${C}&${NC},g" \
-    -e "s,/getVeteranpw,${C}&${NC},g" \
+    -e "s,/getveteranpw,${C}&${NC},g" \
+    -e "s,/pwRequest,${C}&${NC},g" \
+    -e "s,/getpw,${C}&${NC},g" \
+    -e "s,/avaiblePWS,${C}&${NC},g" \
     -e "s,/pwRequest,${C}&${NC},g" \
     -e "s,/login,${C}&${NC},g" \
     -e "s,/manual,${G}&${NC},g" \
@@ -88,7 +91,6 @@ function jsonStats () {
     -e "s,/allqr,${G}&${NC},g" \
     -e "s,/legacy,${G}&${NC},g" \
     -e "s,/donate,${P}&${NC},g" \
-    -e "s,/thanks,${P}&${NC},g" \
     -e "s,/tiszai,${P}&${NC},g" \
     -e "s,/install,${P}&${NC},g" \
     -e "s,/irc,${P}&${NC},g" \
@@ -97,6 +99,7 @@ function jsonStats () {
     -e "s,/scriptgit,${P}&${NC},g" \
     -e "s,/classesgit,${P}&${NC},g" \
     -e "s,/lred,${R}&${NC},g" \
+    -e "s,/thanks,${R}&${NC},g" \
     -e "s,/isAdding,${B}&${NC},g" \
     -e "s,/ask,${B}&${NC},g"
 }
diff --git a/sharedViews/login.ejs b/sharedViews/login.ejs
index 94128d1..a697f55 100644
--- a/sharedViews/login.ejs
+++ b/sharedViews/login.ejs
@@ -155,7 +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!'
+      document.getElementById('text').innerText = 'Ha szeretnél választ kapni akkor kérdésed mellé í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'