SPIP/gamuMail
SPIP/gamuMail
4
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

réorganisation du passage des PDF aux slugs pour essayer d'unifier formulaire et API

Browse source
This commit is contained in:
clem 2020-09-13 03:54:53 +02:00
parent cb96f9f1b1
commit 678070dbc0
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
formulaires/gamumail.php
View file

@ -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");

4
inc/envoyer_gamumail.php
View file

@ -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;
}