Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display

Retry fix bad metadata display

.all-contributorsrc

@@ -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"
+      ]
     }
   ]
 }

.env.example

@@ -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

Dockerfile

@@ -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

Dockerfile.alpine

@@ -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
 

Dockerfile.fpm-alpine

@@ -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" ]

README.md

@@ -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&utm_medium=referral&utm_content=snipe/snipe-it&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!

app/Console/Commands/FixDoubleEscape.php

@@ -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]++;
 
                     }

app/Console/Commands/LdapSync.php

@@ -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);
-            }
 
         }
 

app/Exceptions/Handler.php

@@ -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);
 
                 }
             }

app/Http/Controllers/Accessories/AccessoriesController.php

@@ -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);
 

app/Http/Controllers/Api/AccessoriesController.php

@@ -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);

app/Http/Controllers/Api/AssetMaintenancesController.php

@@ -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'));

app/Http/Controllers/Api/AssetModelsController.php

@@ -234,6 +234,7 @@ class AssetModelsController extends Controller
     public function selectlist(Request $request)
     {
 
+        $this->authorize('view.selectlists');
         $assetmodels = AssetModel::select([
             'models.id',
             'models.name',

app/Http/Controllers/Api/AssetsController.php

@@ -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')));
     }
 
 

app/Http/Controllers/Api/CategoriesController.php

@@ -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',

app/Http/Controllers/Api/CompaniesController.php

@@ -159,7 +159,7 @@ class CompaniesController extends Controller
      */
     public function selectlist(Request $request)
     {
-
+        $this->authorize('view.selectlists');
         $companies = Company::select([
             'companies.id',
             'companies.name',

app/Http/Controllers/Api/ComponentsController.php

@@ -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);

app/Http/Controllers/Api/ConsumablesController.php

@@ -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.

app/Http/Controllers/Api/DepartmentsController.php

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

app/Http/Controllers/Api/LicensesController.php

@@ -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.

app/Http/Controllers/Api/LocationsController.php

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

app/Http/Controllers/Api/ManufacturersController.php

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

app/Http/Controllers/Api/SettingsController.php

@@ -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);
             }
         
         //} 

app/Http/Controllers/Api/SuppliersController.php

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

app/Http/Controllers/Api/UsersController.php

@@ -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.
      *

app/Http/Controllers/AssetMaintenancesController.php

@@ -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

app/Http/Controllers/AssetModelsController.php

@@ -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]);
             }
         }

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -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);

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -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');

app/Http/Controllers/Auth/LoginController.php

@@ -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!');
         }
 

app/Http/Controllers/Components/ComponentsController.php

@@ -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);
 

app/Http/Controllers/Consumables/ConsumablesController.php

@@ -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);
 

app/Http/Controllers/CustomFieldsController.php

@@ -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"]);
+
+       
     }
 
     /**

app/Http/Controllers/ProfileController.php

@@ -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');
     }
 

app/Http/Controllers/SettingsController.php

@@ -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'), ',');

app/Http/Controllers/SuppliersController.php

@@ -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)) {

app/Http/Controllers/Users/UsersController.php

@@ -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

app/Http/Kernel.php

@@ -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',
         ],
     ];

app/Http/Middleware/CheckForTwoFactor.php

@@ -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);
                 }
 

app/Http/Requests/Request.php

@@ -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;

app/Http/Transformers/ActionlogsTransformer.php

@@ -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;
     }

app/Http/Transformers/ComponentsTransformer.php

@@ -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,

app/Http/Transformers/ConsumablesTransformer.php

@@ -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'),
         ];

app/Http/Transformers/LicensesTransformer.php

@@ -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'] = [

app/Importer/AssetImporter.php

@@ -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"));

app/Importer/ItemImporter.php

@@ -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;

app/Importer/LicenseImporter.php

@@ -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) {

app/Importer/UserImporter.php

@@ -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'));

app/Models/Accessory.php

@@ -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',
     ];
 
 

app/Models/Asset.php

@@ -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;
+        }
     }
 
     /**

app/Models/Component.php

@@ -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.

app/Models/Consumable.php

@@ -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.

app/Models/License.php

@@ -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')

app/Models/Loggable.php

@@ -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;

app/Presenters/AccessoryPresenter.php

@@ -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,

app/Presenters/ComponentPresenter.php

@@ -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[] = [

app/Presenters/ConsumablePresenter.php

@@ -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,

app/Providers/AppServiceProvider.php

@@ -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);

app/Providers/AuthServiceProvider.php

@@ -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);  
         });
     }
 }

app/Services/LdapAd.php

@@ -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

composer.json

@@ -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",

composer.lock

@@ -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"
 }

config/app.php

@@ -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),
+
 ];

config/cors.php

@@ -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'],
 
 ];

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.7',
-  'full_app_version' => 'v5.3.7 - build 6587-gcf14a0222',
-  'build_version' => '6587',
+  'app_version' => 'vV5.4.1',
+  'full_app_version' => 'vV5.4.1 - build 6746-g3e22dce11',
+  'build_version' => '6746',
   'prerelease_version' => '',
-  'hash_version' => 'gcf14a0222',
-  'full_hash' => 'v5.3.7-19-gcf14a0222',
+  'hash_version' => 'g3e22dce11',
+  'full_hash' => 'V5.4.1-20-g3e22dce11',
   'branch' => 'master',
 );

database/migrations/2014_11_04_231416_update_group_field_for_reporting.php

@@ -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]);
         }
 
     }

database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php

@@ -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);

database/migrations/2022_02_03_214958_blank_out_ldap_active_flag.php

@@ -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()
+    {
+        //
+    }
+}

database/migrations/2022_03_03_225655_add_notes_to_accessories.php

@@ -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');
+            }
+        });
+    }
+}

database/migrations/2022_03_03_225754_add_notes_to_components.php

@@ -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');
+            }
+        });
+    }
+}

database/migrations/2022_03_03_225824_add_notes_to_consumables.php

@@ -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');
+            }
+        });
+    }
+}

docker/column-statistics.cnf

@@ -0,0 +1,2 @@
+[mysqldump]
+column-statistics=0

package-lock.json

@@ -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",
@@ -16238,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"
       }

package.json

@@ -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",

public/js/build/app.js.LICENSE.txt

@@ -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

public/mix-manifest.json

@@ -1,8 +1,8 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=b6a9a230c52da11a5add",
+    "/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,7 +18,7 @@
     "/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=10e6e9b332aa5f1d2c87",
+    "/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",
@@ -26,7 +26,7 @@
     "/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=473d249fc27f1b907d07",
-    "/js/dist/all.js": "/js/dist/all.js?id=a4fa55da3467245c4456",
+    "/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",

resources/assets/js/components/forms/asset-models/fieldset-default-values.vue

@@ -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>

resources/assets/js/components/importer/importer-file.vue

@@ -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,10 +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: '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' },
 
                     ],

resources/assets/less/overrides.less

@@ -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;
+}
 
 
 /**

resources/lang/af/admin/asset_maintenances/message.php

@@ -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',
-    ];
+    ];

resources/lang/af/admin/asset_maintenances/table.php

@@ -4,5 +4,5 @@
         'title'         => 'Bate Onderhoud',
         'asset_name'    => 'Bate Naam',
         'is_warranty'   => 'waarborg',
-        'dl_csv'        => 'Laai CSV af'
+        'dl_csv'        => 'Laai CSV af',
     ];

resources/lang/af/admin/companies/general.php

@@ -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.',
 ];

resources/lang/af/admin/companies/message.php

@@ -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.',
+    ],
+];

resources/lang/af/admin/custom_fields/general.php

@@ -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>.'
+];

resources/lang/af/admin/depreciations/general.php

@@ -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.',
+];

resources/lang/af/admin/depreciations/table.php

@@ -1,10 +1,11 @@
 <?php
 
-return array(
+return [
 
     'id'      => 'ID',
     'months'   => 'maande',
     'term'   => 'termyn',
     'title'      => 'naam',
+    'depreciation_min' => 'Floor Value',
 
-);
+];

resources/lang/af/admin/groups/titles.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     'about_groups_title'            => 'Oor groepe',
     'about_groups'                  => 'Groepe word gebruik om gebruikersregte te veralgemeen.',
     'group_management' 	 	=> 'Groepbestuur',
@@ -10,5 +10,7 @@ return array(
     'group_admin' 	 		=> 'Groep Admin',
     'allow' 	 			=> 'laat',
     'deny' 	 				=> 'ontken',
-
-);
+    'permission'            => 'Permission',
+    'grant'                 => 'Grant',
+    'no_permissions'        => 'This group has no permissions.'
+];

resources/lang/af/admin/hardware/form.php

@@ -1,12 +1,12 @@
 <?php
 
-return array(
-	'bulk_delete'		=> 'Bevestig bates vir die verwydering van grootmaat',
+return [
+    'bulk_delete'		=> 'Bevestig bates vir die verwydering van grootmaat',
   'bulk_delete_help'	=> 'Hersien die bates vir grootmaatverwydering hieronder. Sodra dit verwyder is, kan hierdie bates herstel word, maar hulle word nie meer geassosieer met enige gebruikers wat hulle tans toegewys is nie.',
   'bulk_delete_warn'	=> 'Jy is op die punt om te verwyder: bate_count bates.',
-	'bulk_update'		=> 'Grootskaalse opdateringsbates',
-	'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
-	'bulk_update_warn'	=> 'Jy is op die punt om die eienskappe van: bate_count bates te wysig.',
+    'bulk_update'		=> 'Grootskaalse opdateringsbates',
+    'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
+    'bulk_update_warn'	=> 'Jy is op die punt om die eienskappe van: bate_count bates te wysig.',
     'checkedout_to'		=> 'Gekontroleer na',
     'checkout_date'		=> 'Checkout Datum',
     'checkin_date'		=> 'Incheckdatum',
@@ -38,7 +38,12 @@ return array(
     'tag'				=> 'Bate-tag',
     'update'			=> 'Asset Update',
     'warranty'			=> 'waarborg',
-		'warranty_expires'		=> 'Warranty Expires',
+        'warranty_expires'		=> 'Warranty Expires',
     'years'				=> 'jaar',
-)
-;
+    'asset_location' => 'Update Asset Location',
+    'asset_location_update_default_current' => 'Update default location AND actual location',
+    'asset_location_update_default' => 'Update only default location',
+    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
+    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+    'processing_spinner' => 'Processing...',
+];

resources/lang/af/admin/hardware/general.php

@@ -1,9 +1,9 @@
 <?php
 
-return array(
+return [
     'about_assets_title'           => 'Oor bates',
     'about_assets_text'            => 'Bates is items opgespoor volgens reeksnommer of bate-tag. Hulle is geneig om hoër waarde items te wees waar die identifisering van \'n spesifieke item saak maak.',
-	'archived'  				=> 'argief',
+    'archived'  				=> 'argief',
     'asset'  					=> 'bate',
     'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Kontrole bate',
@@ -15,8 +15,29 @@ return array(
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
     'requestable'               => 'Requestable',
     'requested'				    => 'versoek',
+    'not_requestable'           => 'Not Requestable',
+    'requestable_status_warning' => 'Do not change  requestable status',
     'restore'  					=> 'Herstel bate',
     'pending'  					=> 'hangende',
     'undeployable'  			=> 'Undeployable',
     'view'  					=> 'Bekyk bate',
-);
+    'csv_error' => 'You have an error in your CSV file:',
+    'import_text' => '
+    <p>
+    Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin &gt; General Settings.
+    </p>
+
+    <p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p>
+
+    <p>Checkin Date: blank or future checkin dates will checkout items to associated user.  Excluding the Checkin Date column will create a checkin date with todays date.</p>
+    ',
+    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
+    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
+    'csv_import_match_first' => 'Try to match users by first name (jane) format',
+    'csv_import_match_email' => 'Try to match users by email as username',
+    'csv_import_match_username' => 'Try to match users by username',
+    'error_messages' => 'Error messages:',
+    'success_messages' => 'Success messages:',
+    'alert_details' => 'Please see below for details.',
+    'custom_export' => 'Custom Export'
+];

resources/lang/af/admin/hardware/message.php

@@ -1,82 +1,82 @@
 <?php
 
-return array(
+return [
 
     'undeployable' 		=> '<strong>Waarskuwing: </strong> Hierdie bate is gemerk as tans onbruikbaar. As hierdie status verander het, verander asseblief die batestatus.',
     'does_not_exist' 	=> 'Bate bestaan ​​nie.',
-    'does_not_exist_or_not_requestable' => 'Goeie probeerslag. Daardie bate bestaan ​​nie of is nie versoekbaar nie.',
+    'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'Hierdie bate word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die bate eers in, en probeer dan weer uitvee.',
 
-    'create' => array(
+    'create' => [
         'error'   		=> 'Bate is nie geskep nie, probeer asseblief weer. :(',
-        'success' 		=> 'Bate geskep suksesvol. :)'
-    ),
+        'success' 		=> 'Bate geskep suksesvol. :)',
+    ],
 
-    'update' => array(
+    'update' => [
         'error'   			=> 'Bate is nie opgedateer nie, probeer asseblief weer',
         'success' 			=> 'Bate is suksesvol opgedateer.',
         'nothing_updated'	=>  'Geen velde is gekies nie, dus niks is opgedateer nie.',
-    ),
+    ],
 
-    'restore' => array(
+    'restore' => [
         'error'   		=> 'Bate is nie herstel nie, probeer asseblief weer',
-        'success' 		=> 'Bate herstel suksesvol.'
-    ),
+        'success' 		=> 'Bate herstel suksesvol.',
+    ],
 
-    'audit' => array(
+    'audit' => [
         'error'   		=> 'Bate-oudit was onsuksesvol. Probeer asseblief weer.',
-        'success' 		=> 'Bate oudit suksesvol aangemeld.'
-    ),
+        'success' 		=> 'Bate oudit suksesvol aangemeld.',
+    ],
 
 
-    'deletefile' => array(
+    'deletefile' => [
         'error'   => 'Lêer nie verwyder nie. Probeer asseblief weer.',
         'success' => 'Lêer suksesvol uitgevee.',
-    ),
+    ],
 
-    'upload' => array(
+    'upload' => [
         'error'   => 'Lêer (s) nie opgelaai nie. Probeer asseblief weer.',
         'success' => 'Lêer (s) suksesvol opgelaai.',
         'nofiles' => 'Jy het nie enige lêers vir oplaai gekies nie, of die lêer wat jy probeer oplaai is te groot',
         'invalidfiles' => 'Een of meer van jou lêers is te groot of is \'n filetipe wat nie toegelaat word nie. Toegelate filetipes is png, gif, jpg, doc, docx, pdf en txt.',
-    ),
+    ],
 
-    'import' => array(
+    'import' => [
         'error'                 => 'Sommige items is nie korrek ingevoer nie.',
         'errorDetail'           => 'Die volgende items is nie ingevoer as gevolg van foute nie.',
-        'success'               => "Jou lêer is ingevoer",
-        'file_delete_success'   => "Jou lêer is suksesvol verwyder",
-        'file_delete_error'      => "Die lêer kon nie uitgevee word nie",
-    ),
+        'success'               => 'Jou lêer is ingevoer',
+        'file_delete_success'   => 'Jou lêer is suksesvol verwyder',
+        'file_delete_error'      => 'Die lêer kon nie uitgevee word nie',
+    ],
 
 
-    'delete' => array(
+    'delete' => [
         'confirm'   	=> 'Is jy seker jy wil hierdie bate uitvee?',
         'error'   		=> 'Daar was \'n probleem met die verwydering van die bate. Probeer asseblief weer.',
         'nothing_updated'   => 'Geen bates is gekies nie, so niks is verwyder nie.',
-        'success' 		=> 'Die bate is suksesvol verwyder.'
-    ),
+        'success' 		=> 'Die bate is suksesvol verwyder.',
+    ],
 
-    'checkout' => array(
+    'checkout' => [
         'error'   		=> 'Bate is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Die bate is suksesvol nagegaan.',
         'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
         'not_available' => 'Die bate is nie beskikbaar vir die kassa nie!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
-    ),
+        'no_assets_selected' => 'You must select at least one asset from the list',
+    ],
 
-    'checkin' => array(
+    'checkin' => [
         'error'   		=> 'Bate is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Die bate is suksesvol nagegaan.',
         'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.',
         'already_checked_in'  => 'Daardie bate is reeds nagegaan.',
 
-    ),
+    ],
 
-    'requests' => array(
+    'requests' => [
         'error'   		=> 'Bate is nie aangevra nie, probeer asseblief weer',
         'success' 		=> 'Die bate is suksesvol aangevra.',
-        'canceled'      => 'Afhandeling versoek suksesvol gekanselleer'
-    )
+        'canceled'      => 'Afhandeling versoek suksesvol gekanselleer',
+    ],
 
-);
+];

resources/lang/af/admin/hardware/table.php

@@ -1,13 +1,14 @@
 <?php
 
-return array(
+return [
 
     'asset_tag'   	=> 'Bate-tag',
     'asset_model'       => 'model',
-    'book_value'  	=> 'waarde',
+    'book_value'  	=> 'Current Value',
     'change' 		=> 'In uit',
     'checkout_date' => 'Checkout Datum',
     'checkoutto' 	=> 'Gekontroleer',
+    'current_value' => 'Current Value',
     'diff' 			=> 'diff',
     'dl_csv' 		=> 'Laai CSV af',
     'eol' 			=> 'EOL',
@@ -18,8 +19,12 @@ return array(
     'serial'   		=> 'Serial',
     'status'   		=> 'status',
     'title'      	=> 'bate',
-    'image'		=> 'Toestelbeeld',
+    'image'		    => 'Toestelbeeld',
     'days_without_acceptance' => 'Dae sonder aanvaarding',
-    'monthly_depreciation' => 'Monthly Depreciation'
-
-);
+    'monthly_depreciation' => 'Monthly Depreciation',
+    'assigned_to'    => 'Assigned To',
+    'requesting_user' => 'Requesting User',
+    'requested_date' => 'Requested Date',
+    'changed'       => 'Changed',
+    'icon' => 'Icon',
+];

resources/lang/af/admin/kits/general.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     'about_kits_title'                  => 'About Predefined Kits',
     'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
     'checkout'                          => 'Checkout Kit ',
@@ -13,5 +13,38 @@ return array(
     'none_licenses'                     => 'There are not enough available seats for :license to checkout. :qty are required. ',
     'none_consumables'                  => 'There are not enough available units of :consumable to checkout. :qty are required. ',
     'none_accessory'                    => 'There are not enough available units of :accessory to checkout. :qty are required. ',
-
-);
+    'append_accessory'                  => 'Append Accessory',
+    'update_appended_accessory'         => 'Update appended Accessory',
+    'append_consumable'                 => 'Append Consumable',
+    'update_appended_consumable'        => 'Update appended Consumable',
+    'append_license'                    => 'Append license',
+    'update_appended_license'           => 'Update appended license',
+    'append_model'                      => 'Append model',
+    'update_appended_model'             => 'Update appended model',
+    'license_error'                     => 'License already attached to kit',
+    'license_added_success'             => 'License added successfully',
+    'license_updated'                   => 'License was successfully updated',
+    'license_none'                      => 'License does not exist',
+    'license_detached'                  => 'License was successfully detached',
+    'consumable_added_success'          => 'Consumable added successfully',
+    'consumable_updated'                => 'Consumable was successfully updated',
+    'consumable_error'                  => 'Consumable already attached to kit',
+    'consumable_deleted'                => 'Delete was successful',
+    'consumable_none'                   => 'Consumable does not exist',
+    'consumable_detached'               => 'Consumable was successfully detached',
+    'accessory_added_success'           => 'Accessory added successfully',
+    'accessory_updated'                 => 'Accessory was successfully updated',
+    'accessory_detached'                => 'Accessory was successfully detached',
+    'accessory_error'                   => 'Accessory already attached to kit',
+    'accessory_deleted'                 => 'Delete was successful',
+    'accessory_none'                    => 'Accessory does not exist',
+    'checkout_success'                  => 'Checkout was successful',
+    'checkout_error'                    => 'Checkout error',
+    'kit_none'                          => 'Kit does not exist',
+    'kit_created'                       => 'Kit was successfully created',
+    'kit_updated'                       => 'Kit was successfully updated',
+    'kit_not_found'                     => 'Kit not found',
+    'kit_deleted'                       => 'Kit was successfully deleted',
+    'kit_model_updated'                 => 'Model was successfully updated',
+    'kit_model_detached'                => 'Model was successfully detached',
+];

resources/lang/af/admin/locations/table.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
     'about_locations_title'     => 'Oor plekke',
     'about_locations'           => 'Plekke word gebruik om ligginginligting vir gebruikers, bates en ander items op te spoor',
     'assets_rtd'                => 'bates', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
@@ -20,4 +20,21 @@ return array(
     'parent'                    => 'Ouer',
     'currency'                  => 'Ligging Geld',
     'ldap_ou'                   => 'LDAP soek OU',
-    );
+    'user_name'                 => 'User Name',
+    'department'                => 'Department',
+    'location'                  => 'Location',
+    'asset_tag'                 => 'Assets Tag',
+    'asset_name'                => 'Name',
+    'asset_category'            => 'Category',
+    'asset_manufacturer'        => 'Manufacturer',
+    'asset_model'               => 'Model',
+    'asset_serial'              => 'Serial',
+    'asset_location'            => 'Location',
+    'asset_checked_out'         => 'Checked Out',
+    'asset_expected_checkin'    => 'Expected Checkin',
+    'date'                      => 'Date:',
+    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
+    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
+    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by'                 => 'Signed Off By:',
+];

resources/lang/af/admin/reports/general.php

@@ -1,5 +1,10 @@
 <?php
 
-return array(
-    'info'   => 'Kies die opsies wat jy wil hê vir jou bateverslag.'
-);
+return [
+    'info'   => 'Kies die opsies wat jy wil hê vir jou bateverslag.',
+    'deleted_user' => 'Deleted user',
+    'send_reminder' => 'Send reminder',
+    'reminder_sent' => 'Reminder sent',
+    'acceptance_deleted' => 'Acceptance request deleted',
+    'acceptance_request' => 'Acceptance request'
+];

resources/lang/af/admin/settings/general.php

@@ -1,30 +1,39 @@
 <?php
 
-return array(
+return [
     'ad'				        => 'Aktiewe gids',
     'ad_domain'				    => 'Active Directory-domein',
     'ad_domain_help'			=> 'Dit is soms dieselfde as jou e-pos domein, maar nie altyd nie.',
     'ad_append_domain_label'    => 'Append domain name',
     'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".' ,
+    'ad_append_domain_help'     => 'User isn\'t required to write "username@domain.local", they can just type "username".',
     'admin_cc_email'            => 'CC Email',
     'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Dit is \'n Active Directory-bediener',
+    'alerts'                	=> 'Alerts',
+    'alert_title'               => 'Update Alert Settings',
     'alert_email'				=> 'Stuur kennisgewings aan',
+    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
     'alerts_enabled'			=> 'Alerts aangeskakel',
     'alert_interval'			=> 'Uitgaande Alert Drempel (in dae)',
     'alert_inv_threshold'		=> 'Voorraadwaarskuwingsdrempel',
     'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
+    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
     'asset_ids'					=> 'Bate ID\'s',
     'audit_interval'            => 'Ouditinterval',
     'audit_interval_help'       => 'As u gereeld u bates fisies moet kontroleer, vul die interval in maande in.',
     'audit_warning_days'        => 'Oudit Waarskuwing Drempel',
     'audit_warning_days_help'   => 'Hoeveel dae vooruit moet ons u waarsku wanneer bates verskuldig is vir ouditering?',
-    'auto_increment_assets'		=> 'Genereer outomaties inkrementele bate-ID\'s',
+    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
     'auto_increment_prefix'		=> 'Voorvoegsel (opsioneel)',
-    'auto_incrementing_help'    => 'Aktiveer outomaties inkrementering van bate ID\'s om dit te stel',
+    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
     'backups'					=> 'rugsteun',
+    'backups_restoring'         => 'Restoring from Backup',
+    'backups_upload'            => 'Upload Backup',
+    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
+    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
+    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
     'barcode_settings'			=> 'Barcode-instellings',
     'confirm_purge'			    => 'Bevestig skoonmaak',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
@@ -47,6 +56,7 @@ return array(
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode tipe',
     'email_logo_size'       => 'Square logos in email look best. ',
+    'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA-instellings',
     'eula_markdown'				=> 'Hierdie EULA laat <a href="https://help.github.com/articles/github-flavored-markdown/">Github-geurde markdown</a> toe.',
     'favicon'                   => 'Favicon',
@@ -55,12 +65,17 @@ return array(
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Algemene instellings',
+    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
+    'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Genereer rugsteun',
     'header_color'              => 'Opskrif Kleur',
     'info'                      => 'Met hierdie instellings kan u sekere aspekte van u installasie aanpas.',
     'label_logo'                => 'Label Logo',
     'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Weergawe',
+    'ldap'                      => 'LDAP',
+    'ldap_help'                 => 'LDAP/Active Directory',
+    'ldap_client_tls_key'       => 'LDAP Client TLS Key',
     'ldap_client_tls_cert'      => 'LDAP Client-Side TLS Certificate',
     'ldap_enabled'              => 'LDAP aangeskakel',
     'ldap_integration'          => 'LDAP-integrasie',
@@ -95,9 +110,17 @@ return array(
     'ldap_activated_flag_help'  => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
     'ldap_emp_num'              => 'LDAP Werknemersnommer',
     'ldap_email'                => 'LDAP-e-pos',
-    'license'                  => 'Software License',
+    'ldap_test'                 => 'Test LDAP',
+    'ldap_test_sync'            => 'Test LDAP Synchronization',
+    'license'                   => 'Software License',
     'load_remote_text'          => 'Remote Scripts',
     'load_remote_help_text'		=> 'Hierdie Snipe-IT installasie kan skrifte van die buitewêreld laai.',
+    'login'                     => 'Login Attempts',
+    'login_attempt'             => 'Login Attempt',
+    'login_ip'                  => 'IP Address',
+    'login_success'             => 'Success?',
+    'login_user_agent'          => 'User Agent',
+    'login_help'                => 'List of attempted logins',
     'login_note'                => 'Login Nota',
     'login_note_help'           => 'Voeg opsioneel \'n paar sinne op jou aanmeldskerm, byvoorbeeld om mense te help wat \'n verlore of gesteelde toestel gevind het. Hierdie veld aanvaar <a href="https://help.github.com/articles/github-flavored-markdown/">Gitub-gegeurde markdown</a>',
     'login_remote_user_text'    => 'Remote User login options',
@@ -118,16 +141,28 @@ return array(
     'optional'					=> 'opsioneel',
     'per_page'                  => 'Resultate per bladsy',
     'php'                       => 'PHP weergawe',
+    'php_info'                  => 'PHP Info',
+    'php_overview'              => 'PHP',
+    'php_overview_keywords'     => 'phpinfo, system, info',
+    'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jy moet php-gd installeer om QR-kodes te vertoon, sien installeringsinstruksies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin is NIE geïnstalleer nie.',
     'pwd_secure_complexity'     => 'Wagwoord Kompleksiteit',
     'pwd_secure_complexity_help' => 'Kies watter wagwoord kompleksiteit reëls jy wil afdwing.',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
+    'pwd_secure_complexity_letters' => 'Require at least one letter',
+    'pwd_secure_complexity_numbers' => 'Require at least one number',
+    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
+    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
     'pwd_secure_min'            => 'Wagwoord minimum karakters',
     'pwd_secure_min_help'       => 'Minimum permitted value is 8',
     'pwd_secure_uncommon'       => 'Voorkom algemene wagwoorde',
     'pwd_secure_uncommon_help'  => 'Dit sal gebruikers nie toelaat om algemene wagwoorde te gebruik van die top 10,000 wagwoorde wat in oortredings gerapporteer is nie.',
     'qr_help'                   => 'Aktiveer QR-kodes eers om dit te stel',
     'qr_text'                   => 'QR Kode Teks',
+    'saml'                      => 'SAML',
+    'saml_title'                => 'Update SAML settings',
+    'saml_help'                 => 'SAML settings',
     'saml_enabled'              => 'SAML enabled',
     'saml_integration'          => 'SAML Integration',
     'saml_sp_entityid'          => 'Entity ID',
@@ -139,7 +174,7 @@ return array(
     'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
     'saml_attr_mapping_username' => 'Attribute Mapping - Username',
     'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
+    'saml_forcelogin_label'     => 'SAML Default Login',
     'saml_forcelogin'           => 'Make SAML the primary login',
     'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
     'saml_slo_label'            => 'SAML Single Log Out',
@@ -147,6 +182,7 @@ return array(
     'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
     'saml_custom_settings'      => 'SAML Custom Settings',
     'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
+    'saml_download'             => 'Download Metadata',
     'setting'                   => 'omgewing',
     'settings'                  => 'instellings',
     'show_alerts_in_menu'       => 'Show alerts in top menu',
@@ -157,6 +193,9 @@ return array(
     'show_images_in_email'     => 'Show images in emails',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Naam',
+    'slack'                     => 'Slack',
+    'slack_title'               => 'Update Slack Settings',
+    'slack_help'                => 'Slack settings',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',
     'slack_endpoint'            => 'Slack Endpoint',
@@ -173,6 +212,8 @@ return array(
     'update'                    => 'Opdateer instellings',
     'value'                     => 'waarde',
     'brand'                     => 'Handelsmerk',
+    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
+    'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Oor instellings',
     'about_settings_text'       => 'Met hierdie instellings kan u sekere aspekte van u installasie aanpas.',
@@ -184,6 +225,7 @@ return array(
     'privacy_policy'            => 'Privacy Policy',
     'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
     'purge'                     => 'Verwyder verwyderde rekords',
+    'purge_deleted'             => 'Purge Deleted ',
     'labels_display_bgutter'    => 'Etiket onderkant goot',
     'labels_display_sgutter'    => 'Label side goot',
     'labels_fontsize'           => 'Etiket lettergrootte',
@@ -229,4 +271,51 @@ return array(
     'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
     'zerofill_count'        => 'Lengte van bate-etikette, insluitend zerofill',
     'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
-);
+    'oauth_title' => 'OAuth API Settings',
+    'oauth' => 'OAuth',
+    'oauth_help' => 'Oauth Endpoint Settings',
+    'asset_tag_title' => 'Update Asset Tag Settings',
+    'barcode_title' => 'Update Barcode Settings',
+    'barcodes' => 'Barcodes',
+    'barcodes_help_overview' => 'Barcode &amp; QR settings',
+    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
+    'barcodes_spinner' => 'Attempting to delete files...',
+    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'branding_title' => 'Update Branding Settings',
+    'general_title' => 'Update General Settings',
+    'mail_test' => 'Send Test',
+    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
+    'filter_by_keyword' => 'Filter by setting keyword',
+    'security' => 'Security',
+    'security_title' => 'Update Security Settings',
+    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    'security_help' => 'Two-factor, Password Restrictions',
+    'groups_keywords' => 'permissions, permission groups, authorization',
+    'groups_help' => 'Account permission groups',
+    'localization' => 'Localization',
+    'localization_title' => 'Update Localization Settings',
+    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'localization_help' => 'Language, date display',
+    'notifications' => 'Notifications',
+    'notifications_help' => 'Email alerts, audit settings',
+    'asset_tags_help' => 'Incrementing and prefixes',
+    'labels' => 'Labels',
+    'labels_title' => 'Update Label Settings',
+    'labels_help' => 'Label sizes &amp; settings',
+    'purge' => 'Purge',
+    'purge_keywords' => 'permanently delete',
+    'purge_help' => 'Purge Deleted Records',
+    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'ldap_ad' => 'LDAP/AD',
+    'employee_number' => 'Employee Number',
+    'create_admin_user' => 'Create a User ::',
+    'create_admin_success' => 'Success! Your admin user has been added!',
+    'create_admin_redirect' => 'Click here to go to your app login!',
+    'setup_migrations' => 'Database Migrations ::',
+    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
+    'setup_successful_migrations' => 'Your database tables have been created',
+    'setup_migration_output' => 'Migration output:',
+    'setup_migration_create_user' => 'Next: Create User',
+    'ldap_settings_link' => 'LDAP Settings Page',
+    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+];