albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
MrFry 2020-04-20 22:16:18 +02:00
commit 5109bf6708
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qminingPublic/moodle-test-userscript

@ -1 +1 @@
Subproject commit f8d4bf2a414d2973582c08bfa8b8b8f19389b2e9 Subproject commit 2c815c8d20b6c25a4214d6118760d993f2287f36

13
serverStats.sh
View file

@ -15,7 +15,7 @@ G=''
# YELLOW='' # YELLOW=''
B='' B=''
P='' P=''
C='' C=''
sep="${P}--------------------------------------------------------------------------------<=$NC" sep="${P}--------------------------------------------------------------------------------<=$NC"
pcolumns () { pcolumns () {
@ -63,18 +63,21 @@ pcolumns () {
function jsonStats () { function jsonStats () {
dateind=$(date '+%Y/%m/%d') 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") bc=$(cat "$1" | jq ".[\"$dateind\"] | length")
b="\t${bc}\n${b}" b="\t${bc}\n${b}"
dateind=$(date -d 'yesterday' '+%Y/%m/%d') 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") ac=$(cat "$1" | jq ".[\"$dateind\"] | length")
a="\t${ac}\n${a}" a="\t${ac}\n${a}"
pcolumns $"$a" $"$b" | sed -E \ 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,/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,/pwRequest,${C}&${NC},g" \
-e "s,/login,${C}&${NC},g" \ -e "s,/login,${C}&${NC},g" \
-e "s,/manual,${G}&${NC},g" \ -e "s,/manual,${G}&${NC},g" \
@ -88,7 +91,6 @@ function jsonStats () {
-e "s,/allqr,${G}&${NC},g" \ -e "s,/allqr,${G}&${NC},g" \
-e "s,/legacy,${G}&${NC},g" \ -e "s,/legacy,${G}&${NC},g" \
-e "s,/donate,${P}&${NC},g" \ -e "s,/donate,${P}&${NC},g" \
-e "s,/thanks,${P}&${NC},g" \
-e "s,/tiszai,${P}&${NC},g" \ -e "s,/tiszai,${P}&${NC},g" \
-e "s,/install,${P}&${NC},g" \ -e "s,/install,${P}&${NC},g" \
-e "s,/irc,${P}&${NC},g" \ -e "s,/irc,${P}&${NC},g" \
@ -97,6 +99,7 @@ function jsonStats () {
-e "s,/scriptgit,${P}&${NC},g" \ -e "s,/scriptgit,${P}&${NC},g" \
-e "s,/classesgit,${P}&${NC},g" \ -e "s,/classesgit,${P}&${NC},g" \
-e "s,/lred,${R}&${NC},g" \ -e "s,/lred,${R}&${NC},g" \
-e "s,/thanks,${R}&${NC},g" \
-e "s,/isAdding,${B}&${NC},g" \ -e "s,/isAdding,${B}&${NC},g" \
-e "s,/ask,${B}&${NC},g" -e "s,/ask,${B}&${NC},g"
} }

2
sharedViews/login.ejs
View file

@ -161,7 +161,7 @@
function ShowFeedback () { function ShowFeedback () {
const form = document.getElementById('form').style.display = "none"; const form = document.getElementById('form').style.display = "none";
const feedback = document.getElementById('feedback').style.display = "block"; 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) { function HandleResp (resp) {
document.getElementById('sendButton').innerText = 'Login' document.getElementById('sendButton').innerText = 'Login'