Changeset 47868 in spip-zone

Timestamp:

May 17, 2011, 2:17:08 PM (10 years ago)

Author:

brunobergot@…

Message:

deux options de config en plus : mode kermesse (détection automatique des liens oembed dans les pages distantes, ignore la liste blanche des providers) + possiblité de désactiver l'autoembed des urls placées dans les textes

Location:

_plugins_/oembed

Files:

• formulaires/configurer_oembed.html (added)
• inc/oembed.php (modified) (1 diff)
• lang/oembed_fr.php (modified) (2 diffs)
• oembed_pipelines.php (modified) (1 diff)
• prive/squelettes/contenu/configurer_oembed.html (modified) (1 diff)

_plugins_/oembed/inc/oembed.php

@@ -18 +18 @@
         
         $provider = oembed_verifier_provider($url);
-        $url_json = parametre_url($provider,'url',$url,'&');
+        $data_url = parametre_url($provider,'url',$url,'&');
         
-        if ((!$provider) AND ($detecter_lien != 'non')) {
+        if ((!$provider) AND (($detecter_lien != 'non') OR lire_config('oembed/detecter_lien','non')=='oui')) {
                 $provider = oembed_detecter_lien($url);
-                $url_json = $provider;
+                $data_url = $provider;
         }
         
-        $url_json = parametre_url($url_json,'maxwidth',$maxwidth,'&');
-        $url_json = parametre_url($url_json,'maxheight',$maxheight,'&');
-        $url_json = parametre_url($url_json,'format',$format,'&');
+        $data_url = parametre_url($data_url,'maxwidth',$maxwidth,'&');
+        $data_url = parametre_url($data_url,'maxheight',$maxheight,'&');
+        $data_url = parametre_url($data_url,'format',$format,'&');
         
         // on recupere le contenu de la page
         include_spip('inc/distant');
-        if ($data = recuperer_page($url_json)) {
+        if ($data = recuperer_page($data_url)) {
                 if ($format == 'json')
                         return json_decode($data,true);

_plugins_/oembed/lang/oembed_fr.php

@@ -16 +16 @@
 'ok_ajout_provider'=>'Provider ajouté',
 
+'label_detecter_lien'=>'Détecter automatiquement les providers (ignorer la liste blanche) ?',
+'label_embed_auto'=>'Transformer automatiquement les URLs insérées dans le texte ?',
 'label_endpoint'=>'Endpoint',
 'label_scheme'=>'Scheme',
@@ -22 +24 @@
 
 'titre_oembed'=>'oEmbed',
+'titre_configurer_oembed'=>'Configurer oEmbed',
 'titre_configurer_providers'=>'Providers oEmbed',
 'titre_ajouter_provider'=>'Ajouter un provider',

_plugins_/oembed/oembed_pipelines.php

@@ -83 +83 @@
 
 function oembed_pre_propre($texte) {
-        include_spip('inc/oembed');
-        foreach (extraire_balises($texte, 'a') as $lien) {
-                if ($url = extraire_attribut($lien, 'href')
-                # seuls les autoliens beneficient de la detection oembed
-                AND preg_match(',\bauto\b,', extraire_attribut($lien, 'class'))
-                AND oembed_verifier_provider($url)) {
-                        $fond = recuperer_fond('modeles/oembed',array('url'=>$url));
-                        if ($fond = trim($fond))
-                                $texte = str_replace($lien, $fond, $texte);
+        if (lire_config('oembed/embed_auto','oui')!='non') {
+                include_spip('inc/oembed');
+                foreach (extraire_balises($texte, 'a') as $lien) {
+                        if ($url = extraire_attribut($lien, 'href')
+                        # seuls les autoliens beneficient de la detection oembed
+                        AND preg_match(',\bauto\b,', extraire_attribut($lien, 'class'))
+                        AND oembed_verifier_provider($url)) {
+                                $fond = recuperer_fond('modeles/oembed',array('url'=>$url));
+                                if ($fond = trim($fond))
+                                        $texte = str_replace($lien, $fond, $texte);
+                        }
                 }
         }

_plugins_/oembed/prive/squelettes/contenu/configurer_oembed.html

@@ -4 +4 @@
 #FORMULAIRE_CONFIGURER_PROVIDERS
 </div>
+
+<div class='ajax'>
+#FORMULAIRE_CONFIGURER_OEMBED
+</div>