From 8b38684668903c3fb2e55708f5b05f0af16a7a08 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 24 Nov 2023 03:44:01 +0100
Subject: [PATCH] =?UTF-8?q?=E1=BA=90en=20UPlanet=20stage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 G1BILLETS.sh     | 12 ++++++------
 MAKE_G1BILLET.sh | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index 4a4bc02..e239123 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -67,20 +67,20 @@ if [[ $MONTANT != "daemon" ]]; then
     [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/fond.jpg- EXIT" && echo $ERROR && exit 1
     [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/logo.png ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/logo.png- EXIT" && echo $ERROR && exit 1
 
-    ## THIS IS THE PASS for ZENCARD
-    UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
-    [ $DICE -gt 4 ] && UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
-    [ $DICE -gt 6 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${RANDOM}${RANDOM}" | tail -c-7)
-
     # CREATION DE $NBbillets BILLETS DE $MONTANT DU
     boucle=0;
     while [ $boucle -lt $NBbillets ]
     do
         boucle=$((boucle+1))
+        ## THIS IS THE PASS for ZENCARD
+        UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
+        [ $DICE -gt 4 ] && UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
+        [ $DICE -gt 6 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${RANDOM}${RANDOM}" | tail -c-7)
+
         mkdir -p "${MY_PATH}/tmp/g1billet/${UNIQID}"
 
         ## ADAPT SECURITY LEVEL
-        [[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1=$(${MY_PATH}/diceware.sh $DICE | xargs)
+        [[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1="${UNIQID} $(${MY_PATH}/diceware.sh $DICE | xargs)"
         [[ ${SECRET2} == "" || $boucle -gt 1 ]] && SECRET2=$(${MY_PATH}/diceware.sh $DICE | xargs)
         echo "${SECRET1}" "${SECRET2}"
         # CREATION CLEF BILLET
diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index a06a922..928defe 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -103,6 +103,8 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
     rm ${MY_PATH}/tmp/topgp ## CLEANING CACHE
 
     DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )"
+    [[ ${STYLE} == "UPlanet" ]] && DISCO="$(cat ~/.zen/tmp/${MOATS}/gpg.asc  | tr '-' '&' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )" ## & ẑencard = (email/8digit)+4digit ## CALLED FROM VISA.new
+
     echo "$DISCO"
 
     ## Put astrologo_nb in QRCode
@@ -165,6 +167,10 @@ fi
                          && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \
                                     && BOTTOM="$(date) :: ♥Box :: ZENCARD+TW :: $(hostname) ::"
 
+        [[ "${STYLE}" == "UPlanet" ]] \
+                         && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png ${MY_PATH}/tmp/g1billet/${UNIQID}/CENTER.png \
+                                    && BOTTOM="$(date) :: ♥UPLANET :: ZENCARD+TW :: $(hostname) ::"
+
         if [[ "${STYLE:0:1}" == "@" || "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] ; then
             #~ ########################## G1Voeu _ G1BILLET  linking ##
                                        ## Astroport.ONE LINKING :: STYLE=EMAIL :: ZENCARD+@
@@ -246,7 +252,12 @@ composite -compose Over -gravity Center -geometry +30+40 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 
 # G1PUB QR CODE RIGHT
-qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
+[[ -s ${HOME}/.zen/Astroport.ONE/images/zenticket.png ]] \
+&& amzqr "${NOTERIB}:ZEN" -l H -p "${HOME}/.zen/Astroport.ONE/images/zenticket.png" -c -n QR.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/ \
+&& convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QR.png -resize 250 ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png \
+&& rm ${MY_PATH}/tmp/g1billet/${UNIQID}/QR.png \
+|| qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB:ZEN"
+
 # AJOUT DU G1PUB QRCODE A DROITE DU BILLET
 composite -compose Over -gravity SouthEast -geometry +35+50 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" \