From b72a9cc6fd633fa6bcd3627560535105cc9ad717 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 28 Feb 2023 23:31:26 -0800
Subject: [PATCH 1/4] Check if the $owner is boolean

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index b04c692ac5..c76e52b53b 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -111,17 +111,17 @@ class SettingsController extends Controller
             $start_settings['prod'] = true;
         }
 
+        $start_settings['owner'] = '';
+
         if (function_exists('posix_getpwuid')) { // Probably Linux
             $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME']));
-            $start_settings['owner'] = $owner['name'];
-        } else { // Windows
-            // TODO: Is there a way of knowing if a windows user has elevated permissions
-            // This just gets the user name, which likely isn't 'root'
-            // $start_settings['owner'] = getenv('USERNAME');
-            $start_settings['owner'] = '';
+            // This *shouldn't* be boolean, but we've seen this in come chrooted environments
+            if (!is_bool($owner)) {
+                $start_settings['owner'] = $owner['name'];
+            }
         }
 
-        if (('root' === $start_settings['owner']) || ('0' === $start_settings['owner'])) {
+        if (($start_settings['owner'] === 'root') || ($start_settings['owner'] === '0')) {
             $start_settings['owner_is_admin'] = true;
         } else {
             $start_settings['owner_is_admin'] = false;

From 4860440306f074bd322a13b31eb4b3dc1d4ed502 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 28 Feb 2023 23:32:10 -0800
Subject: [PATCH 2/4] =?UTF-8?q?Check=20that=20it=E2=80=99s=20an=20array=20?=
 =?UTF-8?q?(versus=20checking=20that=20it=E2=80=99s=20not=20a=20bool)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index c76e52b53b..5b75bfaef1 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -116,7 +116,7 @@ class SettingsController extends Controller
         if (function_exists('posix_getpwuid')) { // Probably Linux
             $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME']));
             // This *shouldn't* be boolean, but we've seen this in come chrooted environments
-            if (!is_bool($owner)) {
+            if (is_array($owner)) {
                 $start_settings['owner'] = $owner['name'];
             }
         }

From 562546a853b6fe683bca0a9e60f6ff8972da316a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 28 Feb 2023 23:37:30 -0800
Subject: [PATCH 3/4] Updated comment

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 5b75bfaef1..5498187561 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -115,7 +115,7 @@ class SettingsController extends Controller
 
         if (function_exists('posix_getpwuid')) { // Probably Linux
             $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME']));
-            // This *shouldn't* be boolean, but we've seen this in come chrooted environments
+            // This *should* be an array, but we've seen this return a bool in some chrooted environments
             if (is_array($owner)) {
                 $start_settings['owner'] = $owner['name'];
             }

From 9b80e8630649a72baabf0d2daf2f81194b9820c7 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 1 Mar 2023 11:34:30 -0800
Subject: [PATCH 4/4] Actually display name of company in Accessories Report

---
 resources/views/reports/accessories.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/reports/accessories.blade.php b/resources/views/reports/accessories.blade.php
index 44f90682ba..997e5fedff 100644
--- a/resources/views/reports/accessories.blade.php
+++ b/resources/views/reports/accessories.blade.php
@@ -35,7 +35,7 @@
 
                             <thead>
                             <tr>
-                                <th class="col-sm-1" data-field="company">{{ trans('admin/companies/table.title') }}</th>
+                                <th class="col-sm-1" data-field="company.name">{{ trans('admin/companies/table.title') }}</th>
                                 <th class="col-sm-1" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
                                 <th class="col-sm-1" data-field="model_number">{{ trans('general.model_no') }}</th>
                                 <th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>