From c8fe002688169c8dedb46c94be869407fc2dd3e1 Mon Sep 17 00:00:00 2001
From: Jeremy Price <jeremy@grokability.com>
Date: Mon, 8 Jul 2024 22:13:14 -0700
Subject: [PATCH 1/2] upgrade.php: If we're on windows, make sure we can load
 intermediate certificates

According to https://github.com/curl/curl/issues/12155 and https://github.com/curl/curl/commit/2d6333101a71129a6a802eb93f84a5ac89e34479

Some corporate Windows proxy (mis)configurations don't pass along
intermediate certificates in their TLS handshakes, breaking lots of
things that don't work around it.

This creates a problem in our curl calls when checking for
.upgrade_requirements.json, and seems to be the source of errors for a
few of our users: https://github.com/snipe/snipe-it/issues/14826#issuecomment-2197611342

In this change, we detect when running on windows environments and load
the curl option that works around this.
---
 upgrade.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/upgrade.php b/upgrade.php
index 0215c3937a..8d92c5497b 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -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;

From 8be44f9cf26a522dee9af0fe04c8cf8c652cc399 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 11 Jul 2024 10:07:58 +0100
Subject: [PATCH 2/2] Check for time until depreciated

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/licenses/view.blade.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 7c99e8b739..aabbdb2608 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -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