Skip to content

A free open source IT asset/license management system

feat: use Storage::disk('public')->url() instead of hardcoded upload URLs

Guillaume Delberguebc7473d8631f
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index f08704039e..d6b0e7c41d 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -89,8 +89,8 @@ class AssetsTransformer
'tag_color' => ($asset->defaultLoc->tag_color) ? e($asset->defaultLoc->tag_color) : null,
] : null,
'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
- 'qr' => ($setting->qr_code == '1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null,
- 'alt_barcode' => ($setting->alt_barcode_enabled == '1') ? config('app.url').'/uploads/barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png' : null,
+ 'qr' => ($setting->qr_code == '1') ? Storage::disk('public')->url('barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png') : null,
+ 'alt_barcode' => ($setting->alt_barcode_enabled == '1') ? Storage::disk('public')->url('barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png') : null,
'assigned_to' => $this->transformAssignedTo($asset),
'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null,
'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
diff --git a/app/Models/Location.php b/app/Models/Location.php
index b3a95718b0..91eb941704 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Storage;
use Watson\Validating\ValidatingTrait;
class Location extends SnipeModel
@@ -362,7 +363,7 @@ class Location extends SnipeModel
foreach ($locations_with_children[$parent_id] as $location) {
$location->use_text = $prefix.' '.$location->name;
- $location->use_image = ($location->image) ? config('app.url').'/uploads/locations/'.$location->image : null;
+ $location->use_image = ($location->image) ? Storage::disk('public')->url('locations/' . $location->image) : null;
$results[] = $location;
// now append the children. (if we have any)
if (array_key_exists($location->id, $locations_with_children)) {
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index 7bf2b9e88b..523bba76bf 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -3,6 +3,7 @@
namespace App\Presenters;
use App\Helpers\Helper;
+use Illuminate\Support\Facades\Storage;
/**
* Class AssetModelPresenter
@@ -280,7 +281,8 @@ class AssetModelPresenter extends Presenter
public function imageUrl()
{
if (! empty($this->image)) {
- return '<img src="'.config('app.url').'/uploads/models/'.$this->image.'" alt="'.$this->name.'" height="50" width="50">';
+ $url = Storage::disk('public')->url(app('models_upload_path') . e($this->image));
+ return '<img src="' . $url . '" alt="' . e($this->name) . '" height="50" width="50">';
}
return '';
@@ -294,7 +296,7 @@ class AssetModelPresenter extends Presenter
public function imageSrc()
{
if (! empty($this->image)) {
- return config('app.url').'/uploads/models/'.$this->image;
+ return Storage::disk('public')->url(app('models_upload_path') . e($this->image));
}
return '';
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 4598840605..d890e7e617 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -6,6 +6,7 @@ use App\Models\CustomField;
use App\Models\Setting;
use Carbon\CarbonImmutable;
use DateTime;
+use Illuminate\Support\Facades\Storage;
/**
* Class AssetPresenter
@@ -477,6 +478,7 @@ class AssetPresenter extends Presenter
public function imageUrl()
{
$imagePath = '';
+ $imageAlt = '';
if ($this->image && ! empty($this->image)) {
$imagePath = $this->image;
$imageAlt = $this->name;
@@ -484,9 +486,9 @@ class AssetPresenter extends Presenter
$imagePath = $this->model->image;
$imageAlt = $this->model->name;
}
- $url = config('app.url');
if (! empty($imagePath)) {
- $imagePath = '<img src="'.$url.'/uploads/assets/'.$imagePath.' height="50" width="50" alt="'.$imageAlt.'">';
+ $url = Storage::disk('public')->url(app('assets_upload_path') . e($imagePath));
+ $imagePath = '<img src="' . $url . '" height="50" width="50" alt="' . e($imageAlt) . '">';
}
return $imagePath;
@@ -506,7 +508,7 @@ class AssetPresenter extends Presenter
$imagePath = $this->model->image;
}
if (! empty($imagePath)) {
- return config('app.url').'/uploads/assets/'.$imagePath;
+ return Storage::disk('public')->url(app('assets_upload_path') . e($imagePath));
}
return $imagePath;
diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.php
index 32ab6b11a1..cd2ccde475 100644
--- a/app/Presenters/DepreciationReportPresenter.php
+++ b/app/Presenters/DepreciationReportPresenter.php
@@ -3,6 +3,7 @@
namespace App\Presenters;
use DateTime;
+use Illuminate\Support\Facades\Storage;
/**
* Class DepreciationReportPresenter
@@ -232,7 +233,7 @@ class DepreciationReportPresenter extends Presenter
$imagePath = $this->model->image;
}
if (! empty($imagePath)) {
- return config('app.url').'/uploads/assets/'.$imagePath;
+ return Storage::disk('public')->url(app('assets_upload_path') . e($imagePath));
}
return $imagePath;
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index da6e4cdc2d..4db7419732 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -52,7 +52,7 @@
@if (($request->itemType() == "asset") && ($request->requestable))
<a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
@elseif (($request->itemType() == "asset_model") && ($request->requestable))
- <a href="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
+ <a href="{{ Storage::disk('public')->url(app('models_upload_path') . $request->requestable->image) }}" data-toggle="lightbox" data-type="image"><img src="{{ Storage::disk('public')->url(app('models_upload_path') . $request->requestable->image) }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
@endif
</td>
<td>
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index 1ef9417fd7..00f2cf979c 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -36,13 +36,13 @@
<h3>
@if ($snipeSettings->acceptance_pdf_logo!='')
- <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
+ <img class="print-logo" src="{{ Storage::disk('public')->url($snipeSettings->acceptance_pdf_logo) }}">
@endif
{{ $snipeSettings->site_name }}
</h3>
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->acceptance_pdf_logo!='')
- <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
+ <img class="print-logo" src="{{ Storage::disk('public')->url($snipeSettings->acceptance_pdf_logo) }}">
@endif
@else
<h3>{{ $snipeSettings->site_name }}</h3>
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 935959a400..f3cb82fd7a 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -76,13 +76,13 @@
<h2>
@if ($snipeSettings->acceptance_pdf_logo!='')
- <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
+ <img class="print-logo" src="{{ Storage::disk('public')->url($snipeSettings->acceptance_pdf_logo) }}">
@endif
{{ $snipeSettings->site_name }}
</h2>
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->acceptance_pdf_logo!='')
- <img class="print-logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->acceptance_pdf_logo }}">
+ <img class="print-logo" src="{{ Storage::disk('public')->url($snipeSettings->acceptance_pdf_logo) }}">
@endif
@else
<h2>{{ $snipeSettings->site_name }}</h2>
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index e2f953e2a6..aed278b1c1 100644
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -6,13 +6,13 @@
@if ($snipeSettings->brand == '3')
@if ($snipeSettings->logo!='')
-<img class="navbar-brand-img logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+<img class="navbar-brand-img logo" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}">
@endif
{{ $snipeSettings->site_name }}
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='')
-<img class="navbar-brand-img logo" src="{{ config('app.url') }}/uploads/{{ $snipeSettings->logo }}">
+<img class="navbar-brand-img logo" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}">
@endif
@else
{{ $snipeSettings->site_name }}
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index 905dc25296..e21c16a568 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -86,13 +86,13 @@ $style = [
@if ($snipeSettings->brand == '3')
@if ($logo!='')
- <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ config('app.url') }}/uploads/{{ $logo }}">
+ <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ Storage::disk('public')->url($logo) }}">
@endif
{{ $snipeSettings->site_name }}
@elseif ($snipeSettings->brand == '2')
@if ($logo!='')
- <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ config('app.url') }}/uploads/{{ $logo }}">
+ <img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ Storage::disk('public')->url($logo) }}">
@endif
@else
{{ $snipeSettings->site_name }}