From fe9e0444b43174bc6f7c58e32f2413dcb525d338 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 16 Sep 2025 13:20:50 +0100
Subject: [PATCH 1/3] Added EULA tab to user view

---
 .../Transformers/ActionlogsTransformer.php    |  2 +-
 resources/views/users/view.blade.php          | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index 44ef39f247..f03f7404ba 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -147,7 +147,7 @@ class ActionlogsTransformer
                 [
                     'url' => $actionlog->uploads_file_url(),
                     'filename' => $actionlog->filename,
-                    'inlineable' => StorageHelper::allowSafeInline($actionlog->uploads_file_url()),
+                    'inlineable' => StorageHelper::allowSafeInline($actionlog->uploads_file_path()),
                     'exists_on_disk' => Storage::exists($actionlog->uploads_file_path()) ? true : false,
                 ] : null,
 
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 7dc8590c08..de2bd58cbd 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -94,6 +94,17 @@
           </a>
         </li>
 
+          <li>
+              <a href="#eulas" data-toggle="tab">
+            <span class="hidden-lg hidden-md" aria-hidden="true">
+                <x-icon type="files" class="fa-2x" />
+              </span>
+                  <span class="hidden-xs hidden-sm">{{ trans('general.eula') }}
+                      {!! ($user->eulas->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->eulas->count()).'</span>' : '' !!}
+            </span>
+              </a>
+          </li>
+
         <li>
           <a href="#history" data-toggle="tab">
             <span class="hidden-lg hidden-md">
@@ -1001,6 +1012,35 @@
           </div> <!--/ROW-->
         </div><!--/FILES-->
 
+          <div class="tab-pane" id="eulas">
+              <table
+                      data-toolbar="#userEULAToolbar"
+                      data-cookie-id-table="userEULATable"
+                      data-id-table="userEULATable"
+                      id="userEULATable"
+                      data-side-pagination="client"
+                      data-show-footer="true"
+                      data-show-refresh="false"
+                      data-sort-order="asc"
+                      data-sort-name="name"
+                      class="table table-striped snipe-table table-hover"
+                      data-url="{{ route('api.user.eulas', $user) }}"
+                      data-export-options='{
+                    "fileName": "export-eula-{{ str_slug($user->username) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","purchasecost", "icon"]
+                    }'>
+                  <thead>
+                  <tr>
+                      <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+                      <th data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
+                      <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
+                      <th data-field="note">{{ trans('general.notes') }}</th>
+                      <th data-field="url" data-formatter="fileDownloadButtonsFormatter">{{ trans('general.download') }}</th>
+                  </tr>
+                  </thead>
+              </table>
+          </div><!-- /eulas-tab -->
+
         <div class="tab-pane" id="history">
           <div class="table-responsive">
 

From ab9cc447aab577fd4acfb5fa367a93d77097c026 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 16 Sep 2025 14:20:20 +0100
Subject: [PATCH 2/3] Use more specific filename

---
 app/Http/Controllers/Account/AcceptanceController.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index 92deef177f..de973f284d 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -120,9 +120,8 @@ class AcceptanceController extends Controller
 
 
         $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
-        $display_model = '';
-        $pdf_view_route = '';
-        $pdf_filename = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf';
+        $checkout_type_shortname = strtolower(str_replace('App\Models\\', '', $acceptance->checkoutable_type));
+        $pdf_filename = 'accepted-'.$acceptance->checkoutable_id.'-'.$checkout_type_shortname.'-eula-'.date('Y-m-d-h-i-s').'.pdf';
         $sig_filename='';
 
         if ($request->input('asset_acceptance') == 'accepted') {
@@ -164,7 +163,7 @@ class AcceptanceController extends Controller
             
             $data = [
                 'item_tag' => $item->asset_tag,
-                'item_model' => $display_model,
+                'item_model' => $item->model ? $item->model->name : $item->display_name,
                 'item_serial' => $item->serial,
                 'item_status' => $item->assetstatus?->name,
                 'eula' => $item->getEula(),
@@ -203,7 +202,7 @@ class AcceptanceController extends Controller
             $pdf->AddPage();
             $pdf->writeHTML('<img src="'.$path_logo.'" height="30">', true, 0, true, 0, '');
 
-            if ($data['item_serial']) {
+            if ($data['item_tag']) {
                 $pdf->writeHTML("<strong>" . trans('general.asset_tag') . '</strong>: ' . $data['item_tag'], true, 0, true, 0, '');
             }
             $pdf->writeHTML("<strong>".trans('general.asset_model').'</strong>: '.$data['item_model'], true, 0, true, 0, '');

From 1346e33e9942bf6f1b548956fbf22ca6eca7ab9e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 16 Sep 2025 14:21:03 +0100
Subject: [PATCH 3/3] Check that the person trying to download can see both the
 user and the target

---
 app/Http/Controllers/ActionlogController.php | 34 ++++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php
index 057ca465bc..144e56a69f 100644
--- a/app/Http/Controllers/ActionlogController.php
+++ b/app/Http/Controllers/ActionlogController.php
@@ -3,11 +3,13 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
+use App\Models\Actionlog;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use \Illuminate\Http\Response;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use \Illuminate\Http\Response;
+
 class ActionlogController extends Controller
 {
     public function displaySig($filename) : RedirectResponse | Response | bool
@@ -39,17 +41,29 @@ class ActionlogController extends Controller
 
     public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
     {
-        $this->authorize('view', \App\Models\Asset::class);
 
-        if (config('filesystems.default') == 's3_private') {
-            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
+        if ($actionlog = Actionlog::where('filename', $filename)->with('user')->with('target')->firstOrFail()) {
+
+            $this->authorize('view', $actionlog->target);
+            $this->authorize('view', $actionlog->user);
+
+
+            if (config('filesystems.default') == 's3_private') {
+                return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/' . $filename, now()->addMinutes(5)));
+            }
+
+            if (Storage::exists('private_uploads/eula-pdfs/' . $filename)) {
+
+                if (request()->input('inline') == 'true') {
+                    return response()->file(config('app.private_uploads') . '/eula-pdfs/' . $filename);
+                }
+
+                return response()->download(config('app.private_uploads') . '/eula-pdfs/' . $filename);
+            }
+
+            return redirect()->back()->with('error', trans('general.file_does_not_exist'));
         }
 
-        if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
-            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
-        }
-
-        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
-
+        return redirect()->back()->with('error', trans('general.record_not_found'));
     }
 }