From acf01f6c1a3709bdc3d8724794f0823e2c9d75b8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20T=C3=A9tard?= <olivier.tetard@miskin.fr>
Date: Wed, 13 Mar 2013 10:57:32 +0100
Subject: [PATCH] Fusion des deux pages d'export CSV

---
 action/exporter_souscriptions.php       | 65 +++++++++++++++++++++++++
 action/exporter_souscriptions_payes.php | 52 --------------------
 action/exporter_souscriptions_tous.php  | 51 -------------------
 3 files changed, 65 insertions(+), 103 deletions(-)
 create mode 100644 action/exporter_souscriptions.php
 delete mode 100644 action/exporter_souscriptions_payes.php
 delete mode 100644 action/exporter_souscriptions_tous.php

diff --git a/action/exporter_souscriptions.php b/action/exporter_souscriptions.php
new file mode 100644
index 0000000..a1228f6
--- /dev/null
+++ b/action/exporter_souscriptions.php
@@ -0,0 +1,65 @@
+<?php
+if (!defined("_ECRIRE_INC_VERSION")) return;
+
+function action_exporter_souscriptions_dist($arg=null) {
+
+  /* FIXME: permettre de selectionner les exports */
+  /* FIXME: améliorer la jointure... */
+
+  if (is_null($arg)) {
+    $securiser_action = charger_fonction('securiser_action', 'inc');
+    $arg = $securiser_action();
+  }
+
+  /* Vérification des droits de l'utilisateur. */
+  if(!autoriser("exporter", "souscriptiondon", '')) {
+    include_spip('inc/minipres');
+    echo minipres();
+    exit;
+  }
+
+  if($arg == "payes") {
+    $row = sql_select("id_souscription, courriel,"
+                      ."montant, reglee, spip_transactions.statut, date_paiement, mode, autorisation_id,"
+                      ."nom, prenom, code_postal, ville, recu_fiscal, envoyer_info, date_souscription,"
+                      ."id_souscription_campagne, titre",
+                      "spip_souscriptions LEFT JOIN spip_transactions USING(id_transaction) LEFT JOIN spip_souscription_campagnes USING(id_souscription_campagne) ",
+                      "reglee='oui'");
+  }
+  elseif($arg == "tous") {
+    $row = sql_select("id_souscription, courriel,"
+                      ."montant, reglee, spip_transactions.statut, date_paiement, mode, autorisation_id,"
+                      ."nom, prenom, code_postal, ville, recu_fiscal, envoyer_info, date_souscription,"
+                      ."id_souscription_campagne, titre",
+                      "spip_souscriptions LEFT JOIN spip_transactions USING(id_transaction) LEFT JOIN spip_souscription_campagnes USING(id_souscription_campagne)");
+  }
+  else {
+    include_spip('inc/minipres');
+    echo minipres("Argument invalide");
+    exit;    
+  }
+
+  $entete = array("ID du don",
+                  "Courriel",
+                  "Montant",
+                  "Reglée",
+                  "Statut",
+                  "Date de paiement",
+                  "Mode de paiement",
+                  "ID de l'autorisation",
+                  "Nom",
+                  "Prénom",
+                  "Code Postal",
+                  "Ville",
+                  "Souhaite reçu fiscal",
+                  "Souhaite être informé",
+                  "Date don",
+                  "ID Campagne",
+                  "Titre de la campagne");
+
+  /* Utilisation de la fonction exporter_csv de Bonux */
+  $exporter_csv = charger_fonction('exporter_csv', 'inc/', true);
+
+  $exporter_csv("souscriptions_${arg}", $row, ',', $entete);
+  exit();
+}
diff --git a/action/exporter_souscriptions_payes.php b/action/exporter_souscriptions_payes.php
deleted file mode 100644
index 04dbc5a..0000000
--- a/action/exporter_souscriptions_payes.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-function action_exporter_souscriptions_payes_dist($arg=null) {
-
-  /* FIXME: permettre de selectionner les exports */
-  /* FIXME: améliorer la jointure... */
-
-  if (is_null($arg)) {
-    $securiser_action = charger_fonction('securiser_action', 'inc');
-    $arg = $securiser_action();
-  }
-
-  /* Vérification des droits de l'utilisateur. */
-  if(!autoriser("exporter", "souscriptiondon", '')) {
-    include_spip('inc/minipres');
-    echo minipres();
-    exit;
-  }
-
-
-  $row = sql_select("id_souscription, courriel,"
-                    ."montant, reglee, spip_transactions.statut, date_paiement, mode, autorisation_id,"
-                    ."nom, prenom, code_postal, ville, recu_fiscal, envoyer_info, date_souscription,"
-                    ."id_souscription_campagne, titre", /* $select */
-                    "spip_souscriptions LEFT JOIN spip_transactions USING(id_transaction) LEFT JOIN spip_souscription_campagnes USING(id_souscription_campagne) ",
-                    "reglee='oui'"); /* $where */
-
-  $entete = array("ID du don",
-                  "Courriel",
-                  "Montant",
-                  "Reglée",
-                  "Statut",
-                  "Date de paiement",
-                  "Mode de paiement",
-                  "ID de l'autorisation",
-                  "Nom",
-                  "Prénom",
-                  "Code Postal",
-                  "Ville",
-                  "Souhaite reçu fiscal",
-                  "Souhaite être informé",
-                  "Date don",
-                  "ID Campagne",
-                  "Titre de la campagne");
-
-  /* Utilisation de la fonction exporter_csv de Bonux */
-  $exporter_csv = charger_fonction('exporter_csv', 'inc/', true);
-
-  $exporter_csv('souscriptions_payes', $row, ',', $entete);
-  exit();
-}
diff --git a/action/exporter_souscriptions_tous.php b/action/exporter_souscriptions_tous.php
deleted file mode 100644
index d7fe705..0000000
--- a/action/exporter_souscriptions_tous.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-if (!defined("_ECRIRE_INC_VERSION")) return;
-
-function action_exporter_souscriptions_tous_dist($arg=null) {
-
-  /* FIXME: permettre de selectionner les exports */
-  /* FIXME: améliorer la jointure... */
-
-  if (is_null($arg)) {
-    $securiser_action = charger_fonction('securiser_action', 'inc');
-    $arg = $securiser_action();
-  }
-
-  /* Vérification des droits de l'utilisateur. */
-  if(!autoriser("exporter", "souscriptiondon", '')) {
-    include_spip('inc/minipres');
-    echo minipres();
-    exit;
-  }
-
-
-  $row = sql_select("id_souscription, courriel,"
-                    ."montant, reglee, spip_transactions.statut, date_paiement, mode, autorisation_id,"
-                    ."nom, prenom, code_postal, ville, recu_fiscal, envoyer_info, date_souscription,"
-                    ."id_souscription_campagne, titre",
-                    "spip_souscriptions LEFT JOIN spip_transactions USING(id_transaction) LEFT JOIN spip_souscription_campagnes USING(id_souscription_campagne)");
-
-  $entete = array("ID du don",
-                  "Courriel",
-                  "Montant",
-                  "Reglée",
-                  "Statut",
-                  "Date de paiement",
-                  "Mode de paiement",
-                  "ID de l'autorisation",
-                  "Nom",
-                  "Prénom",
-                  "Code Postal",
-                  "Ville",
-                  "Souhaite reçu fiscal",
-                  "Souhaite être informé",
-                  "Date don",
-                  "ID Campagne",
-                  "Titre de la campagne");
-
-  /* Utilisation de la fonction exporter_csv de Bonux */
-  $exporter_csv = charger_fonction('exporter_csv', 'inc/', true);
-
-  $exporter_csv('souscriptions_tous', $row, ',', $entete);
-  exit();
-}
-- 
2.30.2