Changeset 95510 in spip-zone

Timestamp:

Feb 26, 2016, 11:31:18 AM (4 years ago)

Author:

cedric@…

Message:

faire marcher les DELETE du webhook sur l'api mail jet aussi si on utilise SPIP 3 (mais c'est pas beau, a faire en curl ?)

Location:

_plugins_/mailshot/trunk

Files:

• lib/mailjet-api-php/mailjet-3.php (modified) (2 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/mailshot/trunk/lib/mailjet-api-php/mailjet-3.php

@@ -66 +66 @@
                 $return = ($result===true) ? $this->_response : false;
 
-                if (isset($this->_response['StatusCode'])){
+                if ($this->_error){
+                        $url_log = "api.mailjet.com/".$this->apiVersion.$this->_method;
+                        spip_log("$url_log : ".$this->_error,'mailshot'._LOG_ERREUR);
+                }
+                elseif (isset($this->_response['StatusCode'])){
                         $url_log = "api.mailjet.com/".$this->apiVersion.$this->_method;
                         spip_log("$url_log : status ".$this->_response['StatusCode']." - ".$this->_response['ErrorInfo'].", ".$this->_response['ErrorMessage'],'mailshot'._LOG_INFO_IMPORTANTE);
@@ -139 +143 @@
                 try {
                         if (!function_exists('recuperer_url')){
-                                $response = recuperer_page($url,false,false,null,$this->_data);
+                                // en cas de DELETE on appelle directement recuperer_lapage
+                                // en esperant ne pas avoir de 301
+                                if (in_array($this->_request,array('DELETE'))){
+                                        $response = recuperer_lapage($url,false,$this->_request,1048576,$this->_data);
+                                }
+                                else {
+                                        $response = recuperer_page($url,false,false,null,$this->_data);
+                                }
                                 if (!$response){
                                         $this->_error = 'erreur lors de recuperer_page sur API Mailjet '.$this->apiVersion;

_plugins_/mailshot/trunk/paquet.xml

@@ -2 +2 @@
         prefix="mailshot"
         categorie="communication"
-        version="1.14.0"
+        version="1.14.1"
         etat="stable"
         compatibilite="[3.0.5;3.1.*]"