mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 08:17:12 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1166 plus some unrelated minor tweaks

Browse Source
This commit is contained in:
Ryan Cramer
2020-05-15 07:06:10 -04:00
parent 3ba72d4508
commit 1da1068d60
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wire/core/WireUpload.php
View File

@@ -417,13 +417,13 @@ class WireUpload extends Wire {
public function validateFilename($value, $extensions = array()) { public function validateFilename($value, $extensions = array()) {
$value = basename($value); $value = basename($value);
if($value[0] == '.') return false; // no hidden files if($value[0] == '.') return false; // no hidden files
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);
if($this->lowercase) $value = strtolower($value);
$value = trim($value, "_"); $value = trim($value, "_");
if(!strlen($value)) return false; if(!strlen($value)) return false;
$p = pathinfo($value); $p = pathinfo($value);
if(!isset($p['extension'])) return false; if(empty($p['extension'])) return false;
$extension = strtolower($p['extension']); $extension = strtolower($p['extension']);
$basename = basename($p['basename'], ".$extension"); $basename = basename($p['basename'], ".$extension");
// replace any dots in the basename with underscores // replace any dots in the basename with underscores
@@ -431,7 +431,7 @@ class WireUpload extends Wire {
$value = "$basename.$extension"; $value = "$basename.$extension";
if(count($extensions)) { if(count($extensions)) {
if(!in_array($extension, $extensions)) $value = false; if(!in_array($extension, $extensions, true)) $value = false;
} }
return $value; return $value;
@@ -454,13 +454,13 @@ class WireUpload extends Wire {
$error = ''; $error = '';
$filename = $this->getTargetFilename($filename); $filename = $this->getTargetFilename($filename);
$_filename = $filename; $_filename = $filename;
$filename = $this->validateFilename($filename); $filename = $this->validateFilename($filename, $this->validExtensions);
if(!$filename && $this->name) { if(($filename === false || !strlen($filename)) && $this->name) {
// if filename doesn't validate, generate filename based on field name // if filename doesn't validate, generate filename based on field name
$ext = pathinfo($_filename, PATHINFO_EXTENSION); $ext = pathinfo($_filename, PATHINFO_EXTENSION);
$filename = $this->name . ".$ext"; $filename = $this->name . ".$ext";
$filename = $this->validateFilename($filename); $filename = $this->validateFilename($filename, $this->validExtensions);
$this->overwrite = false; $this->overwrite = false;
} }