coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

correct media validation for map image

Browse source
This commit is contained in:
oliver 2015-07-27 15:06:09 +02:00
commit cdc2d2aee4
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
controllers/MapController.inc
View file

@ -119,21 +119,23 @@
if($media['error'] !== UPLOAD_ERR_OK) { if($media['error'] !== UPLOAD_ERR_OK) {
$validation = $this->Validation->addValidationResult($validation, 'media', 'error', $media['error']); $validation = $this->Validation->addValidationResult($validation, 'media', 'error', $media['error']);
} }
else
// Check mimetype {
$mediaMimetype = null; // Check mimetype
$media['mimetype'] = \hhu\z\Utils::getMimetype($media['tmp_name'], $media['type']); $mediaMimetype = null;
foreach($mimetypes as &$mimetype) { $media['mimetype'] = \hhu\z\Utils::getMimetype($media['tmp_name'], $media['type']);
if($mimetype['mimetype'] == $media['mimetype']) { foreach($mimetypes as &$mimetype) {
$mediaMimetype = $mimetype; if($mimetype['mimetype'] == $media['mimetype']) {
break; $mediaMimetype = $mimetype;
break;
}
}
if(is_null($mediaMimetype)) {
$validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $media['mimetype']);
}
elseif($media['size'] > $mediaMimetype['size']) {
$validation = $this->Validation->addValidationResult($validation, 'media', 'size', $mediaMimetype['size']);
} }
}
if(is_null($mediaMimetype)) {
$validation = $this->Validation->addValidationResult($validation, 'media', 'mimetype', $media['mimetype']);
}
elseif($media['size'] > $mediaMimetype['size']) {
$validation = $this->Validation->addValidationResult($validation, 'media', 'size', $mediaMimetype['size']);
} }
} }