DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-25 02:07:36 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-03-01 11:52:29 -08:00
parent 823203641d c1b57064d4
commit 816d2f99cc
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/SettingsController.php
View file

@ -111,17 +111,17 @@ class SettingsController extends Controller
$start_settings['prod'] = true; $start_settings['prod'] = true;
} }
$start_settings['owner'] = '';
if (function_exists('posix_getpwuid')) { // Probably Linux if (function_exists('posix_getpwuid')) { // Probably Linux
$owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME'])); $owner = posix_getpwuid(fileowner($_SERVER['SCRIPT_FILENAME']));
// 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']; $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'] = '';
} }
if (('root' === $start_settings['owner']) || ('0' === $start_settings['owner'])) { if (($start_settings['owner'] === 'root') || ($start_settings['owner'] === '0')) {
$start_settings['owner_is_admin'] = true; $start_settings['owner_is_admin'] = true;
} else { } else {
$start_settings['owner_is_admin'] = false; $start_settings['owner_is_admin'] = false;

2
resources/views/reports/accessories.blade.php
View file

@ -35,7 +35,7 @@
<thead> <thead>
<tr> <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="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="model_number">{{ trans('general.model_no') }}</th>
<th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th> <th class="col-sm-1" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>