From 6b1c12b35a7bc16e04422789e550592197b50515 Mon Sep 17 00:00:00 2001
From: "nicod@lerebooteux.fr" <>
Date: Tue, 22 May 2018 17:47:49 +0000
Subject: [PATCH] =?UTF-8?q?Ajouter=20une=20option=20de=20config=20qui=20pe?=
 =?UTF-8?q?rmet=20de=20ne=20pas=20g=C3=A9n=C3=A9rer=20les=20liens=20oembed?=
 =?UTF-8?q?=20dans=20le=20head.=20Rien=20ne=20change=20apr=C3=A8s=20cette?=
 =?UTF-8?q?=20mise=20=C3=A0=20jour,=20les=20liens=20sont=20toujours=20g?=
 =?UTF-8?q?=C3=A9n=C3=A9r=C3=A9s=20par=20d=C3=A9faut.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/configurer_oembed.html | 12 ++++++++++++
 lang/oembed_fr.php                 |  1 +
 oembed_pipelines.php               |  4 ++++
 paquet.xml                         |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/formulaires/configurer_oembed.html b/formulaires/configurer_oembed.html
index 7d20326..eca1975 100644
--- a/formulaires/configurer_oembed.html
+++ b/formulaires/configurer_oembed.html
@@ -44,6 +44,18 @@
 				[(#ENV{#GET{name},non}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label>
 			</div>
 		</li>
+		#SET{name,inserer_head}#SET{erreurs,#ENV**{erreurs}|table_valeur{#GET{name}}}
+		<li class="editer long_label editer_[(#GET{name})][ (#GET{obli})][ (#GET{erreurs}|oui)erreur]">
+			<label for="#GET{name}"><:oembed:label_inserer_head:></label>[
+			<span class='erreur_message'>(#GET{erreurs})</span>
+			]<div class="choix">
+				<input type="radio" name="#GET{name}" class="radio" id="#GET{name}_oui" value="oui"
+				[(#ENV{#GET{name},oui}|=={oui}|oui)checked="checked"] /><label for="#GET{name}_oui"><:item_oui:></label>
+				&nbsp;&nbsp;
+				<input type="radio" name="#GET{name}" class="radio" id="#GET{name}_non" value="non"
+				[(#ENV{#GET{name},oui}|=={oui}|non)checked="checked"] /><label for="#GET{name}_non"><:item_non:></label>
+			</div>
+		</li>
 	</ul>
   [(#REM) ajouter les saisies supplementaires : extra et autre, a cet endroit ]
   <!--extra-->
diff --git a/lang/oembed_fr.php b/lang/oembed_fr.php
index 2e22861..48bb75f 100644
--- a/lang/oembed_fr.php
+++ b/lang/oembed_fr.php
@@ -27,6 +27,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 	'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_inserer_head' => 'Le site est lui même provider oembed',
 	'label_maxheight' => 'Hauteur maxi. par défaut (px)',
 	'label_maxwidth' => 'Largeur maxi. par défaut (px)',
 	'label_scheme' => 'Scheme',
diff --git a/oembed_pipelines.php b/oembed_pipelines.php
index d74550b..54e2605 100644
--- a/oembed_pipelines.php
+++ b/oembed_pipelines.php
@@ -26,6 +26,10 @@ function oembed_insert_head_css($head) {
  * @return string
  */
 function oembed_insert_head($head) {
+	if(lire_config('oembed/inserer_head')=='non') {
+		return $head;
+	}
+	
 	$service = 'oembed.api/';
 
 	$ins = '<link rel="alternate" type="application/json+oembed" href="<?php include_spip(\'inc/filtres_mini\');echo parametre_url(url_absolue("'.parametre_url($service, 'format', 'json').'"), "url", url_absolue(self()));?>" />'."\n";
diff --git a/paquet.xml b/paquet.xml
index d24a238..751ff92 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="oembed"
 	categorie="multimedia"
-	version="2.0.5"
+	version="2.0.6"
 	etat="stable"
 	compatibilite="[3.0.0;3.2.*]"
 	logo="prive/themes/spip/images/oembed-32.png"