From 1c46253d38949c7f0c2038c032a06b2ff23472d6 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Wed, 13 May 2020 13:03:56 +0200
Subject: [PATCH] good morning

---
 0.sms.command.sh            | 31 -------------------------------
 g1sms/cron_VIR.recurrent.sh |  2 +-
 g1sms/functions.sh          |  2 +-
 g1sms/sms_AUTH.sh           | 14 ++++++++++----
 g1sms/sms_BILLET.sh         |  2 +-
 g1sms/sms_BILLETCHK.sh      |  4 ++--
 g1sms/sms_BILLET_MAKE.sh    | 33 ++++++++++++++++++---------------
 g1sms/sms_COUNT.sh          |  2 +-
 g1sms/sms_EMAIL.sh          |  4 ++--
 g1sms/sms_NEW.sh            |  2 +-
 g1sms/sms_PAY.sh            |  6 +++---
 g1sms/sms_REC.sh            |  4 ++--
 g1sms/sms_SETUNIT.sh        |  2 +-
 g1sms/sms_VIR.sh            |  4 ++--
 g1sms/sms_WHERE.sh          |  2 +-
 www/LOVELand/ajax.php       |  2 +-
 www/LOVELand/ajaxform.js    |  4 ++--
 www/LOVELand/index.html     |  8 --------
 zen/zen_PASSENGER_READ.sh   |  2 +-
 19 files changed, 50 insertions(+), 80 deletions(-)
 delete mode 100755 0.sms.command.sh

diff --git a/0.sms.command.sh b/0.sms.command.sh
deleted file mode 100755
index b345ecd..0000000
--- a/0.sms.command.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-# Author: Fred (support@qo-op.com)
-# Version: 0.2
-# License: GPL (http://www.google.com/search?q=GPL)
-################################################################################
-# READ /tmp/sms.commands and RUN it.. TODO, add keys for security ;)
-#################################################################################
-# RECEIVE COMMAND FROM ./www/LOVELand/g1billet/zen_sms.php
-#<?php 
-#header("Access-Control-Allow-Origin: *");
-#if (strlen($_REQUEST['num']) == 10 ) {
-#	$newNumber = preg_replace('/^0?/', '+33', $_REQUEST['num']);
-#	$data = '"'.$newNumber.'" "'.$_REQUEST['val'].'"'.PHP_EOL;
-#	$fp = fopen('/tmp/sms.commands', 'a');
-#	fwrite($fp, $data);
-#} else {
-#	return false;
-#}
-#?>
-MY_PATH="`dirname \"$0\"`"              # relative
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
-
-# tail -fn 1 /tmp/sms.commands | while read -r line
-for line in $(cat /tmp/sms.commands)
-do
-	if [[ $line != "" ]]; then
-		mycmd="$MY_PATH/g1sms/sms_AUTH.sh $line"
-		echo "RUN: $mycmd" > /tmp/sms.commmand.result
-		eval "$mycmd" >> /tmp/sms.commmand.result
-	fi
-done
-[[ -f /tmp/sms.commands ]] && echo "" > /tmp/sms.commands
diff --git a/g1sms/cron_VIR.recurrent.sh b/g1sms/cron_VIR.recurrent.sh
index 732f8ea..f9c7353 100755
--- a/g1sms/cron_VIR.recurrent.sh
+++ b/g1sms/cron_VIR.recurrent.sh
@@ -45,7 +45,7 @@ while read line
 
         sms_INIT_ACCOUNT "$PHONE" "NOSMS"
 
-        duniter_server=$(./tools/duniter_getnode.sh)
+        duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
         PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $REF / $NB" -y)
         if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
             sms_ERROR "$PHONE" "Problème Virement. $PAY";
diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index aff330b..4f96bb7 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -266,7 +266,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         #######################
 		# GIVE NAME TO WALLET
         #######################
-        # 4 derniers chiffres du numéro de téléphone
+        # 6 derniers chiffres du numéro de téléphone (login > 8 char)
         TAIL=${PHONE:6:6}
         # No UIDNA yet. Create new
         UIDNA=$(/home/$YOU/.zen/astroport/zen/tools/diceware.sh 1 | xargs)
diff --git a/g1sms/sms_AUTH.sh b/g1sms/sms_AUTH.sh
index 67f0eb2..1e6570c 100755
--- a/g1sms/sms_AUTH.sh
+++ b/g1sms/sms_AUTH.sh
@@ -1,9 +1,15 @@
 #!/bin/bash
-################################################################################
+########################################################################
 # Author: Fred (support@qo-op.com)
 # Version: 0.1
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-################################################################################
+########################################################################
+# CHECK ACCOUNT if enough for G1BILLETS CREATION
+########################################################################
+# zen_sms.php write "NUMBER" "AMOUNT" into /tmp/sms.commands
+# sms_AUTH_command.sh (cron) IS GETTING then CALL this script. 
+# OK: RETURN PIN and RECORD "/tmp/$PHONE.PIN.auth" for Double AUTH
+########################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
@@ -38,7 +44,7 @@ if [[ "$testmin" -eq "1" ]]
 then
 	mess="CODE: $SMSPIN
 A saisir pour vous authentifier...
-[G1] Zen Astroport Satellite #$(cat /etc/hostname)"
+[G1] Zen Astroport Station #$(cat /etc/hostname)"
 	# Send response SMS
 	sms_SEND "$PHONE" "$mess"
 	echo $SMSPIN > /tmp/$PHONE.PIN.auth
@@ -50,7 +56,7 @@ Insuffisant (minimum $VIR G1 + $LIMIT G1)"
 	echo "Minimum $VIR G1 + $LIMIT G1"
 fi
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 log "__SUB:sms_AUTH.sh: END sms_AUTH.sh "
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLET.sh b/g1sms/sms_BILLET.sh
index e141764..1c49d50 100755
--- a/g1sms/sms_BILLET.sh
+++ b/g1sms/sms_BILLET.sh
@@ -179,7 +179,7 @@ Insuffisant pour créer $NBbillets billet(s) de $VALbillet $UNIT
 https://g1.duniter.fr/api/#/v1/payment/$PUBKEY?amount=$VIR"	
 fi
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
 
 log "__SUB:sms_BILLET.sh: END sms_BILLET.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLETCHK.sh b/g1sms/sms_BILLETCHK.sh
index 9013b11..ef2fbd2 100755
--- a/g1sms/sms_BILLETCHK.sh
+++ b/g1sms/sms_BILLETCHK.sh
@@ -57,7 +57,7 @@ https://www.g1sms.fr/contact"
 
         echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/note.dunikey" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1billets/$bpath/note.dunikey.IPFSPrivKey.gpg"
 
-        duniter_server=$(./tools/duniter_getnode.sh)
+        duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
         PAY=$(silkaj -p "$duniter_server" -af --file /tmp/note.dunikey tx --output "$PUBKEY" --amount "$AMOUNTG1" --comment "[G1sms+] $NODE_G1PUBKEY:RAZ:$CODE" -y)
         if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" ]]; then
 			# DESTROY BILLET 
@@ -85,7 +85,7 @@ else
 	sms_SEND "$PHONE" "BILLET \"$CODE\" INCONNU !!"
 fi
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 log "END sms_BILLETCHK.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_BILLET_MAKE.sh b/g1sms/sms_BILLET_MAKE.sh
index 0445f79..e73d1e2 100755
--- a/g1sms/sms_BILLET_MAKE.sh
+++ b/g1sms/sms_BILLET_MAKE.sh
@@ -7,15 +7,18 @@
 # Make Billet fabrique l'image de 6 billets de monnaie libre
 # Date de validité de 6 mois à compter du premier jour du mois courant
 ############################################################################
-# !!!! INSTALLER convert et qrencode: sudo apt install imagemagick qrencode
+# !!!! INSTALLER sudo apt install imagemagick qrencode ssmtp mpack
 # IMPRIMANTE (http://smspi:631/) : sudo apt install printer-driver-all cups
 # https://junise.wordpress.com/2015/04/12/install-online-cups-printer-in-raspberry-pi/
 ############################################################################
 # TEST:
 # ./sms_BILLET_MAKE.sh "nu me ro test" "se cr et" 100 LOVE 10.04 "https://g1sms.fr" G1SMS TEST
 ############################################################################
-source "./init.sh"
-source "./functions.sh"
+MY_PATH="`dirname \"$0\"`"              # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+
+source $MY_PATH/init.sh
+source $MY_PATH/functions.sh
 
 NUMERO="$1"
 SECRET="$2"
@@ -50,15 +53,15 @@ valid="0${valid:0:2}"
 
 # ADD Avatar on G1 Logo SouthEast
 if [[ $(file "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" | grep 'PNG') ]]; then
-    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" "./Oeuro.jpg" "/tmp/$NUMERO.jpg"
+    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" "$MY_PATH/Oeuro.jpg" "/tmp/$NUMERO.jpg"
     composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "/home/$YOU/.zen/g1sms_wallets/$PHONE/_avatar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
 else
-    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "./G1Anar.png" "./Oeuro.jpg" "/tmp/$NUMERO.jpg"
-    composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "./G1Anar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
+    composite -compose Over -gravity East -geometry +15+0 -dissolve 33% "$MY_PATH/G1Anar.png" "$MY_PATH/Oeuro.jpg" "/tmp/$NUMERO.jpg"
+    composite -compose Over -gravity West -geometry +15+0 -dissolve 33% "$MY_PATH/G1Anar.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
 fi
 
 # Add G1Billet_LOVE.png logo (250px)
-composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "./G1Billet_LOVE.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
+composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "$MY_PATH/G1Billet_LOVE.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
 
 # Prepare BILLET qrcode verification URL
 qrencode -s 3 -o "/tmp/$NUMERO_NOTERIB.png" "$NOTERIB"
@@ -70,28 +73,28 @@ composite -compose Over -gravity NorthEast -geometry +50+25 "/tmp/$NUMERO_NOTERI
 # Add June logo
 case "$MONTANT" in
 	10)
-		convert "./g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	20)
-		convert "./g1.png" -fuzz 20% -fill green -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill green -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	50)
-		convert "./g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	100)
-		convert "./g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	200)
-		convert "./g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	500)
-		convert "./g1.png" -fuzz 20% -fill red -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill red -opaque '#e5912b' "/tmp/g1.png"
 		;;
 	1000)
-		convert "./g1.png" -fuzz 20% -fill black -opaque '#e5912b' "/tmp/g1.png"
+		convert "$MY_PATH/g1.png" -fuzz 20% -fill black -opaque '#e5912b' "/tmp/g1.png"
 		;;		
 	*)
-		cp "./g1.png" "/tmp/g1.png"
+		cp "$MY_PATH/g1.png" "/tmp/g1.png"
 		;;
 esac
 composite -compose Over -gravity SouthEast -geometry +20+20  -dissolve 90% "/tmp/g1.png" "/tmp/$NUMERO.jpg" "/tmp/$NUMERO.jpg"
diff --git a/g1sms/sms_COUNT.sh b/g1sms/sms_COUNT.sh
index e4d584b..47dd40a 100755
--- a/g1sms/sms_COUNT.sh
+++ b/g1sms/sms_COUNT.sh
@@ -74,7 +74,7 @@ else
 	echo $AMOUNTG1
 fi
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 log "END sms_COUNT.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh
index b4d46d6..484d057 100755
--- a/g1sms/sms_EMAIL.sh
+++ b/g1sms/sms_EMAIL.sh
@@ -41,7 +41,7 @@ fi
 SUBJECT="[G1sms+] $MEMBER, Message de votre portefeuille monnaie libre $UIDNA ($PHONE)"
 MESSAGE="Bonjour $MEMBER\n\nVotre porte-monnaie G1sms $UIDNA ($PHONE) a choisi votre email comme contact.\nPour commander vos G1Billets, envoyez par SMS à $MASTERPHONE :\nBILL 10/20/50/100/200/500/1000\n\n\nA bientot <3\n$ADMINPSEUDO ($ADMINPHONE)"
 cat ./email.txt | sed s/EMAIL/"${mail}"/g | sed s/SUBJECT/"${SUBJECT}"/g | sed s/MESSAGE/"${MESSAGE}"/g | ssmtp ${mail}
-mpack -s "[G1sms+] $PHONE, $UIDNA :: Envoyer 'BILL nnn' à $MASTERPHONE pour fabriquer des G1Billets (ci-joint exemple de verso)" ./Dos_G1Billets.odt ${mail}
+mpack -s "[G1sms+] $PHONE, $UIDNA :: Envoyer 'BILL nnn' à $MASTERPHONE pour fabriquer des G1Billets (ci-joint exemple de verso)" $MY_PATH/Dos_G1Billets.odt ${mail}
 
 log "__SUB:sms_EMAIL.sh.sh: Send welcome EMAIL to $mail via ssmtp"
 
@@ -52,7 +52,7 @@ Mettez le à jour, si cela est nécessaire..."
 
 sms_SEND "$phone" "$mess"
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 log "END sms_EMAIL.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh
index 7b94e95..b82ea02 100755
--- a/g1sms/sms_NEW.sh
+++ b/g1sms/sms_NEW.sh
@@ -56,7 +56,7 @@ sms_SEND "$PHONE" "$PUBKEY"
 [[ $MEMRIB != "" ]] && sms_SEND "$PHONE" "Compte Atttaché: $MEMBER $SMSEMAIL
 $MEMRIB"
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 # Add contact to database (TODO REFRESH Member Name in SQL)
 add_contact $PHONE $MEMBERUID && log "${c_green}Contact has been added to database$c_" || log "${c_red}Contact can't be added to database$c_"
diff --git a/g1sms/sms_PAY.sh b/g1sms/sms_PAY.sh
index a1d5d74..2866bc2 100755
--- a/g1sms/sms_PAY.sh
+++ b/g1sms/sms_PAY.sh
@@ -53,7 +53,7 @@ else
    	UNITDEST="$UNIT"
 fi
 
-duniter_server=$(./tools/duniter_getnode.sh)
+duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
 # Payement
 PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$PUBKEYDEST" --amount "$VIR" --comment "[G1sms+] PAY" -y)
 if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
@@ -88,8 +88,8 @@ Envoyez D pour (D)étail.
 A pour (A)ide..."
 sms_SEND "$PHONEDEST" "$mess_dest"
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONEDEST ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONEDEST
-[[ -f /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONEDEST ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONEDEST
+[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
 
 log "__SUB:sms_PAY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~ "
 exit
diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh
index dbce1e1..eb1705b 100755
--- a/g1sms/sms_REC.sh
+++ b/g1sms/sms_REC.sh
@@ -111,7 +111,7 @@ fi
 
 # ADD DATES TO VIREMENTS
 if [[ "$DESTRIB" != "" ]]; then
-    duniter_server=$(./tools/duniter_getnode.sh)
+    duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
     log "__SUB:sms_REC.sh: TRAITEMENT DU VIREMENT DE $AMOUNT $UNIT = 1ER VIREMENT de $VIR G1 vers $VIRDEST ($DESTRIB) $TIME FOIS. OK..."
     PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] REC 1/$TIME ($PERIOD)" -y)
 	if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then
@@ -162,7 +162,7 @@ $DESTRIB"
 		sms_SEND "$DESTPHONE" "[G1sms+] Bonjour $DESTMEM. Vous recev(r)ez un payement de $VIR G1 (pendant $TIME $PERIOD) de la part du portefeuille: $MEMBER $UIDNA."
 	fi
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 else
 	log "__SUB:sms_REC.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND"
diff --git a/g1sms/sms_SETUNIT.sh b/g1sms/sms_SETUNIT.sh
index da422c8..6090be3 100755
--- a/g1sms/sms_SETUNIT.sh
+++ b/g1sms/sms_SETUNIT.sh
@@ -39,7 +39,7 @@ Unité de votre portefeuille: $unit"
 
 sms_SEND "$phone" "$mess"
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
+[[ -d /home/$YOU/.zen/g1sms_wallets/$phone ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone
 
 log "END sms_SETUNIT.sh"
 log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh
index 85b1c98..29966f6 100755
--- a/g1sms/sms_VIR.sh
+++ b/g1sms/sms_VIR.sh
@@ -80,7 +80,7 @@ fi
 
 
 if [[ "$DESTRIB" != "" ]]; then
-    duniter_server=$(./tools/duniter_getnode.sh)
+    duniter_server=$($MY_PATH/tools/duniter_getnode.sh)
     PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $VIR G1" -y)
 	if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" ]]; then
 		log "__SUB:sms_VIR.sh: VIREMENT VERS $DESTMEM OK"
@@ -95,7 +95,7 @@ $PAY"
         sms_SEND "$ADMINPHONE" "$PAY";        
 	fi
     
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
     
 else
 	log "__SUB:sms_VIR.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND"
diff --git a/g1sms/sms_WHERE.sh b/g1sms/sms_WHERE.sh
index f4e3c84..c3f4f2d 100755
--- a/g1sms/sms_WHERE.sh
+++ b/g1sms/sms_WHERE.sh
@@ -49,7 +49,7 @@ $(cat /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_where)"
 
 sms_SEND "$PHONE" "$mess"
 
-[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
+[[ -d /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && [[ $(whoami) == "root" ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE
 
 
 log "__SUB:sms_WHERE.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
diff --git a/www/LOVELand/ajax.php b/www/LOVELand/ajax.php
index b3821b2..ee4c1b4 100644
--- a/www/LOVELand/ajax.php
+++ b/www/LOVELand/ajax.php
@@ -1,6 +1,6 @@
 <?php
 $to = "support@qo-op.com"; // Your email address
-$subject = "Astroport Home Contact";
+$subject = "Astroport Web Contact";
 
 if (isset($_REQUEST['phone'])) $phone = $_REQUEST['phone']; else $phone = "";
 if (isset($_REQUEST['email'])) $email = $_REQUEST['email']; else $email = "";
diff --git a/www/LOVELand/ajaxform.js b/www/LOVELand/ajaxform.js
index 0674bce..82586ce 100644
--- a/www/LOVELand/ajaxform.js
+++ b/www/LOVELand/ajaxform.js
@@ -9,10 +9,10 @@ jQuery(document).ready(function () {
         var phone = jQuery("#phone");
         var data = '';
         // ajax call to ajax.php
-        jQuery.getJSON("ajax.php", {
+        jQuery.getJSON("zen_loveland_entrance.php", {
             phone: phone.val()
         }, function (data) {
-           $("#phoneresultat").html("<p>Votre Compte Ḡ1 est Ouvert... Vous allez recevoir un SMS pour finaliser votre inscription.</p>");
+           $("#phoneresultat").html("<p>Votre inscription en prise en compte...</p>");
         });
     });
 	
diff --git a/www/LOVELand/index.html b/www/LOVELand/index.html
index 15fd1b3..65cf10a 100644
--- a/www/LOVELand/index.html
+++ b/www/LOVELand/index.html
@@ -228,15 +228,7 @@
         });
     });
     </script>
-<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-114787603-1"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
 
-  gtag('config', 'UA-114787603-1');
-</script>
 <script>
   var typed = new Typed('#typed', {
     stringsElement: '#typed-strings',
diff --git a/zen/zen_PASSENGER_READ.sh b/zen/zen_PASSENGER_READ.sh
index 587951b..4ffc1d9 100755
--- a/zen/zen_PASSENGER_READ.sh
+++ b/zen/zen_PASSENGER_READ.sh
@@ -69,4 +69,4 @@ if [[ ! -d ~/.zen/tag/$RAAH ]]; then
 fi
 
 
-./shell/tag_OP.sh ${obj[1]} ${obj[0]} $COMBIENZEN "$SWARM_G1AUTHFILE"
+$MY_PATH/shell/tag_OP.sh ${obj[1]} ${obj[0]} $COMBIENZEN "$SWARM_G1AUTHFILE"