kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Check for double files and some code clean up.

Browse Source
This commit is contained in:
James Cole
2015-07-18 21:46:16 +02:00
parent 73e526645e
commit ed12ea7cfb
4 changed files with 120 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ class AttachmentHelper implements AttachmentHelperInterface
public function saveAttachmentsForModel(Model $model)
{
$files = Input::file('attachments');
foreach ($files as $entry) {
if (!is_null($entry)) {
$this->processFile($entry, $model);
@@ -71,11 +72,19 @@ class AttachmentHelper implements AttachmentHelperInterface
*/
protected function hasFile(UploadedFile $file, Model $model)
{
$md5 = md5_file($file->getPath());
$md5 = md5_file($file->getRealPath());
$name = $file->getClientOriginalName();
$class = get_class($model);
$count = Auth::user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
return ($count > 0);
if ($count > 0) {
$err = 'File ' . e($name) . ' already attached to this object.';
$this->errors->add('attachments', $err);
return true;
}
return false;
}
/**
@@ -97,7 +106,7 @@ class AttachmentHelper implements AttachmentHelperInterface
$attachment = new Attachment;
$attachment->user()->associate(Auth::user());
$attachment->attachable()->associate($model);
$attachment->md5 = md5_file($file->getPath());
$attachment->md5 = md5_file($file->getRealPath());
$attachment->filename = $file->getClientOriginalName();
$attachment->mime = $file->getMimeType();
$attachment->size = $file->getSize();
@@ -128,6 +137,11 @@ class AttachmentHelper implements AttachmentHelperInterface
}
/**
* @param UploadedFile $file
*
* @return bool
*/
protected function validMime(UploadedFile $file)
{
$mime = $file->getMimeType();
@@ -143,6 +157,11 @@ class AttachmentHelper implements AttachmentHelperInterface
return true;
}
/**
* @param UploadedFile $file
*
* @return bool
*/
protected function validSize(UploadedFile $file)
{
$size = $file->getSize();

17
app/Http/Controllers/TransactionController.php
View File

@@ -311,16 +311,29 @@ class TransactionController extends Controller
/**
* @param JournalFormRequest $request
* @param JournalRepositoryInterface $repository
* @param AttachmentHelperInterface $att
* @param TransactionJournal $journal
*
* @return \Illuminate\Http\RedirectResponse
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, AttachmentHelperInterface $att, TransactionJournal $journal)
{
$journalData = $request->getJournalData();
$repository->update($journal, $journalData);
// save attachments:
$att->saveAttachmentsForModel($journal);
if ($att->getErrors()->count() > 0) {
// todo moet beter
Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
}
if ($att->getMessages()->count() > 0) {
// todo moet beter
Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
}
event(new JournalSaved($journal));
// update, get events by date and sort DESC