diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php index d9f390d..83177ea 100644 --- a/formulaires/gamumail.php +++ b/formulaires/gamumail.php @@ -188,6 +188,7 @@ function formulaires_gamumail_verifier_dist($slug, $destinataires = 0, $Tclient } function formulaires_gamumail_traiter_dist($slug, $destinataires = 0, $Tclient = [], $Tpdf = [], $redirect = '', $options = []) :Array{ + $retour = []; // blocage de l'envoi par appel du pseudo-slug no_gamumail if ($slug === 'no_gamumail') { @@ -202,9 +203,8 @@ function formulaires_gamumail_traiter_dist($slug, $destinataires = 0, $Tclient = include_spip('inc/texte'); include_spip('classes/facteur'); - $retour = []; - $envoi_separe = _request('envoi_separe') ?? ''; + $options['envoi_separe'] = $envoi_separe; $pour = _request('pour'); $pour = explode(',', $pour); @@ -340,6 +340,15 @@ function gamuSend($slug, $options, $destinataires, $Tclient, $Tpdf, $redirect, & $nom = isset($p['nom']) ? $p['nom'] : $fichier; } } + $c = array_merge($options, $c); + $c = pipeline('tpdf_charger_contexte', [ + 'args' => [ + 'destinataires' => $destinataires, + 'contexte' => $c, + 'options' => $options + ], 'data' => $c + ]); + $pdf = $recup_pdf($fichier, $c); $nom_fichier = $nom.'.pdf'; $destination = _DIR_TMP.basename($nom_fichier); diff --git a/inclure/vue_slug.html b/inclure/vue_slug.html index 542b98a..1a168f2 100644 --- a/inclure/vue_slug.html +++ b/inclure/vue_slug.html @@ -1,10 +1,16 @@ +[(#SET{Tpdf,#ARRAY{ +fichier,#ENV{pdf_fichier}, +nom,#ENV{pdf_nom}, +contexte,#ARRAY{slug, #ENV{slug}} +}} +)]