mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 09:34:54 +02:00
Code Issues Releases Wiki Activity

Upload handler fix - handle non-latin filenames

Browse Source
This commit is contained in:
SecretR
2013-10-17 16:56:31 +03:00
parent 0f7c5b0a50
commit 9b25fa3c61
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/upload_handler.php
View File

@@ -174,12 +174,16 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
e_log_event(10, __FILE__."|".__FUNCTION__."@".__LINE__, "DEBUG", "Upload Handler test", "Start individual files: ".count($files['name'])." Max upload: ".$max_upload_size, FALSE, FALSE); e_log_event(10, __FILE__."|".__FUNCTION__."@".__LINE__, "DEBUG", "Upload Handler test", "Start individual files: ".count($files['name'])." Max upload: ".$max_upload_size, FALSE, FALSE);
$c = 0; $c = 0;
$tp = e107::getParser();
foreach ($files['name'] as $key=>$name) foreach ($files['name'] as $key=>$name)
{ {
$first_error = FALSE; // Clear error flag $first_error = FALSE; // Clear error flag
if (($name != '') || $files['size'][$key]) // Need this check for things like file manager which allow multiple possible uploads if (($name != '') || $files['size'][$key]) // Need this check for things like file manager which allow multiple possible uploads
{ {
$name = preg_replace("/[^a-z0-9._-]/", '', str_replace(' ', '_', str_replace('%20', '_', strtolower($name)))); $origname = $name;
//$name = preg_replace("/[^a-z0-9._-]/", '', str_replace(' ', '_', str_replace('%20', '_', strtolower($name))));
// FIX handle non-latin file names
$name = preg_replace("/[^\w\pL.-]/u", '', str_replace(' ', '_', str_replace('%20', '_', $tp->ustrtolower($name))));
$raw_name = $name; // Save 'proper' file name - useful for display $raw_name = $name; // Save 'proper' file name - useful for display
$file_ext = trim(strtolower(substr(strrchr($name, "."), 1))); // File extension - forced to lower case internally $file_ext = trim(strtolower(substr(strrchr($name, "."), 1))); // File extension - forced to lower case internally
@@ -275,6 +279,7 @@ function process_uploaded_files($uploaddir, $fileinfo = FALSE, $options = NULL)
{ // All tests passed - can store it somewhere { // All tests passed - can store it somewhere
$uploaded[$c]['name'] = $name; $uploaded[$c]['name'] = $name;
$uploaded[$c]['rawname'] = $raw_name; $uploaded[$c]['rawname'] = $raw_name;
$uploaded[$c]['origname'] = $origname;
$uploaded[$c]['type'] = $files['type'][$key]; $uploaded[$c]['type'] = $files['type'][$key];
$uploaded[$c]['size'] = 0; $uploaded[$c]['size'] = 0;
$uploaded[$c]['index'] = $key; // Store the actual index from the file_userfile array $uploaded[$c]['index'] = $key; // Store the actual index from the file_userfile array