PGP - PASS - QRCODING

API/QRCODE.sh

@@ -76,7 +76,7 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
 
     if [[ $PASS != "" ]]; then
         echo ${WHAT} ${VAL}
-        urldecode ${QRCODE} | tr '~' '\n' | tr '_' '+' > ~/.zen/tmp/${MOATS}/disco.aes
+        urldecode ${QRCODE} | tr '_' '+' | tr '-' '\n' | tr '~' '-'  > ~/.zen/tmp/${MOATS}/disco.aes
         sed -i '$ d' ~/.zen/tmp/${MOATS}/disco.aes
 
         echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch"

ASTROBOT/G1Voeu.sh

@@ -100,7 +100,7 @@ mkdir -p ~/.zen/tmp/$MOATS
     cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/result.png
 
     ## MAKE amzqr WITH astro:// LINK
-    amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~'  | tr '+' '_' | jq -Rr @uri)" \
+    amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc  | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" \
                 -d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \
                 -l H \
                -p ~/.zen/tmp/${MOATS}/result.png -c

tools/VISA.new.sh

@@ -210,7 +210,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
     cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png
 
     ## MAKE amzqr WITH astro:// ---- PGP LINK
-    amzqr  "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~'  | tr '+' '_' | jq -Rr @uri)" \
+    amzqr  "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc  | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" \
                 -d ~/.zen/tmp/${MOATS} \
                 -l H \
                 -p ~/.zen/tmp/${MOATS}/fond.png

www/G1PalPay/index.html

@@ -106,7 +106,7 @@ a {
     <div id="description">
         <h1><a href="javascript:history.go(-1)">(Ğ1) <span>♥Box</span> Station</a></h1><br>
         <h2>Oubliez la crise... N'attendez pas la Retraite !</h2>
-        <h2>Essayez la Monnaie Libre. Fabriquez un Monde Libre.</h2>
+        <h2>Essayez la Monnaie Libre.<br>Explorez le Monde Librement.</h2>
     </div>
 </div>
     <div id="showoff">
@@ -158,9 +158,13 @@ a {
 
       scanner.addListener('scan', function (content) {
             alert(content);
-            if (content.startsWith('-----')) {
+            if (content.startsWith('~~~~~')) {
                 // Try to decode PGP
-                var mypub = document.getElementById("resu").innerHTML.value;
+                if (document.getElementById("resu").innerHTML !== '') {
+                   var mypub = document.getElementById("resu").innerHTML.value;
+                } else {
+                    var mypub = "DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"
+                }
                 var pass = prompt("Saisir PASS:");
                 var amount = prompt("Saisir MONTANT Ğ1:");
                 var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&pay=' + amount + '&g1pub=' + mypub ;
@@ -169,9 +173,10 @@ a {
                 var myU = 'http://astroport.localhost:1234/?qrcode=' + content;
             }
             console.log(myU);
-            fetchAstroport(myU)
+            homeAstroportStation(myU, 'aframe', 5000)
+
+            // fetchAstroport(myU)
 
-            // homeAstroportStation(myU, 'aframe', 15123)
       });
 
       Instascan.Camera.getCameras().then(function (cameras) {
@@ -193,8 +198,8 @@ a {
       });
 
     </script>
-    <button id="ainfo" onclick="javascript:var x = document.getElementById('yellow'); if (x.style.visibility === 'hidden') {x.style.visibility = 'visible';} else {x.style.visibility = 'hidden';}">0/1</button>
-    <div id="yellow" >Menu
+    <h1><button id="ainfo" onclick="javascript:var x = document.getElementById('yellow'); if (x.style.visibility === 'hidden') {x.style.visibility = 'visible';} else {x.style.visibility = 'hidden';}">0/1</button></h1>
+    <div id="yellow" ><a href="_STATION_" target="aframe">Menu</a>
         <iframe name="aframe" id="aframe" src="_STATION_" width="100%" height="300px"></iframe>
     </div>