From 2ede3b420b6be27c2ad0a7af94ce9bf577d14ccd Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Mon, 1 Jan 2024 15:24:15 +0100
Subject: [PATCH] Base64 encode logs

---
 app/Http/Controllers/Bill/EditController.php | 17 +++++++----------
 app/Http/Controllers/Controller.php          |  9 +++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php
index 4da44d930f..78155a9367 100644
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -33,7 +33,6 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -70,16 +69,16 @@ class EditController extends Controller
      */
     public function edit(Request $request, Bill $bill)
     {
-        $periods = [];
+        $periods          = [];
 
         /** @var array $billPeriods */
-        $billPeriods = config('firefly.bill_periods');
+        $billPeriods      = config('firefly.bill_periods');
 
         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").
         if (true !== session('bills.edit.fromUpdate')) {
@@ -93,9 +92,9 @@ class EditController extends Controller
         $defaultCurrency  = app('amount')->getDefaultCurrency();
 
         // code to handle active-checkboxes
-        $hasOldInput = null !== $request->old('_token');
+        $hasOldInput      = null !== $request->old('_token');
 
-        $preFilled = [
+        $preFilled        = [
             'bill_end_date'           => $bill->end_date,
             'extension_date'          => $bill->extension_date,
             'notes'                   => $this->repository->getNoteText($bill),
@@ -124,7 +123,7 @@ class EditController extends Controller
         app('preferences')->mark();
 
         /** @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')) {
             $this->attachments->saveAttachmentsForModel($bill, $files);
         }
@@ -148,6 +147,4 @@ class EditController extends Controller
 
         return $redirect;
     }
-
-
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index f7f6cc27b1..f551175470 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -122,23 +122,20 @@ abstract class Controller extends BaseController
         );
     }
 
-    /**
-     * @param array|null $files
-     *
-     * @return void
-     */
     protected function auditLogAttachmentInfo(?array $files): void
     {
         if (null === $files) {
             Log::channel('audit')->info('No files found');
+
             return;
         }
+
         /**
          * @var int          $index
          * @var UploadedFile $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())));
         }
     }
 }