mirror of
https://github.com/snipe/snipe-it.git
synced 2025-01-17 16:57:28 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
62f4b75156
|
@ -290,12 +290,14 @@
|
|||
</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@if ($license->time_until_depreciated()->y > 0)
|
||||
{{ $license->time_until_depreciated()->y }}
|
||||
{{ trans('admin/hardware/form.years') }},
|
||||
@endif
|
||||
{{ $license->time_until_depreciated()->m }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
@if ($license->time_until_depreciated())
|
||||
@if ($license->time_until_depreciated()->y > 0)
|
||||
{{ $license->time_until_depreciated()->y }}
|
||||
{{ trans('admin/hardware/form.years') }},
|
||||
@endif
|
||||
{{ $license->time_until_depreciated()->m }}
|
||||
{{ trans('admin/hardware/form.months') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
|
@ -10,6 +10,12 @@ function url_get_contents ($Url) {
|
|||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL, $Url);
|
||||
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);
|
||||
curl_close($ch);
|
||||
return $output;
|
||||
|
|
Loading…
Reference in a new issue