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

refactoring: utilise generer_url_public pour l'url du pdf

Browse source
This commit is contained in:
Christophe 2023-04-06 14:24:56 +02:00
parent 17edcf7841
commit 88d4d9a32e
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
inc/charger_pdf.php
View file

@ -7,19 +7,9 @@ function inc_charger_pdf_dist($fichier_pdf, $contexte = []){
$login = lire_config('curl_login'); $login = lire_config('curl_login');
$password = lire_config('curl_mdp'); $password = lire_config('curl_mdp');
$url = $GLOBALS['meta']['adresse_site'].'/spip.php?page=spipdf&spipdf='.$fichier_pdf;
if (is_array($contexte) and count($contexte)) { $contexte['spipdf'] = $contexte['spipdf'] ?? $fichier_pdf ;
foreach ($contexte as $champ => $val) { $url = generer_url_public('spipdf', $contexte, true, false);
/* if (intval($val) === $val) {
// if (intval($val)) {
$val = intval($val);
} else {
$val = "$val";
}
*/
$url .= "&$champ=$val";
}
}
$CurlConnect = curl_init(); $CurlConnect = curl_init();
// pour une connexion https locale avec certificat auto-signé // pour une connexion https locale avec certificat auto-signé
@ -34,8 +24,8 @@ function inc_charger_pdf_dist($fichier_pdf, $contexte = []){
$retour = curl_exec($CurlConnect); $retour = curl_exec($CurlConnect);
if( ! $retour = curl_exec($CurlConnect)) { if( ! $retour = curl_exec($CurlConnect)) {
trigger_error(curl_error($CurlConnect)); trigger_error(curl_error($CurlConnect));
} }
curl_close($CurlConnect); curl_close($CurlConnect);
return $retour; return $retour;
} }

2
paquet.xml
View file

@ -1,7 +1,7 @@
<paquet <paquet
prefix="gamumail" prefix="gamumail"
categorie="communication" categorie="communication"
version="1.1.0" version="1.1.1"
etat="dev" etat="dev"
compatibilite="[3.2.0;4.1.*]" compatibilite="[3.2.0;4.1.*]"
logo="prive/themes/spip/images/gamumail-64.png" logo="prive/themes/spip/images/gamumail-64.png"