X-Git-Url: http://olivier.miskin.fr/git/?a=blobdiff_plain;f=formulaires%2Fconfigurer_souscription.php;h=b2cf8c1e353b2496d25b7bd3cfc0b2b4c4c5a77c;hb=4f5799478da7d42f157194bccad32a8d6895bdfb;hp=882fdaa1dcf45a41f127642c1ff12c4ba573ee75;hpb=7e99638358e14c6989fca5448861fecff724a523;p=spip_souscriptions.git

diff --git a/formulaires/configurer_souscription.php b/formulaires/configurer_souscription.php
index 882fdaa..b2cf8c1 100644
--- a/formulaires/configurer_souscription.php
+++ b/formulaires/configurer_souscription.php
@@ -3,74 +3,32 @@ if (!defined('_ECRIRE_INC_VERSION')) return;
 
 include_spip('inc/config');
 
-function formulaires_configurer_souscription_charger_dist() {
-
-
-  $valeurs = array('adhesion_montants' => montants_array2str(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_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;
-}
-
 function formulaires_configurer_souscription_verifier_dist() {
   /* FIXME: vérifier le format de 'adhesion_montants' et 'don_montants' */
 
   $erreurs = array();
-  $type_saisies = array("input", "radio", "selection");
+  $type_saisies = array("input", "radio", "radioinput", "selection");
 
   if(_request("adhesion_activer")) {
     if(!_request("adhesion_type_saisie")) {
-      $erreurs["adhesion_type_saisie"] = _T("souscription:message_nok_champ_obligatoire");
+      $erreurs["adhesion_type_saisie"] = _T("souscription:erreur_champ_obligatoire");
     }
 
     if(!in_array(_request("adhesion_type_saisie"), $type_saisies)) {
-      $erreurs["adhesion_type_saisie"] = _T("souscription:message_nok_champ_invalide");
+      $erreurs["adhesion_type_saisie"] = _T("souscription:erreur_champ_invalide");
     }
   }
 
   if(_request("don_activer")) {
 
     if(!_request("don_type_saisie")) {
-      $erreurs["don_type_saisie"] = _T("souscription:message_nok_champ_obligatoire");
+      $erreurs["don_type_saisie"] = _T("souscription:erreur_champ_obligatoire");
     }
 
     if(!in_array(_request("don_type_saisie"), $type_saisies)) {
-      $erreurs["don_type_saisie"] = _T("souscription:message_nok_champ_invalide");
+      $erreurs["don_type_saisie"] = _T("souscription:erreur_champ_invalide");
     }
   }
 
   return $erreurs;
 }
-
-function formulaires_configurer_souscription_traiter_dist() {
-
-  ecrire_config("souscription/adhesion_montants", montants_str2array(_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_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"));
-
-  ecrire_config("souscription/dispositions_fiscales_explications", _request("dispositions_fiscales_explications"));
-
-  $res = array('message_ok'=>_T('souscription:config_info_enregistree'));
-
-  return $res;
-}