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

Amélioration de la fonction charger

Browse source
This commit is contained in:
Christophe 2020-04-25 22:35:09 +02:00
parent a99b28a300
commit e39867d8ad
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
formulaires/gamumail.php
View file

@ -9,12 +9,12 @@ include_spip('inc/filtres');
* *
* @param string $slug modele du mail a charger * @param string $slug modele du mail a charger
* @param int|string $auteur id_auteur ou email du destinataire * @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 $Tclient []['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 $Tpdf []['fichier' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]] ou ['fichier' => 'pdf_facture', 'contexte' => ['id_app_facture' => 3]]
* @param string $redirect * @param string $redirect
* @return array $valeurs * @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 = []; $Tmails = [];
if (intval($auteur)) { if (intval($auteur)) {
@ -25,11 +25,11 @@ function formulaires_gamumail_charger_dist($slug, $auteur = 0, $TobjetMailSup =
} }
} }
if (is_array($TobjetMailSup) and count($TobjetMailSup)) { if (is_array($Tclient) and count($Tclient)) {
if (array_key_exists('objet', $TobjetMailSup)) { if (array_key_exists('objet', $Tclient)) {
$TobjetMailSup = [$TobjetMailSup]; $Tclient = [$Tclient];
} }
foreach ($TobjetMailSup as $o) { foreach ($Tclient as $o) {
$table = table_objet_sql($o['objet']); $table = table_objet_sql($o['objet']);
$id = id_table_objet($o['objet']); $id = id_table_objet($o['objet']);
$mail = sql_getfetsel("{$o['champ']}", $table, "$id=".intval($o['id_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( $valeurs = array(
"slug" => $slug, "slug" => $slug,
'sujet' => '', 'sujet' => '',
'texte' => '', 'texte' => '',
'Tmails' => implode(',', $Tmails), 'Tmails' => implode(',', $Tmails),
'Tpdfs' => $TFichierPdf,
'Tid_doc' => [] 'Tid_doc' => []
); );
return $valeurs; 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(); $erreurs = array();
//champs obligatoire //champs obligatoire
@ -69,7 +80,7 @@ function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $TobjetMailSup =
return $erreurs; 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(); $retour = array();