Fix add user to group. Check if group 1 doesn't exist, create it
This commit is contained in:
parent
043b7db512
commit
7ccfd8f377
|
@ -7,6 +7,13 @@
|
||||||
###################################################################################################################################
|
###################################################################################################################################
|
||||||
|
|
||||||
###################################################################################################################################
|
###################################################################################################################################
|
||||||
|
|
||||||
|
MY_PATH="`dirname \"$0\"`" # relative
|
||||||
|
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||||
|
|
||||||
|
## Récupère les données du profile
|
||||||
|
[[ -f $MY_PATH/.profile ]] && source $MY_PATH/.profile
|
||||||
|
|
||||||
function sms_SEND () {
|
function sms_SEND () {
|
||||||
# sms_SEND ($1=phone, $2=message)
|
# sms_SEND ($1=phone, $2=message)
|
||||||
local dest="$1"
|
local dest="$1"
|
||||||
|
@ -621,16 +628,19 @@ function move_g1cents (){
|
||||||
function add_contact(){
|
function add_contact(){
|
||||||
userDB="gammu"
|
userDB="gammu"
|
||||||
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
|
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
|
||||||
local sql="mysql -u$userDB -p$pwdDB gammu -e"
|
local sql="mysql -N -u$userDB -p$pwdDB gammu -e"
|
||||||
|
|
||||||
local MEMBERUID=$1
|
local PHONE=$1
|
||||||
local PHONE=$2
|
local MEMBERUID=$2
|
||||||
|
|
||||||
local reqPhoneExist="SELECT * FROM pbk WHERE Number=$PHONE"
|
[[ -z $MEMBERUID ]] && MEMBERUID=$PHONE
|
||||||
|
|
||||||
if [[ -z $($sql "$reqPhoneExist") ]]; then
|
[[ -z $($sql "SELECT * FROM pbk_groups WHERE ID='1'") ]] && $sql "INSERT INTO pbk_groups (ID, Name, id_user, is_public) VALUES ('1', '$(grep "ADRESSE" $MY_PATH/../.profile | awk -F= '{ print $2 }' | tr -d '"')', '1', 'false')"
|
||||||
local reqAddContact="INSERT INTO pbk (GroupID, Name, Number, id_user, is_public) VALUES ('1', '$MEMBERUID', '$PHONE', '1', 'false')"
|
|
||||||
$sql "$reqAddContact" || exit 1
|
if [[ -z $($sql "SELECT * FROM pbk WHERE Number=$PHONE") ]]; then
|
||||||
|
$sql "INSERT INTO pbk (GroupID, Name, Number, id_user, is_public) VALUES ('1', '$MEMBERUID', '$PHONE', '1', 'false')" || exit 1
|
||||||
|
local id_user=$($sql "SELECT ID FROM pbk WHERE Number=$PHONE" || exit 1)
|
||||||
|
$sql "INSERT INTO user_group (id_group, id_pbk, id_pbk_groups, id_user) VALUES ('$id_user', '$id_user', '1', '1')" || exit 1
|
||||||
else
|
else
|
||||||
log "${red}Contact already exist$c_"
|
log "${red}Contact already exist$c_"
|
||||||
fi
|
fi
|
||||||
|
@ -640,19 +650,21 @@ function add_contact(){
|
||||||
function rm_contact(){
|
function rm_contact(){
|
||||||
userDB="gammu"
|
userDB="gammu"
|
||||||
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
|
pwdDB=$(cat /etc/gammu-smsdrc | grep "password =" | awk '{ print $3 }' || exit 1)
|
||||||
local sql="mysql -u$userDB -p$pwdDB gammu -e"
|
local sql="mysql -N -u$userDB -p$pwdDB gammu -e"
|
||||||
|
|
||||||
local MEMBERUID=$1
|
local PHONE=$1
|
||||||
local PHONE=$2
|
local MEMBERUID=$2
|
||||||
|
|
||||||
local reqPhoneExist="SELECT * FROM pbk WHERE Number=$PHONE"
|
[[ -z $MEMBERUID ]] && MEMBERUID=$PHONE
|
||||||
|
|
||||||
if [[ ! -z $($sql "$reqPhoneExist") ]]; then
|
if [[ ! -z $($sql "SELECT * FROM pbk WHERE Number=$PHONE") ]]; then
|
||||||
local reqRmContact="DELETE FROM pbk WHERE Number=$PHONE"
|
local id_user=$($sql "SELECT ID FROM pbk WHERE Number=$PHONE" || exit 1)
|
||||||
$sql "$reqRmContact" || exit 1
|
$sql "DELETE FROM pbk WHERE Number=$PHONE" || exit 1
|
||||||
|
$sql "DELETE FROM user_group WHERE id_group='$id_user'" || exit 1
|
||||||
else
|
else
|
||||||
log "${red}Contact doesn't exist$c_"
|
log "${red}Contact doesn't exist$c_"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$@
|
||||||
|
|
|
@ -21,14 +21,14 @@ case "$SERVICE" in
|
||||||
ON)
|
ON)
|
||||||
log "Abonnement Kalkun"
|
log "Abonnement Kalkun"
|
||||||
if [[ "$MEMBER" != "" ]]; then
|
if [[ "$MEMBER" != "" ]]; then
|
||||||
add_contact $MEMBER $PHONE && log "${c_green}Contact has been added to database$c_" || log "${c_red}Contact can't be added to database$c_";
|
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_";
|
||||||
sms_SEND "$PHONE" "$MEMBER votre inscription annuaire est active"
|
sms_SEND "$PHONE" "$MEMBER votre inscription annuaire est active"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
OFF)
|
OFF)
|
||||||
log "Retrait Kalkun"
|
log "Retrait Kalkun"
|
||||||
if [[ $MEMBER ]]; then
|
if [[ $MEMBER ]]; then
|
||||||
rm_contact $MEMBER $PHONE && log "${c_green}Contact has been deleted from database$c_" || log "${c_red}Contact can't be deleted database$c_";
|
rm_contact $PHONE $MEMBERUID && log "${c_green}Contact has been deleted from database$c_" || log "${c_red}Contact can't be deleted database$c_";
|
||||||
sms_SEND "$PHONE" "$MEMBER retrait annuaire prise en compte..."
|
sms_SEND "$PHONE" "$MEMBER retrait annuaire prise en compte..."
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -72,7 +72,7 @@ sms_SEND "$PHONE" "$mess"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove contact from database
|
# Remove contact from database
|
||||||
rm_contact $MEMBERUID $PHONE && log "${c_green}Contact has been deleted from database$c_" || log "${c_red}Contact can't be deleted database$c_"
|
rm_contact $PHONE $MEMBERUID && log "${c_green}Contact has been deleted from database$c_" || log "${c_red}Contact can't be deleted database$c_"
|
||||||
|
|
||||||
log "${c_yellow}__SUB:sms_DESTROY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~$c_"
|
log "${c_yellow}__SUB:sms_DESTROY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~$c_"
|
||||||
exit
|
exit
|
||||||
|
|
|
@ -52,7 +52,7 @@ sms_SEND "$PHONE" "Compte relié? $MEMBER $MAIL
|
||||||
$MEMRIB"
|
$MEMRIB"
|
||||||
|
|
||||||
# Add contact to database
|
# Add contact to database
|
||||||
add_contact $MEMBERUID $PHONE && log "${c_green}Contact has been added to database$c_" || log "${c_red}Contact can't be added to database$c_"
|
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_"
|
||||||
|
|
||||||
log "${c_yellow}END sms_NEW.sh$c_"
|
log "${c_yellow}END sms_NEW.sh$c_"
|
||||||
log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
||||||
|
|
Loading…
Reference in New Issue