From e200761127e9496d01ce02abd5eebf4e3f700e98 Mon Sep 17 00:00:00 2001 From: Guillaume Viguier Date: Tue, 6 Jul 2010 13:24:47 -0500 Subject: [PATCH] List of invalid files during stylesheet upload - UTP - BT#1218 --- main/admin/settings.lib.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 0ade0066ba..ea0b6bf81b 100755 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -360,6 +360,7 @@ function upload_stylesheet($values,$picture) $numFiles = $zip->numFiles; $valid = true; $single_directory = true; + $invalid_files = array(); for($i =0; $i < $numFiles; $i++) { $file = $zip->statIndex($i); @@ -367,6 +368,7 @@ function upload_stylesheet($values,$picture) $path_parts = pathinfo($file['name']); if(!in_array($path_parts['extension'], array('jpg', 'jpeg', 'png', 'gif', 'css'))) { $valid = false; + $invalid_files[] = $file['name']; } } @@ -375,7 +377,12 @@ function upload_stylesheet($values,$picture) } } if($valid == false) { - Display::display_error_message(get_lang('ErrorStylesheetFilesExtensionsInsideZip')); + $error_string = ''; + Display::display_error_message(get_lang('ErrorStylesheetFilesExtensionsInsideZip').$error_string, false); } else { // If the zip does not contain a single directory, extract it if($single_directory == false) {