AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make base64 decoding optional for uploaded data

This commit is contained in:
Frederic Guillot 2017-02-04 18:26:35 -05:00
parent 6307070507
commit 40cd74aa95
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Model/FileModel.php
View File

@ -307,31 +307,35 @@ abstract class FileModel extends Base
* Handle file upload (base64 encoded content)
*
* @access public
* @param integer $id
* @param string $original_filename
* @param string $blob
* @return bool|integer
* @param integer $id
* @param string $originalFilename
* @param string $data
* @param bool $isEncoded
* @return bool|int
*/
public function uploadContent($id, $original_filename, $blob)
public function uploadContent($id, $originalFilename, $data, $isEncoded = true)
{
try {
$data = base64_decode($blob);
if ($isEncoded) {
$data = base64_decode($data);
}
if (empty($data)) {
$this->logger->error(__METHOD__.': Content upload with no data');
return false;
}
$destination_filename = $this->generatePath($id, $original_filename);
$this->objectStorage->put($destination_filename, $data);
$destinationFilename = $this->generatePath($id, $originalFilename);
$this->objectStorage->put($destinationFilename, $data);
if ($this->isImage($original_filename)) {
$this->generateThumbnailFromData($destination_filename, $data);
if ($this->isImage($originalFilename)) {
$this->generateThumbnailFromData($destinationFilename, $data);
}
return $this->create(
$id,
$original_filename,
$destination_filename,
$originalFilename,
$destinationFilename,
strlen($data)
);
} catch (ObjectStorageException $e) {