php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

undo changes

Browse Source
This commit is contained in:
Mark
2014-06-14 21:59:10 +04:00
parent 52283616a1
commit 64deaad75d
1 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
framework/validators/FileValidator.php
View File

@ -206,13 +206,13 @@ class FileValidator extends Validator
switch ($file->error) {
case UPLOAD_ERR_OK:
if ($this->maxSize !== null && !$this->validateMaxSize($file)) {
if ($this->maxSize !== null && $file->size > $this->maxSize) {
return [$this->tooBig, ['file' => $file->name, 'limit' => $this->getSizeLimit()]];
} elseif ($this->minSize !== null && !$this->validateMinSize($file)) {
} elseif ($this->minSize !== null && $file->size < $this->minSize) {
return [$this->tooSmall, ['file' => $file->name, 'limit' => $this->minSize]];
} elseif (!empty($this->types) && !$this->validateType($file)) {
return [$this->wrongType, ['file' => $file->name, 'extensions' => implode(', ', $this->types)]];
} elseif (!empty($this->mimeTypes) && !$this->validateMimeType($file)) {
} elseif (!empty($this->mimeTypes) && !in_array(FileHelper::getMimeType($file->tempName), $this->mimeTypes, true)) {
return [$this->wrongMimeType, ['file' => $file->name, 'mimeTypes' => implode(', ', $this->mimeTypes)]];
} else {
return null;
@ -318,34 +318,4 @@ class FileValidator extends Validator
return true;
}
/**
* Checks if given uploaded file have correct mime-type.
* @param \yii\web\UploadedFile $file
* @return boolean
*/
public function validateMimeType($file)
{
return in_array(FileHelper::getMimeType($file->tempName), $this->mimeTypes, true);
}
/**
* Checks if given uploaded file have correct size according current max size.
* @param \yii\web\UploadedFile $file
* @return boolean
*/
public function validateMaxSize($file)
{
return $this->maxSize > $file->size;
}
/**
* Checks if given uploaded file have correct size according current min size.
* @param \yii\web\UploadedFile $file
* @return boolean
*/
public function validateMinSize($file)
{
return $this->minSize < $file->size;
}
}