diff --git a/g1sms/functions.sh b/g1sms/functions.sh index 4b3573d..a9d1e19 100755 --- a/g1sms/functions.sh +++ b/g1sms/functions.sh @@ -143,17 +143,16 @@ function sms_uid2key (){ fi # Search fo duplicate - DUP=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms/*/_uidname 2>/dev/null | cut -f 6 -d '/') - if [[ "$DUP" != "" && "$DUP" != "$PHONE" ]]; then - sms_SEND "$ADMINPHONE" "ADMIN! INFO: $PHONE prend le même $ASKWALLET, que $DUP" - sms_SEND "$DUP" "Vous devez savoir que $ASKWALLET est associé à un autre téléphone que le votre également!" - fi ########################################################### # FIND ASKWALLET into wallets, wallest_swarm OR duniter (silkaj) DESTMEM="$VIRDEST" # SEARCH IN WALLETS LOCAL=$(grep -Rwl "$ASKWALLET" /home/$YOU/.zen/g1sms/*/_uidna 2>/dev/null | cut -f 6 -d '/') + if [[ "$LOCAL" != "" && "$LOCAL" != "$PHONE" ]]; then + sms_SEND "$ADMINPHONE" "ADMIN! INFO: $PHONE prend le même $ASKWALLET, que $LOCAL" + sms_SEND "$LOCAL" "Sachez que $ASKWALLET est associé à un autre téléphone que le votre également!" + fi if [[ "$LOCAL" != "" ]]; then # LOCAL G1sms account DESTRIB=$(cat /home/$YOU/.zen/g1sms/$LOCAL/_pub) diff --git a/g1sms/sms_ASTROPORT.sh b/g1sms/sms_ASTROPORT.sh index d83eaf6..6a2cf06 100755 --- a/g1sms/sms_ASTROPORT.sh +++ b/g1sms/sms_ASTROPORT.sh @@ -40,11 +40,13 @@ Love Land ENTRANCE CHECKING # /home/$YOU/.zen/astroport/zen/ipfs_SWARM_refresh.sh +# CHECK FOR request from loveland home page for hashfile in /tmp/loveland_entrance/*; do [[ ! -f $hashfile ]] && continue PP=$(cat $hashfile) PHONE=$(echo $PP | cut -d '|' -f 1) + # CHECK FOR PHONE NUMBER COHERENCE [[ ! ${#PHONE} -eq 12 ]] && exit 1 [[ ! ${PHONE:3:1} == "6" && ! ${PHONE:3:1} == "7" ]] && exit 1 diff --git a/www/LOVELand/g1sms/code_sms.php b/www/LOVELand/g1sms/code_sms.php index 0050c64..00dcee8 100644 --- a/www/LOVELand/g1sms/code_sms.php +++ b/www/LOVELand/g1sms/code_sms.php @@ -1,7 +1,7 @@