diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php index 59d614b..b671c91 100644 --- a/formulaires/gamumail.php +++ b/formulaires/gamumail.php @@ -12,9 +12,10 @@ include_spip('inc/filtres'); * @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 + * @param array $options * @return array $valeurs */ -function formulaires_gamumail_charger_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '') :Array{ +function formulaires_gamumail_charger_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '', $options = []) :Array{ $Tmails = []; if (intval($auteur)) { @@ -49,13 +50,18 @@ function formulaires_gamumail_charger_dist($slug, $auteur = 0, $Tclient = [], $T } } + $gamuMail = sql_fetsel('sujet, texte', 'spip_gamumails', 'slug='.sql_quote($slug)); $valeurs = array( - "slug" => $slug, - 'sujet' => '', - 'texte' => '', - 'Tmails' => implode(',', $Tmails), - 'Tpdfs' => $TFichierPdf, - 'Tid_doc' => [] + "slug" => $slug, + 'sujet' => $gamuMail['sujet'], + 'texte' => $gamuMail['texte'], + 'pour' => implode(',', $Tmails), + 'cc' => lire_config('gamumail/mail_cc'), + 'cci' => lire_config('gamumail/mail_cci'), + 'TFichierpdfs' => $TFichierPdf, + 'Tpdfs_ok' => [], + 'Tid_doc' => [], + 'options' => $options ); return $valeurs;