Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display

Retry fix bad metadata display
Bumped version
2022-03-03 20:49:30 -08:00 · 2022-03-03 20:45:34 -08:00 · 2022-03-03 20:41:18 -08:00 · 2022-03-03 20:30:58 -08:00 · 2022-03-03 20:30:27 -08:00 · 2022-03-03 20:30:07 -08:00
1689 changed files with 32209 additions and 10702 deletions
@@ -2522,6 +2522,33 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "UniversalSuperBox",
+      "name": "Dalton Durst",
+      "avatar_url": "https://avatars.githubusercontent.com/u/21966173?v=4",
+      "profile": "https://daltondur.st",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TenOfTens",
+      "name": "TenOfTens",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48162670?v=4",
+      "profile": "https://github.com/TenOfTens",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "savornicesei",
+      "name": "Simona Avornicesei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/917232?v=4",
+      "profile": "http://www.avornicesei.com",
+      "contributions": [
+        "test"
+      ]
    }
  ]
 }
@@ -145,10 +145,12 @@ APP_LOG_MAX_FILES=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 APP_FORCE_TLS=false
+APP_ALLOW_INSECURE_HOSTS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
 IMPORT_TIME_LIMIT=600
 IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000
-
+REQUIRE_SAML=false
+API_THROTTLE_PER_MINUTE=120
@@ -77,6 +77,8 @@ COPY . /var/www/html

 RUN a2enmod rewrite

+COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
+
 ############ INITIAL APPLICATION SETUP #####################

 WORKDIR /var/www/html
@@ -32,6 +32,8 @@ RUN  apk add --no-cache \
        mysql-client \
        tini

+COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
+
 # Where apache's PID lives
 RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2

@@ -98,5 +98,6 @@ VOLUME [ "/var/lib/snipeit" ]

 COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
 COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
+COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
 ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
 CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-277-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-280-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)

 ## Snipe-IT - Open Source Asset Management System

@@ -130,7 +130,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/917232?v=4" width="110px;"/><br /><sub>Simona Avornicesei</sub>](http://www.avornicesei.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=savornicesei "Tests") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -40,7 +40,7 @@ class FixDoubleEscape extends Command

        $tables = [
            '\App\Models\Asset' => ['name'],
-            '\App\Models\License' => ['name'],
+            '\App\Models\License' => ['name', 'license_name'],
            '\App\Models\Consumable' => ['name'],
            '\App\Models\Accessory' => ['name'],
            '\App\Models\Component' => ['name'],
@@ -53,7 +53,7 @@ class FixDoubleEscape extends Command
            '\App\Models\Group' => ['name'],
            '\App\Models\Department' => ['name'],
            '\App\Models\Location' => ['name'],
-            '\App\Models\User' => ['first_name', 'last_name'],
+            '\App\Models\User' => ['first_name', 'last_name', 'jobtitle'],
        ];

        $count = array();
@@ -69,10 +69,14 @@ class FixDoubleEscape extends Command
                    $count[$classname]['classname']++;
                    $count[$classname][$field] = 0;

-                    foreach($classname::where("$field",'LIKE','%&%')->get() as $row) {
-                        $this->info('Updating '.$field.' for '.$classname);
-                        $row->{$field} = html_entity_decode($row->{$field},ENT_QUOTES);
-                        $row->save();
+                    foreach($classname::where("$field",'LIKE','%;%')->get() as $row) {
+                       
+                        $fixed = html_entity_decode($row->{$field});
+                        if ($row->save()) {
+                            $this->info('Updating '.$field.' for '.$classname.' to '.$row->{$field}.' to '.$fixed);
+                        } else {
+                            $this->error('Could NOT update '.$field.' for '.$classname.' to '.$row->{$field}.' to '.$fixed.': '.$row->getErrors());
+                        }
                        $count[$classname][$field]++;

                    }
@@ -49,7 +49,7 @@ class LdapSync extends Command
        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;

-        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
+        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag;
        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
        $ldap_result_email = Setting::getSettings()->ldap_email;
        $ldap_result_phone = Setting::getSettings()->ldap_phone_field;
@@ -170,7 +170,6 @@ class LdapSync extends Command
        $pass = bcrypt($tmp_pass);

        for ($i = 0; $i < $results["count"]; $i++) {
-            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {

                $item = array();
                $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : "";
@@ -192,6 +191,7 @@ class LdapSync extends Command


                $user = User::where('username', $item["username"])->first();
+
                if ($user) {
                    // Updating an existing user.
                    $item["createorupdate"] = 'updated';
@@ -199,7 +199,7 @@ class LdapSync extends Command
                    // Creating a new user.
                    $user = new User;
                    $user->password = $pass;
-                    $user->activated = 0;
+                    $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
                    $item["createorupdate"] = 'created';
                }

@@ -213,8 +213,19 @@ class LdapSync extends Command
                $user->country = $item["country"];
                $user->department_id = $department->id;

-                // Sync activated state for Active Directory.
-                if ( array_key_exists('useraccountcontrol', $results[$i]) ) {
+                if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
+                    // ....then *most* things that are truthy will activate the user. Anything falsey will deactivate them.
+                    // (Specifically, we don't handle a value of '0.0' correctly)
+                    $raw_value = @$results[$i][$ldap_result_active_flag][0];
+                    $filter_var = filter_var($raw_value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+                    $boolean_cast = (bool)$raw_value;
+
+                    $user->activated = $filter_var ?? $boolean_cast; // if filter_var() was true or false, use that. If it's null, use the $boolean_cast
+
+                } elseif ( array_key_exists('useraccountcontrol', $results[$i]) ) {
+                    // ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
+                    // ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
+
                    /* The following is _probably_ the correct logic, but we can't use it because
                       some users may have been dependent upon the previous behavior, and this
                       could cause additional access to be available to users they don't want
@@ -240,16 +251,14 @@ class LdapSync extends Command
                    '262688', // 0x40220  NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
                    '328192', // 0x50200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
                    '328224', // 0x50220  NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH 
                    '4260352',// 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
                    '1049088',// 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
                  ];
                  $user->activated = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
-                }

-                // If we're not using AD, and there isn't an activated flag set, activate all users
-                elseif (empty($ldap_result_active_flag)) {
-                  $user->activated = 1;
-                }
+                } /* implied 'else' here - leave the $user->activated flag alone. Newly-created accounts will be active.
+                   already-existing accounts will be however the administrator has set them */

                if ($item['ldap_location_override'] == true) {
                    $user->location_id = $item['location_id'];
@@ -279,7 +288,6 @@ class LdapSync extends Command
                }

                array_push($summary, $item);
-            }

        }

@@ -8,6 +8,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
 use Illuminate\Validation\ValidationException;
 use Log;
+use JsonException;


 class Handler extends ExceptionHandler
@@ -26,6 +27,7 @@ class Handler extends ExceptionHandler
        \Illuminate\Validation\ValidationException::class,
        \Intervention\Image\Exception\NotSupportedException::class,
        \League\OAuth2\Server\Exception\OAuthServerException::class,
+        JsonException::class
    ];

    /**
@@ -60,6 +62,12 @@ class Handler extends ExceptionHandler
            return redirect()->back()->with('error', trans('general.token_expired'));
        }

+        // Invalid JSON exception
+        // TODO: don't understand why we have to do this when we have the invalidJson() method, below, but, well, whatever
+        if ($e instanceof JsonException) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'invalid JSON'), 422);
+        }
+

        // Handle Ajax requests that fail because the model doesn't exist
        if ($request->ajax() || $request->wantsJson()) {
@@ -76,10 +84,12 @@ class Handler extends ExceptionHandler
                switch ($e->getStatusCode()) {
                    case '404':
                       return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
-                    case '405':
+                    case '429':
+                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Too many requests'), 429);
+                     case '405':
                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                    default:
-                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), 405);
+                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), $statusCode);

                }
            }
@@ -78,6 +78,8 @@ class AccessoriesController extends Controller
        $accessory->qty                     = request('qty');
        $accessory->user_id                 = Auth::user()->id;
        $accessory->supplier_id             = request('supplier_id');
+        $accessory->notes                   = request('notes');
+

        $accessory = $request->handleImages($accessory);
        
@@ -140,6 +142,7 @@ class AccessoriesController extends Controller
        $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
        $accessory->qty                     = request('qty');
        $accessory->supplier_id             = request('supplier_id');
+        $accessory->notes                   = request('notes');

        $accessory = $request->handleImages($accessory);

@@ -39,7 +39,8 @@ class AccessoriesController extends Controller
                'notes',
                'created_at',
                'min_amt',
-                'company_id'
+                'company_id',
+                'notes',
            ];


@@ -69,6 +70,10 @@ class AccessoriesController extends Controller
            $accessories->where('location_id','=',$request->input('location_id'));
        }

+        if ($request->filled('notes')) {
+            $accessories->where('notes','=',$request->input('notes'));
+        }
+
        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
        $offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
@@ -33,6 +33,7 @@ class AssetMaintenancesController extends Controller
     */
    public function index(Request $request)
    {
+        $this->authorize('view', Asset::class);
        $maintenances = AssetMaintenance::with('asset', 'asset.model','asset.location', 'supplier', 'asset.company', 'admin');

        if ($request->filled('search')) {
@@ -101,6 +102,7 @@ class AssetMaintenancesController extends Controller
     */
    public function store(Request $request)
    {
+        $this->authorize('update', Asset::class);
        // create a new model instance
        $assetMaintenance = new AssetMaintenance();
        $assetMaintenance->supplier_id = $request->input('supplier_id');
@@ -153,6 +155,7 @@ class AssetMaintenancesController extends Controller
     */
    public function update(Request $request, $assetMaintenanceId = null)
    {
+        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);

@@ -216,6 +219,7 @@ class AssetMaintenancesController extends Controller
     */
    public function destroy($assetMaintenanceId)
    {
+        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);

@@ -241,6 +245,7 @@ class AssetMaintenancesController extends Controller
     */
    public function show($assetMaintenanceId)
    {
+        $this->authorize('view', Asset::class);
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
@@ -234,6 +234,7 @@ class AssetModelsController extends Controller
    public function selectlist(Request $request)
    {

+        $this->authorize('view.selectlists');
        $assetmodels = AssetModel::select([
            'models.id',
            'models.name',
@@ -55,7 +55,7 @@ class AssetsController extends Controller
    {

        \Log::debug(Route::currentRouteName());
-        
+        $filter_non_deprecable_assets = false;

        /**
         * This looks MAD janky (and it is), but the AssetsController@index does a LOT of heavy lifting throughout the 
@@ -69,6 +69,7 @@ class AssetsController extends Controller
         * which would have been far worse of a mess. *sad face*  - snipe (Sept 1, 2021)
         */
        if (Route::currentRouteName()=='api.depreciation-report.index') {
+            $filter_non_deprecable_assets = true;
            $transformer = 'App\Http\Transformers\DepreciationReportTransformer';
            $this->authorize('reports.view');
        } else {
@@ -119,9 +120,24 @@ class AssetsController extends Controller
                'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.

        
+        if ($filter_non_deprecable_assets) {
+            $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
+            $assets->InModelList($non_deprecable_models->toArray());
+        }
+        
        // These are used by the API to query against specific ID numbers.
        // They are also used by the individual searches on detail pages like
        // locations, etc.
+
+
+        // Search custom fields by column name
+        foreach ($all_custom_fields as $field) {
+            if ($request->filled($field->db_column_name())) {
+                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
+            }
+        }
+
+
        if ($request->filled('status_id')) {
            $assets->where('assets.status_id', '=', $request->input('status_id'));
        }
@@ -844,13 +860,18 @@ class AssetsController extends Controller
            $asset->status_id =  $request->input('status_id');
        }

+        $checkin_at = null;
+        if ($request->filled('checkin_at')) {
+            $checkin_at = $request->input('checkin_at');
+        }
+
        if ($asset->save()) {
-            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note')));
+            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at));

            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
        }

-        return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
    }


@@ -148,7 +148,7 @@ class CategoriesController extends Controller
     */
    public function selectlist(Request $request, $category_type = 'asset')
    {
-
+        $this->authorize('view.selectlists');
        $categories = Category::select([
            'id',
            'name',
@@ -159,7 +159,7 @@ class CompaniesController extends Controller
     */
    public function selectlist(Request $request)
    {
-
+        $this->authorize('view.selectlists');
        $companies = Company::select([
            'companies.id',
            'companies.name',
@@ -40,6 +40,7 @@ class ComponentsController extends Controller
                'purchase_cost',
                'qty',
                'image',
+                'notes',
            ];


@@ -62,6 +63,10 @@ class ComponentsController extends Controller
            $components->where('location_id','=',$request->input('location_id'));
        }

+        if ($request->filled('notes')) {
+            $components->where('notes','=',$request->input('notes'));
+        }
+
        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
        $offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
@@ -42,6 +42,7 @@ class ConsumablesController extends Controller
                'item_no', 
                'qty',
                'image',
+                'notes',
                ];


@@ -74,6 +75,10 @@ class ConsumablesController extends Controller
            $consumables->where('location_id','=',$request->input('location_id'));
        }

+        if ($request->filled('notes')) {
+            $consumables->where('notes','=',$request->input('notes'));
+        }
+

        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
@@ -168,6 +168,7 @@ class DepartmentsController extends Controller
    public function selectlist(Request $request)
    {

+        $this->authorize('view.selectlists');
        $departments = Department::select([
            'id',
            'name',
@@ -82,6 +82,10 @@ class LicensesController extends Controller
            $licenses = $licenses->TextSearch($request->input('search'));
        }

+        if ($request->input('deleted')=='true') {
+            $licenses->onlyTrashed();
+        }
+

        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
@@ -223,6 +223,8 @@ class LocationsController extends Controller
    public function selectlist(Request $request)
    {

+        $this->authorize('view.selectlists');
+
        $locations = Location::select([
            'locations.id',
            'locations.name',
@@ -155,6 +155,7 @@ class ManufacturersController extends Controller
    public function selectlist(Request $request)
    {

+        $this->authorize('view.selectlists');
        $manufacturers = Manufacturer::select([
            'id',
            'name',
@@ -31,8 +31,8 @@ class PredefinedKitsController extends Controller

        $offset = $request->input('offset', 0);
        $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
+        $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'name';
        $kits->orderBy($sort, $order);

        $total = $kits->count();
@@ -196,7 +196,7 @@ class SettingsController extends Controller
                return response()->json(['message' => 'Success'], 200);

            } catch (\Exception $e) {
-                return response()->json(['message' => 'FARTS! Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400);
+                return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400);
            }
        
        //} 
@@ -155,6 +155,8 @@ class SuppliersController extends Controller
    public function selectlist(Request $request)
    {

+        $this->authorize('view.selectlists');
+
        $suppliers = Supplier::select([
            'id',
            'name',
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
 use App\Http\Transformers\AccessoriesTransformer;
 use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\UsersTransformer;
@@ -131,6 +132,26 @@ class UsersController extends Controller
            $users = $users->where('users.manager_id','=',$request->input('manager_id'));
        }

+        if ($request->filled('ldap_import')) {
+            $users = $users->where('ldap_import', '=', $request->input('ldap_import'));
+        }
+
+        if ($request->filled('assets_count')) {
+           $users->has('assets', '=', $request->input('assets_count'));
+        }
+
+        if ($request->filled('consumables_count')) {
+            $users->has('consumables', '=', $request->input('consumables_count'));
+        }
+
+        if ($request->filled('licenses_count')) {
+            $users->has('licenses', '=', $request->input('licenses_count'));
+        }
+
+        if ($request->filled('accessories_count')) {
+            $users->has('accessories', '=', $request->input('accessories_count'));
+        }
+
        if ($request->filled('search')) {
            $users = $users->TextSearch($request->input('search'));
        }
@@ -448,6 +469,24 @@ class UsersController extends Controller
        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
    }

+
+    /**
+     * Return JSON containing a list of consumables assigned to a user.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @param $userId
+     * @return string JSON
+     */
+    public function consumables(Request $request, $id)
+    {
+        $this->authorize('view', User::class);
+        $this->authorize('view', Consumable::class);
+        $user = User::findOrFail($id);
+        $consumables = $user->consumables;
+        return (new ConsumablesTransformer)->transformConsumables($consumables, $consumables->count(), $request);
+    }
+
    /**
     * Return JSON containing a list of accessories assigned to a user.
     *
@@ -50,6 +50,7 @@ class AssetMaintenancesController extends Controller
    */
    public function index()
    {
+        $this->authorize('view', Asset::class);
        return view('asset_maintenances/index');
    }

@@ -66,6 +67,7 @@ class AssetMaintenancesController extends Controller
     */
    public function create()
    {
+        $this->authorize('update', Asset::class);
        $asset = null;

        if ($asset = Asset::find(request('asset_id'))) {
@@ -96,6 +98,7 @@ class AssetMaintenancesController extends Controller
    */
    public function store(Request $request)
    {
+        $this->authorize('update', Asset::class);
        // create a new model instance
        $assetMaintenance = new AssetMaintenance();
        $assetMaintenance->supplier_id = $request->input('supplier_id');
@@ -148,6 +151,7 @@ class AssetMaintenancesController extends Controller
    */
    public function edit($assetMaintenanceId = null)
    {
+        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the improvement management page
@@ -200,6 +204,7 @@ class AssetMaintenancesController extends Controller
     */
    public function update(Request $request, $assetMaintenanceId = null)
    {
+        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
@@ -266,6 +271,7 @@ class AssetMaintenancesController extends Controller
    */
    public function destroy($assetMaintenanceId)
    {
+        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
@@ -294,6 +300,8 @@ class AssetMaintenancesController extends Controller
    */
    public function show($assetMaintenanceId)
    {
+        $this->authorize('view', Asset::class);
+
        // Check if the asset maintenance exists
        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
            // Redirect to the asset maintenance management page
@@ -155,7 +155,6 @@ class AssetModelsController extends Controller
        $model->requestable         = $request->input('requestable', '0');


-
        $this->removeCustomFieldsDefaultValues($model);

        if ($request->input('custom_fieldset')=='') {
@@ -168,7 +167,6 @@ class AssetModelsController extends Controller
            }
        }

-
        if ($model->save()) {
            return redirect()->route("models.index")->with('success', trans('admin/models/message.update.success'));
        }
@@ -463,7 +461,9 @@ class AssetModelsController extends Controller
    private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues)
    {
        foreach ($defaultValues as $customFieldId => $defaultValue) {
-            if ($defaultValue) {
+            if(is_array($defaultValue)){
+                $model->defaultValues()->attach($customFieldId, ['default_value' => implode(', ', $defaultValue)]);
+            }elseif ($defaultValue) {
                $model->defaultValues()->attach($customFieldId, ['default_value' => $defaultValue]);
            }
        }
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Assets;
 use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
+use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Http\Request;
@@ -121,6 +122,24 @@ class BulkAssetsController extends Controller
                    }
                }

+                $changed = [];
+                $asset = Asset::where('id' ,$assetId)->get();
+
+                foreach ($this->update_array as $key => $value) {
+                    if ($this->update_array[$key] != $asset->toArray()[0][$key]) {
+                        $changed[$key]['old'] = $asset->toArray()[0][$key];
+                        $changed[$key]['new'] = $this->update_array[$key];
+                    }
+                }
+
+                $logAction = new Actionlog();
+                $logAction->item_type = Asset::class;
+                $logAction->item_id = $assetId;
+                $logAction->created_at =  date("Y-m-d H:i:s");
+                $logAction->user_id = Auth::id();
+                $logAction->log_meta = json_encode($changed);
+                $logAction->logaction('update');
+
                DB::table('assets')
                    ->where('id', $assetId)
                    ->update($this->update_array);
@@ -87,6 +87,8 @@ class ForgotPasswordController extends Controller
            \Log::info('Password reset attempt: User '.$request->input('username').'failed with exception: '.$e );
        }

+        // Prevent timing attack to enumerate users.
+        usleep(500000 + random_int(0, 1500000));

        if ($response === \Password::RESET_LINK_SENT) {
            \Log::info('Password reset attempt: User '.$request->input('username').' WAS found, password reset sent');
@@ -75,6 +75,13 @@ class LoginController extends Controller
            return redirect()->intended('/');
        }

+        // If the environment is set to ALWAYS require SAML, go straight to the SAML route.
+        // We don't need to check other settings, as this should override those.
+        if (config('app.require_saml')) {
+            return redirect()->route('saml.login');
+        }
+
+
        if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == "1" && !($request->has('nosaml') || $request->session()->has('error'))) {
            return redirect()->route('saml.login');
        }
@@ -197,6 +204,12 @@ class LoginController extends Controller
     */
    public function login(Request $request)
    {
+
+        //If the environment is set to ALWAYS require SAML, return access denied
+        if (config('app.require_saml')) {
+            return view('errors.403');
+        }
+
        if (Setting::getSettings()->login_common_disabled == "1") {
            return view('errors.403');
        }
@@ -363,7 +376,7 @@ class LoginController extends Controller
        if (Google2FA::verifyKey($user->two_factor_secret, $secret)) {
            $user->two_factor_enrolled = 1;
            $user->save();
-            $request->session()->put('2fa_authed', 'true');
+            $request->session()->put('2fa_authed', $user->id);
            return redirect()->route('home')->with('success', 'You are logged in!');
        }

@@ -32,6 +32,7 @@ class BulkAssetModelsController extends Controller

            // If deleting....
            if ($request->input('bulk_actions')=='delete') {
+                $this->authorize('delete', AssetModel::class);
                $valid_count = 0;
                foreach ($models as $model) {
                    if ($model->assets_count == 0) {
@@ -42,7 +43,7 @@ class BulkAssetModelsController extends Controller

            // Otherwise display the bulk edit screen
            }
-
+            $this->authorize('update', AssetModel::class);
            $nochange = ['NC' => 'No Change'];
            return view('models/bulk-edit', compact('models'))
                ->with('fieldset_list', $nochange + Helper::customFieldsetList())
@@ -63,7 +64,8 @@ class BulkAssetModelsController extends Controller
     */
    public function update(Request $request)
    {
-
+        $this->authorize('update', AssetModel::class);
+      
        $models_raw_array = $request->input('ids');
        $update_array = array();

@@ -103,6 +105,8 @@ class BulkAssetModelsController extends Controller
     */
    public function destroy(Request $request)
    {
+        $this->authorize('delete', AssetModel::class);
+      
        $models_raw_array = $request->input('ids');

        if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) {
@@ -78,6 +78,7 @@ class ComponentsController extends Controller
        $component->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost', null));
        $component->qty                    = $request->input('qty');
        $component->user_id                = Auth::id();
+        $component->notes                  = $request->input('notes');

        $component = $request->handleImages($component);

@@ -147,6 +148,7 @@ class ComponentsController extends Controller
        $component->purchase_date          = $request->input('purchase_date');
        $component->purchase_cost          = Helper::ParseCurrency(request('purchase_cost'));
        $component->qty                    = $request->input('qty');
+        $component->notes                  = $request->input('notes');

        $component = $request->handleImages($component);

@@ -78,6 +78,8 @@ class ConsumablesController extends Controller
        $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
        $consumable->qty                    = $request->input('qty');
        $consumable->user_id                = Auth::id();
+        $consumable->notes                  = $request->input('notes');
+


        $consumable = $request->handleImages($consumable);
@@ -143,6 +145,7 @@ class ConsumablesController extends Controller
        $consumable->purchase_date          = $request->input('purchase_date');
        $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
        $consumable->qty                    = Helper::ParseFloat($request->input('qty'));
+        $consumable->notes                  = $request->input('notes');

        $consumable = $request->handleImages($consumable);

@@ -133,12 +133,23 @@ class CustomFieldsController extends Controller

        $this->authorize('update', $field);

-        if ($field->fieldset()->detach($fieldset_id)) {
-            return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])
-                ->with("success", trans('admin/custom_fields/message.field.delete.success'));
+        // Check that the field exists - this is mostly related to the demo, where we 
+        // rewrite the data every x minutes, so it's possible someone might be disassociating 
+        // a field from a fieldset just as we're wiping the database
+        if (($field) && ($fieldset_id)) {
+
+            if ($field->fieldset()->detach($fieldset_id)) {
+                return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])
+                    ->with("success", trans('admin/custom_fields/message.field.delete.success'));
+            } else {
+                return redirect()->back()->withErrors(['message' => "Field is in use and cannot be deleted."]);
+            }  
+
        }

-        return redirect()->back()->withErrors(['message' => "Field is in-use"]);
+        return redirect()->back()->withErrors(['message' => "Error deleting field from fieldset"]);
+
+       
    }

    /**
@@ -178,20 +189,25 @@ class CustomFieldsController extends Controller
     */
    public function edit($id)
    {
-        $field = CustomField::find($id);
+        if ($field = CustomField::find($id)) {

-        $this->authorize('update', $field);
+            $this->authorize('update', $field);

-        $customFormat = '';
-        if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
-            $customFormat = $field->format;
-        }
+            $customFormat = '';
+            if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
+                $customFormat = $field->format;
+            }

-        return view("custom_fields.fields.edit",[
-            'field'             => $field,
-            'customFormat'      => $customFormat,
-            'predefinedFormats' => Helper::predefined_formats()
-        ]);
+            return view("custom_fields.fields.edit",[
+                'field'             => $field,
+                'customFormat'      => $customFormat,
+                'predefinedFormats' => Helper::predefined_formats()
+            ]);
+        } 
+
+        return redirect()->route("fields.index")
+            ->with("error", trans('admin/custom_fields/message.field.invalid'));
+        
    }


@@ -23,6 +23,12 @@ use Redirect;
 class CustomFieldsetsController extends Controller
 {

+    public function index() 
+    {
+        return redirect()->route("fields.index")
+        ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
+    }
+
    /**
     * Validates and stores a new custom field.
     *
@@ -6,15 +6,49 @@ use App\Helpers\Helper;

 class ModalController extends Controller
 {
-    function show($type, $itemId = null) {
-        $view = view("modals.${type}");

-        if($type == "statuslabel") {
-            $view->with('statuslabel_types', Helper::statusTypeList());
+    /** 
+     * Load the modal views after confirming they are in the allowed_types array.
+     * The allowed types away just prevents shithead skiddies from fuzzing the urls 
+     * with automated scripts and junking up the logs. - snipe
+     * 
+     * @version    v5.3.7-pre
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @return View
+     */
+    function show ($type, $itemId = null) {
+
+        // These values should correspond to a file in resources/views/modals/
+        $allowed_types = [
+            'category',
+            'kit-model', 
+            'kit-license', 
+            'kit-consumable', 
+            'kit-accessory',
+            'location',
+            'manufacturer',
+            'model',
+            'statuslabel',
+            'supplier',
+            'upload-file',
+            'user',         
+        ];
+
+
+        if (in_array($type, $allowed_types)) {
+            $view = view("modals.${type}");
+
+            if ($type == "statuslabel") {
+                $view->with('statuslabel_types', Helper::statusTypeList());
+            }
+            if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
+                $view->with('kitId', $itemId);
+            }
+            return $view;
        }
-        if(in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
-            $view->with('kitId', $itemId);
-        }
-        return $view;
+        
+        abort(404,'Page not found');
+        
    }
 }
@@ -113,6 +113,12 @@ class ProfileController extends Controller
     * @return View
     */
    public function api() {
+
+        // Make sure the self.api permission has been granted
+        if (!Gate::allows('self.api')) {
+            abort(403);
+        }
+        
        return view('account/api');
    }

@@ -8,6 +8,7 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
 use App\Models\Setting;
+use App\Models\Asset;
 use App\Models\User;
 use App\Notifications\FirstAdminNotification;
 use App\Notifications\MailTest;
@@ -621,6 +622,26 @@ class SettingsController extends Controller
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
        }

+        // Check if the audit interval has changed - if it has, we want to update ALL of the assets audit dates
+        if ($request->input('audit_interval') != $setting->audit_interval) {
+
+            // Be careful - this could be a negative number
+            $audit_diff_months = ((int)$request->input('audit_interval') - (int)($setting->audit_interval));
+            
+            // Grab all of the assets that have an existing next_audit_date
+            $assets = Asset::whereNotNull('next_audit_date')->get();
+
+            // Update all of the assets' next_audit_date values
+            foreach ($assets as $asset) {
+
+                if ($asset->next_audit_date != '') {
+                    $old_next_audit = new \DateTime($asset->next_audit_date);
+                    $asset->next_audit_date = $old_next_audit->modify($audit_diff_months.' month')->format('Y-m-d');
+                    $asset->forceSave();
+                }
+            }
+        } 
+
        $alert_email    = rtrim($request->input('alert_email'), ',');
        $alert_email    = trim($alert_email);
        $admin_cc_email = rtrim($request->input('admin_cc_email'), ',');
@@ -184,6 +184,7 @@ class SuppliersController extends Controller
     */
    public function show($supplierId = null)
    {
+        $this->authorize('view', Supplier::class);
        $supplier = Supplier::find($supplierId);

        if (isset($supplier->id)) {
@@ -484,7 +484,6 @@ class UsersController extends Controller
            $user->first_name = '';
            $user->last_name = '';
            $user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos : 0);
-
            $user->id = null;

            // Get this user groups
@@ -24,6 +24,7 @@ class Kernel extends HttpKernel
        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
        \App\Http\Middleware\SecurityHeaders::class,
        \App\Http\Middleware\PreventBackHistory::class,
+        \Fruitcake\Cors\HandleCors::class,

    ];

@@ -44,8 +45,6 @@ class Kernel extends HttpKernel
        ],

        'api' => [
-            \Barryvdh\Cors\HandleCors::class,
-            'throttle:120,1',
            'auth:api',
        ],
    ];
@@ -32,7 +32,7 @@ class CheckForTwoFactor
        if ($settings = Setting::getSettings()) {
            if (Auth::check() && ($settings->two_factor_enabled != '')) {
                // This user is already 2fa-authed
-                if ($request->session()->get('2fa_authed')) {
+                if ($request->session()->get('2fa_authed')==Auth::user()->id) {
                    return $next($request);
                }

@@ -8,6 +8,14 @@ abstract class Request extends FormRequest
 {
    protected $rules = [];

+    public function json($key = null, $default = null)
+    {
+        if ($this->ajax() || $this->wantsJson()) {
+            json_decode($this->getContent(), false, 512, JSON_THROW_ON_ERROR); // ignore output, just throw
+        }
+        return parent::json($key, $default);
+    }
+
    public function rules()
    {
        return $this->rules;
@@ -19,6 +19,22 @@ class ActionlogsTransformer
        return (new DatatablesTransformer)->transformDatatables($array, $total);
    }

+    private function clean_field($value)
+    {
+        // This object stuff is weird, and is used to make up for the fact that
+        // older data can get strangely formatted if an asset existed,
+        // then a new custom field is added, and the asset is saved again.
+        // It can result in funnily-formatted strings like:
+        //
+        // {"_snipeit_right_sized_fault_tolerant_localareanetwo_1":
+        // {"old":null,"new":{"value":"1579490695972","_snipeit_new_field_2":2,"_snipeit_new_field_3":"Monday, 20 January 2020 2:24:55 PM"}}
+        // so we have to walk down that next level
+        if(is_object($value) && isset($value->value)) {
+            return $this->clean_field($value->value);
+        }
+        return is_scalar($value) || is_null($value) ? e($value) : e(json_encode($value));
+    }
+
    public function transformActionlog (Actionlog $actionlog, $settings = null)
    {
        $icon = $actionlog->present()->icon();
@@ -31,45 +47,9 @@ class ActionlogsTransformer
            $meta_array = json_decode($actionlog->log_meta);

            if ($meta_array) {
-                foreach ($meta_array as $key => $value) {
-                    foreach ($value as $meta_key => $meta_value) {
-
-                        if (is_array($meta_value)) {
-                            foreach ($meta_value as $meta_value_key => $meta_value_value) {
-                                $clean_meta[$key][$meta_value_key] = e($meta_value_value);
-                            }
-                        } else {
-
-                            // This object stuff is weird, and is used to make up for the fact that
-                            // older data can get strangely formatted if an asset existed,
-                            // then a new custom field is added, and the asset is saved again.
-                            // It can result in funnily-formatted strings like:
-                            //
-                            // {"_snipeit_right_sized_fault_tolerant_localareanetwo_1":
-                            // {"old":null,"new":{"value":"1579490695972","_snipeit_new_field_2":2,"_snipeit_new_field_3":"Monday, 20 January 2020 2:24:55 PM"}}
-                            // so we have to walk down that next level
-
-                            if (is_object($meta_value)) {
-
-                                foreach ($meta_value as $meta_value_key => $meta_value_value) {
-
-                                    if ($meta_value_key == 'value') {
-                                        $clean_meta[$key]['old'] = null;
-                                        $clean_meta[$key]['new'] = e($meta_value->value);
-                                    } else {
-                                        $clean_meta[$meta_value_key]['old'] = null;
-                                        $clean_meta[$meta_value_key]['new'] = e($meta_value_value);
-                                    }
-                                }
-
-
-
-                            } else {
-                                $clean_meta[$key][$meta_key] = e($meta_value);
-                            }
-                        }
-
-                    }
+                foreach ($meta_array as $fieldname => $fieldata) {
+                    $clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old);
+                    $clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);
                }

            }
@@ -118,6 +98,7 @@ class ActionlogsTransformer
            'action_date'   => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),

        ];
+        //\Log::info("Clean Meta is: ".print_r($clean_meta,true));

        return $array;
    }
@@ -43,6 +43,7 @@ class ComponentsTransformer
                'id' => (int) $component->company->id,
                'name' => e($component->company->name)
            ] : null,
+            'notes' => ($component->notes) ? e($component->notes) : null,
            'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
            'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
@@ -37,6 +37,7 @@ class ConsumablesTransformer
            'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
            'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
            'qty'           => (int) $consumable->qty,
+            'notes'         => ($consumable->notes) ? e($consumable->notes) : null,
            'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
        ];
@@ -9,13 +9,13 @@ use Illuminate\Database\Eloquent\Collection;
 class GroupsTransformer
 {

-    public function transformGroups (Collection $groups)
+    public function transformGroups (Collection $groups, $total = null)
    {
        $array = array();
        foreach ($groups as $group) {
            $array[] = self::transformGroup($group);
        }
-        return (new DatatablesTransformer)->transformDatatables($array);
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
    }

    public function transformGroup (Group $group)
@@ -45,7 +45,9 @@ class LicensesTransformer
            'category' =>  ($license->category) ? ['id' => (int)  $license->category->id,'name'=> e($license->category->name)] : null,
            'created_at' => Helper::getFormattedDateObject($license->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($license->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($license->deleted_at, 'datetime'),
            'user_can_checkout' => (bool) ($license->free_seats_count > 0),
+
        ];

        $permissions_array['available_actions'] = [
@@ -71,7 +71,7 @@ class AssetImporter extends ItemImporter
            $this->log("No Matching Asset, Creating a new one");
            $asset = new Asset;
        }
-
+        $this->item['notes'] = $this->findCsvMatch($row, 'asset_notes');
        $this->item['image'] = $this->findCsvMatch($row, "image");
        $this->item['requestable'] = $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));;
        $asset->requestable =  $this->fetchHumanBoolean($this->findCsvMatch($row, "requestable"));
@@ -177,7 +177,7 @@ class ItemImporter extends Importer
     */
    public function createOrFetchAssetModel(array $row)
    {
-
+        $condition = array();
        $asset_model_name = $this->findCsvMatch($row, "asset_model");
        $asset_modelNumber = $this->findCsvMatch($row, "model_number");
        // TODO: At the moment, this means  we can't update the model number if the model name stays the same.
@@ -189,8 +189,16 @@ class ItemImporter extends Importer
        } elseif ((empty($asset_model_name))  && (empty($asset_modelNumber))) {
            $asset_model_name ='Unknown';
        }
+
+        if ((!empty($asset_model_name)) && (empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+        } elseif ((!empty($asset_model_name)) && (!empty($asset_modelNumber))) {
+            $condition[] = ['name', '=', $asset_model_name];
+            $condition[] = ['model_number', '=', $asset_modelNumber];
+        }
+
        $editingModel = $this->updating;
-        $asset_model = AssetModel::where(['name' => $asset_model_name, 'model_number' => $asset_modelNumber])->first();
+        $asset_model = AssetModel::where($condition)->first();

        if ($asset_model) {
            if (!$this->updating) {
@@ -200,7 +208,12 @@ class ItemImporter extends Importer
            $this->log("Matching Model found, updating it.");
            $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
            $item['name'] = $asset_model_name;
-            $item['model_number'] = $asset_modelNumber;
+            $item['notes'] = $this->findCsvMatch($row, 'model_notes');
+            
+            if(!empty($asset_modelNumber)){
+                $item['model_number'] = $asset_modelNumber;
+            }
+            
            $asset_model->update($item);
            $asset_model->save();
            $this->log("Asset Model Updated");
@@ -212,6 +225,7 @@ class ItemImporter extends Importer
        $item = $this->sanitizeItemForStoring($asset_model, $editingModel);
        $item['name'] = $asset_model_name;
        $item['model_number'] = $asset_modelNumber;
+        $item['notes'] = $this->findCsvMatch($row, 'model_notes');

        $asset_model->fill($item);
        $item = null;
@@ -32,7 +32,6 @@ class LicenseImporter extends ItemImporter
    {
        $editingLicense = false;
        $license = License::where('name', $this->item['name'])
-                    ->where('serial', $this->item['serial'])
                    ->first();
        if ($license) {
            if (!$this->updating) {
@@ -52,6 +52,7 @@ class UserImporter extends ItemImporter
        $this->item['city'] = $this->findCsvMatch($row, 'city');
        $this->item['state'] = $this->findCsvMatch($row, 'state');
        $this->item['country'] = $this->findCsvMatch($row, 'country');
+        $this->item['zip'] = $this->findCsvMatch($row, 'zip');
        $this->item['activated'] =  ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
        $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
        $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department'));
@@ -35,7 +35,7 @@ class Accessory extends SnipeModel
     * 
     * @var array
     */
-    protected $searchableAttributes = ['name', 'model_number', 'order_number', 'purchase_date'];
+    protected $searchableAttributes = ['name', 'model_number', 'order_number', 'purchase_date', 'notes'];

    /**
     * The relations and their attributes that should be included when searching the model.
@@ -92,7 +92,8 @@ class Accessory extends SnipeModel
        'image',
        'qty',
        'min_amt',
-        'requestable'
+        'requestable',
+        'notes',
    ];


@@ -665,13 +665,15 @@ class Asset extends Depreciable
     */
    public static function getExpiringWarrantee($days = 30)
    {
+        $days = (is_null($days)) ? 30 : $days;
+        
        return Asset::where('archived', '=', '0')
            ->whereNotNull('warranty_months')
            ->whereNotNull('purchase_date')
            ->whereNull('deleted_at')
            ->whereRaw(\DB::raw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL '
                                 . $days
-                                 . ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()'))
+                                 . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()'))
            ->orderBy('purchase_date', 'ASC')
            ->get();
    }
@@ -814,7 +816,9 @@ class Asset extends Depreciable
     */
    public function checkin_email()
    {
-        return $this->model->category->checkin_email;
+        if (($this->model) && ($this->model->category)) {
+            return $this->model->category->checkin_email;
+        }
    }

    /**
@@ -60,6 +60,7 @@ class Component extends SnipeModel
        'order_number',
        'qty',
        'serial',
+        'notes',
    ];

    use Searchable;
@@ -69,7 +70,7 @@ class Component extends SnipeModel
     * 
     * @var array
     */
-    protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date'];
+    protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date', 'notes'];

    /**
     * The relations and their attributes that should be included when searching the model.
@@ -69,7 +69,8 @@ class Consumable extends SnipeModel
        'purchase_date',
        'qty',
        'min_amt',
-        'requestable'
+        'requestable',
+        'notes',
    ];

    use Searchable;
@@ -79,7 +80,7 @@ class Consumable extends SnipeModel
     * 
     * @var array
     */
-    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no', 'model_number'];
+    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no', 'model_number', 'notes'];

    /**
     * The relations and their attributes that should be included when searching the model.
@@ -627,6 +627,7 @@ class License extends Depreciable
     */
    public static function getExpiringLicenses($days = 60)
    {
+        $days = (is_null($days)) ? 60 : $days;

        return License::whereNotNull('expiration_date')
        ->whereNull('deleted_at')
@@ -115,6 +115,7 @@ trait Loggable

        $log->location_id = null;
        $log->note = $note;
+        $log->action_date = $action_date;

        if (Auth::user()) {
            $log->user_id = Auth::user()->id;
@@ -14,8 +14,8 @@ class Supplier extends SnipeModel

    protected $rules = array(
        'name'              => 'required|min:1|max:255|unique_undeleted',
-        'address'           => 'max:50|nullable',
-        'address2'          => 'max:50|nullable',
+        'address'           => 'max:250|nullable',
+        'address2'          => 'max:250|nullable',
        'city'              => 'max:255|nullable',
        'state'             => 'max:32|nullable',
        'country'           => 'max:3|nullable',
@@ -109,7 +109,14 @@ class AccessoryPresenter extends Presenter
                "sortable" => true,
                "visible" => false,
                "title" => trans('general.order_number'),
-            ],[
+            ], [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ], [
                "field" => "change",
                "searchable" => false,
                "sortable" => false,
@@ -104,7 +104,14 @@ class ComponentPresenter extends Presenter
                "title" => trans('general.purchase_cost'),
                "visible" => true,
                "footerFormatter" => 'sumFormatter',
-            ],
+            ], [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ]
        ];

        $layout[] = [
@@ -118,13 +118,20 @@ class ConsumablePresenter extends Presenter
                "visible" => true,
                "footerFormatter" => 'sumFormatter',
            ],[
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ], [
                "field" => "change",
                "searchable" => false,
                "sortable" => false,
                "visible" => true,
                "title" => trans('general.change'),
                "formatter" => "consumablesInOutFormatter",
-            ], [
+            ],  [
                "field" => "actions",
                "searchable" => false,
                "sortable" => false,
@@ -43,6 +43,17 @@ class AppServiceProvider extends ServiceProvider
                \Log::warning("'APP_FORCE_TLS' is set to true, but 'APP_URL' does not start with 'https://'. Will not force TLS on connections.");
            }
        }
+
+        // TODO - isn't it somehow 'gauche' to check the environment directly; shouldn't we be using config() somehow?
+        if ( ! env('APP_ALLOW_INSECURE_HOSTS')) {  // unless you set APP_ALLOW_INSECURE_HOSTS, you should PROHIBIT forging domain parts of URL via Host: headers
+            $url_parts = parse_url(config('app.url'));
+            if ($url_parts && array_key_exists('scheme', $url_parts) && array_key_exists('host', $url_parts)) { // check for the *required* parts of a bare-minimum URL
+                \URL::forceRootUrl(config('app.url'));
+            } else {
+                \Log::error("Your APP_URL in your .env is misconfigured - it is: ".config('app.url').". Many things will work strangely unless you fix it.");
+            }
+        }
+
        Schema::defaultStringLength(191);
        Asset::observe(AssetObserver::class);
        Accessory::observe(AccessoryObserver::class);
@@ -156,6 +156,8 @@ class AuthServiceProvider extends ServiceProvider
            return $user->hasAccess('self.checkout_assets');
        });

+        // This is largely used to determine whether to display the gear icon sidenav 
+        // in the left-side navigation
        Gate::define('backend.interact', function ($user) {
            return $user->can('view', Statuslabel::class)
                || $user->can('view', AssetModel::class)
@@ -168,7 +170,30 @@ class AuthServiceProvider extends ServiceProvider
                || $user->can('view', Manufacturer::class)
                || $user->can('view', CustomField::class)
                || $user->can('view', CustomFieldset::class)                
-                || $user->can('view', Depreciation::class);
+                || $user->can('view', Depreciation::class); 
+        });
+
+
+        // This  determines whether or not an API user should be able to get the selectlists.
+        // This can seem a little confusing, since view properties may not have been granted
+        // to the logged in API user, but creating assets, licenses, etc won't work 
+        // if the user can't view and interact with the select lists.
+        Gate::define('view.selectlists', function ($user) {
+            return $user->can('update', Asset::class) 
+                 || $user->can('create', Asset::class)    
+                 || $user->can('checkout', Asset::class)
+                 || $user->can('checkin', Asset::class)
+                 || $user->can('audit', Asset::class)       
+                 || $user->can('update', License::class)   
+                 || $user->can('create', License::class)   
+                 || $user->can('update', Component::class)
+                 || $user->can('create', Component::class)   
+                 || $user->can('update', Consumable::class)   
+                 || $user->can('create', Consumable::class)   
+                 || $user->can('update', Accessory::class)
+                 || $user->can('create', Accessory::class)   
+                 || $user->can('update', User::class)
+                 || $user->can('create', User::class);  
        });
    }
 }
@@ -47,6 +47,7 @@ class LdapAd extends LdapAdConfiguration
      '262688', // 0x40220  NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
      '328192', // 0x50200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
      '328224', // 0x50220  NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+      '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
      '4260352',// 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
      '1049088',// 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
      '1114624',// 0x110200 NORMAL_ACCOUNT, NOT_DELEGATED, DONT_EXPIRE_PASSWORD
@@ -20,7 +20,6 @@
    "adldap2/adldap2": "^10.2",
    "alek13/slack": "^1.12",
    "bacon/bacon-qr-code": "^1.0",
-    "barryvdh/laravel-cors": "^0.11.3",
    "barryvdh/laravel-debugbar": "^3.2",
    "doctrine/cache": "^1.10",
    "doctrine/common": "^2.12",
@@ -31,6 +30,7 @@
    "enshrined/svg-sanitize": "^0.13.3",
    "erusev/parsedown": "^1.7",
    "fideloper/proxy": "^4.3",
+    "fruitcake/laravel-cors": "^2.2",
    "guzzlehttp/guzzle": "^6.5",
    "intervention/image": "^2.5",
    "javiereguiluz/easyslugger": "^1.0",
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "252b4b452ca73e3e8f3d8543fce394d2",
+    "content-hash": "6bd73d729675b968cf296bdf68f6a523",
    "packages": [
        {
            "name": "adldap2/adldap2",
@@ -139,36 +139,36 @@
        },
        {
            "name": "asm89/stack-cors",
-            "version": "1.3.0",
+            "version": "v2.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/asm89/stack-cors.git",
-                "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08"
+                "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/b9c31def6a83f84b4d4a40d35996d375755f0e08",
-                "reference": "b9c31def6a83f84b4d4a40d35996d375755f0e08",
+                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
+                "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.5.9",
-                "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0",
-                "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0"
+                "php": "^7.2|^8.0",
+                "symfony/http-foundation": "^4|^5|^6",
+                "symfony/http-kernel": "^4|^5|^6"
            },
            "require-dev": {
-                "phpunit/phpunit": "^5.0 || ^4.8.10",
-                "squizlabs/php_codesniffer": "^2.3"
+                "phpunit/phpunit": "^7|^9",
+                "squizlabs/php_codesniffer": "^3.5"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "2.1-dev"
                }
            },
            "autoload": {
                "psr-4": {
-                    "Asm89\\Stack\\": "src/Asm89/Stack/"
+                    "Asm89\\Stack\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -189,9 +189,9 @@
            ],
            "support": {
                "issues": "https://github.com/asm89/stack-cors/issues",
-                "source": "https://github.com/asm89/stack-cors/tree/1.3.0"
+                "source": "https://github.com/asm89/stack-cors/tree/v2.1.1"
            },
-            "time": "2019-12-24T22:41:47+00:00"
+            "time": "2022-01-18T09:12:03+00:00"
        },
        {
            "name": "aws/aws-sdk-php",
@@ -333,72 +333,6 @@
            },
            "time": "2017-10-17T09:59:25+00:00"
        },
-        {
-            "name": "barryvdh/laravel-cors",
-            "version": "v0.11.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fruitcake/laravel-cors.git",
-                "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/03492f1a3bc74a05de23f93b94ac7cc5c173eec9",
-                "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9",
-                "shasum": ""
-            },
-            "require": {
-                "asm89/stack-cors": "^1.2",
-                "illuminate/support": "^5.5|^6",
-                "php": ">=7",
-                "symfony/http-foundation": "^3.1|^4",
-                "symfony/http-kernel": "^3.1|^4"
-            },
-            "require-dev": {
-                "laravel/framework": "^5.5",
-                "orchestra/testbench": "3.3.x|3.4.x|3.5.x|3.6.x|3.7.x",
-                "phpunit/phpunit": "^4.8|^5.2|^7.0",
-                "squizlabs/php_codesniffer": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.11-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Barryvdh\\Cors\\ServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Barryvdh\\Cors\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
-            "keywords": [
-                "api",
-                "cors",
-                "crossdomain",
-                "laravel"
-            ],
-            "support": {
-                "issues": "https://github.com/fruitcake/laravel-cors/issues",
-                "source": "https://github.com/fruitcake/laravel-cors/tree/v0.11.4"
-            },
-            "time": "2019-08-28T11:27:11+00:00"
-        },
        {
            "name": "barryvdh/laravel-debugbar",
            "version": "v3.6.2",
@@ -2042,6 +1976,85 @@
            },
            "time": "2021-06-23T19:00:23+00:00"
        },
+        {
+            "name": "fruitcake/laravel-cors",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruitcake/laravel-cors.git",
+                "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534",
+                "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534",
+                "shasum": ""
+            },
+            "require": {
+                "asm89/stack-cors": "^2.0.1",
+                "illuminate/contracts": "^6|^7|^8|^9",
+                "illuminate/support": "^6|^7|^8|^9",
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "laravel/framework": "^6|^7.24|^8",
+                "orchestra/testbench-dusk": "^4|^5|^6|^7",
+                "phpunit/phpunit": "^6|^7|^8|^9",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Fruitcake\\Cors\\CorsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Fruitcake\\Cors\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fruitcake",
+                    "homepage": "https://fruitcake.nl"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
+            "keywords": [
+                "api",
+                "cors",
+                "crossdomain",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/fruitcake/laravel-cors/issues",
+                "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-23T14:25:13+00:00"
+        },
        {
            "name": "guzzlehttp/guzzle",
            "version": "6.5.5",
@@ -11625,5 +11638,5 @@
    "platform-overrides": {
        "php": "7.2.5"
    },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }
@@ -255,7 +255,20 @@ return [
    'enable_csp' => env('ENABLE_CSP', false),


+    /*
+     |--------------------------------------------------------------------------
+     | Require SAML Login
+     |--------------------------------------------------------------------------
+     |
+     | Disable the ability to login via form login, and disables the 'nosaml'
+     | workaround. It requires all logins to process via SAML login.
+     | (This is for high security setups. If your SAML configuration is not
+     | working, this option should be set to false. This option is not needed
+     | to successfully configure SAML authentication.)
+     |
+     */

+    'require_saml' => env('REQUIRE_SAML', false),

    /*
    |--------------------------------------------------------------------------
@@ -412,4 +425,15 @@ return [

    ],

+    /*
+    |--------------------------------------------------------------------------
+    | API Throttling
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the number of API requests permitted per minute
+    |
+    */
+
+    'api_throttle_per_minute' => env('API_THROTTLE_PER_MINUTE', 120),
+
 ];
@@ -37,12 +37,13 @@ return [
    |
    */
   
-    'supportsCredentials' => false,
-    'allowedOrigins' => $allowed_origins,
-    'allowedOriginsPatterns' => [],
-    'allowedHeaders' => ['*'],
-    'allowedMethods' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'],
-    'exposedHeaders' => [],
-    'maxAge' => 0,
+    'supports_credentials' => false,
+    'allowed_origins' => $allowed_origins,
+    'allowed_origins_patterns' => [],
+    'allowed_headers' => ['*'],
+    'allowed_methods' => ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'],
+    'exposed_headers' => [],
+    'max_age' => 0,
+    'paths' => ['api/*', 'sanctum/csrf-cookie'],

 ];
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.6',
-  'full_app_version' => 'v5.3.6 - build 6567-g9b2dd6522',
-  'build_version' => '6567',
+  'app_version' => 'vV5.4.1',
+  'full_app_version' => 'vV5.4.1 - build 6746-g3e22dce11',
+  'build_version' => '6746',
  'prerelease_version' => '',
-  'hash_version' => 'g9b2dd6522',
-  'full_hash' => 'v5.3.6-8-g9b2dd6522',
+  'hash_version' => 'g3e22dce11',
+  'full_hash' => 'V5.4.1-20-g3e22dce11',
  'branch' => 'master',
 );
@@ -22,12 +22,12 @@ class UpdateGroupFieldForReporting extends Migration {
        
        if (Schema::hasTable('permission_groups')) {

-            Group::where('id', 1)->update(['permissions' => '{"users-poop":1,"reports":1}']);
-            Group::where('id', 2)->update(['permissions' => '{"users-pop":1,"reports":1}']);
+            Group::where('id', 1)->update(['permissions' => '{"users-foo":1,"reports":1}']);
+            Group::where('id', 2)->update(['permissions' => '{"users-foo":1,"reports":1}']);

        } elseif (Schema::hasTable('groups')) {
-            DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin-farts":1,"users":1,"reports":1}', 1]);
-            DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users-farts":1,"reports":1}', 2]);
+            DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin-foo":1,"users":1,"reports":1}', 1]);
+            DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users-foo":1,"reports":1}', 2]);
        }

    }
@@ -23,7 +23,7 @@ class AddLdapFieldsToSettings extends Migration {
 			$table->string('ldap_username_field')->nullable()->default('samaccountname');
 			$table->string('ldap_lname_field')->nullable()->default('sn');
 			$table->string('ldap_fname_field')->nullable()->default('givenname');
-			$table->string('ldap_auth_filter_query')->nullable()->default('uid=samaccountname');
+			$table->string('ldap_auth_filter_query')->nullable()->default('uid=');
 			$table->integer('ldap_version')->nullable()->default(3);
 			$table->string('ldap_active_flag')->nullable()->default(NULL);
 			$table->string('ldap_emp_num')->nullable()->default(NULL);
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeSupplierAddressLength extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            //
+            $table->string('address', 250)->nullable()->change();
+            $table->string('address2', 250)->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            //
+            $table->text('address', 50)->nullable()->default(null)->change();
+            $table->text('address2', 50)->nullable()->default(null)->change();
+        });
+    }
+}
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\Setting;
+
+class BlankOutLdapActiveFlag extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ($s = Setting::getSettings()) {
+            $s->ldap_active_flag = '';
+            $s->save();
+        }
+    }
+    
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToAccessories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            if (Schema::hasColumn('accessories', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToComponents extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (Schema::hasColumn('components', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToConsumables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('consumables', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('consumables', function (Blueprint $table) {
+            if (Schema::hasColumn('consumables', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
@@ -0,0 +1,2 @@
+[mysqldump]
+column-statistics=0
@@ -4233,7 +4233,7 @@
    "deep-equal": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
      "dev": true,
      "requires": {
        "is-arguments": "^1.0.4",
@@ -11630,8 +11630,7 @@
        "picomatch": {
          "version": "2.2.2",
          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-          "optional": true
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
        },
        "pify": {
          "version": "2.3.0",
@@ -14237,7 +14236,6 @@
              "version": "4.0.1",
              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
              "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-              "optional": true,
              "requires": {
                "is-extglob": "^2.1.1"
              }
@@ -14251,8 +14249,7 @@
            "normalize-path": {
              "version": "3.0.0",
              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-              "optional": true
+              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
            },
            "readdirp": {
              "version": "3.4.0",
@@ -16241,9 +16238,9 @@
      "integrity": "sha1-G+i3twTdOFcVJwiu+x1KSzpp+zM="
    },
    "jquery-ui": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.0.tgz",
-      "integrity": "sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw==",
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.1.tgz",
+      "integrity": "sha512-2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA==",
      "requires": {
        "jquery": ">=1.8.0 <4.0.0"
      }
@@ -18337,8 +18334,7 @@
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "pify": {
      "version": "2.3.0",
@@ -41,7 +41,7 @@
    "imagemin": "^5.3.1",
    "jquery-form-validator": "^2.3.79",
    "jquery-slimscroll": "^1.3.8",
-    "jquery-ui": "^1.13.0",
+    "jquery-ui": "^1.13.1",
    "jquery-ui-bundle": "^1.12.1",
    "jquery.iframe-transport": "^1.0.0",
    "less": "^3.13.1",
@@ -36,7 +36,7 @@
 */

 /*!
- * jQuery UI Widget 1.13.0
+ * jQuery UI Widget 1.13.1
 * http://jqueryui.com
 *
 * Copyright jQuery Foundation and other contributors
@@ -1,8 +1,8 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=fa8e6e2c8e6ebd812d15",
+    "/js/build/app.js": "/js/build/app.js?id=7f0aa35a0e80a6a64427",
    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=89f2b7816c4e00784b59",
-    "/css/build/app.css": "/css/build/app.css?id=5d0d4ed9f5ea4d02b6fe",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=1a11d122b620ebdc8354",
+    "/css/build/app.css": "/css/build/app.css?id=423186da9bf73779ce2a",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=e0c3caf0357a7ab0a2e9",
    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=2da78d31ca46509e2927",
    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=0845c3960331dcd5db3c",
    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=83a9d7106a863eb4536d",
@@ -18,15 +18,15 @@
    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0409748eb4bb77fe171a",
    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=7abb3dcd41ad0d4700b7",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/all.css": "/css/dist/all.css?id=d428302ff341ffec8b1b",
+    "/css/dist/all.css": "/css/dist/all.css?id=23d12dde43fa52cbc84d",
    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
    "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=75760107ce879b26f156",
-    "/js/dist/all.js": "/js/dist/all.js?id=5999105216485cd776ad",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=473d249fc27f1b907d07",
+    "/js/dist/all.js": "/js/dist/all.js?id=1b9488168279292af5c4",
    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=1f137fd2dcbac676d291",
    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=af88a4cc8e58dc298963",
    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=5ef650950378aeb72dfa",
@@ -46,6 +46,14 @@
                                <input v-if="field.type == 'text'" class="form-control m-b-xs" type="text" :value="getValue(field)" :id="'default-value' + field.id" :name="'default_values[' + field.id + ']'">
                                <textarea v-if="field.type == 'textarea'" class="form-control" :value="getValue(field)" :id="'default-value' + field.id" :name="'default_values[' + field.id + ']'"></textarea><br>

+                              <div v-if="field.type == 'checkbox'" v-for="field_value in field.field_values_array">
+                                <input v-if="field.type == 'checkbox'" class="" type="checkbox" :name="'default_values[' + field.id + '][]'" :value="field_value" :checked="getValue(field).split(', ').includes(field_value)"> <label>{{ field_value }}</label>
+                              </div>
+
+                              <div v-if="field.type == 'radio'" v-for="field_value in field.field_values_array">
+                                <input v-if="field.type == 'radio'" class="" type="radio" :name="'default_values[' + field.id + ']'" :value="field_value" :checked="getValue(field).split(', ').includes(field_value)"> <label>{{ field_value }}</label>
+                              </div>
+
                                <select v-if="field.type == 'listbox'" class="form-control m-b-xs" :name="'default_values[' + field.id + ']'">
                                    <option value=""></option>
                                    <option v-for="field_value in field.field_values_array" :value="field_value" :selected="getValue(field) == field_value">{{ field_value }}</option>
@@ -130,7 +130,6 @@
                        {id: 'location', text: 'Location' },
                        {id: 'maintained', text: 'Maintained' },
                        {id: 'manufacturer', text: 'Manufacturer' },
-                        {id: 'notes', text: 'Notes' },
                        {id: 'order_number', text: 'Order Number' },
                        {id: 'purchase_cost', text: 'Purchase Cost' },
                        {id: 'purchase_date', text: 'Purchase Date' },
@@ -143,10 +142,13 @@
                    ],
                    accessories:[
                        {id: 'model_number', text: 'Model Number'},
+                        {id: 'notes', text: 'Notes' },
                    ],
                    assets: [
                        {id: 'asset_tag', text: 'Asset Tag' },
                        {id: 'asset_model', text: 'Model Name' },
+                        {id: 'asset_notes', text: 'Asset Notes' },
+                        {id: 'model_notes', text: 'Model Notes' },
                        {id: 'checkout_class', text: 'Checkout Type' },
                        {id: 'checkout_location', text: 'Checkout Location' },
                        {id: 'image', text: 'Image Filename' },
@@ -159,6 +161,7 @@
                        {id: 'item_no', text: "Item Number"},
                        {id: 'model_number', text: "Model Number"},
                        {id: 'min_amt', text: "Minimum Quantity"},
+                        {id: 'notes', text: 'Notes' },
                    ],
                    licenses: [
                        {id: 'asset_tag', text: 'Assigned To Asset'},
@@ -166,6 +169,7 @@
                        {id: 'full_name', text: 'Full Name' },
                        {id: 'license_email', text: 'Licensed To Email' },
                        {id: 'license_name', text: 'Licensed To Name' },
+                        {id: 'notes', text: 'Notes' },
                        {id: 'purchase_order', text: 'Purchase Order' },
                        {id: 'reassignable', text: 'Reassignable' },
                        {id: 'seats', text: 'Seats' },
@@ -178,11 +182,12 @@
                        {id: 'phone_number', text: 'Phone Number' },
                        {id: 'manager_first_name', text: 'Manager First Name' },
                        {id: 'manager_last_name', text: 'Manager Last Name' },
-                        {id: 'department', text: 'Department' },
+                        {id: 'notes', text: 'Notes' },
                        {id: 'activated', text: 'Activated' },
                        {id: 'address', text: 'Address' },
                        {id: 'city', text: 'City' },
                        {id: 'state', text: 'State' },
+                        {id: 'zip', text: 'ZIP' },
                        {id: 'country', text: 'Country' },

                    ],
@@ -466,7 +466,16 @@ h4 {
  display: table-cell;
 }

+.card-view-title {
+  min-width: 40% !important;
+  line-height: 3.0!important;
+  padding-right: 20px;
+}

+.card-view {
+  display: table-row;
+  flex-direction: column;
+}


 /**
@@ -5,17 +5,17 @@
        'delete'                       => [
            'confirm' => 'Is jy seker jy wil hierdie bate instandhouding uitvee?',
            'error'   => 'Daar was \'n probleem met die verwydering van die bate-instandhouding. Probeer asseblief weer.',
-            'success' => 'Die bate-instandhouding is suksesvol verwyder.'
+            'success' => 'Die bate-instandhouding is suksesvol verwyder.',
        ],
        'create'                       => [
            'error'   => 'Asset Maintenance is nie geskep nie, probeer asseblief weer.',
-            'success' => 'Bate Onderhoud geskep suksesvol.'
+            'success' => 'Bate Onderhoud geskep suksesvol.',
        ],
        'edit'                       => [
            'error'   => 'Bateonderhoud is nie geredigeer nie, probeer asseblief weer.',
-            'success' => 'Bate Onderhoud suksesvol geredigeer.'
+            'success' => 'Bate Onderhoud suksesvol geredigeer.',
        ],
        'asset_maintenance_incomplete' => 'Nog nie voltooi nie',
        'warranty'                     => 'waarborg',
        'not_warranty'                 => 'Nie waarborg nie',
-    ];
+    ];
@@ -4,5 +4,5 @@
        'title'         => 'Bate Onderhoud',
        'asset_name'    => 'Bate Naam',
        'is_warranty'   => 'waarborg',
-        'dl_csv'        => 'Laai CSV af'
+        'dl_csv'        => 'Laai CSV af',
    ];
@@ -1,4 +1,7 @@
 <?php
+
 return [
    'select_company' => 'Kies Maatskappy',
+    'about_companies' => 'About Companies',
+    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
 ];
@@ -1,18 +1,19 @@
 <?php
-return array(
+
+return [
    'does_not_exist' => 'Maatskappy bestaan nie.',
    'assoc_users'    => 'Hierdie maatskappy is tans geassosieer met ten minste een model en kan nie verwyder word nie. Dateer asseblief jou modelle op om nie meer hierdie maatskappy te verwys nie en probeer weer.',
-    'create' => array(
+    'create' => [
        'error'   => 'Maatskappy is nie geskep nie, probeer asseblief weer.',
-        'success' => 'Maatskappy geskep suksesvol.'
-    ),
-    'update' => array(
+        'success' => 'Maatskappy geskep suksesvol.',
+    ],
+    'update' => [
        'error'   => 'Maatskappy is nie opgedateer nie, probeer asseblief weer',
-        'success' => 'Maatskappy suksesvol opgedateer.'
-    ),
-    'delete' => array(
+        'success' => 'Maatskappy suksesvol opgedateer.',
+    ],
+    'delete' => [
        'confirm' => 'Is jy seker jy wil hierdie maatskappy uitvee?',
        'error'   => 'Daar was \'n probleem met die verwydering van die maatskappy. Probeer asseblief weer.',
-        'success' => 'Die maatskappy is suksesvol verwyder.'
-    )
-);
+        'success' => 'Die maatskappy is suksesvol verwyder.',
+    ],
+];
@@ -1,11 +1,12 @@
 <?php

-return array(
+return [
    'custom_fields'		        => 'Aangepaste velde',
+    'manage'                    => 'Manage',
    'field'		                => 'veld',
    'about_fieldsets_title'		=> 'Oor Fieldsets',
-    'about_fieldsets_text'		=> 'Veldstelle stel jou in staat om groepe van persoonlike velde te skep wat gereeld hergebruik word vir spesifieke tipe bates.',
-    'custom_format'             => 'Gepasmaakte formaat ...',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'custom_format'             => 'Custom Regex format...',
    'encrypt_field'      	        => 'Enkripteer die waarde van hierdie veld in die databasis',
    'encrypt_field_help'      => 'WAARSKUWING: Om \'n veld te enkripteer, maak dit onondersoekbaar.',
    'encrypted'      	        => 'encrypted',
@@ -26,7 +27,19 @@ return array(
    'used_by_models'   		    => 'Gebruik deur modelle',
    'order'   		            => 'Orde',
    'create_fieldset'         => 'Nuwe Fieldset',
+    'create_fieldset_title' => 'Create a new fieldset',
    'create_field'            => 'Nuwe aangepaste veld',
+    'create_field_title' => 'Create a new custom field',
    'value_encrypted'      	        => 'Die waarde van hierdie veld is geïnkripteer in die databasis. Slegs admingebruikers sal die gedecodeerde waarde kan sien',
    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
-);
+    'help_text' => 'Help Text',
+    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'about_custom_fields_title' => 'About Custom Fields',
+    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
+    'add_field_to_fieldset' => 'Add Field to Fieldset',
+    'make_optional' => 'Required - click to make optional',
+    'make_required' => 'Optional - click to make required',
+    'reorder' => 'Reorder',
+    'db_field' => 'DB Field',
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+];
@@ -1,13 +1,16 @@
 <?php

-return array(
+return [
    'about_asset_depreciations'  			=> 'Oor bate afskrywing',
    'about_depreciations'  					=> 'U kan bate-afskrywings opstel om bates te deprecieer gebaseer op reguit-waardevermindering.',
    'asset_depreciations'  					=> 'Bate afskrywing',
    'create'  					            => 'Skep waardevermindering',
    'depreciation_name'  					=> 'Waardevermindering Naam',
+    'depreciation_min'                      => 'Floor Value of Depreciation',
    'number_of_months'  					=> 'Aantal maande',
    'update'  					            => 'Werk waardevermindering op',
-    'depreciation_min'                      => 'Minimum Value after Depreciation'
-
-);
+    'depreciation_min'                      => 'Minimum Value after Depreciation',
+    'no_depreciations_warning'               => '<strong>Warning: </strong>
+                      You do not currently have any depreciations set up.
+                      Please set up at least one depreciation to view the depreciation report.',
+];
@@ -1,10 +1,11 @@
 <?php

-return array(
+return [

    'id'      => 'ID',
    'months'   => 'maande',
    'term'   => 'termyn',
    'title'      => 'naam',
+    'depreciation_min' => 'Floor Value',

-);
+];
--- a/Show More
+++ b/Show More