Changeset 112609 in spip-zone

Timestamp:

Dec 3, 2018, 1:51:33 PM (2 years ago)

Author:

pierrekuhn82@…

Message:

Version 1.1.6 : On mets en place un inclure qui va afficher les valeurs + doc

Location:

_plugins_/sms/trunk

Files:

• classes/octopush/config.inc.php (modified) (1 diff)
• classes/octopush/sms.inc.php (modified) (6 diffs)
• formulaires/configurer_sms.html (modified) (1 diff)
• inclure (added)
• inclure/octopush_balance.html (added)
• paquet.xml (modified) (2 diffs)
• sms_fonctions.php (modified) (1 diff)

_plugins_/sms/trunk/classes/octopush/config.inc.php

@@ -42 +42 @@
 define('SIMULATION', 'simu');
 define('REEL', 'real');
-?>

_plugins_/sms/trunk/classes/octopush/sms.inc.php

@@ -49 +49 @@
                 $this->api_key          = '';
 
-                $this->sms_text         = '';
+                $this->sms_text         = '';
 
                 $this->sms_recipients                   = array();
@@ -81 +81 @@
         public function send()
         {
-                $domain  = DOMAIN;
-                $path    = PATH_SMS;
-                $port    = PORT;
+                $domain         = DOMAIN;
+                $path           = PATH_SMS;
+                $port           = PORT;
 
                 $data = array(
@@ -203 +203 @@
 
                 $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
                 );
 
@@ -229 +229 @@
 
                 $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
                 );
 
@@ -269 +269 @@
 
                 $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
                 );
 
@@ -546 +546 @@
 
 }
-
-?>

_plugins_/sms/trunk/formulaires/configurer_sms.html

@@ -62 +62 @@
                         <li class="fieldset octopush">
                                 <h3 class="legend">Octopush</h3>
-                                #SET{standard,#VAL{standard}|balance}
-                                #SET{premium,#VAL{premium}|balance}
-                                <p class="explication"><:sms:explication_octopush{standard=#GET{standard}, premium=#GET{premium}}:></p>
+                                <p class="explication"><INCLURE{fond=inclure/octopush_balance} /></p>
                                 <ul>
                                         <li class="editer">

_plugins_/sms/trunk/paquet.xml

@@ -2 +2 @@
         prefix="sms"
         categorie="communication"
-        version="1.1.5"
+        version="1.1.6"
         etat="test"
         compatibilite="[3.0.0;3.2.*]"
@@ -15 +15 @@
         <licence>GNU/GPL</licence>
 
-        <pipeline nom="declarer_tables_objets_sql" inclure ="base/sms.php" />
-        <pipeline nom="declarer_tables_interfaces" inclure ="base/sms.php" />
+        <pipeline nom="declarer_tables_objets_sql" inclure="base/sms.php" />
+        <pipeline nom="declarer_tables_interfaces" inclure="base/sms.php" />
 
 </paquet>

_plugins_/sms/trunk/sms_fonctions.php

@@ -118 +118 @@
         return $xml;
 }
+
+
+/**
+ * Afficher la balance de sms disponible
+ *
+ * <INCLURE{fond=inclure/octopush_balance} /> pour l'affichage
+ * 
+ * @param string $type
+ *              standard ou premium
+ * @return boolean
+ *              valeur en nombre entier de sms restant
+**/
 function filtre_balance($type) {
         $username = lire_config('sms/login_octopush');