axiom-team
/
G1sms
7
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Add contact to database when wallet is created. Remove contact from database where wellet is destroyed

This commit is contained in:
poka 2019-12-17 20:02:40 +01:00
parent 5163a4cb26
commit d34559ff5e
5 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
debug/GSM_POWERKEY.py → GSM_POWERKEY.py
View File

0
debug/GSM_powerkey.sh → GSM_powerkey.sh
View File

42
shell/functions.sh
View File

@ -614,3 +614,45 @@ function move_g1cents (){
# UPDATE MY new ./wallet STATUS to SWARM
I=$(ipfs_node_wallets_add)
}
#################################################################################################################################
# Contact database management
function add_contact(){
userDB="gammu"
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
local sql="mysql -u$userDB -p$pwdDB gammu -e"
local MEMBERUID=$1
local PHONE=$2
local reqPhoneExist="SELECT * FROM pbk WHERE Number=$PHONE"
if [[ -z $($sql "$reqPhoneExist") ]]; then
local reqAddContact="INSERT INTO pbk (GroupID, Name, Number, id_user, is_public) VALUES ('-1', '$MEMBERUID', '$PHONE', '1', 'false')"
$sql "$reqAddContact" || exit 1
else
log "${red}Contact already exist$c_"
fi
}
function rm_contact(){
userDB="gammu"
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
local sql="mysql -u$userDB -p$pwdDB gammu -e"
local MEMBERUID=$1
local PHONE=$2
local reqPhoneExist="SELECT * FROM pbk WHERE Number=$PHONE"
if [[ ! -z $($sql "$reqPhoneExist") ]]; then
local reqRmContact="DELETE FROM pbk WHERE Number=$PHONE"
$sql "$reqRmContact" || exit 1
else
log "${red}Contact doesn't exist$c_"
fi
}

15
shell/sms_DESTROY.sh
View File

@ -6,7 +6,7 @@
################################################################################
source ./shell/init.sh
source ./shell/functions.sh
log "__SUB:sms_DESTROY.sh: START ($1=phone, $2=uid)"
log "${c_yellow}__SUB:sms_DESTROY.sh: START ($1=phone, $2=uid)$c_"
PHONE="$1"
MEMBERUID="$2"
@ -22,7 +22,7 @@ if [[ -f "./wallets/$PHONE/VIREMENTS" ]]; then
sms_ERROR "$PHONE" "Votre portefeuille comporte des virements non réglés... FERMETURE IMPOSSIBLE!"
exit
else
log "__SUB:sms_DESTROY.sh: VIREMENT $next OK "
log "__SUB:sms_DESTROY.sh: VIREMENT $next ${c_green}OK$c_"
fi
done
fi
@ -50,12 +50,12 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
cents=$(echo $(bc -l <<< "scale=0; $LIMIT * 100") | cut -d '.' -f 1)
move_g1cents "$PHONE" "$NODEPUB" "$cents"
I=$(ipfs_node_wallets_add)
log "__SUB:sms_DESTROY.sh: WALLET DESTROYED : $PHONE / $UIDNA / $MEMBER : OK"
log "__SUB:sms_DESTROY.sh: WALLET DESTROYED : $PHONE / $UIDNA / $MEMBER : ${c_green}OK$c_"
fi
else
new=$(./shell/checknodes.sh "BAN")
sms_ERROR "$PHONE" "Problème de payement avec silkaj (changement de serveur $new): $PAY";
log "__SUB:sms_DESTROY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
sms_ERROR "$PHONE" "Problème de payement avec silkaj (changement de serveur $new): $PAY";
log "${c_red}__SUB:sms_DESTROY.sh: END WITH ERRORS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~$c_"
exit
fi
fi
@ -71,5 +71,8 @@ $back"
sms_SEND "$PHONE" "$mess"
log "__SUB:sms_DESTROY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
# Remove contact from database
rm_contact $MEMBERUID $PHONE && log "${c_green}Contact has been deleted from database$c_" || "${c_red}Contact can't be deleted database$c_"
log "${c_yellow}__SUB:sms_DESTROY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~$c_"
exit

12
shell/sms_NEW.sh
View File

@ -6,7 +6,7 @@
################################################################################
source ./shell/init.sh
source ./shell/functions.sh
log "X sms_NEW.sh ($1=phone, $2=uid)"
log "${c_yellow}X sms_NEW.sh ($1=phone, $2=uid)$c_"
PHONE="$1"
MEMBERUID="$2"
@ -15,9 +15,9 @@ MEMBERUID="$2"
sms_INIT_ACCOUNT "$PHONE"
if [[ "$MEMBERUID" != "" && "$MEMBERUID" != "N" && "$MEMBERUID" != "D" && "$MEMBERUID" != "NOUV" ]]; then
# UID RECEIVED in SMS
VIRDEST=$MEMBERUID
VIRDEST=$MEMBERUID
MEMRIB=$(sms_uid2key "$MEMBERUID" "$PHONE" "$PIN")
if [[ $MEMRIB == "" ]]; then exit; fi
if [[ $MEMRIB == "" ]]; then exit; fi
MEMBER="$MEMBERUID"
fi
@ -51,8 +51,10 @@ sleep 2
sms_SEND "$PHONE" "Compte relié? $MEMBER $MAIL
$MEMRIB"
# Add contact to database
add_contact $MEMBERUID $PHONE && log "${c_green}Contact has been added to database$c_" || "${c_red}Contact can't be added to database$c_"
log "END sms_NEW.sh"
log "${c_yellow}END sms_NEW.sh$c_"
log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
exit