X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=formulaires%2Fconfigurer_souscription.php;h=f9f6741d32b6fe80e18dd99f49f7fe4c110d3df9;hb=800a8b6733d42c0cae4aa9d4895cad217dc3fac1;hp=685070fefb99eb7a0be22a82fb84b65b21c4c2ca;hpb=ca1954a1b7c043dfcbb0a9112373cf482446cfa7;p=spip_souscriptions.git

diff --git a/formulaires/configurer_souscription.php b/formulaires/configurer_souscription.php
index 685070f..f9f6741 100644
--- a/formulaires/configurer_souscription.php
+++ b/formulaires/configurer_souscription.php
@@ -6,13 +6,19 @@ include_spip('inc/config');
 function formulaires_configurer_souscription_charger_dist() {
 
 
-  $valeurs = array('adhesion_montants' => montants_array2str(lire_config("souscription/adhesion_montants")),
+  $valeurs = array('adhesion_montants' => lire_config("souscription/adhesion_montants"),
                    'adhesion_type_saisie' => lire_config("souscription/adhesion_type_saisie"),
                    "adhesion_activer" => lire_config("souscription/adhesion_activer"),
+                   "adhesion_montants_description" => lire_config("souscription/adhesion_montants_description"),
+                   "adhesion_montants_label" => lire_config("souscription/adhesion_montants_label"),
 
-                   'don_montants' => montants_array2str(lire_config("souscription/don_montants")),
+                   'don_montants' => lire_config("souscription/don_montants"),
                    'don_type_saisie' => lire_config("souscription/don_type_saisie"),
                    "don_activer" => lire_config("souscription/don_activer"),
+                   "don_montants_description" => lire_config("souscription/don_montants_description"),
+                   "don_montants_label" => lire_config("souscription/don_montants_label"),
+
+		   "dispositions_fiscales_explications" => lire_config("souscription/dispositions_fiscales_explications"),
                    );
 
   return $valeurs;
@@ -26,22 +32,22 @@ function formulaires_configurer_souscription_verifier_dist() {
 
   if(_request("adhesion_activer")) {
     if(!_request("adhesion_type_saisie")) {
-      $erreurs["adhesion_type_saisie"] = "Ce champs est obligatoire";
+      $erreurs["adhesion_type_saisie"] = _T("souscription:message_nok_champ_obligatoire");
     }
-    
+
     if(!in_array(_request("adhesion_type_saisie"), $type_saisies)) {
-      $erreurs["adhesion_type_saisie"] = "Le type de saisie pour le montant est invalide";
+      $erreurs["adhesion_type_saisie"] = _T("souscription:message_nok_champ_invalide");
     }
   }
 
   if(_request("don_activer")) {
 
     if(!_request("don_type_saisie")) {
-      $erreurs["don_type_saisie"] = "Ce champs est obligatoire";
+      $erreurs["don_type_saisie"] = _T("souscription:message_nok_champ_obligatoire");
     }
-    
+
     if(!in_array(_request("don_type_saisie"), $type_saisies)) {
-      $erreurs["don_type_saisie"] = "Le type de saisie pour le montant est invalide";
+      $erreurs["don_type_saisie"] = _T("souscription:message_nok_champ_invalide");
     }
   }
 
@@ -50,36 +56,21 @@ function formulaires_configurer_souscription_verifier_dist() {
 
 function formulaires_configurer_souscription_traiter_dist() {
 
-  ecrire_config("souscription/adhesion_montants", montants_str2array(_request("adhesion_montants")));
+  ecrire_config("souscription/adhesion_montants", _request("adhesion_montants"));
   ecrire_config("souscription/adhesion_type_saisie", _request("adhesion_type_saisie"));
   ecrire_config("souscription/adhesion_activer", _request("adhesion_activer"));
+  ecrire_config("souscription/adhesion_montants_description", _request("adhesion_montants_description"));
+  ecrire_config("souscription/adhesion_montants_label", _request("adhesion_montants_label"));
 
-  ecrire_config("souscription/don_montants", montants_str2array(_request("don_montants")));
+  ecrire_config("souscription/don_montants", _request("don_montants"));
   ecrire_config("souscription/don_type_saisie", _request("don_type_saisie"));
   ecrire_config("souscription/don_activer", _request("don_activer"));
+  ecrire_config("souscription/don_montants_description", _request("don_montants_description"));
+  ecrire_config("souscription/don_montants_label", _request("don_montants_label"));
 
-  $res = array('message_ok'=>_T('facteur:config_info_enregistree'));
-  
-  return $res;
-}
-
+  ecrire_config("souscription/dispositions_fiscales_explications", _request("dispositions_fiscales_explications"));
 
-function montants_array2str($array) {
-  $montants = "";
-  foreach($array as $prix => $description) {
-    $montants .= $prix . "|" . $description . "\n";
-  }
+  $res = array('message_ok'=>_T('souscription:config_info_enregistree'));
 
-  return $montants;
-}
-
-function montants_str2array($str) {
-  $montants = array();
-
-  foreach(explode("\n", trim($str)) as $montant) {
-    list($prix, $description) = explode("|", $montant, 2);
-    $montants[trim($prix)] = trim($description);
-  }
-
-  return $montants;
+  return $res;
 }