From c4865b4ee2e4cba38bb3d8597f31007c745babf7 Mon Sep 17 00:00:00 2001
From: cy_altern <cy.altern@gmail.com>
Date: Wed, 18 Oct 2023 23:21:51 +0200
Subject: [PATCH] =?UTF-8?q?Feat:=20ajout=20de=20la=20classe=20nomulti=20au?=
 =?UTF-8?q?x=20champs=20qui=20ne=20doivent=20pas=20int=C3=A9grer=20le=20mu?=
 =?UTF-8?q?ltilang=20lors=20de=20l'=C3=A9dition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/envoyer_gamumail.php     | 21 ++++++++++-----------
 inclure/gamumail_config.html |  8 ++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/inc/envoyer_gamumail.php b/inc/envoyer_gamumail.php
index 1eb614e..703b25f 100644
--- a/inc/envoyer_gamumail.php
+++ b/inc/envoyer_gamumail.php
@@ -221,17 +221,22 @@ function inc_envoyer_gamumail($slug, $destinataires, $options = [], $Tid_doc_pie
 	$args['destinataires'] = $pour;
 	//var_dump($args)	;
 
-	$html = pipeline('remplacements_slug', array(
+	$html = pipeline('remplacements_slug', [
 		'args' => $args,
 		'data' => $html
-	));
+	]);
+	$sujet = pipeline('remplacements_slug',[
+		'args' => $args,
+		'data' => $sujet
+	]);
 
 	// traitement des remplacements génériques fournis par Gamumail
 	$remplacement_generiques = charger_fonction('gamumail_remplacements', 'inc');
 	$html = $remplacement_generiques($args, $html);
+	$sujet = $remplacement_generiques($args, $sujet);
+
 	include_spip('facteur_fonctions');
 	$texte = facteur_mail_html2text($html);
-
 	$corps = [
 		'html'           => $html,
 		'texte'          => $texte,
@@ -260,14 +265,8 @@ function inc_envoyer_gamumail($slug, $destinataires, $options = [], $Tid_doc_pie
 		echo '<br>$corps : ';
 		var_dump($corps);
 		$ok = true;
-		exit;
-	}
-	else {
-		$sujet = pipeline('remplacements_slug',[
-		'args' => $args,
-		'data' => $sujet
-		]);
-		$sujet = $remplacement_generiques($args, $sujet);
+		//exit;
+	} else {
 		// pour ne pas avoir de warning de la fonction envoyer_mail() on doit lui passer un paramètre $from et un $header
 		$from = '';
 		$header = '';
diff --git a/inclure/gamumail_config.html b/inclure/gamumail_config.html
index 07d510a..bdb6481 100644
--- a/inclure/gamumail_config.html
+++ b/inclure/gamumail_config.html
@@ -80,7 +80,7 @@
 			<div class="une_conf">
 				<small class="name_config">gamumail/mail_cc</small>
 				<h4><:gamumail:email_en_cc:></h4>
-				<div class="#EDIT{meta-gamumail/mail_cc} inbl w600p">[(#CONFIG{gamumail/mail_cc}|sinon{<i><:gamumail:dbe_clic_editer:></i>})]</div>
+				<div class="#EDIT{meta-gamumail/mail_cc} inbl w600p nomulti">[(#CONFIG{gamumail/mail_cc}|sinon{<i><:gamumail:dbe_clic_editer:></i>})]</div>
 				<p class="explication"><:gamumail:plusieurs_mails_separer_virgule:>.</p>
 			</div>
 		</div>
@@ -88,7 +88,7 @@
 			<div class="une_conf">
 				<small class="name_config">gamumail/mail_cci</small>
 				<h4><:gamumail:email_en_cci:></h4>
-				<div class="#EDIT{meta-gamumail/mail_cci} inbl w600p">[(#CONFIG{gamumail/mail_cci}|sinon{<i><:gamumail:dbe_clic_editer:></i>})]</div>
+				<div class="#EDIT{meta-gamumail/mail_cci} inbl w600p nomulti">[(#CONFIG{gamumail/mail_cci}|sinon{<i><:gamumail:dbe_clic_editer:></i>})]</div>
 				<p class="explication"><:gamumail:plusieurs_mails_separer_virgule:>.</p>
 			</div>
 
@@ -114,7 +114,7 @@
 						<div class="objet--slug">
 							<strong><:gamumail:slug:>: </strong>
 							[(#AUTORISER{modifier_nom_slug, gamumail, #ID_GAMUMAIL}|?{
-								<span class="[(#EDIT{nom_slug})]">[(#SLUG|sinon{<:gamumail:dbe_clic_editer:>})]</span>
+								<span class="[(#EDIT{nom_slug})] nomulti">[(#SLUG|sinon{<:gamumail:dbe_clic_editer:>})]</span>
 								,
 								<span class="">[(#SLUG)]</span>
 							})]
@@ -131,7 +131,7 @@
 						</div>
 						<div class="objet--mail">
 							<span><strong><:gamumail:documents_attaches:> :</strong> <em class="explication"><:gamumail:liste_id_separes:> , </em></span>
-							<div class="texte #EDIT{id_docs}">
+							<div class="texte #EDIT{id_docs} nomulti">
 								[(#ID_DOCS|sinon{<:gamumail:dbe_clic_editer:>})]
 							</div>
 							<B_docs_spip>