From 0c095b05ee91dfa6d272123e4289ae510b6059a5 Mon Sep 17 00:00:00 2001 From: "pierrekuhn82@gmail.com" <> Date: Mon, 3 Dec 2018 13:51:33 +0000 Subject: [PATCH] Version 1.1.6 : On mets en place un inclure qui va afficher les valeurs + doc --- .gitattributes | 1 + classes/octopush/config.inc.php | 1 - classes/octopush/sms.inc.php | 42 ++++++++++++++++----------------- formulaires/configurer_sms.html | 4 +--- inclure/octopush_balance.html | 3 +++ paquet.xml | 6 ++--- sms_fonctions.php | 12 ++++++++++ 7 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 inclure/octopush_balance.html diff --git a/.gitattributes b/.gitattributes index d5b24a6..a4f3789 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,7 @@ classes/octopush/sms.inc.php -text classes/smsfactor/AccuseReceptionSMSClass.php -text classes/smsfactor/sendSMSclass.php -text formulaires/configurer_sms.html -text +inclure/octopush_balance.html -text lang/paquet-sms.xml -text lang/paquet-sms_fr.php -text lang/sms.xml -text diff --git a/classes/octopush/config.inc.php b/classes/octopush/config.inc.php index f2f6e15..c94efd0 100644 --- a/classes/octopush/config.inc.php +++ b/classes/octopush/config.inc.php @@ -41,4 +41,3 @@ define('DIFFERE', 2); define('SIMULATION', 'simu'); define('REEL', 'real'); -?> diff --git a/classes/octopush/sms.inc.php b/classes/octopush/sms.inc.php index 56294db..4004c3a 100644 --- a/classes/octopush/sms.inc.php +++ b/classes/octopush/sms.inc.php @@ -48,7 +48,7 @@ class SMS_OCTOSPUSH $this->user_login = ''; $this->api_key = ''; - $this->sms_text = ''; + $this->sms_text = ''; $this->sms_recipients = array(); $this->recipients_first_names = array(); @@ -80,9 +80,9 @@ class SMS_OCTOSPUSH public function send() { - $domain = DOMAIN; - $path = PATH_SMS; - $port = PORT; + $domain = DOMAIN; + $path = PATH_SMS; + $port = PORT; $data = array( 'user_login' => $this->user_login, @@ -202,13 +202,13 @@ class SMS_OCTOSPUSH $port = PORT; $data = array( - 'user_login' => $this->user_login, - 'api_key' => $this->api_key, - 'first_name' => $first_name, - 'last_name' => $last_name, - 'raison_sociale' => $raison_sociale, - 'alert_bound' => intval($alert_bound), - 'alert_sms_type' => $alert_sms_type + 'user_login' => $this->user_login, + 'api_key' => $this->api_key, + 'first_name' => $first_name, + 'last_name' => $last_name, + 'raison_sociale'=> $raison_sociale, + 'alert_bound' => intval($alert_bound), + 'alert_sms_type'=> $alert_sms_type ); return trim($this->_httpRequest($domain, $path, $port, $data)); @@ -228,9 +228,9 @@ class SMS_OCTOSPUSH $port = PORT; $data = array( - 'user_login' => $user_login, - 'api_key' => $api_key, - 'sub_account_email' => $sub_account_email + 'user_login' => $user_login, + 'api_key' => $api_key, + 'sub_account_email' => $sub_account_email ); $xml_return = trim($this->_httpRequest($domain, $path, $port, $data)); @@ -268,12 +268,12 @@ class SMS_OCTOSPUSH } $data = array( - 'user_login' => $user_login, - 'api_key' => $api_key, - 'sub_account_email' => $sub_account_email, - 'sms_number' => $sms_amount, - 'sms_type' => $sms_type, - 'token' => $token + 'user_login' => $user_login, + 'api_key' => $api_key, + 'sub_account_email' => $sub_account_email, + 'sms_number' => $sms_amount, + 'sms_type' => $sms_type, + 'token' => $token ); $xml_return = trim($this->_httpRequest($domain, $path, $port, $data)); @@ -545,5 +545,3 @@ class SMS_OCTOSPUSH } } - -?> diff --git a/formulaires/configurer_sms.html b/formulaires/configurer_sms.html index 03b8fbe..8bae9df 100644 --- a/formulaires/configurer_sms.html +++ b/formulaires/configurer_sms.html @@ -61,9 +61,7 @@ $(function(){
  • Octopush

    - #SET{standard,#VAL{standard}|balance} - #SET{premium,#VAL{premium}|balance} -

    <:sms:explication_octopush{standard=#GET{standard}, premium=#GET{premium}}:>

    +