fix: upgrade webpack from 5.65.0 to 5.72.0

Snyk has created this PR to upgrade webpack from 5.65.0 to 5.72.0.

See this package in npm:
https://www.npmjs.com/package/webpack

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr

.all-contributorsrc

@@ -2585,6 +2585,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "QveenSi",
+      "name": "Yevhenii Huzii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
+      "profile": "https://github.com/QveenSi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "veenone",
+      "name": "Achmad Fienan Rahardianto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3839381?v=4",
+      "profile": "https://github.com/veenone",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "QveenSi",
+      "name": "Yevhenii Huzii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
+      "profile": "https://github.com/QveenSi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chrisweirich",
+      "name": "Christian Weirich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97299851?v=4",
+      "profile": "https://github.com/chrisweirich",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.env.docker

@@ -138,6 +138,13 @@ PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
+# --------------------------------------------
+# OPTIONAL: AWS Settings
+# --------------------------------------------
+AWS_ACCESS_KEY_ID=null
+AWS_SECRET_ACCESS_KEY=null
+AWS_DEFAULT_REGION=null
+
 # --------------------------------------------
 # OPTIONAL: LOGIN THROTTLING
 # --------------------------------------------

.env.example

@@ -134,6 +134,13 @@ PRIVATE_AWS_BUCKET=null
 PRIVATE_AWS_URL=null
 PRIVATE_AWS_BUCKET_ROOT=null
 
+# --------------------------------------------
+# OPTIONAL: AWS Settings
+# --------------------------------------------
+AWS_ACCESS_KEY_ID=null
+AWS_SECRET_ACCESS_KEY=null
+AWS_DEFAULT_REGION=null
+
 # --------------------------------------------
 # OPTIONAL: LOGIN THROTTLING
 # --------------------------------------------

.env.testing

@@ -38,7 +38,7 @@ IMAGE_LIB=gd
 
 
 # --------------------------------------------
-# OPTIONAL: AWS S3 SETTINGS
+# OPTIONAL: AWS SETTINGS
 # --------------------------------------------
 AWS_SECRET_ACCESS_KEY=null
 AWS_ACCESS_KEY_ID=null

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,42 +1,27 @@
-name: Feature Request
-description: Suggest an idea for this project
-body:
-  - type: input
-    attributes:
-      label: Snipe-IT Version
-    validations:
-      required: true
-  - type: input
-    id: server_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. Ubuntu, Windows'
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: Web Server
-      description: 'e.g. Apache, IIS'
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: PHP Version
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe. A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    attributes:
-      label: Additional context Add any other context or screenshots about the feature request here.
+name: Feature Request
+description: Suggest an idea for this project
+title: "[Feature Request]: "
+labels: ["feature request"]
+assignees:
+  - snipe
+body:
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. The more information you can provide about your use-case, the more liklely we are to consider your feature.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.

.github/workflows/SA-codeql.yml

@@ -0,0 +1,39 @@
+# This workflow checks out code, performs a CodeQL analysis (for JavaScript) and integrates the results
+# with the GitHub Advanced Security code scanning feature.
+# More information: https://codeql.github.com/
+name: CodeQL Security Scan
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+#   schedule:
+#     - cron: '15 17 * * 1'
+
+jobs:
+  analyze:
+    name: CodeQL Security Scan
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

Dockerfile

@@ -41,6 +41,7 @@ libmcrypt-dev \
 php7.4-dev \
 ca-certificates \
 unzip \
+dnsutils \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 

README.md

@@ -1,11 +1,11 @@
 ![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-284-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-286-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
 
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.
 
-It is built on [Laravel 6](http://laravel.com).
+It is built on [Laravel 8](http://laravel.com).
 
 Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
@@ -131,7 +131,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/1975640?v=4" width="110px;"/><br /><sub>Evan Taylor</sub>](https://github.com/Delta5)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Delta5 "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/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "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/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "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/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "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/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") |
 <!-- 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/KillAllSessions.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class KillAllSessions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:global-logout  {--force : Skip the danger prompt; assuming you enter "y"} ';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will destroy all web sessions on disk and will force a re-login for all users.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        if (!$this->option('force') && !$this->confirm("****************************************************\nTHIS WILL FORCE A LOGIN FOR ALL LOGGED IN USERS.\n\nAre you SURE you wish to continue? ")) {
+            return $this->error("Session loss not confirmed");
+        }
+
+        $session_files = glob(storage_path("framework/sessions/*"));
+
+        $count = 0;
+        foreach ($session_files as $file) {
+
+            if (is_file($file))
+                unlink($file);
+                $count++;
+        }
+        \DB::table('users')->update(['remember_token' => null]);
+
+        $this->info($count. ' sessions cleared!');
+
+    }
+}

app/Console/Commands/LdapSync.php

@@ -56,6 +56,7 @@ class LdapSync extends Command
         $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle;
         $ldap_result_country = Setting::getSettings()->ldap_country;
         $ldap_result_dept = Setting::getSettings()->ldap_dept;
+        $ldap_result_manager = Setting::getSettings()->ldap_manager;
 
         try {
             $ldapconn = Ldap::connectToLdap();
@@ -184,12 +185,12 @@ class LdapSync extends Command
                 $item['jobtitle'] = isset($results[$i][$ldap_result_jobtitle][0]) ? $results[$i][$ldap_result_jobtitle][0] : '';
                 $item['country'] = isset($results[$i][$ldap_result_country][0]) ? $results[$i][$ldap_result_country][0] : '';
                 $item['department'] = isset($results[$i][$ldap_result_dept][0]) ? $results[$i][$ldap_result_dept][0] : '';
+                $item['manager'] = isset($results[$i][$ldap_result_manager][0]) ? $results[$i][$ldap_result_manager][0] : '';
 
                 $department = Department::firstOrCreate([
                     'name' => $item['department'],
                 ]);
 
-
                 $user = User::where('username', $item['username'])->first();
                 if ($user) {
                     // Updating an existing user.
@@ -212,6 +213,15 @@ class LdapSync extends Command
                 $user->country = $item['country'];
                 $user->department_id = $department->id;
 
+                if($item['manager']!= null) {
+                    //Captures only the Canonical Name
+                    $item['manager'] = ltrim($item['manager'], "CN=");
+                    $item['manager'] = substr($item['manager'],0, strpos($item['manager'], ','));
+                    $ldap_manager = User::where('username', $item['manager'])->first();
+                    $user->manager_id = $ldap_manager->id;
+                }
+
+
                 // Sync activated state for Active Directory.
                 if (array_key_exists('useraccountcontrol', $results[$i])) {
                     /* The following is _probably_ the correct logic, but we can't use it because

app/Console/Commands/LdapTroubleshooter.php

@@ -0,0 +1,503 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\Setting;
+use Exception;
+use Crypt;
+
+/**
+ * Check if a given ip is in a network
+ * @param  string $ip    IP to check in IPV4 format eg. 127.0.0.1
+ * @param  string $range IP/CIDR netmask eg. 127.0.0.0/24, also 127.0.0.1 is accepted and /32 assumed
+ * @return boolean true if the ip is in this range / false if not.
+ */
+function ip_in_range( $ip, $range ) {
+	if ( strpos( $range, '/' ) == false ) {
+		$range .= '/32';
+	}
+	// $range is in IP/CIDR format eg 127.0.0.1/24
+	list( $range, $netmask ) = explode( '/', $range, 2 );
+	$range_decimal = ip2long( $range );
+	$ip_decimal = ip2long( $ip );
+	$wildcard_decimal = pow( 2, ( 32 - $netmask ) ) - 1;
+	$netmask_decimal = ~ $wildcard_decimal;
+	return ( ( $ip_decimal & $netmask_decimal ) == ( $range_decimal & $netmask_decimal ) );
+}
+// NOTE - this function was shamelessly stolen from this gist: https://gist.github.com/tott/7684443
+
+class LdapTroubleshooter extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'ldap:troubleshoot
+                            {--ldap-search : Output an ldapsearch command-line for testing your LDAP config}
+                            {--force : Skip the interactive yes/no prompt for confirmation}
+                            {--debug : Include debugging output (verbose)}
+                            {--trace : Include extremely verbose LDAP trace output}
+                            {--timeout=15 : Timeout for LDAP Bind operations}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Runs a series of non-destructive LDAP commands to help try and determine correct LDAP settings for your environment.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Output something *only* if debug is enabled
+     * 
+     * @return void
+     */
+    public function debugout($string)
+    {
+        if($this->option('debug')) {
+            $this->line($string);
+        }
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if($this->option('trace')) {
+    	    ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
+        }
+
+        $settings = Setting::getSettings();
+        $this->settings = $settings;
+        if($this->option('ldap-search')) {
+            if(!$this->option('force')) {
+                $confirmation = $this->confirm('WARNING: This command will display your LDAP password on your terminal. Are you sure this is ok?');
+                if(!$confirmation) {
+                    $this->error('ABORTING');
+                    exit(-1);
+                }
+            }
+            $output = [];
+            if($settings->ldap_server_cert_ignore) {
+                $this->line("# Ignoring server certificate validity");
+                $output[] = "LDAPTLS_REQCERT=never";
+            }
+            if($settings->ldap_client_tls_cert && $settings->ldap_client_tls_key) {
+                $this->line("# Adding LDAP Client Certificate and Key");
+                $output[] = "LDAPTLS_CERT=storage/ldap_client_tls.cert";
+                $output[] = "LDAPTLS_KEY=storage/ldap_client_tls.key";
+            }
+            $output[] = "ldapsearch";
+            $output[] = $settings->ldap_server;
+            $output[] = "-x";
+            $output[] = "-b ".escapeshellarg($settings->ldap_basedn);
+            $output[] = "-D ".escapeshellarg($settings->ldap_uname);
+            $output[] = "-w ".escapeshellarg(\Crypt::Decrypt($settings->ldap_pword));
+            if(substr($settings->ldap_filter,0,1) == "(" ) {
+                $output[] = escapeshellarg($settings->ldap_filter);
+            } else {
+                $output[] = escapeshellarg("(".$settings->ldap_filter.")");
+            }
+            if($settings->ldap_tls) {
+                $this->line("# adding STARTTLS option");
+                $output[] = "-Z";
+            }
+            $output[] = "-v";
+            $this->line("\n");
+            $this->line(implode(" \\\n",$output));
+            exit(0);
+        }
+        if(!$this->option('force')) {
+            $confirmation = $this->confirm('WARNING: This command will make several attempts to connect to your LDAP server. Are you sure this is ok?');
+            if(!$confirmation) {
+                $this->error('ABORTING');
+                exit(-1);
+            }
+        }
+        //$this->line(print_r($settings,true));
+        $this->info("STAGE 1: Checking settings");
+        if(!$settings->ldap_enabled) {
+            $this->error("WARNING: Snipe-IT's LDAP setting is not turned on. (That may be OK if you're still trying to figure out settings)");
+        }
+
+        $ldap_conn = false;
+        try {
+            $ldap_conn = ldap_connect($settings->ldap_server);
+        } catch (Exception $e) {
+            $this->error("WARNING: Exception caught when executing 'ldap_connect()' - ".$e->getMessage().". We will try to guess.");
+        }
+
+        if(!$ldap_conn) {
+            $this->error("WARNING: LDAP Server setting of: ".$settings->ldap_server." cannot be parsed. We will try to guess.");
+            //exit(-1);
+        }
+        //since we never use $ldap_conn again, we don't have to ldap_unbind() it (it's not even connected, tbh - that only happens at bind-time)
+
+        $parsed = parse_url($settings->ldap_server);
+
+        if(@$parsed['scheme'] != 'ldap' && @$parsed['scheme'] != 'ldaps') {
+            $this->error("WARNING: LDAP URL Scheme of '".@$parsed['scheme']."' is probably incorrect; should usually be ldap or ldaps");
+        }
+
+        if(!@$parsed['host']) {
+            $this->error("ERROR: Cannot determine hostname or IP from ldap URL: ".$settings->ldap_server.". ABORTING.");
+            exit(-1);
+        } else {
+            $this->info("Determined LDAP hostname to be: ".$parsed['host']);
+        }
+
+        $this->info("Performing DNS lookup of: ".$parsed['host']);
+        $ips = dns_get_record($parsed['host']);
+        $raw_ips = [];
+
+        //$this->info("Host IP is: ".print_r($ips,true));
+
+        if(!$ips || count($ips) == 0) {
+            $this->error("ERROR: DNS lookup of host: ".$parsed['host']." has failed. ABORTING.");
+            exit(-1);
+        }
+        $this->debugout("IP's? ".print_r($ips,true));
+        foreach($ips as $ip) {
+            if(!isset($ip['ip'])) {
+                continue;
+            }
+            $raw_ips[]=$ip['ip'];
+            if($ip['ip'] == "127.0.0.1") {
+                $this->error("WARNING: Using the localhost IP as the LDAP server. This is usually wrong");
+            }
+            if(ip_in_range($ip['ip'],'10.0.0.0/8') || ip_in_range($ip['ip'],'192.168.0.0/16') || ip_in_range($ip['ip'], '172.16.0.0/12')) {
+                $this->error("WARNING: Using an RFC1918 Private address for LDAP server. This may be correct, but it can be a problem if your Snipe-IT instance is not hosted on your private network");
+            }
+        }
+
+        $this->info("STAGE 2: Checking basic network connectivity");
+        $ports = [389,636];
+        if(@$parsed['port'] && !in_array($parsed['port'],$ports)) {
+            $ports[] = $parsed['port'];
+        }
+
+        $open_ports=[];
+        foreach($ports as $port ) {
+            $errno = 0;
+            $errstr = '';
+            $timeout = 30.0;
+            $result = '';
+            $this->info("Attempting to connect to port: ".$port." - may take up to $timeout seconds");
+            try {
+                $result = fsockopen($parsed['host'], $port, $errno, $errstr, 30.0);
+            } catch(Exception $e) {
+                $this->error("Exception: ".$e->getMessage());
+            }
+            if($result) {
+                $this->info("Success!");
+                $open_ports[] = $port;
+            } else {
+                $this->error("WARNING: Cannot connect to port: $port - $errstr ($errno)");
+            }
+        }
+
+        if(count($open_ports) == 0) {
+            $this->error("ERROR - no open ports. ABORTING.");
+            exit(-1);
+        }
+
+        $this->info("STAGE 3: Determine encryption algorithm, if any");
+
+        $ldap_urls = [];
+        $pretty_ldap_urls = [];
+        foreach($open_ports as $port) {
+            $this->line("Trying TLS first for port $port");
+            $ldap_url = "ldaps://".$parsed['host'].":$port";
+            if($this->test_anonymous_bind($ldap_url)) {
+                $this->info("Anonymous bind succesful to $ldap_url!");
+                $ldap_urls[] = [ $ldap_url, true, false ];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
+                continue; // TODO - lots of copypasta in these if(test_anonymous_bind()) routines...
+            } else {
+                $this->error("WARNING: Failed to bind to $ldap_url - trying without certificate checks.");
+            }
+
+            if($this->test_anonymous_bind($ldap_url, false)) {
+                $this->info("Anonymous bind succesful to $ldap_url with certifcate-checks disabled");
+                $ldap_urls[] = [ $ldap_url, false, false ]; 
+                $pretty_ldap_urls[] = [ $ldap_url, "no", "no" ]; 
+                continue;
+            } else {
+                $this->error("WARNING: Failed to bind to $ldap_url with certificate checks disabled. Trying unencrypted with STARTTLS");
+            }
+
+            $ldap_url = "ldap://".$parsed['host'].":$port";
+            if($this->test_anonymous_bind($ldap_url, true, true)) {
+                $this->info("Plain connection to $ldap_url with STARTTLS succesful!");
+                $ldap_urls[] = [ $ldap_url, true, true ];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "YES" ];
+                continue;
+            } else {
+                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled. Trying without STARTTLS");
+            }
+
+            if($this->test_anonymous_bind($ldap_url)) {
+                $this->info("Plain connection to $ldap_url succesful!");
+                $ldap_urls[] = [ $ldap_url, true, false ];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
+                continue;
+            } else {
+                $this->error("WARNING: Failed to bind to $ldap_url. Giving up on port $port");
+            }
+        }
+
+        $this->debugout(print_r($ldap_urls,true));
+
+        if(count($ldap_urls) > 0 ) {
+            $this->info("Found working LDAP URL's: ");
+            foreach($ldap_urls as $ldap_url) { // TODO maybe do this as a $this->table() instead?
+                $this->info("LDAP URL: ".$ldap_url[0]);
+                $this->info($ldap_url[0]. ($ldap_url[1] ? " certificate checks enabled" : " certificate checks disabled"). ($ldap_url[2] ? " STARTTLS Enabled ": " STARTTLS Disabled"));
+            }
+            $this->table(["URL", "Cert Checks Enabled?", "STARTTLS Enabled?"],$pretty_ldap_urls);
+        } else {
+            $this->error("ERROR - no valid LDAP URL's available - ABORTING");
+            exit(1);
+        }
+
+        $this->info("STAGE 4: Test Administrative Bind for LDAP Sync");
+        foreach($ldap_urls AS $ldap_url) {
+            $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $settings->ldap_uname, Crypt::decrypt($settings->ldap_pword));
+        }
+
+        $this->info("STAGE 5: Test BaseDN");
+        //grab all LDAP_ constants and fill up a reversed array mapping from weird LDAP dotted-strings to (Constant Name)
+        $all_defined_constants = get_defined_constants();
+        $ldap_constants = [];
+        foreach($all_defined_constants AS $key => $val) {
+            if(starts_with($key,"LDAP_") && is_string($val)) {
+                $ldap_constants[$val] = $key; // INVERT the meaning here!
+            }
+        }
+        $this->debugout("LDAP constants are: ".print_r($ldap_constants,true));
+
+        // recursive function that 'cleans' the returned array from ldap_get_entries which are formatted awfully
+        $cleaner = function ($array) {
+            $cleaned = [];
+            for($i = 0; $i < $array['count']; $i++) {
+                $row = $array[$i];
+                $clean_row = [];
+                foreach($row AS $key => $val ) {
+                    $this->debugout("Key is: ".$key);
+                    if($key == "count" || is_int($key) || $key == "dn") {
+                        $this->debugout(" and we're gonna skip it\n");
+                        continue;
+                    }
+                    $this->debugout(" And that seems fine.\n");
+                    if(array_key_exists('count',$val)) {
+                        if($val['count'] == 1) {
+                            $clean_row[$key] = $val[0];
+                        } else {
+                            unset($val['count']); //these counts are annoying
+                            $elements = [];
+                            foreach($val as $entry) {
+                                if(isset($ldap_constants[$entry])) {
+                                    $elements[] = $ldap_constants[$entry];
+                                } else {
+                                    $elements[] = $entry;
+                                }
+                            }
+                            $clean_row[$key] = $elements;
+                        }
+                    } else {
+                        $clean_row[$key] = $val;
+                    }
+                }
+                $cleaned[$i] = $clean_row;
+            }
+            return $cleaned;
+        };
+        
+        foreach($ldap_urls AS $ldap_url) {
+            if($this->test_informational_bind($ldap_url[0],$ldap_url[1],$ldap_url[2],$settings->ldap_uname,Crypt::decrypt($settings->ldap_pword))) {
+                $this->info("Success getting informational bind!");
+            } else {
+                $this->error("Unable to get information from bind.");
+            }
+        }
+
+        $this->info("STAGE 6: Test LDAP Login to Snipe-IT");
+        foreach($ldap_urls AS $ldap_url) {
+            $this->info("Starting auth to ".$ldap_url[0]);
+            while(true) {
+                $with_tls = $ldap_url[1] ? "with": "without";
+                $with_startssl = $ldap_url[2] ? "using": "not using";
+                if(!$this->confirm('Do you wish to try to authenticate to this directory: '.$ldap_url[0]." $with_tls TLS and $with_startssl STARTSSL?")) {
+                    break;
+                }
+                $username = $this->ask("Username");
+                $password = $this->secret("Password");
+                $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $username, $password); // FIXME - should do some other stuff here, maybe with the concatenating or something? maybe? and/or should put up some results?
+            }
+        }
+
+        $this->info("LDAP TROUBLESHOOTING COMPLETE!");
+    }
+
+    public function connect_to_ldap($ldap_url, $check_cert, $start_tls) 
+    {
+        $lconn = ldap_connect($ldap_url);
+        ldap_set_option($lconn, LDAP_OPT_PROTOCOL_VERSION, 3); // should we 'test' different protocol versions here? Does anyone even use anything other than LDAPv3?
+                                                             // no - it's formally deprecated: https://tools.ietf.org/html/rfc3494
+        if(!$check_cert) {
+            putenv('LDAPTLS_REQCERT=never'); // This is horrible; is this *really* the only way to do it?
+        } else {
+            putenv('LDAPTLS_REQCERT'); // have to very explicitly and manually *UN* set the env var here to ensure it works
+        }
+        if($this->settings->ldap_client_tls_cert && $this->settings->ldap_client_tls_key) {
+            // client-side TLS certificate support for LDAP (Google Secure LDAP)
+            putenv('LDAPTLS_CERT=storage/ldap_client_tls.cert');
+            putenv('LDAPTLS_KEY=storage/ldap_client_tls.key');
+        }
+        if($start_tls) {
+            if(!ldap_start_tls($lconn)) {
+                $this->error("WARNING: Unable to start TLS");
+                return false;
+            }
+        }
+        if(!$lconn) {
+            $this->error("WARNING: Failed to generate connection string - using: ".$ldap_url);
+            return false;
+        }
+        $net = ldap_set_option($lconn, LDAP_OPT_NETWORK_TIMEOUT, $this->option('timeout'));
+        $time = ldap_set_option($lconn, LDAP_OPT_TIMELIMIT, $this->option('timeout'));
+        if(!$net || !$time) {
+            $this->error("Unable to set timeouts!");
+        }
+        return $lconn;
+    }
+
+    public function test_anonymous_bind($ldap_url, $check_cert = true, $start_tls = false)
+    {
+        return $this->timed_boolean_execute(function () use ($ldap_url, $check_cert , $start_tls) {
+            try {
+                $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
+                $this->info("gonna try to bind now, this can take a while if we mess it up");
+                $bind_results = ldap_bind($lconn);
+                $this->info("Bind results are: ".$bind_results." which translate into boolean: ".(bool)$bind_results);
+                return (bool)$bind_results;
+            } catch (Exception $e) {
+                $this->error("WARNING: Exception caught during bind - ".$e->getMessage());
+                return false;
+            }
+        });
+    }
+
+    public function test_authed_bind($ldap_url, $check_cert, $start_tls, $username, $password) 
+    {
+        return $this->timed_boolean_execute(function () use ($ldap_url, $check_cert, $start_tls, $username, $password) {
+            try {
+                $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
+                $bind_results = ldap_bind($lconn, $username, $password);
+                if(!$bind_results) {
+                    $this->error("WARNING: Failed to bind to $ldap_url as $username");
+                    return false;
+                } else {
+                    $this->info("SUCCESS - Able to bind to $ldap_url as $username");
+                    return (bool)$lconn;
+                }
+            } catch (Exception $e) {
+                $this->error("WARNING: Exception caught during Authed bind to $username - ".$e->getMessage());
+                return false;
+            }
+        });
+    }
+
+    public function test_informational_bind($ldap_url, $check_cert, $start_tls, $username, $password)
+    {
+        return $this->timed_boolean_execute(function () use ($ldap_url, $check_cert, $start_tls, $username, $password) {
+            try { // TODO - copypasta'ed from test_authed_bind
+                $conn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
+                $bind_results = ldap_bind($conn, $username, $password);
+                if(!$bind_results) {
+                    $this->error("WARNING: Failed to bind to $ldap_url as $username");
+                    return false;
+                }
+                $this->info("SUCCESS - Able to bind to $ldap_url as $username");
+                $result = ldap_read($conn, '', '(objectClass=*)'/* , ['supportedControl']*/);
+                $results = ldap_get_entries($conn, $result);
+                $cleaned_results = $cleaner($results);
+                $this->line(print_r($cleaned_results,true));
+                //okay, great - now how do we display those results? I have no idea.
+                // I don't see why this throws an Exception for Google LDAP, but I guess we ought to try and catch it?
+                $this->comment("I guess we're trying to do the ldap search here, but sometimes it takes too long?");
+                $search_results = ldap_search($conn, $settings->base_dn, $settings->filter);
+                $this->info("Printing first 10 results: ");
+                for($i=0;$i<10;$i++) {
+                    $this->info($search_results[$i]);
+                }
+            } catch (\Exception $e) {
+                $this->error("WARNING: Exception caught during Authed bind to $username - ".$e->getMessage());
+                return false;
+            }
+        });
+    }
+
+    /***********************************************
+     * 
+     * This function executes $function - which is expected to be some kind of executable function - 
+     * with a timeout set. It respects the timeout by forking execution and setting a strict timer
+     * for which to get back a SIGUSR1 or SIGUSR2 signal from the forked process.
+     * 
+     ***********************************************/
+    private function timed_boolean_execute($function)
+    {
+        if(!(function_exists('pcntl_sigtimedwait') && function_exists('posix_getpid') && function_exists('pcntl_fork') && function_exists('posix_kill') && function_exists('pcntl_wifsignaled'))) {
+            // POSIX functions needed for forking aren't present, just run the function inline (ignoring timeout)
+            $this->info('WARNING: Unable to execute POSIX fork() commands, timeout may not be respected');
+            return $function();
+        } else {
+            $parent_pid = posix_getpid();
+            $pid = pcntl_fork();
+            switch($pid) {
+                case 0:
+                    //we're the 'child'
+                    if($function()) {
+                        //SUCCESS = SIGUSR1
+                        posix_kill($parent_pid, SIGUSR1);
+                    } else {
+                        //FAILURE = SIGUSR2
+                        posix_kill($parent_pid, SIGUSR2);
+                    }
+                    exit();
+                    break; //yes I know we don't need it.
+                case -1:
+                    //couldn't fork
+                    $this->error("COULD NOT FORK - assuming failure");
+                    return false;
+                    break; //I still know that we don't need it
+                default:
+                    //we remain the 'parent', $pid is the PID of the forked process.
+                    $siginfo = [];
+                    $exit_status = pcntl_sigtimedwait ([SIGUSR1, SIGUSR2], $siginfo, $this->option('timeout'));
+                    if ($exit_status == SIGUSR1) {
+                        return true;
+                    } else {
+                        posix_kill($pid, SIGKILL); //make sure we don't have processes hanging around that might try and send signals during later executions, confusing us
+                        return false;
+                    }
+                    break; //Yeah I get it already, shush.
+            }
+        }
+
+    }
+}

app/Console/Commands/MoveUploadsToNewDisk.php

@@ -46,30 +46,31 @@ class MoveUploadsToNewDisk extends Command
         }
         $delete_local = $this->argument('delete_local');
 
-        $public_uploads['accessories'] = glob('public/accessories'.'/*.*');
-        $public_uploads['assets'] = glob('public/assets'.'/*.*');
-        $public_uploads['avatars'] = glob('public/avatars'.'/*.*');
-        $public_uploads['categories'] = glob('public/categories'.'/*.*');
-        $public_uploads['companies'] = glob('public/companies'.'/*.*');
-        $public_uploads['components'] = glob('public/components'.'/*.*');
-        $public_uploads['consumables'] = glob('public/consumables'.'/*.*');
-        $public_uploads['departments'] = glob('public/departments'.'/*.*');
-        $public_uploads['locations'] = glob('public/locations'.'/*.*');
-        $public_uploads['manufacturers'] = glob('public/manufacturers'.'/*.*');
-        $public_uploads['suppliers'] = glob('public/suppliers'.'/*.*');
-        $public_uploads['assetmodels'] = glob('public/models'.'/*.*');
+        $public_uploads['accessories'] = glob('public/uploads/accessories'."/*.*");
+        $public_uploads['assets'] = glob('public/uploads/assets'."/*.*");
+        $public_uploads['avatars'] = glob('public/uploads/avatars'."/*.*");
+        $public_uploads['categories'] = glob('public/uploads/categories'."/*.*");
+        $public_uploads['companies'] = glob('public/uploads/companies'."/*.*");
+        $public_uploads['components'] = glob('public/uploads/components'."/*.*");
+        $public_uploads['consumables'] = glob('public/uploads/consumables'."/*.*");
+        $public_uploads['departments'] = glob('public/uploads/departments'."/*.*");
+        $public_uploads['locations'] = glob('public/uploads/locations'."/*.*");
+        $public_uploads['manufacturers'] = glob('public/uploads/manufacturers'."/*.*");
+        $public_uploads['suppliers'] = glob('public/uploads/suppliers'."/*.*");
+        $public_uploads['assetmodels'] = glob('public/uploads/models'."/*.*");
+
 
         // iterate files
         foreach ($public_uploads as $public_type => $public_upload) {
             $type_count = 0;
-            $this->info('- There are '.count($public_upload).' PUBLIC '.$public_type.' files.');
+            $this->info('- There are ' . count($public_upload) . ' PUBLIC ' . $public_type . ' files.');
 
             for ($i = 0; $i < count($public_upload); $i++) {
                 $type_count++;
                 $filename = basename($public_upload[$i]);
 
-                try {
-                    Storage::disk('public')->put('uploads/'.public_type.'/'.$filename, file_get_contents($public_upload[$i]));
+                try  {
+                    Storage::disk('public')->put('uploads/'.$public_type.'/'.$filename, file_get_contents($public_upload[$i]));
                     $new_url = Storage::disk('public')->url('uploads/'.$public_type.'/'.$filename, $filename);
                     $this->info($type_count.'. PUBLIC: '.$filename.' was copied to '.$new_url);
                 } catch (\Exception $e) {
@@ -79,83 +80,87 @@ class MoveUploadsToNewDisk extends Command
             }
         }
 
-        $logos = glob('public/uploads/setting*.*');
-        $this->info('- There are '.count($logos).' files that might be logos.');
+        $logos = glob("public/uploads/setting*.*");
+        $this->info("- There are ".count($logos).' files that might be logos.');
         $type_count = 0;
 
         foreach ($logos as $logo) {
             $this->info($logo);
             $type_count++;
             $filename = basename($logo);
-            Storage::disk('public')->put('uploads/'.$filename, file_get_contents($logo));
-            $this->info($type_count.'. LOGO: '.$filename.' was copied to '.env('PUBLIC_AWS_URL').'/uploads/'.$filename);
+            Storage::disk('public')->put('uploads/' . $filename, file_get_contents($logo));
+            $this->info($type_count . '. LOGO: ' . $filename . ' was copied to ' . env('PUBLIC_AWS_URL') . '/uploads/' . $filename);
         }
 
-        $private_uploads['assets'] = glob('storage/private_uploads/assets'.'/*.*');
-        $private_uploads['signatures'] = glob('storage/private_uploads/signatures'.'/*.*');
-        $private_uploads['audits'] = glob('storage/private_uploads/audits'.'/*.*');
-        $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'.'/*.*');
-        $private_uploads['imports'] = glob('storage/private_uploads/imports'.'/*.*');
-        $private_uploads['licenses'] = glob('storage/private_uploads/licenses'.'/*.*');
-        $private_uploads['users'] = glob('storage/private_uploads/users'.'/*.*');
-        $private_uploads['backups'] = glob('storage/private_uploads/users'.'/*.*');
+        $private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*");
+        $private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*");
+        $private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*");
+        $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*");
+        $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
+        $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
+        $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");
+        $private_uploads['backups'] = glob('storage/private_uploads/backups'."/*.*");
+        
 
         foreach ($private_uploads as $private_type => $private_upload) {
-            $this->info('- There are '.count($private_upload).' PRIVATE '.$private_type.' files.');
+            {
+                $this->info('- There are ' . count($private_upload) . ' PRIVATE ' . $private_type . ' files.');
 
-            $type_count = 0;
-            for ($x = 0; $x < count($private_upload); $x++) {
-                $type_count++;
-                $filename = basename($private_upload[$x]);
+                $type_count = 0;
+                for ($x = 0; $x < count($private_upload); $x++) {
+                    $type_count++;
+                    $filename = basename($private_upload[$x]);
 
-                try {
-                    Storage::put($private_type.'/'.$filename, file_get_contents($private_upload[$i]));
-                    $new_url = Storage::url($private_type.'/'.$filename, $filename);
-                    $this->info($type_count.'. PRIVATE: '.$filename.' was copied to '.$new_url);
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                    $this->error($e);
+                    try {
+                        Storage::put($private_type . '/' . $filename, file_get_contents($private_upload[$i]));
+                        $new_url = Storage::url($private_type . '/' . $filename, $filename);
+                        $this->info($type_count . '. PRIVATE: ' . $filename . ' was copied to ' . $new_url);
+                    } catch (\Exception $e) {
+                        \Log::debug($e);
+                        $this->error($e);
+                    }
                 }
             }
-        }
 
-        if ($delete_local == 'true') {
-            $public_delete_count = 0;
-            $private_delete_count = 0;
 
-            $this->info("\n\n");
-            $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-            $this->warn("\nTHIS WILL DELETE ALL OF YOUR LOCAL UPLOADED FILES. \n\nThis cannot be undone, so you should take a backup of your system before you proceed.\n");
-            $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+            if ($delete_local == 'true') {
+                $public_delete_count = 0;
+                $private_delete_count = 0;
 
-            if ($this->confirm('Do you wish to continue?')) {
-                foreach ($public_uploads as $public_type => $public_upload) {
-                    for ($i = 0; $i < count($public_upload); $i++) {
-                        $filename = $public_upload[$i];
-                        try {
-                            unlink($filename);
-                            $public_delete_count++;
-                        } catch (\Exception $e) {
-                            \Log::debug($e);
-                            $this->error($e);
+                $this->info("\n\n");
+                $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+                $this->warn("\nTHIS WILL DELETE ALL OF YOUR LOCAL UPLOADED FILES. \n\nThis cannot be undone, so you should take a backup of your system before you proceed.\n");
+                $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+
+                if ($this->confirm('Do you wish to continue?')) {
+                    foreach ($public_uploads as $public_type => $public_upload) {
+                        for ($i = 0; $i < count($public_upload); $i++) {
+                            $filename = $public_upload[$i];
+                            try {
+                                unlink($filename);
+                                $public_delete_count++;
+                            } catch (\Exception $e) {
+                                \Log::debug($e);
+                                $this->error($e);
+                            }
                         }
                     }
-                }
 
-                foreach ($private_uploads as $private_type => $private_upload) {
-                    for ($i = 0; $i < count($private_upload); $i++) {
-                        $filename = $private_upload[$i];
-                        try {
-                            unlink($filename);
-                            $private_delete_count++;
-                        } catch (\Exception $e) {
-                            \Log::debug($e);
-                            $this->error($e);
+                    foreach ($private_uploads as $private_type => $private_upload) {
+                        for ($i = 0; $i < count($private_upload); $i++) {
+                            $filename = $private_upload[$i];
+                            try {
+                                unlink($filename);
+                                $private_delete_count++;
+                            } catch (\Exception $e) {
+                                \Log::debug($e);
+                                $this->error($e);
+                            }
                         }
                     }
-                }
 
-                $this->info($public_delete_count.' PUBLIC local files and '.$private_delete_count.' PRIVATE local files were deleted from your filesystem.');
+                    $this->info($public_delete_count . ' PUBLIC local files and ' . $private_delete_count . ' PRIVATE local files were deleted from your filesystem.');
+                }
             }
         }
     }

app/Console/Commands/RestoreFromBackup.php

@@ -13,8 +13,8 @@ class RestoreFromBackup extends Command
      * @var string
      */
     protected $signature = 'snipeit:restore 
-                                            {--force : Skip the danger prompt; assuming you hit "y"} 
-                                            {filename : The full path of the .zip file to be migrated}
+                                            {--force : Skip the danger prompt; assuming you enter "y"} 
+                                            {filename : The zip file to be migrated}
                                             {--no-progress : Don\'t show a progress bar}';
 
     /**
@@ -82,6 +82,7 @@ class RestoreFromBackup extends Command
             return $this->error('Could not access file: '.$filename.' - '.array_key_exists($errcode, $errors) ? $errors[$errcode] : " Unknown reason: $errcode");
         }
 
+
         $private_dirs = [
             'storage/private_uploads/assets', // these are asset _files_, not the pictures.
             'storage/private_uploads/audits',
@@ -245,19 +246,21 @@ class RestoreFromBackup extends Command
             return false;
         }
         $bytes_read = 0;
+
         while (($buffer = fgets($sql_contents, self::$buffer_size)) !== false) {
             $bytes_read += strlen($buffer);
             // \Log::debug("Buffer is: '$buffer'");
             $bytes_written = fwrite($pipes[0], $buffer);
+
             if ($bytes_written === false) {
                 $stdout = fgets($pipes[1]);
                 $this->info($stdout);
                 $stderr = fgets($pipes[2]);
                 $this->info($stderr);
-
                 return false;
             }
         }
+        
         if (!feof($sql_contents) || $bytes_read == 0) {
             return $this->error("Not at end of file for sql file, or zero bytes read. aborting!");
         }

app/Helpers/Helper.php

@@ -1059,4 +1059,34 @@ class Helper
 
         return $file_name;
     }
+
+    public static function formatFilesizeUnits($bytes)
+    {
+        if ($bytes >= 1073741824)
+        {
+            $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        }
+        elseif ($bytes >= 1048576)
+        {
+            $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        }
+        elseif ($bytes >= 1024)
+        {
+            $bytes = number_format($bytes / 1024, 2) . ' KB';
+        }
+        elseif ($bytes > 1)
+        {
+            $bytes = $bytes . ' bytes';
+        }
+        elseif ($bytes == 1)
+        {
+            $bytes = $bytes . ' byte';
+        }
+        else
+        {
+            $bytes = '0 bytes';
+        }
+
+        return $bytes;
+    }
 }

app/Http/Controllers/Account/AcceptanceController.php

@@ -7,13 +7,22 @@ use App\Events\CheckoutDeclined;
 use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Http\Controllers\Controller;
+use App\Models\Actionlog;
+use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\Contracts\Acceptable;
+use App\Models\User;
+use App\Models\AssetModel;
+use App\Models\Accessory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use App\Http\Controllers\SettingsController;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Carbon\Carbon;
 
 class AcceptanceController extends Controller
 {
@@ -39,6 +48,7 @@ class AcceptanceController extends Controller
     {
         $acceptance = CheckoutAcceptance::find($id);
 
+
         if (is_null($acceptance)) {
             return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
         }
@@ -102,7 +112,8 @@ class AcceptanceController extends Controller
             $data_uri = e($request->input('signature_output'));
             $encoded_image = explode(',', $data_uri);
             $decoded_image = base64_decode($encoded_image[1]);
-            Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);
+            $acceptance->stored_eula_file = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf';
+            $path = Storage::put('private_uploads/signatures/'.$sig_filename, (string) $decoded_image);
         }
 
         if ($request->input('asset_acceptance') == 'accepted') {
@@ -111,6 +122,8 @@ class AcceptanceController extends Controller
             event(new CheckoutAccepted($acceptance));
 
             $return_msg = trans('admin/users/message.accepted');
+
+
         } else {
             $acceptance->decline($sig_filename);
 
@@ -119,6 +132,61 @@ class AcceptanceController extends Controller
             $return_msg = trans('admin/users/message.declined');
         }
 
+        $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
+
+        if ($acceptance->checkoutable_type== 'App\Models\Asset') {
+            $assigned_to = User::find($item->assigned_to);
+            $asset_model = AssetModel::find($item->model_id);
+            $branding_settings = SettingsController::getPDFBranding();
+            $data = [
+                'item_tag' => $item->asset_tag,
+                'item_model' => $asset_model->name,
+                'item_serial' => $item->serial,
+                'eula' => $item->getEula(),
+                'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format),
+                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+                'assigned_to' => $assigned_to->first_name . ' ' . $assigned_to->last_name,
+                'company_name' => $branding_settings->site_name,
+                'signature' => storage_path() . '/private_uploads/signatures/' . $sig_filename,
+                'logo' => public_path() . '/uploads/' . $branding_settings->logo,
+                'date_settings' => $branding_settings->date_display_format,
+            ];
+            $pdf = Pdf::loadView('account.accept.accept-asset-eula', $data);
+            Storage::put('private_uploads/eula-pdfs/' . $acceptance->stored_eula_file, $pdf->output());
+
+            $a = new Actionlog();
+            $a->stored_eula = $item->getEula();
+            $a->stored_eula_file = $acceptance->stored_eula_file;
+            $a->save();
+
+            return redirect()->to('account/accept')->with('success', $return_msg);
+        }
+//
+        $accessory_user= DB::table('checkout_acceptances')->find($acceptance->assigned_to_id);
+        $assigned_to = User::find($accessory_user->assigned_to_id);
+        $accessory_model = Accessory::find($item->id);
+        $branding_settings = SettingsController::getPDFBranding();
+        $data = [
+            'item_tag' => $item->model_number,
+            'item_model' => $accessory_model->name,
+            'eula' => $item->getEula(),
+            'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format),
+            'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+//          'assigned_by'    => self
+            'assigned_to' => $assigned_to->first_name . ' ' . $assigned_to->last_name,
+            'company_name' => $branding_settings->site_name,
+            'signature' => storage_path() . '/private_uploads/signatures/' . $sig_filename,
+            'logo' => public_path() . '/uploads/' . $branding_settings->logo,
+            'date_settings' => $branding_settings->date_display_format,
+        ];
+        $pdf = Pdf::loadView('account.accept.accept-accessory-eula', $data);
+        Storage::put('private_uploads/eula-pdfs/' . $acceptance->stored_eula_file, $pdf->output());
+
+        $a = new Actionlog();
+        $a->stored_eula = $item->getEula();
+        $a->stored_eula_file = $acceptance->stored_eula_file;
+        $a->save();
+
         return redirect()->to('account/accept')->with('success', $return_msg);
     }
-}
+}

app/Http/Controllers/ActionlogController.php

@@ -3,17 +3,34 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
+use App\Models\Actionlog;
 use Response;
 
 class ActionlogController extends Controller
 {
     public function displaySig($filename)
     {
+        // PHP doesn't let you handle file not found errors well with 
+        // file_get_contents, so we set the error reporting for just this class
+        error_reporting(0);
+
         $this->authorize('view', \App\Models\Asset::class);
         $file = config('app.private_uploads').'/signatures/'.$filename;
         $filetype = Helper::checkUploadIsImage($file);
-        $contents = file_get_contents($file);
 
-        return Response::make($contents)->header('Content-Type', $filetype);
+        $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
+        if ($contents === false) {
+            \Log::warn('File '.$file.' not found');
+            return false;
+        } else {
+            return Response::make($contents)->header('Content-Type', $filetype);
+        }
+       
+    }
+    public function getStoredEula($filename){
+        $this->authorize('view', \App\Models\Asset::class);
+        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
+
+        return Response::download($file);
     }
 }

app/Http/Controllers/Api/AssetsController.php

@@ -52,7 +52,7 @@ class AssetsController extends Controller
      */
     public function index(Request $request, $audit = null) 
     {
-        \Log::debug(Route::currentRouteName());
+
         $filter_non_deprecable_assets = false;
 
         /**
@@ -345,6 +345,7 @@ class AssetsController extends Controller
         }
 
 
+
         /**
          * Here we're just determining which Transformer (via $transformer) to use based on the 
          * variables we set earlier on in this method - we default to AssetsTransformer.
@@ -521,7 +522,7 @@ class AssetsController extends Controller
         $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost')); // this is the API's store method, so I don't know that I want to do this? Confusing. FIXME (or not?!)
         $asset->purchase_date           = $request->get('purchase_date', null);
         $asset->assigned_to             = $request->get('assigned_to', null);
-        $asset->supplier_id             = $request->get('supplier_id', 0);
+        $asset->supplier_id             = $request->get('supplier_id');
         $asset->requestable             = $request->get('requestable', 0);
         $asset->rtd_location_id         = $request->get('rtd_location_id', null);
         $asset->location_id             = $request->get('rtd_location_id', null);
@@ -730,6 +731,7 @@ class AssetsController extends Controller
             $logaction->logaction('restored');
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.restore.success')));
+        
 
         }
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
@@ -786,6 +788,9 @@ class AssetsController extends Controller
             $error_payload['target_type'] = 'user';
         }
 
+        if ($request->filled('status_id')) {
+            $asset->status_id = $request->get('status_id');
+        }
 
 
         if (! isset($target)) {

app/Http/Controllers/Api/LicensesController.php

@@ -26,7 +26,8 @@ class LicensesController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', License::class);
-        $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'supplier', 'category')->withCount('freeSeats as free_seats_count'));
+        $licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count'));
+
 
         if ($request->filled('company_id')) {
             $licenses->where('company_id', '=', $request->input('company_id'));
@@ -148,9 +149,10 @@ class LicensesController extends Controller
         }
 
         $total = $licenses->count();
-        $licenses = $licenses->skip($offset)->take($limit)->get();
 
+        $licenses = $licenses->skip($offset)->take($limit)->get();
         return (new LicensesTransformer)->transformLicenses($licenses, $total);
+
     }
 
     /**

app/Http/Controllers/Api/ProfileController.php

@@ -29,11 +29,11 @@ class ProfileController extends Controller
             // Make sure the asset and request still exist
             if ($checkoutRequest && $checkoutRequest->itemRequested()) {
                 $results['rows'][] = [
-                    'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
-                    'name' => $checkoutRequest->itemRequested()->present()->name(),
-                    'type' => $checkoutRequest->itemType(),
-                    'qty' => $checkoutRequest->quantity,
-                    'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
+                    'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
+                    'name' => e($checkoutRequest->itemRequested()->present()->name()),
+                    'type' => e($checkoutRequest->itemType()),
+                    'qty' => (int) $checkoutRequest->quantity,
+                    'location' => ($checkoutRequest->location()) ? e($checkoutRequest->location()->name) : null,
                     'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
                     'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
                 ];

app/Http/Controllers/Api/ReportsController.php

@@ -52,6 +52,7 @@ class ReportsController extends Controller
             'accept_signature',
             'action_type',
             'note',
+            'stored_eula_file',
         ];
 
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

app/Http/Controllers/Api/SettingsController.php

@@ -18,6 +18,7 @@ use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator; 
 use App\Http\Requests\SlackSettingsRequest;
+use App\Http\Transformers\LoginAttemptsTransformer;
 
 
 class SettingsController extends Controller

app/Http/Controllers/Api/StatuslabelsController.php

@@ -30,6 +30,20 @@ class StatuslabelsController extends Controller
             $statuslabels = $statuslabels->TextSearch($request->input('search'));
         }
 
+
+        // if a status_type is passed, filter by that
+        if ($request->filled('status_type')) {
+            if (strtolower($request->input('status_type')) == 'pending') {
+                $statuslabels = $statuslabels->Pending();
+            } elseif (strtolower($request->input('status_type')) == 'archived') {
+                $statuslabels = $statuslabels->Archived();
+            } elseif (strtolower($request->input('status_type')) == 'deployable') {
+                $statuslabels = $statuslabels->Deployable();
+            } elseif (strtolower($request->input('status_type')) == 'undeployable') {
+                $statuslabels = $statuslabels->Undeployable();
+            }
+        }
+
         // 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 = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0);
@@ -80,8 +94,8 @@ class StatuslabelsController extends Controller
         if ($statuslabel->save()) {
             return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success')));
         }
-
         return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors()));
+
     }
 
     /**
@@ -100,6 +114,7 @@ class StatuslabelsController extends Controller
         return (new StatuslabelsTransformer)->transformStatuslabel($statuslabel);
     }
 
+
     /**
      * Update the specified resource in storage.
      *
@@ -116,6 +131,7 @@ class StatuslabelsController extends Controller
         
         $request->except('deployable', 'pending', 'archived');
 
+
         if (! $request->filled('type')) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.'));
         }
@@ -161,6 +177,8 @@ class StatuslabelsController extends Controller
         return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/statuslabels/message.assoc_assets')));
     }
 
+
+
      /**
      * Show a count of assets by status label for pie chart
      *

app/Http/Controllers/Api/UsersController.php

@@ -63,6 +63,7 @@ class UsersController extends Controller
             'users.updated_at',
             'users.username',
             'users.zip',
+            'users.remote',
             'users.ldap_import',
 
         ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables')
@@ -136,6 +137,10 @@ class UsersController extends Controller
             $users = $users->where('ldap_import', '=', $request->input('ldap_import'));
         }
 
+        if ($request->filled('remote')) {
+            $users = $users->where('remote', '=', $request->input('remote'));
+        }
+
         if ($request->filled('assets_count')) {
            $users->has('assets', '=', $request->input('assets_count'));
         }
@@ -187,7 +192,7 @@ class UsersController extends Controller
                         'assets', 'accessories', 'consumables', 'licenses', 'groups', 'activated', 'created_at',
                         'two_factor_enrolled', 'two_factor_optin', 'last_login', 'assets_count', 'licenses_count',
                         'consumables_count', 'accessories_count', 'phone', 'address', 'city', 'state',
-                        'country', 'zip', 'id', 'ldap_import',
+                        'country', 'zip', 'id', 'ldap_import', 'remote',
                     ];
 
                 $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -101,14 +101,22 @@ class AssetCheckinController extends Controller
         \Log::debug('After Location ID: '.$asset->location_id);
         \Log::debug('After RTD Location ID: '.$asset->rtd_location_id);
 
+
         if ($request->filled('location_id')) {
             \Log::debug('NEW Location ID: '.$request->get('location_id'));
             $asset->location_id = e($request->get('location_id'));
         }
 
-        $checkin_at = date('Y-m-d');
-        if ($request->filled('checkin_at')) {
-            $checkin_at = $request->input('checkin_at');
+        $checkin_at = date('Y-m-d H:i:s');
+        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
+            $checkin_at = $request->get('checkin_at');
+        }
+
+        if(!empty($asset->licenseseats->all())){
+            foreach ($asset->licenseseats as $seat){
+                $seat->assigned_to = null;
+                $seat->save();
+            }
         }
 
         // Get all pending Acceptances for this asset and delete them

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -80,6 +80,15 @@ class AssetCheckoutController extends Controller
                 $asset->status_id = $request->get('status_id');
             }
 
+            if(!empty($asset->licenseseats->all())){
+                if(request('checkout_to_type') == 'user') {
+                    foreach ($asset->licenseseats as $seat){
+                        $seat->assigned_to = $target->id;
+                        $seat->save();
+                    }
+                }
+            }
+
             if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $request->get('name'))) {
                 return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success'));
             }

app/Http/Controllers/Assets/AssetsController.php

@@ -137,12 +137,12 @@ class AssetsController extends Controller
             $asset->archived                = '0';
             $asset->physical                = '1';
             $asset->depreciate              = '0';
-            $asset->status_id               = request('status_id', 0);
+            $asset->status_id               = request('status_id');
             $asset->warranty_months         = request('warranty_months', null);
             $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost'));
             $asset->purchase_date           = request('purchase_date', null);
             $asset->assigned_to             = request('assigned_to', null);
-            $asset->supplier_id             = request('supplier_id', 0);
+            $asset->supplier_id             = request('supplier_id', null);
             $asset->requestable             = request('requestable', 0);
             $asset->rtd_location_id         = request('rtd_location_id', null);
 
@@ -168,9 +168,9 @@ class AssetsController extends Controller
                     if ($field->field_encrypted == '1') {
                         if (Gate::allows('admin')) {
                             if (is_array($request->input($field->convertUnicodeDbSlug()))) {
-                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug()))));
+                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(implode(', ', $request->input($field->convertUnicodeDbSlug())));
                             } else {
-                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug())));
+                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                             }
                         }
                     } else {
@@ -235,6 +235,7 @@ class AssetsController extends Controller
             ->with('statuslabel_types', Helper::statusTypeList());
     }
 
+
     /**
      * Returns a view that presents information about an asset for detail view.
      *
@@ -309,6 +310,7 @@ class AssetsController extends Controller
             $asset->location_id = $request->input('rtd_location_id', null);
         }
 
+
         if ($request->filled('image_delete')) {
             try {
                 unlink(public_path().'/uploads/assets/'.$asset->image);
@@ -342,9 +344,9 @@ class AssetsController extends Controller
                 if ($field->field_encrypted == '1') {
                     if (Gate::allows('admin')) {
                         if (is_array($request->input($field->convertUnicodeDbSlug()))) {
-                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug()))));
+                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(implode(', ', $request->input($field->convertUnicodeDbSlug())));
                         } else {
-                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug())));
+                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                         }
                     }
                 } else {
@@ -401,6 +403,24 @@ class AssetsController extends Controller
         return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
     }
 
+    /**
+     * Searches the assets table by serial, and redirects if it finds one
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function getAssetBySerial(Request $request)
+    {
+        $topsearch = ($request->get('topsearch')=="true");
+
+        if (!$asset = Asset::where('serial', '=', $request->get('serial'))->first()) {
+            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+        $this->authorize('view', $asset);
+        return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
+    }
+
     /**
      * Searches the assets table by asset tag, and redirects if it finds one
      *
@@ -420,6 +440,7 @@ class AssetsController extends Controller
         return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
     }
 
+
     /**
      * Return a QR code for the asset
      *
@@ -792,6 +813,7 @@ class AssetsController extends Controller
         return view('hardware/audit-overdue');
     }
 
+
     public function auditStore(Request $request, $id)
     {
         $this->authorize('audit', Asset::class);
@@ -822,6 +844,7 @@ class AssetsController extends Controller
             $asset->location_id = $request->input('location_id');
         }
 
+
         if ($asset->save()) {
             $file_name = '';
             // Upload an image, if attached
@@ -838,12 +861,13 @@ class AssetsController extends Controller
 
 
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
-            return redirect()->to('hardware')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
         }
     }
 
     public function getRequestedIndex($user_id = null)
     {
+        $this->authorize('index', Asset::class);
         $requestedItems = CheckoutRequest::with('user', 'requestedItem')->whereNull('canceled_at')->with('user', 'requestedItem');
 
         if ($user_id) {

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -11,6 +11,7 @@ use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
 
 class BulkAssetsController extends Controller
 {
@@ -30,9 +31,17 @@ class BulkAssetsController extends Controller
         $this->authorize('update', Asset::class);
 
         if (! $request->filled('ids')) {
-            return redirect()->back()->with('error', 'No assets selected');
+            return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
+
         }
 
+        // Figure out where we need to send the user after the update is complete, and store that in the session
+        $bulk_back_url = request()->headers->get('referer');
+        session(['bulk_back_url' => $bulk_back_url]);
+
+        \Log::debug('Back to url: '.$bulk_back_url);
+
+
 
         $asset_ids = array_values(array_unique($request->input('ids')));
 
@@ -73,10 +82,15 @@ class BulkAssetsController extends Controller
     {
         $this->authorize('update', Asset::class);
 
-        \Log::debug($request->input('ids'));
+        // Get the back url from the session and then destroy the session
+        $bulk_back_url = route('hardware.index');
+        if ($request->session()->has('bulk_back_url')) {
+            $bulk_back_url = $request->session()->pull('bulk_back_url');
+        }
+
 
         if (! $request->filled('ids') || count($request->input('ids')) <= 0) {
-            return redirect()->route('hardware.index')->with('warning', trans('No assets selected, so nothing was updated.'));
+            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
         }
 
         $assets = array_keys($request->input('ids'));
@@ -147,11 +161,13 @@ class BulkAssetsController extends Controller
                     ->update($this->update_array);
             } // endforeach
 
-            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.update.success'));
-            // no values given, nothing to update
+            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
+
+
         }
 
-        return redirect()->route('hardware.index')->with('warning', trans('admin/hardware/message.update.nothing_updated'));
+        // no values given, nothing to update
+        return redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));
     }
 
     /**
@@ -188,6 +204,11 @@ class BulkAssetsController extends Controller
     {
         $this->authorize('delete', Asset::class);
 
+        $bulk_back_url = route('hardware.index');
+        if ($request->session()->has('bulk_back_url')) {
+            $bulk_back_url = $request->session()->pull('bulk_back_url');
+        }
+
         if ($request->filled('ids')) {
             $assets = Asset::find($request->get('ids'));
             foreach ($assets as $asset) {
@@ -199,11 +220,11 @@ class BulkAssetsController extends Controller
                     ->update($update_array);
             } // endforeach
 
-            return redirect()->to('hardware')->with('success', trans('admin/hardware/message.delete.success'));
+            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
             // no values given, nothing to update
         }
 
-        return redirect()->to('hardware')->with('info', trans('admin/hardware/message.delete.nothing_updated'));
+        return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
     }
 
     /**
@@ -224,6 +245,9 @@ class BulkAssetsController extends Controller
      */
     public function storeCheckout(Request $request)
     {
+
+        $this->authorize('checkout', Asset::class);
+
         try {
             $admin = Auth::user();
 

app/Http/Controllers/Auth/LoginController.php

@@ -68,18 +68,21 @@ 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 (!$request->session()->has('loggedout')) {
+            // 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');
+            if ($this->saml->isEnabled() && Setting::getSettings()->saml_forcelogin == '1' && ! ($request->has('nosaml') || $request->session()->has('error'))) {
+                return redirect()->route('saml.login');
+            }
         }
 
         if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
             return view('errors.403');
         }
 
@@ -101,13 +104,18 @@ class LoginController extends Controller
      */
     private function loginViaSaml(Request $request)
     {
+        \Log::debug('Attempting to login via SAML');
         $saml = $this->saml;
         $samlData = $request->session()->get('saml_login');
+
         if ($saml->isEnabled() && ! empty($samlData)) {
+            \Log::debug('SAML is enabled, and the samleData is not empty');
+
             try {
                 Log::debug('Attempting to log user in by SAML authentication.');
                 $user = $saml->samlLogin($samlData);
-                if (! is_null($user)) {
+
+                if (!is_null($user)) {
                     Auth::login($user);
                 } else {
                     $username = $saml->getUsername();
@@ -120,11 +128,26 @@ class LoginController extends Controller
                     $user->last_login = \Carbon::now();
                     $user->save();
                 }
+                
             } catch (\Exception $e) {
                 \Log::warning('There was an error authenticating the SAML user: '.$e->getMessage());
                 throw new \Exception($e->getMessage());
             }
+
+        // Fallthrough with better logging
+        } else {
+
+            // Better logging
+            if (!$saml->isEnabled()) {
+                \Log::warning("SAML page requested, but SAML does not seem to enabled.");
+            } else {
+                \Log::warning("SAML page requested, but samlData seems empty.");
+            }
         }
+
+        \Log::warning("Something else went wrong while trying to login as SAML user");
+
+
     }
 
     /**
@@ -239,10 +262,12 @@ class LoginController extends Controller
 
         //If the environment is set to ALWAYS require SAML, return access denied
         if (config('app.require_saml')) {
+            \Log::debug('require SAML is enabled in the .env - return a 403');
             return view('errors.403');
         }
 
         if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
             return view('errors.403');
         }
 
@@ -333,7 +358,6 @@ class LoginController extends Controller
 
         $secret = Google2FA::generateSecretKey();
         $user->two_factor_secret = $secret;
-        $user->save();
 
         $barcode = new Barcode();
         $barcode_obj =
@@ -351,6 +375,8 @@ class LoginController extends Controller
                 [-2, -2, -2, -2]
             );
 
+        $user->save(); // make sure to save *AFTER* displaying the barcode, or else we might save a two_factor_secret that we never actually displayed to the user if the barcode fails
+
         return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj);
     }
 
@@ -395,7 +421,7 @@ class LoginController extends Controller
             return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
         }
 
-        if (! $request->has('two_factor_secret')) {
+        if (! $request->has('two_factor_secret')) { // TODO this seems almost the same as above?
             return redirect()->route('two-factor')->with('error', 'Two-factor code is required.');
         }
 
@@ -423,10 +449,17 @@ class LoginController extends Controller
      */
     public function logout(Request $request)
     {
+        // Logout is only allowed with a http POST but we need to allow GET for SAML SLO
         $settings = Setting::getSettings();
         $saml = $this->saml;
+        $samlLogout = $request->session()->get('saml_logout');
         $sloRedirectUrl = null;
         $sloRequestUrl = null;
+    
+        // Only allow GET if we are doing SAML SLO otherwise abort with 405
+        if ($request->isMethod('GET') && !$samlLogout) {
+            abort(405);
+        }
 
         if ($saml->isEnabled()) {
             $auth = $saml->getAuth();
@@ -443,8 +476,6 @@ class LoginController extends Controller
             return redirect()->away($sloRequestUrl);
         }
 
-        $request->session()->regenerate(true);
-
         $request->session()->regenerate(true);
         Auth::logout();
 
@@ -475,6 +506,7 @@ class LoginController extends Controller
         ]);
     }
 
+
     public function username()
     {
         return 'username';
@@ -501,6 +533,7 @@ class LoginController extends Controller
             ->withErrors([$this->username() => $message]);
     }
 
+
     /**
      * Override the lockout time and duration
      *

app/Http/Controllers/Auth/SamlController.php

@@ -51,6 +51,7 @@ class SamlController extends Controller
         $metadata = $this->saml->getSPMetadata();
 
         if (empty($metadata)) {
+            \Log::debug('SAML metadata is empty - return a 403');
             return response()->view('errors.403', [], 403);
         }
 
@@ -141,6 +142,6 @@ class SamlController extends Controller
             return view('errors.403');
         }
 
-        return redirect()->route('logout')->with('saml_slo_redirect_url', $sloUrl);
+        return redirect()->route('logout')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
     }
 }

app/Http/Controllers/CustomFieldsetsController.php

@@ -186,7 +186,7 @@ class CustomFieldsetsController extends Controller
                 }
             }
 
-            $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => $request->input('order', 1)]);
+            $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => (int)$request->input('order', 1)]);
 
             return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success'));
         }

app/Http/Controllers/Kits/CheckoutKitController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Kits;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\PredefinedKit;
+use App\Models\Asset;
 use App\Models\PredefinedLicence;
 use App\Models\PredefinedModel;
 use App\Models\User;

app/Http/Controllers/Licenses/LicensesController.php

@@ -134,6 +134,7 @@ class LicensesController extends Controller
             ->with('maintained_list', $maintained_list);
     }
 
+
     /**
      * Validates and stores the license form data submitted from the edit
      * license form.

app/Http/Controllers/ReportsController.php

@@ -275,13 +275,18 @@ class ReportsController extends Controller
                         }
                     }
 
+                    if($actionlog->item){
+                        $item_name = e($actionlog->item->getDisplayNameAttribute());
+                    } else {
+                        $item_name = '';
+                    }
 
                     $row = [
                         $actionlog->created_at,
                         ($actionlog->user) ? e($actionlog->user->getFullNameAttribute()) : '',
                         $actionlog->present()->actionType(),
                         e($actionlog->itemType()),
-                        ($actionlog->itemType() == 'user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()),
+                        ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
                         $target_name,
                         ($actionlog->note) ? e($actionlog->note) : '',
                         $actionlog->log_meta,
@@ -933,12 +938,17 @@ class ReportsController extends Controller
         /**
          * Get all assets with pending checkout acceptances
          */
-
-        $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();
+        if($showDeleted) {
+            $acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        } else {
+            $acceptances = CheckoutAcceptance::pending()->with(['assignedTo' => function ($query) {
+                $query->withTrashed();
+            }, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        }
 
         $assetsForReport = $acceptances
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
+            ->filter(function ($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
             })
             ->map(function($acceptance) {
                 return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];

app/Http/Controllers/SettingsController.php

@@ -946,6 +946,7 @@ class SettingsController extends Controller
             $setting->ldap_active_flag = $request->input('ldap_active_flag');
             $setting->ldap_emp_num = $request->input('ldap_emp_num');
             $setting->ldap_email = $request->input('ldap_email');
+            $setting->ldap_manager = $request->input('ldap_manager');
             $setting->ad_domain = $request->input('ad_domain');
             $setting->is_ad = $request->input('is_ad', '0');
             $setting->ad_append_domain = $request->input('ad_append_domain', '0');
@@ -1025,6 +1026,12 @@ class SettingsController extends Controller
 
         return redirect()->back()->withInput()->withErrors($setting->getErrors());
     }
+    public static function getPDFBranding()
+    {
+        $pdf_branding= Setting::getSettings();
+
+        return $pdf_branding;
+    }
 
     /**
      * Show the listing of backups.

app/Http/Controllers/Users/BulkUsersController.php

@@ -51,8 +51,8 @@ class BulkUsersController extends Controller
                         });
                     }
                 }
-
                 return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));
+
             }
         }
 
@@ -90,7 +90,9 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('department_id')
             ->conditionallyAddItem('company_id')
             ->conditionallyAddItem('locale')
+            ->conditionallyAddItem('remote')
             ->conditionallyAddItem('activated');
+            
         // If the manager_id is one of the users being updated, generate a warning.
         if (array_search($request->input('manager_id'), $user_raw_array)) {
             $manager_conflict = true;
@@ -101,11 +103,16 @@ class BulkUsersController extends Controller
         if (! $manager_conflict) {
             $this->conditionallyAddItem('manager_id');
         }
-
         // Save the updated info
         User::whereIn('id', $user_raw_array)
             ->where('id', '!=', Auth::id())->update($this->update_array);
 
+        if(array_key_exists('location_id', $this->update_array)){
+            Asset::where('assigned_type', User::class)
+                ->whereIn('assigned_to', $user_raw_array)
+                ->update(['location_id' => $this->update_array['location_id']]);
+        }
+
         // Only sync groups if groups were selected
         if ($request->filled('groups')) {
             foreach ($users as $user) {
@@ -171,6 +178,7 @@ class BulkUsersController extends Controller
         $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
         $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
 
+
         $this->logItemCheckinAndDelete($assets, Asset::class);
         $this->logItemCheckinAndDelete($accessories, Accessory::class);
         $this->logItemCheckinAndDelete($licenses, LicenseSeat::class);
@@ -181,6 +189,7 @@ class BulkUsersController extends Controller
             'assigned_type' => null,
         ]);
 
+
         LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]);
 
         foreach ($users as $user) {

app/Http/Controllers/Users/UsersController.php

@@ -93,8 +93,8 @@ class UsersController extends Controller
         $this->authorize('create', User::class);
         $user = new User;
         //Username, email, and password need to be handled specially because the need to respect config values on an edit.
-        $user->email = e($request->input('email'));
-        $user->username = e($request->input('username'));
+        $user->email = trim($request->input('email'));
+        $user->username = trim($request->input('username'));
         if ($request->filled('password')) {
             $user->password = bcrypt($request->input('password'));
         }
@@ -115,6 +115,7 @@ class UsersController extends Controller
         $user->state = $request->input('state', null);
         $user->country = $request->input('country', null);
         $user->zip = $request->input('zip', null);
+        $user->remote = $request->input('remote', 0);
 
         // Strip out the superuser permission if the user isn't a superadmin
         $permissions_array = $request->input('permission');
@@ -179,7 +180,6 @@ class UsersController extends Controller
         if ($user = User::find($id)) {
             $this->authorize('update', $user);
             $permissions = config('permissions');
-
             $groups = Group::pluck('name', 'id');
 
             $userGroups = $user->groups()->pluck('name', 'id');
@@ -190,9 +190,7 @@ class UsersController extends Controller
             return view('users/edit', compact('user', 'groups', 'userGroups', 'permissions', 'userPermissions'))->with('item', $user);
         }
 
-        $error = trans('admin/users/message.user_not_found', compact('id'));
-
-        return redirect()->route('users.index')->with('error', $error);
+        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
     }
 
     /**
@@ -245,9 +243,9 @@ class UsersController extends Controller
 
         // Update the user
         if ($request->filled('username')) {
-            $user->username = $request->input('username');
+            $user->username = trim($request->input('username'));
         }
-        $user->email = $request->input('email');
+        $user->email = trim($request->input('email'));
         $user->first_name = $request->input('first_name');
         $user->last_name = $request->input('last_name');
         $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
@@ -267,6 +265,7 @@ class UsersController extends Controller
         $user->country = $request->input('country', null);
         $user->activated = $request->input('activated', 0);
         $user->zip = $request->input('zip', null);
+        $user->remote = $request->input('remote', 0);
 
         // Update the location of any assets checked out to this user
         Asset::where('assigned_type', User::class)
@@ -623,7 +622,7 @@ class UsersController extends Controller
     public function sendPasswordReset($id)
     {
         if (($user = User::find($id)) && ($user->activated == '1') && ($user->email != '') && ($user->ldap_import == '0')) {
-            $credentials = ['email' => $user->email];
+            $credentials = ['email' => trim($user->email)];
 
             try {
                 \Password::sendResetLink($credentials, function (Message $message) use ($user) {

app/Http/Kernel.php

@@ -39,6 +39,7 @@ class Kernel extends HttpKernel
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \App\Http\Middleware\CheckLocale::class,
+            \App\Http\Middleware\CheckUserIsActivated::class,
             \App\Http\Middleware\CheckForTwoFactor::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
             \App\Http\Middleware\AssetCountForSidebar::class,

app/Http/Middleware/CheckForTwoFactor.php

@@ -24,7 +24,13 @@ class CheckForTwoFactor
     public function handle($request, Closure $next)
     {
         // Skip the logic if the user is on the two factor pages or the setup pages
-        if (in_array($request->route()->getName(), self::IGNORE_ROUTES)) {
+
+        // TODO - what we have below only works because our ROUTE uri's look _exactly_ like the route *names*.
+        // The problem is that, in the new(-ish) Laravel routing system, the route-name doesn't match if the route _verb_ is wrong.
+        // so we can have a blade that POST's to a route('two-factor') - but that route *name* is only matched when the method is GET
+        // because we attached the name to the GET, not to the POST (as route names *SHOULD* be unique in Laravel)
+        // there has got to be a better way to do this, but this is the best I could come up with for now.
+        if (in_array($request->route()->getName(), self::IGNORE_ROUTES) || in_array($request->route()->uri(), self::IGNORE_ROUTES)) {
             return $next($request);
         }
 

app/Http/Middleware/CheckUserIsActivated.php

@@ -4,8 +4,9 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Auth;
 
-class Authenticate
+class CheckUserIsActivated
 {
     /**
      * The Guard implementation.
@@ -34,14 +35,16 @@ class Authenticate
      */
     public function handle($request, Closure $next)
     {
-        if ($this->auth->guest()) {
-            if ($request->ajax()) {
-                return response('Unauthorized.', 401);
-            } else {
-                return redirect()->guest('login');
-            }
+
+        // If there is a user AND the user is NOT activated, send them to the login page
+        // This prevents people who still have active sessions logged in and their status gets toggled
+        // to inactive (aka unable to login)
+        if (($request->user()) && (!$request->user()->isActivated())) {
+            Auth::logout();
+            return redirect()->guest('login');
         }
 
         return $next($request);
+
     }
 }

app/Http/Middleware/SecurityHeaders.php

@@ -42,30 +42,15 @@ class SecurityHeaders
         //           - https://github.com/w3c/webappsec-feature-policy/issues/189
 
         $feature_policy[] = "accelerometer 'none'";
-        $feature_policy[] = "ambient-light-sensor 'none'";
-        $feature_policy[] = "animations 'none'";
         $feature_policy[] = "autoplay 'none'";
-        $feature_policy[] = "battery 'none'";
         $feature_policy[] = "camera 'none'";
         $feature_policy[] = "display-capture 'none'";
         $feature_policy[] = "document-domain 'none'";
         $feature_policy[] = "encrypted-media 'none'";
         $feature_policy[] = "fullscreen 'none'";
         $feature_policy[] = "geolocation 'none'";
-        $feature_policy[] = "gyroscope 'none'";
-        $feature_policy[] = "legacy-image-formats 'none'";
-        $feature_policy[] = "magnetometer 'none'";
-        $feature_policy[] = "microphone 'none'";
-        $feature_policy[] = "midi 'none'";
-        $feature_policy[] = "oversized-images 'none'";
-        $feature_policy[] = "payment 'none'";
-        $feature_policy[] = "picture-in-picture 'none'";
-        $feature_policy[] = "publickey-credentials 'none'";
         $feature_policy[] = "sync-xhr 'none'";
-        $feature_policy[] = "unsized-media 'none'";
         $feature_policy[] = "usb 'none'";
-        $feature_policy[] = "vibrate 'none'";
-        $feature_policy[] = "wake-lock 'none'";
         $feature_policy[] = "xr-spatial-tracking 'none'";
 
         $feature_policy = implode(';', $feature_policy);

app/Http/Requests/AssetCheckoutRequest.php

@@ -25,6 +25,7 @@ class AssetCheckoutRequest extends Request
             'assigned_user'         => 'required_without_all:assigned_asset,assigned_location',
             'assigned_asset'        => 'required_without_all:assigned_user,assigned_location',
             'assigned_location'     => 'required_without_all:assigned_user,assigned_asset',
+            'status_id'             => 'exists:status_labels,id,deployable,1',
             'checkout_to_type'      => 'required|in:asset,location,user',
         ];
 

app/Http/Requests/ItemImportRequest.php

@@ -60,8 +60,8 @@ class ItemImportRequest extends FormRequest
         }
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
                  ->setUserId(Auth::id())
-                 ->setUpdating($this->has('import-update'))
-                 ->setShouldNotify($this->has('send-welcome'))
+                 ->setUpdating($this->get('import-update'))
+                 ->setShouldNotify($this->get('send-welcome'))
                  ->setUsernameFormat('firstname.lastname')
                  ->setFieldMappings($fieldMappings);
         $importer->import();

app/Http/Transformers/ActionlogsTransformer.php

@@ -96,7 +96,7 @@ class ActionlogsTransformer
             'signature_file'   => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
             'log_meta'          => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
             'action_date'   => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
-
+            'stored_eula_file' => ($actionlog->stored_eula_file) ? route('log.storedeula.download', ['filename' => $actionlog->stored_eula_file]) : null,
         ];
         //\Log::info("Clean Meta is: ".print_r($clean_meta,true));
 

app/Http/Transformers/AssetsTransformer.php

@@ -4,6 +4,7 @@ namespace App\Http\Transformers;
 
 use App\Helpers\Helper;
 use App\Models\Asset;
+use App\Models\Setting;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -21,6 +22,9 @@ class AssetsTransformer
 
     public function transformAsset(Asset $asset)
     {
+        // This uses the getSettings() method so we're pulling from the cache versus querying the settings on single asset
+        $setting = Setting::getSettings();
+
         $array = [
             'id' => (int) $asset->id,
             'name' => e($asset->name),
@@ -65,6 +69,8 @@ class AssetsTransformer
                 'name'=> e($asset->defaultLoc->name),
             ] : null,
             'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
+            'qr' => ($setting->qr_code=='1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null,
+            'alt_barcode' => ($setting->alt_barcode_enabled=='1') ? config('app.url').'/uploads/barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png' : null,
             'assigned_to' => $this->transformAssignedTo($asset),
             'warranty_months' =>  ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null,
             'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,

app/Http/Transformers/DepreciationReportTransformer.php

@@ -98,7 +98,7 @@ class DepreciationReportTransformer
             'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),
             'book_value' => Helper::formatCurrencyOutput($depreciated_value),
             'monthly_depreciation' => $monthly_depreciation,
-            'checked_out_to' => $checkout_target,
+            'checked_out_to' => ($checkout_target) ? e($checkout_target) : null,
             'diff' =>  Helper::formatCurrencyOutput($diff),
             'number_of_months' =>  ($asset->model && $asset->model->depreciation) ? e($asset->model->depreciation->months) : null,
             'depreciation' => (($asset->model) && ($asset->model->depreciation)) ?  e($asset->model->depreciation->name) : null,

app/Http/Transformers/UsersTransformer.php

@@ -28,6 +28,7 @@ class UsersTransformer
                 'first_name' => e($user->first_name),
                 'last_name' => e($user->last_name),
                 'username' => e($user->username),
+                'remote' => ($user->remote == '1') ? true : false,
                 'locale' => ($user->locale) ? e($user->locale) : null,
                 'employee_num' => e($user->employee_num),
                 'manager' => ($user->manager) ? [

app/Importer/AssetImporter.php

@@ -97,10 +97,12 @@ class AssetImporter extends ItemImporter
             $item['rtd_location_id'] = $this->item['location_id'];
         }
 
+        $item['last_audit_date'] = null;
         if (isset($this->item['last_audit_date'])) {
             $item['last_audit_date'] = $this->item['last_audit_date'];
         }
 
+        $item['next_audit_date'] = null;
         if (isset($this->item['next_audit_date'])) {
             $item['next_audit_date'] = $this->item['next_audit_date'];
         }

app/Importer/LicenseImporter.php

@@ -35,7 +35,7 @@ class LicenseImporter extends ItemImporter
                     ->first();
         if ($license) {
             if (! $this->updating) {
-                $this->log('A matching License '.$this->item['name'].'with serial '.$this->item['serial'].' already exists');
+                $this->log('A matching License '.$this->item['name'].' with serial '.$this->item['serial'].' already exists');
 
                 return;
             }
@@ -47,14 +47,22 @@ class LicenseImporter extends ItemImporter
             $license = new License;
         }
         $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset.
-        $this->item['expiration_date'] = $this->findCsvMatch($row, 'expiration_date');
+
+        $this->item["expiration_date"] = null;
+        if ($this->findCsvMatch($row, "expiration_date")!='') {
+            $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "expiration_date")));
+        }
         $this->item['license_email'] = $this->findCsvMatch($row, 'license_email');
         $this->item['license_name'] = $this->findCsvMatch($row, 'license_name');
         $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
         $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
         $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
         $this->item['seats'] = $this->findCsvMatch($row, 'seats');
-        $this->item['termination_date'] = $this->findCsvMatch($row, 'termination_date');
+        
+        $this->item["termination_date"] = null;
+        if ($this->findCsvMatch($row, "termination_date")!='') {
+            $this->item["termination_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "termination_date")));
+        }
 
         if ($editingLicense) {
             $license->update($this->sanitizeItemForUpdating($license));

app/Listeners/LogListener.php

@@ -34,11 +34,12 @@ class LogListener
 
     public function onCheckoutAccepted(CheckoutAccepted $event)
     {
-        $logaction = new Actionlog();
 
+        $logaction = new Actionlog();
         $logaction->item()->associate($event->acceptance->checkoutable);
         $logaction->target()->associate($event->acceptance->assignedTo);
         $logaction->accept_signature = $event->acceptance->signature_filename;
+        $logaction->stored_eula_file = $event->acceptance->stored_eula_file;
         $logaction->action_type = 'accepted';
 
         // TODO: log the actual license seat that was checked out

app/Models/Accessory.php

@@ -61,7 +61,7 @@ class Accessory extends SnipeModel
         'category_id'       => 'required|integer|exists:categories,id',
         'company_id'        => 'integer|nullable',
         'min_amt'           => 'integer|min:0|nullable',
-        'purchase_cost'     => 'numeric|nullable',
+        'purchase_cost'     => 'numeric|nullable|gte:0',
     ];
 
 

app/Models/Actionlog.php

@@ -25,7 +25,7 @@ class Actionlog extends SnipeModel
 
     protected $table = 'action_logs';
     public $timestamps = true;
-    protected $fillable = ['created_at', 'item_type', 'user_id', 'item_id', 'action_type', 'note', 'target_id', 'target_type'];
+    protected $fillable = ['created_at', 'item_type', 'user_id', 'item_id', 'action_type', 'note', 'target_id', 'target_type', 'stored_eula', 'stored_eula_file'];
 
     use Searchable;
 
@@ -34,7 +34,7 @@ class Actionlog extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['action_type', 'note', 'log_meta'];
+    protected $searchableAttributes = ['action_type', 'note', 'log_meta','user_id'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -43,6 +43,7 @@ class Actionlog extends SnipeModel
      */
     protected $searchableRelations = [
         'company' => ['name'],
+        'user' => ['first_name','last_name','username'],
     ];
 
     /**
@@ -69,6 +70,7 @@ class Actionlog extends SnipeModel
         });
     }
 
+
     /**
      * Establishes the actionlog -> item relationship
      *
@@ -125,6 +127,7 @@ class Actionlog extends SnipeModel
         return camel_case(class_basename($this->target_type));
     }
 
+
     /**
      * Establishes the actionlog -> uploads relationship
      *
@@ -188,6 +191,7 @@ class Actionlog extends SnipeModel
         return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed();
     }
 
+
     /**
      * Check if the file exists, and if it does, force a download
      *

app/Models/Asset.php

@@ -111,7 +111,7 @@ class Asset extends Depreciable
         'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
         'status'          => 'integer',
         'serial'          => 'unique_serial|nullable',
-        'purchase_cost'   => 'numeric|nullable',
+        'purchase_cost'   => 'numeric|nullable|gte:0',
         'next_audit_date' => 'date|nullable',
         'last_audit_date' => 'date|nullable',
         'supplier_id'     => 'exists:suppliers,id|nullable',
@@ -195,10 +195,25 @@ class Asset extends Depreciable
             $model = AssetModel::find($this->model_id);
 
             if (($model) && ($model->fieldset)) {
+
+                foreach ($model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
+
                 $this->rules += $model->fieldset->validation_rules();
+
+                foreach ($this->model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
             }
         }
 
+
+
         return parent::save($params);
     }
 

app/Models/Component.php

@@ -36,7 +36,7 @@ class Component extends SnipeModel
         'company_id'     => 'integer|nullable',
         'min_amt'        => 'integer|min:0|nullable',
         'purchase_date'  => 'date|nullable',
-        'purchase_cost'  => 'numeric|nullable',
+        'purchase_cost'  => 'numeric|nullable|gte:0',
     ];
 
     /**

app/Models/Consumable.php

@@ -39,7 +39,7 @@ class Consumable extends SnipeModel
         'category_id' => 'required|integer',
         'company_id'  => 'integer|nullable',
         'min_amt'     => 'integer|min:0|nullable',
-        'purchase_cost'   => 'numeric|nullable',
+        'purchase_cost'   => 'numeric|nullable|gte:0',
     ];
 
     /**

app/Models/Ldap.php

@@ -208,6 +208,7 @@ class Ldap extends Model
         $ldap_result_jobtitle = Setting::getSettings()->ldap_jobtitle;
         $ldap_result_country = Setting::getSettings()->ldap_country;
         $ldap_result_dept = Setting::getSettings()->ldap_dept;
+        $ldap_result_manager = Setting::getSettings()->ldap_manager;
         // Get LDAP user data
         $item = [];
         $item['username'] = isset($ldapattributes[$ldap_result_username][0]) ? $ldapattributes[$ldap_result_username][0] : '';
@@ -219,6 +220,7 @@ class Ldap extends Model
         $item['jobtitle'] = isset($ldapattributes[$ldap_result_jobtitle][0]) ? $ldapattributes[$ldap_result_jobtitle][0] : '';
         $item['country'] = isset($ldapattributes[$ldap_result_country][0]) ? $ldapattributes[$ldap_result_country][0] : '';
         $item['department'] = isset($ldapattributes[$ldap_result_dept][0]) ? $ldapattributes[$ldap_result_dept][0] : '';
+        $item['manager'] = isset($ldapattributes[$ldap_result_manager][0]) ? $ldapattributes[$ldap_result_manager][0] : '';
 
         return $item;
     }

app/Models/License.php

@@ -48,6 +48,7 @@ class License extends Depreciable
         'notes'   => 'string|nullable',
         'category_id' => 'required|exists:categories,id',
         'company_id' => 'integer|nullable',
+        'purchase_cost'=> 'numeric|nullable|gte:0',
     ];
 
     /**
@@ -186,6 +187,7 @@ class License extends Depreciable
             ];
         }
         //Chunk and use DB transactions to prevent timeouts.
+
         collect($licenseInsert)->chunk(1000)->each(function ($chunk) {
             DB::transaction(function () use ($chunk) {
                 LicenseSeat::insert($chunk->toArray());
@@ -388,6 +390,7 @@ class License extends Depreciable
             ->orderBy('created_at', 'desc');
     }
 
+
     /**
      * Establishes the license -> admin user relationship
      *
@@ -617,6 +620,7 @@ class License extends Depreciable
                     ->first();
     }
 
+
     /**
      * Establishes the license -> free seats relationship
      *

app/Models/Loggable.php

@@ -114,6 +114,13 @@ trait Loggable
         $log->location_id = null;
         $log->note = $note;
         $log->action_date = $action_date;
+        if (! $log->action_date) {
+            $log->action_date = date('Y-m-d H:i:s');
+        }
+
+        if (! $log->action_date) {
+            $log->action_date = date('Y-m-d H:i:s');
+        }
 
         if (Auth::user()) {
             $log->user_id = Auth::user()->id;

app/Models/Recipients/AdminRecipient.php

@@ -9,6 +9,6 @@ class AdminRecipient extends Recipient
     public function __construct()
     {
         $settings = Setting::getSettings();
-        $this->email = $settings->admin_cc_email;
+        $this->email = trim($settings->admin_cc_email);
     }
 }

app/Models/SCIMUser.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+class SCIMUser extends User
+{
+    protected $table = 'users';
+
+    protected $throwValidationExceptions = true; // we want model-level validation to fully THROW, not just return false
+
+    public function __construct(array $attributes = []) {
+        $attributes['password'] = "*NO PASSWORD*";
+        // $attributes['activated'] = 1;
+        parent::__construct($attributes);
+    }
+}

app/Models/SnipeSCIMConfig.php

@@ -0,0 +1,174 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Helper;
+use ArieTimmerman\Laravel\SCIMServer\SCIM\Schema;
+use ArieTimmerman\Laravel\SCIMServer\Attribute\AttributeMapping;
+
+
+class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
+{
+    public function getUserConfig()
+    {
+        $config = parent::getUserConfig();
+
+        // Much of this is copied verbatim from the library, then adjusted for our needs
+        $config['class'] = SCIMUser::class;
+
+        unset($config['mapping']['example:name:space']);
+
+        $config['map_unmapped'] = false; // anything we don't explicitly map will _not_ show up.
+
+        $core_namespace = 'urn:ietf:params:scim:schemas:core:2.0:User';
+        $core = $core_namespace.':'; 
+        $mappings =& $config['mapping'][$core_namespace]; //grab this entire key, we don't want to be repeating ourselves
+
+        //username - *REQUIRED*
+        $config['validations'][$core.'userName'] = 'required';
+        $mappings['userName'] = AttributeMapping::eloquent('username');
+
+        //human name - *FIRST NAME REQUIRED*
+        $config['validations'][$core.'name.givenName'] = 'required';
+        $config['validations'][$core.'name.familyName'] = 'string'; //not required
+
+        $mappings['name']['familyName'] = AttributeMapping::eloquent("last_name");
+        $mappings['name']['givenName'] = AttributeMapping::eloquent("first_name");
+        $mappings['name']['formatted'] = (new AttributeMapping())->ignoreWrite()->setRead(
+            function (&$object) {
+                return $object->getFullNameAttribute();
+            } 
+        );
+
+        $config['validations'][$core.'emails'] = 'nullable|array';         // emails are not required in Snipe-IT...
+        $config['validations'][$core.'emails.*.value'] = 'required|email'; // ...but if you give us one, it better be an email address
+
+        $mappings['emails'] = [[
+            "value" => AttributeMapping::eloquent("email"),
+            "display" => null,
+            "type" => AttributeMapping::constant("work")->ignoreWrite(),
+            "primary" => AttributeMapping::constant(true)->ignoreWrite()
+        ]];
+
+        //active
+        $config['validations'][$core.'active'] = 'boolean';
+
+        $mappings['active'] = AttributeMapping::eloquent('activated');
+
+        //phone
+        $config['validations'][$core.'phoneNumbers'] = 'nullable|array';
+        $config['validations'][$core.'phoneNumbers.*.value'] = 'required';
+
+        $mappings['phoneNumbers'] = [[
+            "value" => AttributeMapping::eloquent("phone"),
+            "display" => null,
+            "type" => AttributeMapping::constant("work")->ignoreWrite(),
+            "primary" => AttributeMapping::constant(true)->ignoreWrite()
+        ]];
+
+        //address
+        $config['validations'][$core.'addresses'] = 'nullable|array';
+        $config['validations'][$core.'addresses.*.streetAddress'] = 'required';
+        $config['validations'][$core.'addresses.*.locality'] = 'string';
+        $config['validations'][$core.'addresses.*.region'] = 'string';
+        $config['validations'][$core.'addresses.*.postalCode'] = 'string';
+        $config['validations'][$core.'addresses.*.country'] = 'string';
+
+        $mappings['addresses'] = [[
+            'type' => AttributeMapping::constant("work")->ignoreWrite(),
+            'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right.
+            'streetAddress' => AttributeMapping::eloquent("address"),
+            'locality' => AttributeMapping::eloquent("city"),
+            'region' => AttributeMapping::eloquent("state"),
+            'postalCode' => AttributeMapping::eloquent("zip"),
+            'country' => AttributeMapping::eloquent("country"),
+            'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example?
+        ]];
+
+        //title
+        $config['validations'][$core.'title'] = 'string';
+        $mappings['title'] = AttributeMapping::eloquent('jobtitle');
+
+        //Preferred Language
+        $config['validations'][$core.'preferredLanguage'] = 'string';
+        $mappings['preferredLanguage'] = AttributeMapping::eloquent('locale');
+
+        /* 
+          more snipe-it attributes I'd like to check out (to map to 'enterprise' maybe?):
+         - website
+         - notes?
+         - remote???
+         - location_id ?
+         - company_id to "organization?"
+        */
+
+        $enterprise_namespace = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User';
+        $ent = $enterprise_namespace.':';
+
+        // we remove the 'example' namespace and add the Enterprise one
+        $config['mapping']['schemas'] = AttributeMapping::constant( [$core_namespace, $enterprise_namespace] )->ignoreWrite();
+
+        $config['validations'][$ent.'employeeNumber'] = 'string';
+        $config['validations'][$ent.'department'] = 'string';
+        $config['validations'][$ent.'manager'] = 'nullable';
+        $config['validations'][$ent.'manager.value'] = 'string';
+
+        $config['mapping'][$enterprise_namespace] = [
+            'employeeNumber' => AttributeMapping::eloquent('employee_num'),
+            'department' =>(new AttributeMapping())->setAdd( // FIXME parent?
+                function ($value, &$object) {
+                    \Log::error("Department-Add: $value"); //FIXME
+                    $department = Department::where("name", $value)->first();
+                    if ($department) {
+                        $object->department_id = $department->id;
+                    }
+                }
+                )->setReplace(
+                    function ($value, &$object) {
+                        \Log::error("Department-Replace: $value"); //FIXME
+                        $department = Department::where("name", $value)->first();
+                        if ($department) {
+                            $object->department_id = $department->id;
+                        }
+                    }
+                )->setRead(
+                    function (&$object) {
+                        \Log::error("Weird department reader firing..."); //FIXME
+                        return $object->department ? $object->department->name : null;
+                    } 
+                ),
+            'manager' => [
+                // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool.
+                // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing
+                'value' => (new AttributeMapping())->setAdd(
+                    function ($value, &$object) {
+                        \Log::error("Manager-Add: $value"); //FIXME
+                        $manager = User::find($value);
+                        if ($manager) {
+                            $object->manager_id = $manager->id;
+                        }
+                    }
+                    )->setReplace(
+                        function ($value, &$object) {
+                            \Log::error("Manager-Replace: $value"); //FIXME
+                            $manager = User::find($value);
+                            if ($manager) {
+                                $object->manager_id = $manager->id;
+                            }
+                        }
+                    )->setRead(
+                        function (&$object) {
+                            \Log::error("Weird manager reader firing..."); //FIXME
+                            return $object->manager_id;
+                        } 
+                    ),
+            ]
+        ];
+
+        return $config;
+    }
+
+}

app/Models/Statuslabel.php

@@ -120,6 +120,18 @@ class Statuslabel extends SnipeModel
             ->where('deployable', '=', 1);
     }
 
+    /**
+     * Query builder scope for undeployable status types
+     *
+     * @return \Illuminate\Database\Query\Builder Modified query builder
+     */
+    public function scopeUndeployable()
+    {
+        return $this->where('pending', '=', 0)
+            ->where('archived', '=', 0)
+            ->where('deployable', '=', 0);
+    }
+
     /**
      * Helper function to determine type attributes
      *

app/Models/User.php

@@ -58,6 +58,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'state',
         'username',
         'zip',
+        'remote',
     ];
 
     protected $casts = [
@@ -73,14 +74,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @var array
      */
 
-    // 'username' => 'required|string|min:1|unique:users,username,NULL,id,deleted_at,NULL',
     protected $rules = [
-        'first_name'              => 'required|string|min:1',
-        'username'                => 'required|string|min:1|unique_undeleted',
-        'email'                   => 'email|nullable',
+        'first_name'              => 'required|string|min:1|max:191',
+        'username'                => 'required|string|min:1|unique_undeleted|max:191',
+        'email'                   => 'email|nullable|max:191',
         'password'                => 'required|min:8',
         'locale'                  => 'max:10|nullable',
-        'website'                 => 'url|nullable',
+        'website'                 => 'url|nullable|max:191',
         'manager_id'              => 'nullable|exists:users,id|cant_manage_self',
         'location_id'             => 'exists:locations,id|nullable',
     ];
@@ -258,6 +258,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return $this->endpoint;
     }
 
+
     /**
      * Establishes the user -> assets relationship
      *
@@ -307,7 +308,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function consumables()
     {
-        return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed();
+        return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id','created_at')->withTrashed();
     }
 
     /**
@@ -497,13 +498,15 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
             $last_name = '';
             $username = $users_name;
         } else {
+
             list($first_name, $last_name) = explode(' ', $users_name, 2);
 
             // Assume filastname by default
             $username = str_slug(substr($first_name, 0, 1).$last_name);
 
-            if ($format == 'firstname.lastname') {
-                $username = str_slug($first_name).'.'.str_slug($last_name);
+            if ($format=='firstname.lastname') {
+                $username = str_slug($first_name) . '.' . str_slug($last_name);
+
             } elseif ($format == 'lastnamefirstinitial') {
                 $username = str_slug($last_name.substr($first_name, 0, 1));
             } elseif ($format == 'firstintial.lastname') {
@@ -527,6 +530,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         $user['last_name'] = $last_name;
         $user['username'] = strtolower($username);
 
+
         return $user;
     }
 
@@ -581,8 +585,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         elseif ((Setting::getSettings()->two_factor_enabled == '2') && ($this->two_factor_enrolled)) {
             return true;
         }
-
         return false;
+
     }
 
 
@@ -640,6 +644,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         });
     }
 
+
     /**
      * Query builder scope to order on manager
      *

app/Observers/AssetObserver.php

@@ -17,12 +17,15 @@ class AssetObserver
      */
     public function updating(Asset $asset)
     {
-
+        $attributes = $asset->getAttributes();
+        $attributesOriginal = $asset->getOriginal();
+        
         // If the asset isn't being checked out or audited, log the update.
         // (Those other actions already create log entries.)
-        if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
-            && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date'])
-            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])) {
+          if (($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
+            && ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
+            && ($attributes['last_checkout']   == $attributesOriginal['last_checkout']))
+        {
             $changed = [];
 
             foreach ($asset->getOriginal() as $key => $value) {

app/Policies/SnipePermissionsPolicy.php

@@ -83,6 +83,18 @@ abstract class SnipePermissionsPolicy
         return $user->hasAccess($this->columnName().'.edit');
     }
 
+
+    /**
+     * Determine whether the user can update the accessory.
+     *
+     * @param  \App\Models\User  $user
+     * @return mixed
+     */
+    public function checkout(User $user, $item = null)
+    {
+        return $user->hasAccess($this->columnName().'.checkout');
+    }
+
     /**
      * Determine whether the user can delete the accessory.
      *

app/Presenters/AssetAuditPresenter.php

@@ -17,6 +17,10 @@ class AssetAuditPresenter extends Presenter
     public static function dataTableLayout()
     {
         $layout = [
+             [
+                'field' => 'checkbox',
+                'checkbox' => true,
+             ],
              [
                 'field' => 'id',
                 'searchable' => false,

app/Presenters/LicensePresenter.php

@@ -189,6 +189,14 @@ class LicensePresenter extends Presenter
     public static function dataTableLayoutSeats()
     {
         $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+           ],
            [
                 'field' => 'name',
                 'searchable' => false,

app/Presenters/UserPresenter.php

@@ -85,6 +85,15 @@ class UserPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'usersLinkFormatter',
             ],
+            [
+                'field' => 'remote',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/users/general.remote'),
+                'visible' => false,
+                'formatter' => 'trueFalseFormatter',
+            ],
             [
                 'field' => 'email',
                 'searchable' => true,

app/Providers/AppServiceProvider.php

@@ -8,6 +8,7 @@ use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\License;
 use App\Models\Setting;
+use App\Models\SnipeSCIMConfig;
 use App\Observers\AccessoryObserver;
 use App\Observers\AssetObserver;
 use App\Observers\ComponentObserver;
@@ -80,6 +81,8 @@ class AppServiceProvider extends ServiceProvider
         if ($this->app->environment(['local', 'develop'])) {
             $this->app->register(\Laravel\Dusk\DuskServiceProvider::class);
         } 
+
+        $this->app->singleton('ArieTimmerman\Laravel\SCIMServer\SCIMConfig', SnipeSCIMConfig::class); // this overrides the default SCIM configuration with our own
     
     }
 }

app/Providers/RouteServiceProvider.php

@@ -24,7 +24,7 @@ class RouteServiceProvider extends ServiceProvider
 
             $this->mapWebRoutes();
 
-            //
+            require base_path('routes/scim.php');
         });
     }
 

app/Services/Saml.php

@@ -130,9 +130,11 @@ class Saml
             $this->clearData();
         }
 
+        \Log::debug('Trying to create a new OneLogin_Saml2_Auth object ');
         try {
             $this->_auth = new OneLogin_Saml2_Auth($this->_settings);
         } catch (Exception $e) {
+            \Log::error('Trying OneLogin_Saml2_Auth failed. Setting SAML enabled to false. OneLogin_Saml2_Auth error message is: '.  $e->getMessage());
             $this->_enabled = false;
         }
     }
@@ -155,6 +157,7 @@ class Saml
         $this->_enabled = $setting->saml_enabled == '1';
 
         if ($this->isEnabled()) {
+            \Log::debug('SAML is enabled according to loadSettings()');
             //Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
             OneLogin_Saml2_Utils::setProxyVars(request()->isFromTrustedProxy());
 

composer.json

@@ -10,6 +10,12 @@
   ],
   "license": "AGPL-3.0-or-later",
   "type": "project",
+  "repositories": [
+      {
+          "type": "vcs",
+          "url": "https://github.com/grokability/laravel-scim-server"
+      }
+  ],
   "require": {
     "php": ">=7.4 <8.1",
     "ext-curl": "*",
@@ -18,15 +24,17 @@
     "ext-mbstring": "*",
     "ext-pdo": "*",
     "alek13/slack": "^2.0",
+    "arietimmerman/laravel-scim-server": "dev-master",
     "bacon/bacon-qr-code": "^2.0",
     "barryvdh/laravel-debugbar": "^3.6",
+    "barryvdh/laravel-dompdf": "^1.0",
     "doctrine/cache": "^1.10",
     "doctrine/common": "^2.12",
     "doctrine/dbal": "^3.1",
     "doctrine/inflector": "^1.3",
     "doctrine/instantiator": "^1.3",
     "eduardokum/laravel-mail-auto-embed": "^1.0",
-    "enshrined/svg-sanitize": "^0.13.3",
+    "enshrined/svg-sanitize": "^0.15.0",
     "erusev/parsedown": "^1.7",
     "facade/ignition": "^2.10",
     "fideloper/proxy": "^4.3",
@@ -60,7 +68,6 @@
     "rollbar/rollbar-laravel": "^7.0",
     "spatie/laravel-backup": "^6.16",
     "tecnickcom/tc-lib-barcode": "^1.15",
-    "tightenco/ziggy": "v1.2.0",
     "unicodeveloper/laravel-password": "^1.0",
     "watson/validating": "^6.1"
   },
@@ -104,7 +111,9 @@
   },
   "scripts": {
     "post-autoload-dump": [
-      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump"
+      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+      "@php artisan package:discover --ansi",
+      "@php artisan vendor:publish --force --tag=livewire:assets --ansi"
     ],
     "post-create-project-cmd": [
       "php artisan key:generate"

config/app.php

@@ -328,6 +328,7 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Barryvdh\DomPDF\ServiceProvider::class,
 
         /*
          * Package Service Providers...
@@ -341,7 +342,6 @@ return [
         Laravel\Passport\PassportServiceProvider::class,
         Laravel\Tinker\TinkerServiceProvider::class,
         Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
-        Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
         Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,
 
         /*
@@ -396,6 +396,7 @@ return [
         'Mail' => Illuminate\Support\Facades\Mail::class,
         'Notification' => Illuminate\Support\Facades\Notification::class,
         'Password' => Illuminate\Support\Facades\Password::class,
+        'PDF'   => Barryvdh\DomPDF\Facade::class,
         'Queue' => Illuminate\Support\Facades\Queue::class,
         'Redirect' => Illuminate\Support\Facades\Redirect::class,
         'Redis' => Illuminate\Support\Facades\Redis::class,

config/google2fa.php

@@ -0,0 +1,84 @@
+<?php
+
+return [
+
+    /*
+     * Enable / disable Google2FA.
+     */
+    'enabled' => env('OTP_ENABLED', true),
+
+    /*
+     * Lifetime in minutes.
+     *
+     * In case you need your users to be asked for a new one time passwords from time to time.
+     */
+    'lifetime' => env('OTP_LIFETIME', 0), // 0 = eternal
+
+    /*
+     * Renew lifetime at every new request.
+     */
+    'keep_alive' => env('OTP_KEEP_ALIVE', true),
+
+    /*
+     * Auth container binding.
+     */
+    'auth' => 'auth',
+
+    /*
+     * Guard.
+     */
+    'guard' => '',
+
+    /*
+     * 2FA verified session var.
+     */
+
+    'session_var' => 'google2fa',
+
+    /*
+     * One Time Password request input name.
+     */
+    'otp_input' => 'one_time_password', //should this be 'two_factor_secret'?
+
+    /*
+     * One Time Password Window.
+     */
+    'window' => 1,
+
+    /*
+     * Forbid user to reuse One Time Passwords.
+     */
+    'forbid_old_passwords' => false,
+
+    /*
+     * User's table column for google2fa secret.
+     */
+    'otp_secret_column' => 'google2fa_secret',
+
+    /*
+     * One Time Password View.
+     */
+    'view' => 'google2fa.index', //should this be 'auth.two_factor_enroll'?
+
+    /*
+     * One Time Password error message.
+     */
+    'error_messages' => [
+        'wrong_otp'       => "The 'One Time Password' typed was wrong.",
+        'cannot_be_empty' => 'One Time Password cannot be empty.',
+        'unknown'         => 'An unknown error has occurred. Please try again.',
+    ],
+
+    /*
+     * Throw exceptions or just fire events?
+     */
+    'throw_exceptions' => env('OTP_THROW_EXCEPTION', true),
+
+    /*
+     * Which image backend to use for generating QR codes?
+     *
+     * Supports imagemagick, svg and eps
+     */
+    'qrcode_image_backend' => \PragmaRX\Google2FALaravel\Support\Constants::QRCODE_IMAGE_BACKEND_SVG,
+
+];

config/permissions.php

@@ -6,6 +6,7 @@
  |--------------------------------------------------------------------------
 */
 
+
 return [
 
     'Global' => [
@@ -97,6 +98,7 @@ return [
             'display'    => true,
         ],
 
+
         [
             'permission' => 'assets.view.requestable',
             'label'      => 'View Requestable Assets',
@@ -178,6 +180,7 @@ return [
         ],
     ],
 
+
     'Licenses' => [
         [
             'permission' => 'licenses.view',
@@ -223,6 +226,7 @@ return [
         ],
     ],
 
+
     'Components' => [
         [
             'permission' => 'components.view',
@@ -288,13 +292,6 @@ return [
             'note'       => '',
             'display'    => true,
         ],
-
-        [
-            'permission' => 'kits.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
-            'display'    => true,
-        ],
     ],
 
     'Users' => [
@@ -488,6 +485,7 @@ return [
         ],
     ],
 
+
     'Manufacturers' => [
         [
             'permission' => 'manufacturers.view',
@@ -596,6 +594,9 @@ return [
         ],
     ],
 
+
+
+
     'Self' => [
         [
             'permission' => 'self.two_factor',

config/scim.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    "publish_routes" => false
+];

config/services.php

@@ -32,9 +32,9 @@ return [
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => 'us-east-1',
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
     'stripe' => [

config/session.php

@@ -117,7 +117,7 @@ return [
     |
     */
 
-    'cookie' => env('COOKIE_NAME', 'snipeitv4_session'),
+    'cookie' => env('COOKIE_NAME', 'snipeitv6_session'),
 
     /*
     |--------------------------------------------------------------------------

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.0-RC-4',
-  'full_app_version' => 'v6.0.0-RC-4 - build 6754-gafd83311a',
-  'build_version' => '6754',
+  'app_version' => 'v6.0.0',
+  'full_app_version' => 'v6.0.0 - build 6860-g722e88a47',
+  'build_version' => '6860',
   'prerelease_version' => '',
-  'hash_version' => 'gafd83311a',
-  'full_hash' => 'v6.0.0-RC-4-1-gafd83311a',
-  'branch' => 'develop',
+  'hash_version' => 'g722e88a47',
+  'full_hash' => 'v6.0.0-30-g722e88a47',
+  'branch' => 'master',
 );

database/factories/LicenseFactory.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Database\Factories;
 
 use App\Models\Category;
@@ -99,6 +98,7 @@ class LicenseFactory extends Factory
                 'seats' => 10,
                 'category_id' => 14,
             ];
+    
 
             return $data;
         });

database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateCustomFieldCustomFieldset extends Migration
 {
@@ -13,13 +13,14 @@ class CreateCustomFieldCustomFieldset extends Migration
     public function up()
     {
         Schema::create('custom_field_custom_fieldset', function (Blueprint $table) {
+            $table->bigIncrements('id');
             $table->integer('custom_field_id');
             $table->integer('custom_fieldset_id');
-
             $table->integer('order');
             $table->boolean('required');
             $table->engine = 'InnoDB';
         });
+
     }
 
     /**

database/migrations/2018_07_28_023826_create_checkout_acceptances_table.php

@@ -13,20 +13,22 @@ class CreateCheckoutAcceptancesTable extends Migration
      */
     public function up()
     {
-        Schema::create('checkout_acceptances', function (Blueprint $table) {
-            $table->increments('id');
+        if (!Schema::hasTable('checkout_acceptances')) {
+            Schema::create('checkout_acceptances', function (Blueprint $table) {
+                $table->increments('id');
 
-            $table->morphs('checkoutable');
-            $table->integer('assigned_to_id')->nullable();
+                $table->morphs('checkoutable');
+                $table->integer('assigned_to_id')->nullable();
 
-            $table->string('signature_filename')->nullable();
+                $table->string('signature_filename')->nullable();
 
-            $table->timestamp('accepted_at')->nullable();
-            $table->timestamp('declined_at')->nullable();
+                $table->timestamp('accepted_at')->nullable();
+                $table->timestamp('declined_at')->nullable();
 
-            $table->timestamps();
-            $table->softDeletes();
-        });
+                $table->timestamps();
+                $table->softDeletes();
+            });
+        }
     }
 
     /**
@@ -36,6 +38,8 @@ class CreateCheckoutAcceptancesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('checkout_acceptances');
+        if (Schema::hasTable('checkout_acceptances')) {
+            Schema::dropIfExists('checkout_acceptances');
+        }
     }
 }

database/migrations/2018_10_18_191228_add_kits_licenses_table.php

@@ -1,7 +1,9 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
 
 class AddKitsLicensesTable extends Migration
 {
@@ -12,15 +14,16 @@ class AddKitsLicensesTable extends Migration
      */
     public function up()
     {
-        //
-        Schema::create('kits_licenses', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(null);
-            $table->integer('license_id')->nullable()->default(null);
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
-    }
+		if (!Schema::hasTable('kits_licenses')) {
+            Schema::create('kits_licenses', function ($table) {
+                $table->increments('id');
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('license_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
+	}
 
     /**
      * Reverse the migrations.
@@ -29,7 +32,9 @@ class AddKitsLicensesTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('kits_licenses');
-    }
+		if (Schema::hasTable('kits_licenses')) {
+           Schema::drop('kits_licenses');
+        }
+	}
+
 }

database/migrations/2018_10_19_153910_add_kits_table.php

@@ -1,7 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
 
 class AddKitsTable extends Migration
 {
@@ -12,14 +13,16 @@ class AddKitsTable extends Migration
      */
     public function up()
     {
-        //
-        Schema::create('kits', function ($table) {
-            $table->increments('id');
-            $table->string('name')->nullable()->default(null);
-            $table->timestamps();
-            $table->engine = 'InnoDB';
-        });
-    }
+		if (!Schema::hasTable('kits')) {
+            Schema::create('kits', function ($table) {
+                $table->increments('id');
+				$table->string('name')->nullable()->default(NULL);
+                $table->timestamps();
+                $table->engine = 'InnoDB';
+            });
+        }
+
+	}
 
     /**
      * Reverse the migrations.
@@ -28,7 +31,10 @@ class AddKitsTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('kits');
-    }
+		if (Schema::hasTable('kits')) {
+           Schema::drop('kits');
+        }
+
+	}
+
 }

database/migrations/2018_10_19_154013_add_kits_models_table.php

@@ -1,7 +1,9 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
 
 class AddKitsModelsTable extends Migration
 {
@@ -12,15 +14,16 @@ class AddKitsModelsTable extends Migration
      */
     public function up()
     {
-        //
-        Schema::create('kits_models', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(null);
-            $table->integer('model_id')->nullable()->default(null);
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
-    }
+		if (!Schema::hasTable('kits_models')) {
+            Schema::create('kits_models', function ($table) {
+                $table->increments('id');
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('model_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
+	}
 
     /**
      * Reverse the migrations.
@@ -29,7 +32,9 @@ class AddKitsModelsTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('kits_models');
+		if (Schema::hasTable('kits_models')) {
+           Schema::drop('kits_models');
+        }
     }
+
 }

database/migrations/2019_02_07_185953_add_kits_consumables_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddKitsConsumablesTable extends Migration
 {
@@ -13,14 +13,15 @@ class AddKitsConsumablesTable extends Migration
      */
     public function up()
     {
-        //
-        Schema::create('kits_consumables', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(null);
-            $table->integer('consumable_id')->nullable()->default(null);
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+        if (!Schema::hasTable('kits_consumables')) {
+            Schema::create('kits_consumables', function ($table) {
+                $table->increments('id');
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('consumable_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
     }
 
     /**
@@ -30,7 +31,8 @@ class AddKitsConsumablesTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('kits_consumables');
+        if (Schema::hasTable('kits_consumables')) {
+            Schema::drop('kits_consumables');
+        }
     }
 }

database/migrations/2019_02_07_190030_add_kits_accessories_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddKitsAccessoriesTable extends Migration
 {
@@ -13,14 +13,15 @@ class AddKitsAccessoriesTable extends Migration
      */
     public function up()
     {
-        //
-        Schema::create('kits_accessories', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(null);
-            $table->integer('accessory_id')->nullable()->default(null);
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+        if (!Schema::hasTable('kits_accessories')) {
+            Schema::create('kits_accessories', function ($table) {
+                $table->increments('id');
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('accessory_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
     }
 
     /**
@@ -30,7 +31,8 @@ class AddKitsAccessoriesTable extends Migration
      */
     public function down()
     {
-        //
-        Schema::drop('kits_accessories');
+        if (Schema::hasTable('kits_accessories')) {
+            Schema::drop('kits_accessories');
+        }
     }
 }

database/migrations/2022_03_04_080836_add_remote_to_user.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddRemoteToUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('remote')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (Schema::hasColumn('users', 'remote')) {
+                $table->dropColumn('remote');
+            }
+        });
+    }
+}

database/migrations/2022_03_09_001334_add_eula_to_checkout_acceptance.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddEulaToCheckoutAcceptance extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('checkout_acceptances', function (Blueprint $table) {
+            $table->text('stored_eula')->nullable()->default(null);
+            $table->string('stored_eula_file')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('checkout_acceptances', function (Blueprint $table) {
+            if (Schema::hasColumn('checkout_acceptances', 'stored_eula')) {
+                $table->dropColumn('stored_eula');
+            }
+            if (Schema::hasColumn('checkout_acceptances', 'stored_eula_file')) {
+                $table->dropColumn('stored_eula_file');
+            }
+        });
+    }
+}

database/migrations/2022_03_10_175740_add_eula_to_action_logs.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddEulaToActionLogs extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->text('stored_eula')->nullable()->default(null);
+            $table->string('stored_eula_file')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->dropColumn('stored_eula');
+            $table->dropColumn('stored_eula_file');
+        });
+    }
+}

database/migrations/2022_03_21_162724_adds_ldap_manager.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddsLdapManager extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //Updates the Settings Table
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('ldap_manager')->after('ldap_jobtitle')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('ldap_manager');
+        });
+    }
+}

database/migrations/2022_04_05_135340_add_primary_key_to_custom_fields_pivot.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPrimaryKeyToCustomFieldsPivot extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        // Check if the ID primary key already exists, if not, add it
+        Schema::table('custom_field_custom_fieldset', function (Blueprint $table) {
+            if (!Schema::hasColumn('custom_field_custom_fieldset', 'id')) {
+                $table->bigIncrements('id')->first();
+            }
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_field_custom_fieldset', function (Blueprint $table) {
+            if (Schema::hasColumn('custom_field_custom_fieldset', 'id')) {
+                $table->dropColumn('id');
+            }
+        });
+    }
+}

package-lock.json

@@ -1388,27 +1388,27 @@
             }
         },
         "@types/eslint": {
-            "version": "8.2.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.1.tgz",
-            "integrity": "sha512-UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ==",
+            "version": "8.4.2",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz",
+            "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==",
             "requires": {
                 "@types/estree": "*",
                 "@types/json-schema": "*"
             }
         },
         "@types/eslint-scope": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.2.tgz",
-            "integrity": "sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ==",
+            "version": "3.7.3",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+            "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
             "requires": {
                 "@types/eslint": "*",
                 "@types/estree": "*"
             }
         },
         "@types/estree": {
-            "version": "0.0.50",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
+            "version": "0.0.51",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+            "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
         },
         "@types/glob": {
             "version": "7.2.0",
@@ -1842,13 +1842,9 @@
             "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
         },
         "adler-32": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz",
-            "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
-            "requires": {
-                "exit-on-epipe": "~1.0.1",
-                "printj": "~1.1.0"
-            }
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+            "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
         },
         "admin-lte": {
             "version": "2.4.18",
@@ -2790,9 +2786,9 @@
             "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
         },
         "base64-arraybuffer": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-            "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+            "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
         },
         "base64-js": {
             "version": "1.5.1",
@@ -2942,9 +2938,9 @@
             "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
         },
         "bootstrap-table": {
-            "version": "1.19.1",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.19.1.tgz",
-            "integrity": "sha512-WvV+l1AI/C+zThaKmfHmi/IuayVNB0qdFyEhFx1jyZhO0oLtNJNANkCR3rvJf6Dkh72dsLElxpE/bzK9seEQLA=="
+            "version": "1.20.0",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.20.0.tgz",
+            "integrity": "sha512-e6lOTG44aAeSFuOqFSjuMakXUlVF2jSkgtlDqa2lXbwq/Hn3Sn4TMSSJgSKdMnwX8WOpdlF3DIGUKQLiQ9vlXA=="
         },
         "brace-expansion": {
             "version": "1.1.11",
@@ -3375,9 +3371,9 @@
             "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw=="
         },
         "canvg": {
-            "version": "3.0.9",
-            "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.9.tgz",
-            "integrity": "sha512-rDXcnRPuz4QHoCilMeoTxql+fvGqNAxp+qV/KHD8rOiJSAfVjFclbdUNHD2Uqfthr+VMg17bD2bVuk6F07oLGw==",
+            "version": "3.0.10",
+            "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
+            "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
             "optional": true,
             "requires": {
                 "@babel/runtime": "^7.12.5",
@@ -3391,9 +3387,9 @@
             },
             "dependencies": {
                 "core-js": {
-                    "version": "3.20.1",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz",
-                    "integrity": "sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg==",
+                    "version": "3.22.5",
+                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
+                    "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
                     "optional": true
                 },
                 "regenerator-runtime": {
@@ -3405,35 +3401,12 @@
             }
         },
         "cfb": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz",
-            "integrity": "sha512-wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+            "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
             "requires": {
                 "adler-32": "~1.3.0",
-                "crc-32": "~1.2.0",
-                "printj": "~1.3.0"
-            },
-            "dependencies": {
-                "adler-32": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz",
-                    "integrity": "sha512-f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==",
-                    "requires": {
-                        "printj": "~1.2.2"
-                    },
-                    "dependencies": {
-                        "printj": {
-                            "version": "1.2.3",
-                            "resolved": "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz",
-                            "integrity": "sha512-sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="
-                        }
-                    }
-                },
-                "printj": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz",
-                    "integrity": "sha512-017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="
-                }
+                "crc-32": "~1.2.0"
             }
         },
         "chalk": {
@@ -3907,13 +3880,9 @@
             }
         },
         "crc-32": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz",
-            "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==",
-            "requires": {
-                "exit-on-epipe": "~1.0.1",
-                "printj": "~1.1.0"
-            }
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+            "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
         },
         "create-ecdh": {
             "version": "4.0.4",
@@ -4006,11 +3975,11 @@
             }
         },
         "css-line-break": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
-            "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+            "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
             "requires": {
-                "base64-arraybuffer": "^0.2.0"
+                "utrie": "^1.0.2"
             }
         },
         "css-loader": {
@@ -4487,9 +4456,9 @@
             }
         },
         "dompurify": {
-            "version": "2.3.4",
-            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz",
-            "integrity": "sha512-6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ==",
+            "version": "2.3.7",
+            "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.7.tgz",
+            "integrity": "sha512-fsVZLywBd3awZIG3qU4JEdw7DCb0uUCajTfWRrLhsgKjTBd5CIIluPoAkNfco05GuNYQGj4/+bQIhlq96eT9eQ==",
             "optional": true
         },
         "domutils": {
@@ -4596,9 +4565,9 @@
             }
         },
         "enhanced-resolve": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+            "version": "5.9.3",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+            "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
             "requires": {
                 "graceful-fs": "^4.2.4",
                 "tapable": "^2.2.0"
@@ -4671,13 +4640,13 @@
             }
         },
         "es5-ext": {
-            "version": "0.10.53",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-            "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+            "version": "0.10.61",
+            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
+            "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==",
             "requires": {
-                "es6-iterator": "~2.0.3",
-                "es6-symbol": "~3.1.3",
-                "next-tick": "~1.0.0"
+                "es6-iterator": "^2.0.3",
+                "es6-symbol": "^3.1.3",
+                "next-tick": "^1.1.0"
             }
         },
         "es6-iterator": {
@@ -4880,11 +4849,6 @@
                 }
             }
         },
-        "exit-on-epipe": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
-            "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
-        },
         "express": {
             "version": "4.17.2",
             "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
@@ -4946,9 +4910,9 @@
             },
             "dependencies": {
                 "type": {
-                    "version": "2.5.0",
-                    "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
-                    "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="
+                    "version": "2.6.0",
+                    "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
+                    "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="
                 }
             }
         },
@@ -15016,12 +14980,12 @@
             }
         },
         "html2canvas": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.3.tgz",
-            "integrity": "sha512-nQi0ayEY1cMiUMbq/F5hRwMAqsRMo7NIP6VaCqaXnXO6b/FfZO49oSfIJjdyRha28EuY8D6FBCzQOXPQV0TCrA==",
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+            "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
             "requires": {
-                "css-line-break": "2.0.1",
-                "text-segmentation": "^1.0.2"
+                "css-line-break": "^2.1.0",
+                "text-segmentation": "^1.0.3"
             }
         },
         "htmlescape": {
@@ -15662,7 +15626,7 @@
         "jquery": {
             "version": "3.6.0",
             "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-            "integrity": "sha1-xyoJ8Vwb3OFC9J2/EXC9+K2sJHA="
+            "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
         },
         "jquery-form-validator": {
             "version": "2.3.79",
@@ -15773,9 +15737,9 @@
             "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
         },
         "jspdf": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.0.tgz",
-            "integrity": "sha512-XT0E2m8A9P1xl7ItA2OUbmhokzbDQEyZEdWQZD2olADiTiBEZGDRiK1J1zWxBRUG2KezQJOZq//GYZTkvEZuJg==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.1.tgz",
+            "integrity": "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==",
             "requires": {
                 "@babel/runtime": "^7.14.0",
                 "atob": "^2.1.2",
@@ -15788,9 +15752,9 @@
             },
             "dependencies": {
                 "core-js": {
-                    "version": "3.20.1",
-                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz",
-                    "integrity": "sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg==",
+                    "version": "3.22.5",
+                    "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
+                    "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
                     "optional": true
                 }
             }
@@ -16248,9 +16212,9 @@
             }
         },
         "loader-runner": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-            "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+            "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
         },
         "loader-utils": {
             "version": "1.4.0",
@@ -16715,9 +16679,9 @@
             "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
         },
         "next-tick": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-            "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
         },
         "no-case": {
             "version": "3.0.4",
@@ -18020,11 +17984,6 @@
             "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==",
             "dev": true
         },
-        "printj": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
-            "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
-        },
         "private": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -19192,13 +19151,13 @@
             }
         },
         "tableexport.jquery.plugin": {
-            "version": "1.21.0",
-            "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.21.0.tgz",
-            "integrity": "sha512-oCI9hn3XY7fKEepsL5IZbGhkT43pyWM6jE44PY0IwFJYGwhacKKxG1QhremY9CkCvUBaZ+Ks+FhBjA2qnS2uQg==",
+            "version": "1.26.0",
+            "resolved": "https://registry.npmjs.org/tableexport.jquery.plugin/-/tableexport.jquery.plugin-1.26.0.tgz",
+            "integrity": "sha512-PMad8npkQviiZG/J0kV6zphmcpNwMglxbxZjGR/7DtcKOTfiOzpcQQFIjHVqpnnKgpHHzOfV6GB9km6EkUAt4A==",
             "requires": {
                 "file-saver": ">=2.0.1",
                 "html2canvas": ">=1.0.0",
-                "jquery": ">=1.9.1",
+                "jquery": ">=3.2.1",
                 "jspdf": ">=2.0.0",
                 "pdfmake": "^0.1.71",
                 "xlsx": ">=0.16.0"
@@ -19271,11 +19230,11 @@
             "integrity": "sha1-1WqBhZDY/nLjh/d6Z/k6uW2OH7I="
         },
         "text-segmentation": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
-            "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+            "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
             "requires": {
-                "utrie": "^1.0.1"
+                "utrie": "^1.0.2"
             }
         },
         "through": {
@@ -19575,18 +19534,11 @@
             "dev": true
         },
         "utrie": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
-            "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+            "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
             "requires": {
-                "base64-arraybuffer": "^1.0.1"
-            },
-            "dependencies": {
-                "base64-arraybuffer": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
-                    "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
-                }
+                "base64-arraybuffer": "^1.0.2"
             }
         },
         "uuid": {
@@ -19684,12 +19636,12 @@
             }
         },
         "webpack": {
-            "version": "5.65.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
-            "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
+            "version": "5.72.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.0.tgz",
+            "integrity": "sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==",
             "requires": {
-                "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.50",
+                "@types/eslint-scope": "^3.7.3",
+                "@types/estree": "^0.0.51",
                 "@webassemblyjs/ast": "1.11.1",
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
@@ -19697,12 +19649,12 @@
                 "acorn-import-assertions": "^1.7.6",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.3",
+                "enhanced-resolve": "^5.9.2",
                 "es-module-lexer": "^0.9.0",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.4",
+                "graceful-fs": "^4.2.9",
                 "json-parse-better-errors": "^1.0.2",
                 "loader-runner": "^4.2.0",
                 "mime-types": "^2.1.27",
@@ -19711,13 +19663,18 @@
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
                 "watchpack": "^2.3.1",
-                "webpack-sources": "^3.2.2"
+                "webpack-sources": "^3.2.3"
             },
             "dependencies": {
                 "@types/json-schema": {
-                    "version": "7.0.9",
-                    "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-                    "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
+                    "version": "7.0.11",
+                    "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+                    "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
+                },
+                "graceful-fs": {
+                    "version": "4.2.10",
+                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+                    "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
                 },
                 "schema-utils": {
                     "version": "3.1.1",
@@ -19730,9 +19687,9 @@
                     }
                 },
                 "webpack-sources": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
-                    "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw=="
+                    "version": "3.2.3",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+                    "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
                 }
             }
         },
@@ -20114,14 +20071,14 @@
             "dev": true
         },
         "xlsx": {
-            "version": "0.17.4",
-            "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.4.tgz",
-            "integrity": "sha512-9aKt8g9ZLP0CUdBX8L5xnoMDFwSiLI997eQnDThCaqQMYB9AEBIRzblSSNN/ICMGLYIHUO3VKaItcedZJ3ijIg==",
+            "version": "0.18.5",
+            "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+            "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
             "requires": {
-                "adler-32": "~1.2.0",
-                "cfb": "^1.1.4",
+                "adler-32": "~1.3.0",
+                "cfb": "~1.2.1",
                 "codepage": "~1.15.0",
-                "crc-32": "~1.2.0",
+                "crc-32": "~1.2.1",
                 "ssf": "~0.11.2",
                 "wmf": "~1.0.1",
                 "word": "~0.3.0"

package.json

@@ -34,7 +34,7 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.9.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "^1.19.1",
+        "bootstrap-table": "1.20.0",
         "chart.js": "^2.9.4",
         "css-loader": "^3.6.0",
         "ekko-lightbox": "^5.1.1",
@@ -53,9 +53,9 @@
         "papaparse": "^4.3.3",
         "select2": "4.0.13",
         "sheetjs": "^2.0.0",
-        "tableexport.jquery.plugin": "^1.21.0",
+        "tableexport.jquery.plugin": "1.26.0",
         "tether": "^1.4.0",
         "vue-resource": "^1.5.2",
-        "webpack": "^5.65.0"
+        "webpack": "^5.72.0"
     }
 }

public/css/dist/signature-pad.css

@@ -1,135 +1 @@
-
-#signature-pad {
-  padding-top: 250px;
-  margin: auto;
-}
-.m-signature-pad {
-
-  position: relative;
-  font-size: 10px;
-  width: 100%;
-  height: 300px;
-  border: 1px solid #e8e8e8;
-  background-color: #fff;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.08) inset;
-  border-radius: 4px;
-}
-
-.m-signature-pad:before, .m-signature-pad:after {
-	position: absolute;
-  z-index: -1;
-  content: "";
-	width: 40%;
-	height: 10px;
-	left: 20px;
-	bottom: 10px;
-	background: transparent;
-	-webkit-transform: skew(-3deg) rotate(-3deg);
-	-moz-transform: skew(-3deg) rotate(-3deg);
-	-ms-transform: skew(-3deg) rotate(-3deg);
-	-o-transform: skew(-3deg) rotate(-3deg);
-	transform: skew(-3deg) rotate(-3deg);
-	box-shadow: 0 8px 12px rgba(0, 0, 0, 0.4);
-}
-
-.m-signature-pad:after {
-	left: auto;
-	right: 20px;
-	-webkit-transform: skew(3deg) rotate(3deg);
-	-moz-transform: skew(3deg) rotate(3deg);
-	-ms-transform: skew(3deg) rotate(3deg);
-	-o-transform: skew(3deg) rotate(3deg);
-	transform: skew(3deg) rotate(3deg);
-}
-
-.m-signature-pad--body {
-  position: absolute;
-  top: 20px;
-  bottom: 60px;
-  border: 1px solid #f4f4f4;
-  background-color: white;
-}
-
-.m-signature-pad--body
-  canvas {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    border-radius: 4px;
-    box-shadow: 0 0 5px rgba(0, 0, 0, 0.02) inset;
-  }
-
-.m-signature-pad--footer {
-  position: absolute;
-  left: 20px;
-  right: 20px;
-  bottom: 20px;
-  height: 40px;
-}
-
-.m-signature-pad--footer
-  .description {
-    color: #C3C3C3;
-    text-align: center;
-    font-size: 1.2em;
-    margin-top: 1.8em;
-  }
-
-.m-signature-pad--footer
-  .button {
-    position: absolute;
-    bottom: 0;
-  }
-
-.m-signature-pad--footer
-  .button.clear {
-    left: 0;
-  }
-
-.m-signature-pad--footer
-  .button.save {
-    right: 0;
-  }
-
-@media screen and (max-width: 1024px) {
-  .m-signature-pad {
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    width: auto;
-    height: auto;
-    min-width: 250px;
-    min-height: 140px;
-    margin: 5%;
-  }
-
-}
-
-@media screen and (min-device-width: 768px) and (max-device-width: 1024px) {
-  .m-signature-pad {
-    margin: 10%;
-  }
-}
-
-@media screen and (max-height: 320px) {
-  .m-signature-pad--body {
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 32px;
-  }
-  .m-signature-pad--footer {
-    left: 20px;
-    right: 20px;
-    bottom: 4px;
-    height: 28px;
-  }
-  .m-signature-pad--footer
-    .description {
-      font-size: 1em;
-      margin-top: 1em;
-    }
-}
+#signature-pad{padding-top:250px;margin:auto}.m-signature-pad{position:relative;font-size:10px;width:100%;height:300px;border:1px solid #e8e8e8;background-color:#fff;box-shadow:0 1px 4px rgba(0,0,0,.27),0 0 40px rgba(0,0,0,.08) inset;border-radius:4px}.m-signature-pad:after,.m-signature-pad:before{position:absolute;z-index:-1;content:"";width:40%;height:10px;left:20px;bottom:10px;background:0 0;-webkit-transform:skew(-3deg) rotate(-3deg);-moz-transform:skew(-3deg) rotate(-3deg);-ms-transform:skew(-3deg) rotate(-3deg);-o-transform:skew(-3deg) rotate(-3deg);transform:skew(-3deg) rotate(-3deg);box-shadow:0 8px 12px rgba(0,0,0,.4)}.m-signature-pad:after{left:auto;right:20px;-webkit-transform:skew(3deg) rotate(3deg);-moz-transform:skew(3deg) rotate(3deg);-ms-transform:skew(3deg) rotate(3deg);-o-transform:skew(3deg) rotate(3deg);transform:skew(3deg) rotate(3deg)}.m-signature-pad--body{position:absolute;top:20px;bottom:60px;border:1px solid #f4f4f4;background-color:#fff}.m-signature-pad--body canvas{position:absolute;left:0;top:0;width:100%;height:100%;border-radius:4px;box-shadow:0 0 5px rgba(0,0,0,.02) inset}.m-signature-pad--footer{position:absolute;left:20px;right:20px;bottom:20px;height:40px}.m-signature-pad--footer .description{color:#c3c3c3;text-align:center;font-size:1.2em;margin-top:1.8em}.m-signature-pad--footer .button{position:absolute;bottom:0}.m-signature-pad--footer .button.clear{left:0}.m-signature-pad--footer .button.save{right:0}@media screen and (max-width:1024px){.m-signature-pad{top:0;left:0;right:0;bottom:0;width:auto;height:auto;min-width:250px;min-height:140px;margin:5%}}@media screen and (min-device-width:768px) and (max-device-width:1024px){.m-signature-pad{margin:10%}}@media screen and (max-height:320px){.m-signature-pad--body{left:0;right:0;top:0;bottom:32px}.m-signature-pad--footer{left:20px;right:20px;bottom:4px;height:28px}.m-signature-pad--footer .description{font-size:1em;margin-top:1em}}