kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 02:52:44 +00:00
Code Issues Projects Releases Wiki Activity

Base64 encode logs

Browse Source
This commit is contained in:
James Cole
2024-01-01 15:24:15 +01:00
parent 4bed30347d
commit 2ede3b420b
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Bill/EditController.php
View File

@@ -33,7 +33,6 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
/** /**
@@ -70,16 +69,16 @@ class EditController extends Controller
*/ */
public function edit(Request $request, Bill $bill) public function edit(Request $request, Bill $bill)
{ {
$periods = []; $periods = [];
/** @var array $billPeriods */ /** @var array $billPeriods */
$billPeriods = config('firefly.bill_periods'); $billPeriods = config('firefly.bill_periods');
foreach ($billPeriods as $current) { foreach ($billPeriods as $current) {
$periods[$current] = (string) trans('firefly.' . $current); $periods[$current] = (string) trans('firefly.'.$current);
} }
$subTitle = (string) trans('firefly.edit_bill', ['name' => $bill->name]); $subTitle = (string) trans('firefly.edit_bill', ['name' => $bill->name]);
// put previous url in session if not redirect from store (not "return_to_edit"). // put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('bills.edit.fromUpdate')) { if (true !== session('bills.edit.fromUpdate')) {
@@ -93,9 +92,9 @@ class EditController extends Controller
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
// code to handle active-checkboxes // code to handle active-checkboxes
$hasOldInput = null !== $request->old('_token'); $hasOldInput = null !== $request->old('_token');
$preFilled = [ $preFilled = [
'bill_end_date' => $bill->end_date, 'bill_end_date' => $bill->end_date,
'extension_date' => $bill->extension_date, 'extension_date' => $bill->extension_date,
'notes' => $this->repository->getNoteText($bill), 'notes' => $this->repository->getNoteText($bill),
@@ -124,7 +123,7 @@ class EditController extends Controller
app('preferences')->mark(); app('preferences')->mark();
/** @var null|array $files */ /** @var null|array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null; $files = $request->hasFile('attachments') ? $request->file('attachments') : null;
if (null !== $files && !auth()->user()->hasRole('demo')) { if (null !== $files && !auth()->user()->hasRole('demo')) {
$this->attachments->saveAttachmentsForModel($bill, $files); $this->attachments->saveAttachmentsForModel($bill, $files);
} }
@@ -148,6 +147,4 @@ class EditController extends Controller
return $redirect; return $redirect;
} }
} }

9
app/Http/Controllers/Controller.php
View File

@@ -122,23 +122,20 @@ abstract class Controller extends BaseController
); );
} }
/**
* @param array|null $files
*
* @return void
*/
protected function auditLogAttachmentInfo(?array $files): void protected function auditLogAttachmentInfo(?array $files): void
{ {
if (null === $files) { if (null === $files) {
Log::channel('audit')->info('No files found'); Log::channel('audit')->info('No files found');
return; return;
} }
/** /**
* @var int $index * @var int $index
* @var UploadedFile $file * @var UploadedFile $file
*/ */
foreach ($files as $index => $file) { foreach ($files as $index => $file) {
Log::channel('audit')->info(sprintf('File [%d/%d] upload attachment "%s", content is: "%s".', $index + 1, count($files), $file->getClientOriginalName(), $file->getContent())); Log::channel('audit')->info(sprintf('File [%d/%d] upload attachment "%s", content is: "%s".', $index + 1, count($files), $file->getClientOriginalName(),base64_encode($file->getContent())));
} }
} }
} }