mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-18 20:41:16 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#462 solution for files using arabic filenames

Browse Source
This commit is contained in:
Ryan Cramer
2017-12-26 07:27:50 -05:00
parent f573473066
commit 5bba89b043
1 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
wire/core/WireUpload.php
View File

@@ -406,6 +406,7 @@ class WireUpload extends Wire {
if($this->lowercase) $value = function_exists('mb_strtolower') ? mb_strtolower($value) : strtolower($value); if($this->lowercase) $value = function_exists('mb_strtolower') ? mb_strtolower($value) : strtolower($value);
$value = $this->wire('sanitizer')->filename($value, Sanitizer::translate); $value = $this->wire('sanitizer')->filename($value, Sanitizer::translate);
$value = trim($value, "_"); $value = trim($value, "_");
if(!strlen($value)) return false;
$p = pathinfo($value); $p = pathinfo($value);
if(!isset($p['extension'])) return false; if(!isset($p['extension'])) return false;
@@ -434,35 +435,62 @@ class WireUpload extends Wire {
protected function saveUpload($tmp_name, $filename, $ajax = false) { protected function saveUpload($tmp_name, $filename, $ajax = false) {
if(!$this->checkDestinationPath()) return false; if(!$this->checkDestinationPath()) return false;
$success = false;
$error = '';
$filename = $this->getTargetFilename($filename); $filename = $this->getTargetFilename($filename);
$_filename = $filename;
$filename = $this->validateFilename($filename); $filename = $this->validateFilename($filename);
if($this->lowercase) $filename = strtolower($filename);
$destination = $this->destinationPath . $filename;
$p = pathinfo($destination);
$exists = file_exists($destination);
if(!$this->overwrite && $filename != $this->overwriteFilename) { if(!$filename && $this->name) {
// overwrite not allowed, so find a new name for it // if filename doesn't validate, generate filename based on field name
$destination = $this->getUniqueFilename($destination); $ext = pathinfo($_filename, PATHINFO_EXTENSION);
$filename = basename($destination); $filename = $this->name . ".$ext";
$filename = $this->validateFilename($filename);
} else if($exists && $this->overwrite) { $this->overwrite = false;
// file already exists in destination and will be overwritten
// here we back it up temporarily, and we don't remove the backup till __destruct()
$bakName = $filename;
do {
$bakName = "_$bakName";
$bakDestination = $this->destinationPath . $bakName;
} while(file_exists($bakDestination));
rename($destination, $bakDestination);
$this->overwrittenFiles[$bakDestination] = $destination;
} }
if($ajax) $success = @rename($tmp_name, $destination); $destination = $this->destinationPath . $filename;
else $success = move_uploaded_file($tmp_name, $destination); $p = pathinfo($destination);
if($filename) {
if($this->lowercase) {
$filename = function_exists('mb_strtolower') ? mb_strtolower($filename) : strtolower($filename);
}
$exists = file_exists($destination);
if(!$this->overwrite && $filename != $this->overwriteFilename) {
// overwrite not allowed, so find a new name for it
$destination = $this->getUniqueFilename($destination);
$filename = basename($destination);
} else if($exists && $this->overwrite) {
// file already exists in destination and will be overwritten
// here we back it up temporarily, and we don't remove the backup till __destruct()
$bakName = $filename;
do {
$bakName = "_$bakName";
$bakDestination = $this->destinationPath . $bakName;
} while(file_exists($bakDestination));
rename($destination, $bakDestination);
$this->overwrittenFiles[$bakDestination] = $destination;
}
if($ajax) {
$success = @rename($tmp_name, $destination);
} else {
$success = move_uploaded_file($tmp_name, $destination);
}
} else {
$error = "Filename does not validate";
}
if(!$success) { if(!$success) {
$this->error("Unable to move uploaded file to: $destination"); if(!$destination || !$filename) $destination = $this->destinationPath . 'invalid-filename';
if(!$error) $error = "Unable to move uploaded file to: $destination";
$this->error($error);
if(is_file($tmp_name)) @unlink($tmp_name); if(is_file($tmp_name)) @unlink($tmp_name);
return false; return false;
} }
@@ -722,7 +750,7 @@ class WireUpload extends Wire {
* *
* @param array|Wire|string $text * @param array|Wire|string $text
* @param int $flags * @param int $flags
* @return $this * @return Wire|WireUpload
* *
*/ */
public function error($text, $flags = 0) { public function error($text, $flags = 0) {