From 6f01ccd2de7a01e20a45e74326f03f80a2160d53 Mon Sep 17 00:00:00 2001
From: "guy.cesaro@gmail.com" <>
Date: Tue, 12 Apr 2011 13:36:02 +0000
Subject: [PATCH] =?UTF-8?q?Annulation=20de=20[46626]=20et=20[46625],=20on?=
=?UTF-8?q?=20reprend=20les=20fonctions=20comment=C3=A9es=20par=20[44694]?=
=?UTF-8?q?=20en=20les=20d=C3=A9placant=20dans=20inc/joindre=5Fdocument.?=
=?UTF-8?q?=20(C=C3=A9dric)=20On=20ajoute=20un=20autre=20include=5Fspip(ac?=
=?UTF-8?q?tion/ajouter=5Fdocuments)=20pour=20disposer=20de=20corriger=5Fe?=
=?UTF-8?q?xtension=20dans=20accepte=5Ffichier=5Fupload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
inc/getdocument.php | 27 +--------------------------
inc/joindre_document.php | 30 +++++++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/inc/getdocument.php b/inc/getdocument.php
index 6071cf83..78039cb3 100644
--- a/inc/getdocument.php
+++ b/inc/getdocument.php
@@ -41,30 +41,5 @@ function erreur_upload_trop_gros() {
exit;
}
-//
-// Gestion des fichiers ZIP
-//
-// http://doc.spip.org/@accepte_fichier_upload
-/*
-function accepte_fichier_upload ($f) {
- if (!preg_match(",.*__MACOSX/,", $f)
- AND !preg_match(",^\.,", basename($f))) {
- $ext = corriger_extension((strtolower(substr(strrchr($f, "."), 1))));
- return sql_countsel('spip_types_documents', "extension=" . sql_quote($ext) . " AND upload='oui'");
- }
-}
-*/
-# callback pour le deballage d'un zip telecharge
-# http://www.phpconcept.net/pclzip/man/en/?options-pclzip_cb_pre_extractfunction
-// http://doc.spip.org/@callback_deballe_fichier
-/*
-function callback_deballe_fichier($p_event, &$p_header) {
- if (accepte_fichier_upload($p_header['filename'])) {
- $p_header['filename'] = _tmp_dir . basename($p_header['filename']);
- return 1;
- } else {
- return 0;
- }
-}
-*/
+
?>
diff --git a/inc/joindre_document.php b/inc/joindre_document.php
index 0171c713..e334cdae 100644
--- a/inc/joindre_document.php
+++ b/inc/joindre_document.php
@@ -238,7 +238,7 @@ function joindre_decrire_contenu_zip($zip) {
$fichiers = array();
$erreurs = array();
foreach ($list as $file) {
- if (is_array(verifier_upload_autorise($f = $file['stored_filename'])))
+ if (accepte_fichier_upload($f = $file['stored_filename']))
$fichiers[$f] = $file;
else
// pas de message pour les dossiers et fichiers caches
@@ -298,4 +298,32 @@ function fixer_extension_document($doc) {
return array($extension,$name);
}
}
+
+//
+// Gestion des fichiers ZIP
+//
+// http://doc.spip.org/@accepte_fichier_upload
+
+function accepte_fichier_upload ($f) {
+ if (!preg_match(",.*__MACOSX/,", $f)
+ AND !preg_match(",^\.,", basename($f))) {
+ include_spip('action/ajouter_documents');
+ $ext = corriger_extension((strtolower(substr(strrchr($f, "."), 1))));
+ return sql_countsel('spip_types_documents', "extension=" . sql_quote($ext) . " AND upload='oui'");
+ }
+}
+
+# callback pour le deballage d'un zip telecharge
+# http://www.phpconcept.net/pclzip/man/en/?options-pclzip_cb_pre_extractfunction
+// http://doc.spip.org/@callback_deballe_fichier
+
+function callback_deballe_fichier($p_event, &$p_header) {
+ if (accepte_fichier_upload($p_header['filename'])) {
+ $p_header['filename'] = _tmp_dir . basename($p_header['filename']);
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
?>
\ No newline at end of file
--
GitLab