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

Make base64 decoding optional for uploaded data

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