From cb335842ca8c0b1c98ec36f58ebbd28237a5df14 Mon Sep 17 00:00:00 2001 From: fred Date: Thu, 13 Apr 2023 12:49:56 +0200 Subject: [PATCH] Do not use Wish credential (G1 prefixed Pepper) in salt API --- API/SALT.sh | 2 +- templates/register.html | 8 ++++++-- www/G1PalPay/index.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/API/SALT.sh b/API/SALT.sh index b9bfe7ce..be5b6600 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -32,7 +32,7 @@ Content-Type: text/html; charset=UTF-8 echo ">>>>>>>>>>>>>> Application LaBureautique >><< APPNAME = $APPNAME <<<<<<<<<<<<<<<<<<<<" [[ ! $SALT ]] && (echo "$HTTPCORS ERROR - SALT MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 - [[ ! $PEPPER ]] && (echo "$HTTPCORS ERROR - PEPPER MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 + [[ ! $PEPPER || ${PEPPER:0:2} == "G1" ]] && (echo "$HTTPCORS ERROR - BAD OR PEPPER MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 ## SAVE "salt" "pepper" DEBUG REMOVE OR PASS ENCRYPT FOR SECURITY REASON echo "PLAYER : \"$SALT\" \"$PEPPER\" : $APPNAME ($WHAT)" diff --git a/templates/register.html b/templates/register.html index 529ee026..57fb3495 100644 --- a/templates/register.html +++ b/templates/register.html @@ -37,7 +37,10 @@ header { width: 18%; visibility: hidden; } -#login {visibility: hidden; right: 10%;} +#login { + right: 10%; + top: 5% + } @@ -47,11 +50,12 @@ header {
+
+

BOX

-
diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index 5edf1413..1fafd326 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -199,7 +199,7 @@ a { document.getElementById("resu").innerHTML = content; var myU = 'http://astroport.localhost:1234/?qrcode=' + content; console.log(myU); - homeAstroportStation(myU, 'aframe', 5000) + homeAstroportStation(myU, 'aframe', 10000) }