DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-17 16:57:28 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-11 10:08:25 +01:00
parent 3d5b1b6c6d 5364838fc0
commit 62f4b75156
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/views/licenses/view.blade.php
View file

@ -290,12 +290,14 @@
</strong> </strong>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if ($license->time_until_depreciated()->y > 0) @if ($license->time_until_depreciated())
{{ $license->time_until_depreciated()->y }} @if ($license->time_until_depreciated()->y > 0)
{{ trans('admin/hardware/form.years') }}, {{ $license->time_until_depreciated()->y }}
@endif {{ trans('admin/hardware/form.years') }},
{{ $license->time_until_depreciated()->m }} @endif
{{ trans('admin/hardware/form.months') }} {{ $license->time_until_depreciated()->m }}
{{ trans('admin/hardware/form.months') }}
@endif
</div> </div>
</div> </div>
@endif @endif

6
upgrade.php
View file

@ -10,6 +10,12 @@ function url_get_contents ($Url) {
$ch = curl_init(); $ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $Url); curl_setopt($ch, CURLOPT_URL, $Url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
// If we're on windows, make sure we can load intermediate certificates in
// weird corporate environments.
// See: https://github.com/curl/curl/commit/2d6333101a71129a6a802eb93f84a5ac89e34479
if (PHP_OS == "WINNT"){
curl_setopt($ch, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NATIVE_CA);
}
$output = curl_exec($ch); $output = curl_exec($ch);
curl_close($ch); curl_close($ch);
return $output; return $output;