From d802aa33d06a2423f87be5ff0b778f2386953f42 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 5 Aug 2006 18:11:32 +0000
Subject: [PATCH] =?UTF-8?q?R=C3=A9percuter=20la=20globale=20indiquant=20le?=
=?UTF-8?q?s=20formats=20de=20logos=20dans=20les=20endroits=20o=C3=B9=20on?=
=?UTF-8?q?=20y=20fait=20r=C3=A9f=C3=A9rence=20(suite=20du=20[6883]).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/action/iconifier.php | 7 ++-----
ecrire/inc/chercher_logo.php | 23 +++++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ecrire/action/iconifier.php b/ecrire/action/iconifier.php
index c7df995471..82225b7664 100644
--- a/ecrire/action/iconifier.php
+++ b/ecrire/action/iconifier.php
@@ -41,7 +41,7 @@ function action_spip_image_effacer_dist() {
// $source = $_FILES[0]
// $dest = arton12.xxx
function action_spip_image_ajouter_dist() {
- global $sousaction2, $source, $arg;
+ global $sousaction2, $source, $arg, $formats_logos;
include_spip('inc/getdocument');
if (!$sousaction2) {
@@ -104,10 +104,7 @@ function action_spip_image_ajouter_dist() {
}
else {
@unlink ($f);
- check_upload_error(6,
- _T('info_logo_format_interdit',
- array ('formats' => 'GIF, JPG, PNG'))
- );
+ check_upload_error(6,_T('info_logo_format_interdit', $formats_logos));
}
}
diff --git a/ecrire/inc/chercher_logo.php b/ecrire/inc/chercher_logo.php
index 47a8f57013..22d82bca45 100644
--- a/ecrire/inc/chercher_logo.php
+++ b/ecrire/inc/chercher_logo.php
@@ -101,17 +101,20 @@ function afficher_boite_logo($id_objet, $id, $texteon, $texteoff, $script) {
function indiquer_logo($titre, $id_objet, $mode, $id, $script) {
- include_spip('inc/actions');
- $dir_ftp = determine_upload();
- $afficher = "";
- if ($dir_ftp
- AND $fichiers = preg_files($dir_ftp, '[.](gif|jpg|png)$')) {
- foreach ($fichiers as $f) {
- $f = substr($f, strlen($dir_ftp));
- $afficher .= "\n<option value='$f'>$f</option>";
- }
+ global $formats_logos;
+ include_spip('inc/actions');
+ $dir_ftp = determine_upload();
+ $afficher = "";
+ $reg = '[.](' . join('|', $formats_logos) . ')$';
+
+ if ($dir_ftp
+ AND $fichiers = preg_files($dir_ftp, $reg)) {
+ foreach ($fichiers as $f) {
+ $f = substr($f, strlen($dir_ftp));
+ $afficher .= "\n<option value='$f'>$f</option>";
}
- if (!$afficher) {
+ }
+ if (!$afficher) {
if ($dir_ftp)
$afficher = _T('info_installer_images_dossier',
array('upload' => '<b>' . $dir_ftp . '</b>'));
--
GitLab