Changeset 93685 in spip-zone

Timestamp:

Dec 14, 2015, 2:59:34 PM (4 years ago)

Author:

cedric@…

Message:

Utiliser le proxy configuré dans SPIP pour récupérer les URLs embed ​http://contrib.spip.net/oEmbed-4407#forum484935
+ renommage variable plus clair et PHPDoc

Location:

_plugins_/oembed

Files:

• inc/oembed_recuperer_url.php (modified) (4 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/oembed/inc/oembed_recuperer_url.php

@@ -8 +8 @@
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
-
-function inc_oembed_recuperer_url($data_url,$url,$format){
+/**
+ * Recuperer une URL oembed, si possible via curl et IPv4 pour contourner le bug de Youtube sur les IPv6
+ *
+ * @param string $oembed_url
+ * @param string $url
+ * @param string $format
+ * @return bool|mixed|string
+ */
+function inc_oembed_recuperer_url($oembed_url,$url,$format){
         $data = false;
 
@@ -15 +22 @@
         // si possible via curl en IPv4 car youtube bug en IPv6
         if (function_exists('curl_init')){
-                spip_log('Requete oembed (curl) pour '.$url.' : '.$data_url,'oembed.'._LOG_DEBUG);
+                spip_log('Requete oembed (curl) pour '.$url.' : '.$oembed_url,'oembed.'._LOG_DEBUG);
                 $c = curl_init();
                 curl_setopt($c, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($c, CURLOPT_URL, $data_url);
+                curl_setopt($c, CURLOPT_URL, $oembed_url);
+
+                if (isset($GLOBALS['meta']["http_proxy"]) AND $GLOBALS['meta']["http_proxy"]){
+                  curl_setopt($c, CURLOPT_PROXY, $GLOBALS['meta']["http_proxy"]);
+                        if (isset($GLOBALS['meta']["http_noproxy"])){
+                                curl_setopt($c, CURLOPT_NOPROXY, $GLOBALS['meta']["http_proxy"]);
+                        }
+                }
+
                 // the real trick for Youtube :
                 // http://stackoverflow.com/questions/26089067/youtube-oembed-api-302-then-503-errors
@@ -27 +42 @@
         }
         else {
-                spip_log('Requete oembed (recuperer_page) pour '.$url.' : '.$data_url,'oembed.'._LOG_DEBUG);
+                spip_log('Requete oembed (recuperer_page) pour '.$url.' : '.$oembed_url,'oembed.'._LOG_DEBUG);
                 include_spip('inc/distant');
-                $data = recuperer_page($data_url);
+                $data = recuperer_page($oembed_url);
         }
 
@@ -38 +53 @@
                 // TODO : format xml
                 //if ($format == 'xml')
-                //      $cache[$data_url] = false;
+                //      $cache[$oembed_url] = false;
         }
 

_plugins_/oembed/paquet.xml

@@ -2 +2 @@
         prefix="oembed"
         categorie="multimedia"
-        version="1.5.3"
+        version="1.5.4"
         etat="stable"
         compatibilite="[3.0.0;3.1.*]"