From 678070dbc0a6ccf4ee4900dbe64151ade52425a1 Mon Sep 17 00:00:00 2001
From: clem <cyrille@gamuza.fr>
Date: Sun, 13 Sep 2020 03:54:53 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=A9organisation=20du=20passage=20des=20PDF?=
 =?UTF-8?q?=20aux=20slugs=20pour=20essayer=20d'unifier=20formulaire=20et?=
 =?UTF-8?q?=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/gamumail.php | 16 ++++++++--------
 inc/envoyer_gamumail.php |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php
index e0f6e9b..2576e9a 100644
--- a/formulaires/gamumail.php
+++ b/formulaires/gamumail.php
@@ -14,6 +14,7 @@ include_spip('inc/filtres');
  * @param array $Tpdf []['fichier' => 'pdf_facture', 'nom' => 'facture_123', 'contexte' => ['id_app_facture' => 3]] ou ['fichier' => 'pdf_facture', 'nom' => 'facture_123', 'contexte' => ['id_app_facture' => 3]]
  * @param string $redirect
  * @param array $options
+ * 
  * @return array $valeurs
  * 
  */
@@ -167,15 +168,15 @@ function formulaires_gamumail_traiter_dist($slug, $destinataires = 0, $Tclient =
 
 	$docs_spip = ($docs_spip != '' ?  explode(',', $docs_spip) : []);
 
-	$Tmails = [];
+	$destinataires = [];
 	foreach ($pour as $dest) {
 		if (is_numeric($dest)) {
 			if ($mail = sql_getfetsel('email', 'spip_auteurs', 'id_auteur='.$dest)) {
-				$Tmails[] = $mail;
+				$destinataires[] = $mail;
 			}
 		}
 		elseif (email_valide($dest)) {
-			$Tmails[] = $dest;
+			$destinataires[] = $dest;
 		}
 	}
 
@@ -264,7 +265,6 @@ function formulaires_gamumail_traiter_dist($slug, $destinataires = 0, $Tclient =
 		'data' => $html
 	));
 	$texte = facteur_mail_html2text($html);
-
 	$corps = [
 		'html'           => $html,
 		'texte'          => $texte,
@@ -275,16 +275,16 @@ function formulaires_gamumail_traiter_dist($slug, $destinataires = 0, $Tclient =
 
 	/*
 	if ($f = charger_fonction('traiter', 'gamumail', true)) {
-		$corps = $f($corps, $options, $slug, $Tmails, $Tclient, $Tpdf, $redirect);
+		$corps = $f($corps, $options, $slug, $destinataires, $Tclient, $Tpdf, $redirect);
 	}
-*/
+	*/
 	// appel d'une éventuelle fonction de traitement du contenu spécifique du slug
 	if ($f = charger_fonction($slug . '_traiter', 'gamumail', true)) {
-		$corps = $f($corps, $options, $slug, $Tmails);
+		$corps = $f($corps, $options, $slug, $destinataires);
 	}
 
 	$envoyer_mail = charger_fonction('envoyer_mail', 'inc/');
-	$ok = $envoyer_mail($Tmails, $sujet, $corps);
+	$ok = $envoyer_mail($destinataires, $sujet, $corps);
 
 	if (!$ok) {
 		spip_log("Erreur d'envoi du mail : ","gamumail");
diff --git a/inc/envoyer_gamumail.php b/inc/envoyer_gamumail.php
index 8504eb4..a2fca8a 100644
--- a/inc/envoyer_gamumail.php
+++ b/inc/envoyer_gamumail.php
@@ -223,14 +223,14 @@ function inc_envoyer_gamumail($slug, $destinataires, $options = []) {
 	else {
 		$retour['message_ok'] = _T('gamumail:mail_envoye');
 	}
-/*
+
 	// on supprime les pdfs temporaires
 	if (count($Tpdf_dell)) {
 		foreach ($Tpdf_dell as $pdf) {
 			unlink($pdf);
 		}
 	}
-
+/*
 	if ($redirect) {
 		$retour['redirect'] = $redirect;
 	}