From 141aa1ae4f85ac88924d6b209bb79be7e36865ee Mon Sep 17 00:00:00 2001
From: clem <cyrille@gamuza.fr>
Date: Wed, 2 Dec 2020 01:47:31 +0100
Subject: [PATCH] =?UTF-8?q?utilisation=20de=20la=20constante=20=5FDEBUG=5F?=
 =?UTF-8?q?AUTORISER=20(tir=C3=A9e=20de=20dd)=20pour=20que=20le=20curl=20d?=
 =?UTF-8?q?e=20la=20ges=C3=A9n=C3=A9ration=20des=20pdf=20ne=20bloque=20pas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/gamumail.php | 27 +++++++++++++++------------
 inc/charger_pdf.php      |  7 +++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/formulaires/gamumail.php b/formulaires/gamumail.php
index b8b2c14..a814217 100644
--- a/formulaires/gamumail.php
+++ b/formulaires/gamumail.php
@@ -92,6 +92,7 @@ function formulaires_gamumail_verifier_dist($slug, $auteur = 0, $Tclient = [], $
 	return $erreurs;
 }
 
+
 function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $Tpdf = [], $redirect = '', $options = []) :Array{
 
 	include_spip('inc/texte');
@@ -112,17 +113,9 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T
 	$cc   = explode(',', $cc);
 	$cci  = explode(',', $cci);
 
-
+	// les documents joints
 	$pieces_jointes = [];
 
-	if ($f = charger_fonction('traiter_av_pdf', 'gamumail', true)) {
-		$options = $f($options, $auteur, $Tclient, $Tpdf);
-	}
-	if ($f = charger_fonction($slug . '_traiter_av_pdf', 'gamumail', true)) {
-		$options = $f($options, $auteur, $Tclient, $Tpdf);
-	}
-
-	// les documents joints
 	if (!empty($Tid_doc)) {
 		foreach ($Tid_doc as $id_document) {
 			$Tdocument	 = sql_fetsel('titre,fichier,extension','spip_documents','id_document='.intval($id_document));
@@ -142,8 +135,15 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T
 			];
 		}
 	}
-
+	
 	// les pdfs
+	if ($f = charger_fonction('traiter_av_pdf', 'gamumail', true)) {
+		$options = $f($options, $auteur, $Tclient, $Tpdf);
+	}
+	if ($f = charger_fonction($slug . '_traiter_av_pdf', 'gamumail', true)) {
+		$options = $f($options, $auteur, $Tclient, $Tpdf);
+	}
+
 	$Tpdf_dell = [];
 	if (!empty($Tpdfs_ok) and is_array($Tpdfs_ok)) {
 		if (array_key_exists('fichier', $Tpdf)) {
@@ -177,14 +177,16 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T
 
 	if(find_in_path('gamumail/html_header.html')){
 		$html_header = recuperer_fond('gamumail/html_header', $options);
-	} elseif (find_in_path($slug . '_html_header.html')) {
+	} 
+	elseif (find_in_path($slug . '_html_header.html')) {
 		$html_header = recuperer_fond('gamumail/'.$slug . '_html_header', $options);
 	}
 
 	$html_footer = '';
 	if(find_in_path('gamumail/html_footer.html')){
 		$html_footer = recuperer_fond('gamumail/html_footer', $options);
-	}elseif (find_in_path($slug . '_html_footer.html')) {
+	}
+	elseif (find_in_path($slug . '_html_footer.html')) {
 		$html_footer = recuperer_fond('gamumail/'.$slug . '_html_footer', $options);
 	}
 
@@ -205,6 +207,7 @@ function formulaires_gamumail_traiter_dist($slug, $auteur = 0, $Tclient = [], $T
 		$corps = $f($corps, $options, $slug, $auteur, $Tclient, $Tpdf, $redirect);
 	}
 
+	// envoi du mail
 	$envoyer_mail = charger_fonction('envoyer_mail', 'inc/');
 	$ok = $envoyer_mail($pour, $sujet, $corps);
 	if (!$ok) {
diff --git a/inc/charger_pdf.php b/inc/charger_pdf.php
index 8fd1d61..ccd2225 100644
--- a/inc/charger_pdf.php
+++ b/inc/charger_pdf.php
@@ -19,11 +19,18 @@ function inc_charger_pdf_dist($fichier_pdf, $contexte = []){
 		}
 	}
 	$CurlConnect = curl_init();
+
+	// pour une connexion https locale (certificat auto-signé)
+	if (defined('_DEBUG_AUTORISER')) {
+		curl_setopt($CurlConnect, CURLOPT_SSL_VERIFYHOST, false);
+		curl_setopt($CurlConnect, CURLOPT_SSL_VERIFYPEER, false);
+	}
 	curl_setopt($CurlConnect, CURLOPT_URL, $url);
 	curl_setopt($CurlConnect, CURLOPT_RETURNTRANSFER, 1 );
 	//curl_setopt($CurlConnect, CURLOPT_POSTFIELDS, $request);
 	curl_setopt($CurlConnect, CURLOPT_USERPWD, $login.':'.$password);
 	$retour = curl_exec($CurlConnect);
 	curl_close($CurlConnect);
+
 	return $retour;
 }