IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some optimisation.

Browse Source
This commit is contained in:
James Cole
2015-07-18 22:17:31 +02:00
parent ed12ea7cfb
commit ed4fcc9011
3 changed files with 98 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -3,6 +3,7 @@
namespace FireflyIII\Helpers\Attachments; namespace FireflyIII\Helpers\Attachments;
use Auth; use Auth;
use Config;
use Crypt; use Crypt;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@@ -18,11 +19,13 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
class AttachmentHelper implements AttachmentHelperInterface class AttachmentHelper implements AttachmentHelperInterface
{ {
// move to config: /** @var int */
protected $maxUploadSize = 1048576; // 1MB per file protected $maxUploadSize;
protected $allowedMimes = ['image/png', 'image/jpeg', 'application/pdf']; /** @var array */
protected $allowedMimes;
/** @var MessageBag */
public $errors; public $errors;
/** @var MessageBag */
public $messages; public $messages;
/** /**
@@ -30,14 +33,16 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
public function __construct() public function __construct()
{ {
$this->errors = new MessageBag; $this->maxUploadSize = Config::get('firefly.maxUploadSize');
$this->messages = new MessageBag; $this->allowedMimes = Config::get('firefly.allowedMimes');
$this->errors = new MessageBag;
$this->messages = new MessageBag;
} }
/** /**
* @param Attachment $attachment * @param Attachment $attachment
* *
* @return mixed * @return string
*/ */
public function getAttachmentLocation(Attachment $attachment) public function getAttachmentLocation(Attachment $attachment)
{ {
@@ -78,8 +83,8 @@ class AttachmentHelper implements AttachmentHelperInterface
$count = Auth::user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); $count = Auth::user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
if ($count > 0) { if ($count > 0) {
$err = 'File ' . e($name) . ' already attached to this object.'; $msg = trans('validation.file_already_attached', ['name' => $name]);
$this->errors->add('attachments', $err); $this->errors->add('attachments', $msg);
return true; return true;
} }
@@ -89,8 +94,11 @@ class AttachmentHelper implements AttachmentHelperInterface
/** /**
* @param UploadedFile $file * @param UploadedFile $file
* @param Model $model
*
* @return bool
*/ */
protected function processFile(UploadedFile $file, Model $model) protected function validateUpload(UploadedFile $file, Model $model)
{ {
if (!$this->validMime($file)) { if (!$this->validMime($file)) {
return false; return false;
@@ -102,8 +110,23 @@ class AttachmentHelper implements AttachmentHelperInterface
return false; return false;
} }
// create Attachment object. return true;
$attachment = new Attachment; }
/**
* @param UploadedFile $file
* @param Model $model
*
* @return bool|Attachment
*/
protected function processFile(UploadedFile $file, Model $model)
{
$validation = $this->validateUpload($file, $model);
if ($validation === false) {
return false;
}
$attachment = new Attachment; // create Attachment object.
$attachment->user()->associate(Auth::user()); $attachment->user()->associate(Auth::user());
$attachment->attachable()->associate($model); $attachment->attachable()->associate($model);
$attachment->md5 = md5_file($file->getRealPath()); $attachment->md5 = md5_file($file->getRealPath());
@@ -113,23 +136,22 @@ class AttachmentHelper implements AttachmentHelperInterface
$attachment->uploaded = 0; $attachment->uploaded = 0;
$attachment->save(); $attachment->save();
// encrypt and move file to storage. $path = $file->getRealPath(); // encrypt and move file to storage.
$path = $file->getRealPath();
$content = file_get_contents($path); $content = file_get_contents($path);
$encrypted = Crypt::encrypt($content); $encrypted = Crypt::encrypt($content);
// store it: // store it:
$upload = storage_path('upload') . DIRECTORY_SEPARATOR . 'at-' . $attachment->id . '.data'; $upload = $this->getAttachmentLocation($attachment);
if (is_writable(dirname($upload))) { if (is_writable(dirname($upload))) {
file_put_contents($upload, $encrypted); file_put_contents($upload, $encrypted);
} }
// update Attacment. $attachment->uploaded = 1; // update attachment
$attachment->uploaded = 1;
$attachment->save(); $attachment->save();
// add message: $name = e($file->getClientOriginalName()); // add message:
$this->messages->add('attachments', 'File ' . e($file->getClientOriginalName()) . ' was uploaded successfully.'); $msg = trans('validation.file_attached', ['name' => $name]);
$this->messages->add('attachments', $msg);
// return it. // return it.
return $attachment; return $attachment;
@@ -144,12 +166,12 @@ class AttachmentHelper implements AttachmentHelperInterface
*/ */
protected function validMime(UploadedFile $file) protected function validMime(UploadedFile $file)
{ {
$mime = $file->getMimeType(); $mime = e($file->getMimeType());
$name = $file->getClientOriginalName(); $name = e($file->getClientOriginalName());
if (!in_array($mime, $this->allowedMimes)) { if (!in_array($mime, $this->allowedMimes)) {
$err = 'File ' . e($name) . ' is of type ' . e($mime) . '.'; $msg = trans('validation.file_invalid_mime', ['name' => $name, 'mime' => $mime]);
$this->errors->add('attachments', $err); $this->errors->add('attachments', $msg);
return false; return false;
} }
@@ -165,11 +187,10 @@ class AttachmentHelper implements AttachmentHelperInterface
protected function validSize(UploadedFile $file) protected function validSize(UploadedFile $file)
{ {
$size = $file->getSize(); $size = $file->getSize();
$name = $file->getClientOriginalName(); $name = e($file->getClientOriginalName());
if ($size > $this->maxUploadSize) { if ($size > $this->maxUploadSize) {
$msg = trans('validation.file_too_large', ['name' => $name]);
$err = 'File ' . e($name) . ' is too large.'; $this->errors->add('attachments', $msg);
$this->errors->add('attachments', $err);
return false; return false;
} }

2
config/firefly.php
View File

@@ -6,6 +6,8 @@ return [
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'], 'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], 'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true, 'csv_import_enabled' => true,
'maxUploadSize' => 5242880,
'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],
'piggy_bank_periods' => [ 'piggy_bank_periods' => [
'week' => 'Week', 'week' => 'Week',
'month' => 'Month', 'month' => 'Month',

92
resources/lang/en/validation.php
View File

@@ -13,69 +13,73 @@ return [
| |
*/ */
"accepted" => "The :attribute must be accepted.", 'file_already_attached' => 'Uploaded file ":name" is already attached to this object.',
"active_url" => "The :attribute is not a valid URL.", 'file_attached' => 'Succesfully uploaded file ":name".',
"after" => "The :attribute must be a date after :date.", 'file_invalid_mime' => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
"alpha" => "The :attribute may only contain letters.", 'file_too_large' => 'File ":name" is too large.',
"alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", "accepted" => "The :attribute must be accepted.",
"alpha_num" => "The :attribute may only contain letters and numbers.", "active_url" => "The :attribute is not a valid URL.",
"array" => "The :attribute must be an array.", "after" => "The :attribute must be a date after :date.",
"unique_for_user" => "There already is an entry with this :attribute.", "alpha" => "The :attribute may only contain letters.",
"before" => "The :attribute must be a date before :date.", "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
'unique_object_for_user' => 'This name is already in use', "alpha_num" => "The :attribute may only contain letters and numbers.",
"array" => "The :attribute must be an array.",
"unique_for_user" => "There already is an entry with this :attribute.",
"before" => "The :attribute must be a date before :date.",
'unique_object_for_user' => 'This name is already in use',
'unique_account_for_user' => 'This account name is already in use', 'unique_account_for_user' => 'This account name is already in use',
"between" => [ "between" => [
"numeric" => "The :attribute must be between :min and :max.", "numeric" => "The :attribute must be between :min and :max.",
"file" => "The :attribute must be between :min and :max kilobytes.", "file" => "The :attribute must be between :min and :max kilobytes.",
"string" => "The :attribute must be between :min and :max characters.", "string" => "The :attribute must be between :min and :max characters.",
"array" => "The :attribute must have between :min and :max items.", "array" => "The :attribute must have between :min and :max items.",
], ],
"boolean" => "The :attribute field must be true or false.", "boolean" => "The :attribute field must be true or false.",
"confirmed" => "The :attribute confirmation does not match.", "confirmed" => "The :attribute confirmation does not match.",
"date" => "The :attribute is not a valid date.", "date" => "The :attribute is not a valid date.",
"date_format" => "The :attribute does not match the format :format.", "date_format" => "The :attribute does not match the format :format.",
"different" => "The :attribute and :other must be different.", "different" => "The :attribute and :other must be different.",
"digits" => "The :attribute must be :digits digits.", "digits" => "The :attribute must be :digits digits.",
"digits_between" => "The :attribute must be between :min and :max digits.", "digits_between" => "The :attribute must be between :min and :max digits.",
"email" => "The :attribute must be a valid email address.", "email" => "The :attribute must be a valid email address.",
"filled" => "The :attribute field is required.", "filled" => "The :attribute field is required.",
"exists" => "The selected :attribute is invalid.", "exists" => "The selected :attribute is invalid.",
"image" => "The :attribute must be an image.", "image" => "The :attribute must be an image.",
"in" => "The selected :attribute is invalid.", "in" => "The selected :attribute is invalid.",
"integer" => "The :attribute must be an integer.", "integer" => "The :attribute must be an integer.",
"ip" => "The :attribute must be a valid IP address.", "ip" => "The :attribute must be a valid IP address.",
"max" => [ "max" => [
"numeric" => "The :attribute may not be greater than :max.", "numeric" => "The :attribute may not be greater than :max.",
"file" => "The :attribute may not be greater than :max kilobytes.", "file" => "The :attribute may not be greater than :max kilobytes.",
"string" => "The :attribute may not be greater than :max characters.", "string" => "The :attribute may not be greater than :max characters.",
"array" => "The :attribute may not have more than :max items.", "array" => "The :attribute may not have more than :max items.",
], ],
"mimes" => "The :attribute must be a file of type: :values.", "mimes" => "The :attribute must be a file of type: :values.",
"min" => [ "min" => [
"numeric" => "The :attribute must be at least :min.", "numeric" => "The :attribute must be at least :min.",
"file" => "The :attribute must be at least :min kilobytes.", "file" => "The :attribute must be at least :min kilobytes.",
"string" => "The :attribute must be at least :min characters.", "string" => "The :attribute must be at least :min characters.",
"array" => "The :attribute must have at least :min items.", "array" => "The :attribute must have at least :min items.",
], ],
"not_in" => "The selected :attribute is invalid.", "not_in" => "The selected :attribute is invalid.",
"numeric" => "The :attribute must be a number.", "numeric" => "The :attribute must be a number.",
"regex" => "The :attribute format is invalid.", "regex" => "The :attribute format is invalid.",
"required" => "The :attribute field is required.", "required" => "The :attribute field is required.",
"required_if" => "The :attribute field is required when :other is :value.", "required_if" => "The :attribute field is required when :other is :value.",
"required_with" => "The :attribute field is required when :values is present.", "required_with" => "The :attribute field is required when :values is present.",
"required_with_all" => "The :attribute field is required when :values is present.", "required_with_all" => "The :attribute field is required when :values is present.",
"required_without" => "The :attribute field is required when :values is not present.", "required_without" => "The :attribute field is required when :values is not present.",
"required_without_all" => "The :attribute field is required when none of :values are present.", "required_without_all" => "The :attribute field is required when none of :values are present.",
"same" => "The :attribute and :other must match.", "same" => "The :attribute and :other must match.",
"size" => [ "size" => [
"numeric" => "The :attribute must be :size.", "numeric" => "The :attribute must be :size.",
"file" => "The :attribute must be :size kilobytes.", "file" => "The :attribute must be :size kilobytes.",
"string" => "The :attribute must be :size characters.", "string" => "The :attribute must be :size characters.",
"array" => "The :attribute must contain :size items.", "array" => "The :attribute must contain :size items.",
], ],
"unique" => "The :attribute has already been taken.", "unique" => "The :attribute has already been taken.",
"url" => "The :attribute format is invalid.", "url" => "The :attribute format is invalid.",
"timezone" => "The :attribute must be a valid zone.", "timezone" => "The :attribute must be a valid zone.",
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -88,7 +92,7 @@ return [
| |
*/ */
'custom' => [ 'custom' => [
'attribute-name' => [ 'attribute-name' => [
'rule-name' => 'custom-message', 'rule-name' => 'custom-message',
], ],
@@ -105,6 +109,6 @@ return [
| |
*/ */
'attributes' => [], 'attributes' => [],
]; ];