viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-29 23:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix upload attacment

Browse Source
This commit is contained in:
yuri
2018-11-19 15:20:20 +02:00
parent 3b8e9d8e47
commit 2c2ac08bf7
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Espo/Core/Mail/Importer.php
View File

@@ -366,7 +366,8 @@ class Importer
foreach ($inlineAttachmentList as $attachment) {
$attachment->set([
'relatedId' => $email->id,
'relatedType' => 'Email'
'relatedType' => 'Email',
'field' => 'body'
]);
$this->getEntityManager()->saveEntity($attachment);
}

23
application/Espo/Services/Attachment.php
View File

@@ -42,7 +42,7 @@ class Attachment extends Record
protected $attachmentFieldTypeList = ['file', 'image', 'attachmentMultiple'];
protected $inlineAttachmentFieldTypeList = ['text', 'wysiwyg'];
protected $inlineAttachmentFieldTypeList = ['wysiwyg'];
public function upload($fileData)
{
@@ -95,16 +95,15 @@ class Attachment extends Record
throw new BadRequest("Params 'field' and 'parentType' not passed along with 'file'.");
}
$fieldType = $this->getMetadata()->get(['entityDefs', $relatedEntityType, 'fields', $field, 'type']);
if (!$role || !in_array($role, ['Attachment', 'Inline Attachment'])) {
throw new BadRequest("Not supported attachment 'role'.");
}
$this->checkAttachmentField($relatedEntityType, $field);
$this->checkAttachmentField($relatedEntityType, $field, $role);
$size = mb_strlen($contents, '8bit');
if ($role === 'Attachment') {
if (!in_array($fieldType, $this->attachmentFieldTypeList)) {
throw new Error("Field type '{$fieldType}' is not allowed for attachment.");
}
$maxSize = $this->getMetadata()->get(['entityDefs', $relatedEntityType, 'fields', $field, 'maxFileSize']);
if (!$maxSize) {
$maxSize = $this->getConfig()->get('attachmentUploadMaxSize');
@@ -116,9 +115,7 @@ class Attachment extends Record
}
} else if ($role === 'Inline Attachment') {
if (!in_array($fieldType, $this->inlineAttachmentFieldTypeList)) {
throw new Error("Field '{$field}' is not allowed to have inline attachment.");
}
$inlineAttachmentUploadMaxSize = $this->getConfig()->get('inlineAttachmentUploadMaxSize');
if ($inlineAttachmentUploadMaxSize) {
if ($size > $inlineAttachmentUploadMaxSize * 1024 * 1024) {
@@ -155,14 +152,16 @@ class Attachment extends Record
}
}
protected function checkAttachmentField($relatedEntityType, $field)
protected function checkAttachmentField($relatedEntityType, $field, $role = 'Attachment')
{
$fieldType = $this->getMetadata()->get(['entityDefs', $relatedEntityType, 'fields', $field, 'type']);
if (!$fieldType) {
throw new Error("Field '{$field}' does not exist.");
}
if (!in_array($fieldType, $this->attachmentFieldTypeList)) {
throw new Error("Field type '{$fieldType}' is not allowed for attachment.");
$attachmentFieldTypeListParam = lcfirst(str_replace(' ', '', $role)) . 'FieldTypeList';
if (!in_array($fieldType, $this->$attachmentFieldTypeListParam)) {
throw new Error("Field type '{$fieldType}' is not allowed for {$role}.");
}
if (