Commit fcc4c661 authored by Millicent Billette's avatar Millicent Billette

GPL -> AGPL dans le code

parent 612fe5dd
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......
......@@ -2,13 +2,13 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
log "X sms_COUNT.sh ($1=phone $2=NOSMS)"
PHONE=$1
# Initialise PHONE, PIN, PUBKEY, UNIT, HIST
sms_INIT_ACCOUNT "$PHONE" "NOSMS"
if [[ $UNKNOWN == "unknown" ]]; then
......@@ -39,8 +39,8 @@ log "Solde = $AMOUNT ($UNIT)"
# If script control only run: NOSMS
if [ "$2" != "NOSMS" ]; then
mess="[G1SMS]
Compte: $PHONE
Solde: $AMOUNT $UNIT
Compte: $PHONE
Solde: $AMOUNT $UNIT
"
# Send response SMS
sms_SEND "$PHONE" "$mess"
......
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......@@ -10,7 +10,7 @@ log "X sms_NEW.sh ($1=phone, $2=uid)"
PHONE="$1"
MEMBERUID="$2"
# Initialise PHONE, PIN, PUBKEY, UNIT, HIST
sms_INIT_ACCOUNT $PHONE
if [ "$MEMBERUID" != "" ]; then
......
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......@@ -11,7 +11,7 @@ log "X sms_PAY.sh ($1=phone, $2=destphone, $3=amount)"
phone="$1"
phonedest="$2"
amount="$3"
# Initialise PHONE, PIN, PUBKEY, UNIT, HIST
sms_INIT_ACCOUNT "$phone" "NOSMS"
if [[ $UNKNOWN == "unknown" ]]; then
......@@ -97,7 +97,7 @@ Envoi de $amount $unit vers $phonedest : OK!
# Send dest SMS
mess_dest="[G1SMS]
Vous venez de recevoir $RECV $unitdest de la part de $phone
Vous venez de recevoir $RECV $unitdest de la part de $phone
Envoyez A pour des explications."
sms_SEND "$phonedest" "$mess_dest"
......@@ -107,9 +107,9 @@ else
text="
Solde: $AMOUNTLOVE LOVE
($AMOUNTG1 G1 = $AMOUNTDU DU)
INSUFFISANT pour virer $amount $UNIT
INSUFFISANT pour virer $amount $UNIT
Rechargez https://cesium.madeinzion.org/api/#/v1/payment/$PUBKEY?amount=100"
sms_ERROR "$phone" "$text"
fi
exit
\ No newline at end of file
exit
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......@@ -25,7 +25,7 @@ if [[ $name == "RIB" ]]; then
name=$(cat "$NAMEFILE")
else
name="G1SMS_${PUBKEY:0:8}";
fi
fi
fi
echo "$name" > "$NAMEFILE"
......
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......@@ -25,7 +25,7 @@ if [[ $unit == "U" ]]; then
unit=$(cat "$UNITFILE")
else
unit="LOVE";
fi
fi
fi
echo "$unit" > "$UNITFILE"
......
......@@ -2,7 +2,7 @@
################################################################################
# Author: Fred (support@qo-op.com)
# Version: 0.1
# License: GPL (http://www.google.com/search?q=GPL)
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
################################################################################
source /root/G1SMS/shell/init.sh
source /root/G1SMS/shell/functions.sh
......@@ -56,7 +56,7 @@ case "$CMD" in
RIB)
NAME=$(echo "$TEXT" | cut -d ' ' -f 2)
./shell/sms_SETRIB.sh "$PHONE" "$NAME" &
;;
;;
U)
UNIT=$(echo "$TEXT" | cut -d ' ' -f 2)
./shell/sms_SETUNIT.sh "$PHONE" "$UNIT" &
......
  • OK, maintenant il faut que je fusionne ;) Comment on fait avec git quand mon code local a modifié les même fichiers? @1000i100

    Edited by Fred
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment