From 87d308b849fe7f4aa0bd0bd22247763f09ccc79e Mon Sep 17 00:00:00 2001
From: Pierre <pierre.lecomte.86@gmail.com>
Date: Sat, 14 Mar 2020 02:40:17 +0100
Subject: [PATCH] =?UTF-8?q?On=20g=C3=A9n=C3=A9ralise=20et=20simplifie=20la?=
 =?UTF-8?q?=20transmission=20des=20redirections=20apr=C3=A8s=20les=20actio?=
 =?UTF-8?q?ns=20li=C3=A9es=20aux=20documents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 action/inverser_ordre.php        | 2 +-
 action/promouvoir_photo.php      | 7 +------
 action/supprimer_photo.php       | 6 ------
 inclure/editer_docs_article.html | 8 ++++----
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/action/inverser_ordre.php b/action/inverser_ordre.php
index 2376d98..35ca5f6 100644
--- a/action/inverser_ordre.php
+++ b/action/inverser_ordre.php
@@ -4,7 +4,7 @@ if (!defined('_ECRIRE_INC_VERSION')) return;
 function action_inverser_ordre_dist(){
 	$securiser_action = charger_fonction('securiser_action', 'inc');
 	$arg = $securiser_action();
-	list($id_objet,$objet,$ordre,$retour)=explode('/',$arg);
+	list($id_objet,$objet,$ordre)=explode('/',$arg);
 	$id_objet = intval($id_objet);
 
 
diff --git a/action/promouvoir_photo.php b/action/promouvoir_photo.php
index 4769a9e..60855ce 100644
--- a/action/promouvoir_photo.php
+++ b/action/promouvoir_photo.php
@@ -8,7 +8,7 @@ function action_promouvoir_photo_dist(){
 	$Targs = explode('-', $arg);
 	$id_document = intval($Targs[0]);
 	$id_article = intval($Targs[1]);
-	$type = $Targs[2];
+
 	if (!$id_document OR !$id_article) 
 		return false;
 
@@ -34,10 +34,5 @@ function action_promouvoir_photo_dist(){
 	// Cache
 	include_spip('inc/invalideur');
 	suivre_invalideur("id='id_article/$id_article'");
-
-	// redirection sur la page d'édition de l'article
-	$retour = "spip.php?page=editer_$type&id_article=$id_article#les_photos";
-	include_spip('inc/headers');
-	redirige_par_entete($retour);
 }
 
diff --git a/action/supprimer_photo.php b/action/supprimer_photo.php
index 5db3abe..bf0e64e 100644
--- a/action/supprimer_photo.php
+++ b/action/supprimer_photo.php
@@ -7,7 +7,6 @@ function action_supprimer_photo_dist(){
 	$Targs = explode('-', $arg);
 	$id_document = intval($Targs[0]);
 	$id_article = intval($Targs[1]);
-	$type = $Targs[2];
 
 
 	include_spip('inc/autoriser');
@@ -20,10 +19,5 @@ function action_supprimer_photo_dist(){
 		include_spip('inc/invalideur');
 		suivre_invalideur("id='id_article/$id_article'");
 	}
-
-	// redirection sur la page d'édition
-	$retour = "spip.php?page=editer_$type&id_article=$id_article";
-	include_spip('inc/headers');
-	redirige_par_entete($retour);
 }
 
diff --git a/inclure/editer_docs_article.html b/inclure/editer_docs_article.html
index c99d40d..2a8079b 100644
--- a/inclure/editer_docs_article.html
+++ b/inclure/editer_docs_article.html
@@ -6,8 +6,8 @@
 	<div class="col-lg-4">
 		<div class="une_photo">
 			[(#TYPE_DOCUMENT|in_array{#LISTE{JPEG,PNG,GIF}}|?{
-				[(#FICHIER|image_recadre{320:180,-,focus}|image_reduire{320,180})],
-				[(#CHEMIN{img/document.png}|image_recadre{320:180,+,center}|image_reduire{320,180})]
+				[(#FICHIER|image_recadre{320:180,-,focus,transparent}|image_reduire{320,180})],
+				[(#CHEMIN{img/document.png}|image_recadre{320:180,+,center,transparent}|image_reduire{320,180})]
 			}
 			)]
 			
@@ -19,13 +19,13 @@
 				[(#CREDITS*|=={une}|?{
 					<i class="fas fa-check green"></i> Au premier plan
 					,
-					<a class="btn btn_une" href="[(#URL_ACTION_AUTEUR{promouvoir_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})][-(#ENV{type})]})]" title="Mettre en première photo">
+					<a class="btn btn_une" href="[(#URL_ACTION_AUTEUR{promouvoir_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})],#SELF})]" title="Mettre en première photo">
 						<i class="fas fa-check"></i> Mettre au premier plan
 					</a>
 				})]
 				]
 				</div>
-				<a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})][-(#ENV{type})]})]" title="Supprimer la photo">
+				<a class="btn btn_poubelle" href="[(#URL_ACTION_AUTEUR{supprimer_photo, [(#ID_DOCUMENT)][-(#ENV{id_article})],#SELF})]" title="Supprimer la photo">
 					<i class="fas fa-trash red"></i> Supprimer
 				</a>