diff --git a/12345.sh b/12345.sh
index 5128be4e..fa8f12b2 100755
--- a/12345.sh
+++ b/12345.sh
@@ -46,13 +46,14 @@ Content-Type: text/html; charset=UTF-8
echo "_________________________________________________________ $(date)"
echo "LAUNCHING Astroport API Server - TUBE : $LIBRA - "
echo
-echo "OPEN GCHANGE ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub"
+echo "GCHANGE ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub"
echo "OPEN TW ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=astro"
-echo "CREATE PLAYER ON GW : ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=totodu56@yopmail.com"
-echo
echo "GCHANGE MESSAGING ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&messaging"
+echo "CREATE SAME PLAYER : ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=totodu56@yopmail.com"
echo
-echo "VIDEO URL COPY ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&CopierYoutube=https://"
+echo "NEW PLAYER : ${myHTTP}${myHOST}:1234/?salt=${RANDOM}&pepper=${RANDOM}&g1pub=on&email=astro${RANDOM}@yopmail.com"
+echo
+echo "BunkerBOX : ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=_URL_&email=totodu56@yopmail.com"
echo
echo "TESTCRAFT ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&testcraft=on&nodeid=12D3KooWK1ACupF7RD3MNvkBFU9Z6fX11pKRAR99WDzEUiYp5t8j&dataid=QmPXhrqQrS1bePKJUPH9cJ2qe4RrNjaJdRXaJzSjxWuvDi"
echo "_________________________________________________________"
diff --git a/20h12.process.sh b/20h12.process.sh
index 1f13e31b..9401e2fe 100755
--- a/20h12.process.sh
+++ b/20h12.process.sh
@@ -68,7 +68,7 @@ end=`date +%s`
echo "20H12 (♥‿‿♥) Execution time was "`expr $end - $start` seconds.
## MAIL LOG : support@qo-op.com
-$MY_PATH/tools/mailjet.sh "support@qo-op.com" "/tmp/20h12.log.txt"
+$MY_PATH/tools/mailjet.sh "support@qo-op.com" "/tmp/20h12.log"
espeak "Byte Storm Over" > /dev/null 2>&1
diff --git a/start.sh b/start.sh
index e1d2b80b..172c6b2d 100755
--- a/start.sh
+++ b/start.sh
@@ -20,8 +20,10 @@ killall 12345.sh; killall "_12345.sh"; killall nc
mkdir -p ~/.zen/tmp
~/.zen/Astroport.ONE/12345.sh > ~/.zen/tmp/12345.log &
+sleep 1
echo "HTTP API : http://$myIP:1234"
-echo "MONITORING : tail -f ~/.zen/tmp/12345.log"
+cat ~/.zen/tmp/12345.log
+echo "API DEBUG : tail -f ~/.zen/tmp/12345.log"
###################################################
echo '
@@ -48,8 +50,8 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
echo 'PRESS ENTER... '; read
## CREATE AND OR CONNECT USER
- PS3='Créez votre VISA PLAYER ou connectez-vous avec un compte Astronaute ___ '
- players=("NOUVEAU VISA" "IMPORT GCHANGE" $(ls ~/.zen/game/players 2>/dev/null))
+ PS3='Astronaute connectez votre PLAYER ___ '
+ players=("NOUVEAU VISA" "IMPORT PLAYER" $(ls ~/.zen/game/players 2>/dev/null))
## MULTIPLAYER
select fav in "${players[@]}"; do
@@ -60,10 +62,10 @@ echo 'PRESS ENTER... '; read
echo "Astronaute $fav bienvenue dans le jeu de terraformation forêt jardin MadeInZion"
exit
;;
- "IMPORT GCHANGE")
- echo "'Identifiant Gchange'"
+ "IMPORT PLAYER")
+ echo "'Identifiant'"
read SALT
- echo "'Mot de passe Gchange'"
+ echo "'Mot de passe'"
read PEPPER
echo "'Adresse Email'"
read EMAIL
diff --git a/templates/register.html b/templates/register.html
index 5ef22166..a7e5f94d 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -47,7 +47,7 @@ html {
Associez 2 phrases clefs et votre adresse email
Phrase 1 :
Phrase 2 :
- Lien :
+ URL :
Email -
diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh
index 1dbe93b8..92ee7fad 100755
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@@ -254,7 +254,7 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
# composite -compose Over -gravity NorthWest -geometry +280+280 ~/.zen/game/players/.current/QRsec.png /tmp/one.png /tmp/image.png
convert -gravity northwest -pointsize 35 -fill black -draw "text 50,300 \"$PSEUDO\"" /tmp/one.png /tmp/image.png
- convert -gravity northwest -pointsize 30 -fill black -draw "text 300,40 \"$PLAYER\"" /tmp/image.png /tmp/pseudo.png
+ convert -gravity northwest -pointsize 25 -fill black -draw "text 300,40 \"$PLAYER\"" /tmp/image.png /tmp/pseudo.png
convert -gravity northeast -pointsize 25 -fill black -draw "text 20,180 \"$PASS\"" /tmp/pseudo.png /tmp/pass.png
convert -gravity northwest -pointsize 25 -fill black -draw "text 300,100 \"$SALT\"" /tmp/pass.png /tmp/salt.png
convert -gravity northwest -pointsize 25 -fill black -draw "text 300,140 \"$PEPPER\"" /tmp/salt.png ~/.zen/game/players/$PLAYER/ID.png
diff --git a/tools/mailjet.sh b/tools/mailjet.sh
index 0da17688..e8047fae 100755
--- a/tools/mailjet.sh
+++ b/tools/mailjet.sh
@@ -15,18 +15,21 @@ echo '
# \\///
# qo-op
############# '$MY_PATH/$ME'
-########################################################################
-# SEND EMAIL FORGE IT YOUR WAY
########################################################################'
### PLEASE CHANGE YOUR DOMAIN AND KEY ( OR HELP PAYING TRAFIC ;)
## THIS IS A FREE LIMITED ACCOUNT. DO NOT EXAGERATE ;)
mail="$1" # EMAIL DESTINATAIRE
-messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGE
-
[[ ! $1 ]] && mail="support@qo-op.com"
+messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGE
+
+echo '
+########################################################################
+# EMAIL $messfile TO $mail
+########################################################################'
+
SUBJECT="[(♥‿‿♥)] Message Station Astroport : $(hostname)"
-MESSAGE="( ◕‿◕)\n\n Bonjour $PLAYER\n\n\n Activez votre TW https://astroport.copylaradio.com .\n\nAstroport\n($IPFSNODEID)"
+MESSAGE="( ◕‿◕)\n\n Bonjour $PLAYER\n\n\n https://astroport.copylaradio.com .\n\nAstroport\n($IPFSNODEID)"
echo "From: support@g1sms.fr
To: EMAIL
@@ -34,7 +37,7 @@ Bcc: support@qo-op.com
Subject: SUBJECT
MESSAGE
" > ~/.zen/tmp/email.txt
-[[ $messfile && -f $messfile ]] && [[ $(file --mime-type -b $messfile) == 'text/plain' ]] && cat $messfile >> ~/.zen/tmp/email.txt
+[[ ! -s $messfile ]] && [[ $(file --mime-type -b $messfile) == 'text/plain' ]] && cat $messfile >> ~/.zen/tmp/email.txt
cat ~/.zen/tmp/email.txt | sed "s~EMAIL~${mail}~g" | sed "s~SUBJECT~${SUBJECT}~g" | sed "s~MESSAGE~${MESSAGE}~g" | ssmtp -v ${mail}