From e39867d8ad917f33e7c3abe85955840be09edd61 Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Sat, 25 Apr 2020 22:35:09 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20fonction=20charge?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/gamumail.php | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php
index 8a47a63..59d614b 100644
--- a/formulaires/gamumail.php
+++ b/formulaires/gamumail.php
@@ -9,12 +9,12 @@ include_spip('inc/filtres');
  *
  * @param string $slug modele du mail a charger
  * @param int|string $auteur  id_auteur ou email du destinataire
- * @param array $TobjetMailSup []['objet' => 'app_client', 'id_objet' => 3, 'champ' => 'email'] ou  ['objet' => 'app_client', 'id_objet' => 3, 'champ' => 'email']
- * @param array $Tpdf []['slug' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]] ou ['slug' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]]
+ * @param array $Tclient []['objet' => 'app_client', 'id_objet' => 3, 'champ' => 'email'] ou  ['objet' => 'app_client', 'id_objet' => 3, 'champ' => 'email']
+ * @param array $Tpdf []['fichier' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]] ou ['fichier' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]]
  * @param string $redirect
  * @return array $valeurs
  */
-function formulaires_gamumail_charger_dist($slug, $auteur = 0, $TobjetMailSup = [], $Tpdf = [], $redirect = '') :Array{
+function formulaires_gamumail_charger_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '') :Array{
 
 	$Tmails = [];
 	if (intval($auteur)) {
@@ -25,11 +25,11 @@ function formulaires_gamumail_charger_dist($slug, $auteur = 0, $TobjetMailSup =
 		}
 	}
 
-	if (is_array($TobjetMailSup) and count($TobjetMailSup)) {
-		if (array_key_exists('objet', $TobjetMailSup)) {
-			$TobjetMailSup = [$TobjetMailSup];
+	if (is_array($Tclient) and count($Tclient)) {
+		if (array_key_exists('objet', $Tclient)) {
+			$Tclient = [$Tclient];
 		}
-		foreach ($TobjetMailSup as $o) {
+		foreach ($Tclient as $o) {
 			$table = table_objet_sql($o['objet']);
 			$id    = id_table_objet($o['objet']);
 			$mail  = sql_getfetsel("{$o['champ']}", $table, "$id=".intval($o['id_objet']));
@@ -39,18 +39,29 @@ function formulaires_gamumail_charger_dist($slug, $auteur = 0, $TobjetMailSup =
 		}
 	}
 
+	$TFichierPdf = [];
+	if (is_array($Tpdf) and count($Tpdf)) {
+		if (array_key_exists('fichier', $Tpdf)) {
+			$TFichierPdf = [$Tpdf];
+		}
+		foreach ($Tpdf as $pdf) {
+			$TFichierPdf[] = $pdf['fichier'];
+		}
+	}
+
 	$valeurs = array(
 		"slug"    => $slug,
 		'sujet'   => '',
 		'texte'   => '',
 		'Tmails'  => implode(',', $Tmails),
+		'Tpdfs'   => $TFichierPdf,
 		'Tid_doc' => []
 	);
 
 	return $valeurs;
 }
 
-function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $TobjetMailSup = [], $Tpdf = [], $redirect = '') :Array{
+function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '') :Array{
 
 	$erreurs = array();
 	//champs obligatoire
@@ -69,7 +80,7 @@ function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $TobjetMailSup =
 	return $erreurs;
 }
 
-function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $TobjetMailSup = [], $Tpdf = [], $redirect = '') :Array{
+function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '') :Array{
 
 	$retour = array();