Beginning refactor

Signed-off-by: snipe <snipe@snipe.net>
Squashed commit of the following:
2022-03-19 22:26:23 +00:00 · 2022-03-16 20:31:14 +00:00 · 2022-03-09 20:06:20 -08:00 · 2022-03-09 18:12:23 -08:00 · 2022-03-09 18:10:54 -08:00 · 2022-03-09 18:09:57 -08:00
2221 changed files with 25597 additions and 338743 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2585,258 +2585,6 @@
      "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"
-      ]
-    },
-    {
-      "login": "denzfarid",
-      "name": "denzfarid",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1294403?v=4",
-      "profile": "https://github.com/denzfarid",
-      "contributions": []
-    },
-    {
-      "login": "ntbutler-nbcs",
-      "name": "ntbutler-nbcs",
-      "avatar_url": "https://avatars.githubusercontent.com/u/94018771?v=4",
-      "profile": "https://github.com/ntbutler-nbcs",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "naveensrinivasan",
-      "name": "Naveen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/172697?v=4",
-      "profile": "https://naveensrinivasan.dev",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mikeroq",
-      "name": "Mike Roquemore",
-      "avatar_url": "https://avatars.githubusercontent.com/u/55674383?v=4",
-      "profile": "https://github.com/mikeroq",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "reederda",
-      "name": "Daniel Reeder",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7991086?v=4",
-      "profile": "https://github.com/reederda",
-      "contributions": [
-        "translation",
-        "translation",
-        "code"
-      ]
-    },
-    {
-      "login": "vickyjaura183",
-      "name": "vickyjaura183",
-      "avatar_url": "https://avatars.githubusercontent.com/u/109422491?v=4",
-      "profile": "https://github.com/vickyjaura183",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "julian-piehl",
-      "name": "Peace",
-      "avatar_url": "https://avatars.githubusercontent.com/u/32363424?v=4",
-      "profile": "https://github.com/julian-piehl",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "kylegordon",
-      "name": "Kyle Gordon",
-      "avatar_url": "https://avatars.githubusercontent.com/u/231528?v=4",
-      "profile": "https://github.com/kylegordon",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sunflowerbofh",
-      "name": "Katharina Drexel",
-      "avatar_url": "https://avatars.githubusercontent.com/u/53009155?v=4",
-      "profile": "http://www.bfh.ch",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "dsferruzza",
-      "name": "David Sferruzza",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1931963?v=4",
-      "profile": "https://david.sferruzza.fr/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "rnelsonee",
-      "name": "Rick Nelson",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19511639?v=4",
-      "profile": "https://github.com/rnelsonee",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "BasO12",
-      "name": "BasO12",
-      "avatar_url": "https://avatars.githubusercontent.com/u/94169344?v=4",
-      "profile": "https://github.com/BasO12",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Vautia",
-      "name": "Vautia",
-      "avatar_url": "https://avatars.githubusercontent.com/u/111710123?v=4",
-      "profile": "https://github.com/Vautia",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "chartjes",
-      "name": "Chris Hartjes",
-      "avatar_url": "https://avatars.githubusercontent.com/u/28321?v=4",
-      "profile": "http://www.littlehart.net/atthekeyboard",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "geo-chen",
-      "name": "geo-chen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2404584?v=4",
-      "profile": "https://github.com/geo-chen",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "nh314",
-      "name": "Phan Nguyen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6006620?v=4",
-      "profile": "https://github.com/nh314",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "StarlessNights",
-      "name": "Iisakki Jaakkola",
-      "avatar_url": "https://avatars.githubusercontent.com/u/115993812?v=4",
-      "profile": "https://github.com/StarlessNights",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "eltociear",
-      "name": "Ikko Ashimine",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22633385?v=4",
-      "profile": "https://bandism.net/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "lukasfehling",
-      "name": "Lukas Fehling",
-      "avatar_url": "https://avatars.githubusercontent.com/u/56871540?v=4",
-      "profile": "https://github.com/lukasfehling",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "fernando-almeida",
-      "name": "Fernando Almeida",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1975990?v=4",
-      "profile": "https://github.com/fernando-almeida",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "akemidx",
-      "name": "akemidx",
-      "avatar_url": "https://avatars.githubusercontent.com/u/116301219?v=4",
-      "profile": "https://github.com/akemidx",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "oguzbilgic",
-      "name": "Oguz Bilgic",
-      "avatar_url": "https://avatars.githubusercontent.com/u/144778?v=4",
-      "profile": "http://oguz.site",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "scoo73r",
-      "name": "Scooter Crawford",
-      "avatar_url": "https://avatars.githubusercontent.com/u/9262438?v=4",
-      "profile": "https://github.com/scoo73r",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "subdriven",
-      "name": "subdriven",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5957345?v=4",
-      "profile": "https://github.com/subdriven",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.env.docker
+++ b/.env.docker
@@ -138,13 +138,6 @@ 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
 # --------------------------------------------
@@ -155,8 +148,8 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=stderr
-LOG_MAX_DAYS=10
+APP_LOG=stderr
+APP_LOG_MAX_FILES=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 GOOGLE_MAPS_API=
--- a/.env.dusk.example
+++ b/.env.dusk.example
@@ -20,13 +20,12 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # REQUIRED: DATABASE SETTINGS
 # --------------------------------------------
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=null
-DB_USERNAME=null
-DB_PASSWORD=null
+DB_HOST=localhost
+DB_DATABASE=snipeit-local
+DB_USERNAME=snipeit-local
+DB_PASSWORD=snipeit-local
 DB_PREFIX=null
-#DB_DUMP_PATH=
+DB_DUMP_PATH='/Applications/MAMP/Library/bin'

 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
@@ -94,7 +93,7 @@ DISABLE_NOSAML_LOCAL_LOGIN=true
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=single
+APP_LOG=single
 LOG_LEVEL=debug
 LOG_CHANNEL=stack
 LOG_SLACK_WEBHOOK_URL=null
--- a/.env.example
+++ b/.env.example
@@ -24,7 +24,6 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # --------------------------------------------
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_PORT=3306
 DB_DATABASE=null
 DB_USERNAME=null
 DB_PASSWORD=null
@@ -71,13 +70,11 @@ IMAGE_LIB=gd
 MAIL_BACKUP_NOTIFICATION_DRIVER=null
 MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true
-ALLOW_BACKUP_DELETE=false
-ALLOW_DATA_PURGE=false
+

 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
-SESSION_DRIVER=file
 SESSION_LIFETIME=12000
 EXPIRE_ON_CLOSE=false
 ENCRYPT=false
@@ -100,6 +97,7 @@ ENABLE_HSTS=false
 # OPTIONAL: CACHE SETTINGS
 # --------------------------------------------
 CACHE_DRIVER=file
+SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 CACHE_PREFIX=snipeit

@@ -136,31 +134,18 @@ 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
 # --------------------------------------------
 LOGIN_MAX_ATTEMPTS=5
 LOGIN_LOCKOUT_DURATION=60
-
-# --------------------------------------------
-# OPTIONAL: FORGOTTEN PASSWORD SETTINGS
-# --------------------------------------------
-RESET_PASSWORD_LINK_EXPIRES=15
-PASSWORD_CONFIRM_TIMEOUT=10800
-PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
+RESET_PASSWORD_LINK_EXPIRES=900

 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=single
-LOG_MAX_DAYS=10
+APP_LOG=single
+APP_LOG_MAX_FILES=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
 APP_FORCE_TLS=false
@@ -173,10 +158,3 @@ IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000
 REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
-CSV_ESCAPE_FORMULAS=true
-
-# --------------------------------------------
-# OPTIONAL: SCIM
-# --------------------------------------------
-SCIM_TRACE=false
-SCIM_STANDARDS_COMPLIANCE=false
--- a/.env.testing
+++ b/.env.testing
@@ -14,7 +14,6 @@ FILESYSTEM_DISK=local
 # --------------------------------------------
 DB_CONNECTION=sqlite_testing
 DB_HOST=localhost
-DB_PORT=3306
 DB_DATABASE=testing.sqlite
 DB_USERNAME=null
 DB_PASSWORD=null
@@ -39,7 +38,7 @@ IMAGE_LIB=gd


 # --------------------------------------------
-# OPTIONAL: AWS SETTINGS
+# OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
 AWS_SECRET_ACCESS_KEY=null
 AWS_ACCESS_KEY_ID=null
@@ -71,5 +70,5 @@ SECURE_COOKIES=false
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-LOG_CHANNEL=single
-LOG_LEVEL=debug
+APP_LOG=single
+APP_LOG_LEVEL=debug
--- a/.env.testing-ci
+++ b/.env.testing-ci
@@ -14,7 +14,6 @@ FILESYSTEM_DISK=local
 # --------------------------------------------
 DB_CONNECTION=sqlite
 DB_HOST=localhost
-DB_PORT=3306
 DB_DATABASE='sqlite_testing'
 DB_USERNAME=root
 DB_PASSWORD=null
@@ -35,4 +34,4 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: APP LOG FORMAT
 # --------------------------------------------
-LOG_CHANNEL=single
+APP_LOG=single
--- a/.env.tests
+++ b/.env.tests
@@ -4,7 +4,6 @@ APP_URL=http://snipe-it.localapp
 DB_CONNECTION=mysql
 DB_DEFAULT=mysql
 DB_HOST=localhost
-DB_PORT=3306
 DB_DATABASE=snipeittests
 DB_USERNAME=snipeit
 DB_PASSWORD=snipe
--- a/.env.unit-tests
+++ b/.env.unit-tests
@@ -4,7 +4,6 @@ APP_URL=http://snipe-it.localapp
 DB_CONNECTION=sqlite_testing
 DB_DEFAULT=sqlite_testing
 DB_HOST=localhost
-DB_PORT=3306
 APP_KEY=base64:tu9NRh/a6+dCXBDGvg0Gv/0TcABnFsbT4AKxrr8mwQo=


--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,8 +15,8 @@
 #  *.js    @octocat @github/js


+app/Importer/*  @dmeltzer
 app/Http/Controllers/CustomFields* @uberbrady
 app/Http/Controllers/Api/CustomFields* @uberbrady
 resources/views/custom_fields/* @uberbrady
 docker/* @uberbrady
-app/Providers/SamlServiceProvider.php @uberbrady
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,27 +1,42 @@
-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.
+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.
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -1,18 +1,4 @@
-frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*", "*livewire*"]
-skins: ["*.js", "*.css", "*.scss", "*.less"]
-css: ["*.css","*.scss", "*.less"]
-backend: ["/app/*", "*.php"]
-backups: ["*backup*"]
-restore: ["*restore*"]
-saml: ["*saml*"]
-scim: ["*scim*"]
-custom fields: ["*fields*", "*fieldsets*"]
-dependencies: ["composer.json"]
-consumables: ["*consumables*"]
-api: ["/app/Http/Controllers/api/*"]
-notifications: ["/app/Notifications/*"]
-importer: ["/app/Importer/*"]
-cli / artisan: ["/app/Console/*"]
-LDAP: ["*LDAP*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
-docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
+frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*"]
+backend: ["/app", "*.php"]
+legal: ["LICENSE*", "NOTICES*"]
 config: .github
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/SA-codeql.yml
+++ b/.github/workflows/SA-codeql.yml
@@ -1,39 +0,0 @@
-# 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@v3.3.0
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -17,26 +17,18 @@ on:
  schedule:
    - cron: '36 23 * * 3'

-permissions:
-  contents: read
-
 jobs:
  codacy-security-scan:
-    # Ensure schedule job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    permissions:
-      contents: read  # for actions/checkout to fetch code
-      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
-    if: (github.repository == 'snipe/snipe-it') || ((github.repository != 'snipe/snipe-it') && (github.event_name != 'schedule'))
    name: Codacy Security Scan
    runs-on: ubuntu-latest
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.2.0
+        uses: codacy/codacy-analysis-cli-action@1.1.0
        with:
          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
          # You can also omit the token and run the tools that support default configurations
@@ -52,6 +44,6 @@ jobs:

      # Upload the SARIF file generated in the previous step
      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v1
        with:
          sarif_file: results.sarif
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -15,9 +15,6 @@ on:

  pull_request:

-permissions:
-  contents: read
-
 jobs:
  docker:
    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
@@ -41,17 +38,17 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1

      # https://github.com/docker/login-action
      - name: Login to DockerHub
        # Only login if not a PR, as PRs only trigger a Docker build and not a push
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -63,7 +60,7 @@ jobs:
      # Get Metadata for docker_build step below
      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
        id: meta_build
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
        with:
          images: snipe/snipe-it
          tags: ${{ env.IMAGE_TAGS }}
@@ -72,7 +69,7 @@ jobs:
      # https://github.com/docker/build-push-action
      - name: Build and push 'snipe-it' image
        id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
        with:
          context: .
          file: ./Dockerfile.alpine
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -15,9 +15,6 @@ on:

  pull_request:

-permissions:
-  contents: read
-
 jobs:
  docker:
    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
@@ -41,17 +38,17 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v2

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1

      # https://github.com/docker/login-action
      - name: Login to DockerHub
        # Only login if not a PR, as PRs only trigger a Docker build and not a push
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -63,7 +60,7 @@ jobs:
      # Get Metadata for docker_build step below
      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
        id: meta_build
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
        with:
          images: snipe/snipe-it
          tags: ${{ env.IMAGE_TAGS }}
@@ -72,7 +69,7 @@ jobs:
      # https://github.com/docker/build-push-action
      - name: Build and push 'snipe-it' image
        id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
        with:
          context: .
          file: ./Dockerfile
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 .couscous
 .DS_Store
 .env
-.env.dusk.*
-!.env.dusk.example
 .idea
 /bin/
 /bootstrap/compiled.php
--- a/4
+++ b/4
@@ -23,8 +23,6 @@ php7.4-xml \
 php7.4-mbstring \
 php7.4-zip \
 php7.4-bcmath \
-php7.4-redis \
-php-memcached \
 patch \
 curl \
 wget  \
@@ -140,4 +138,4 @@ RUN chmod +x /startup.sh /usr/bin/supervisor-exit-event-listener
 CMD ["/startup.sh"]

 EXPOSE 80
-EXPOSE 443
+EXPOSE 443
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -27,8 +27,6 @@ RUN  apk add --no-cache \
        php7-xmlwriter \
        php7-xmlreader \
        php7-sodium \
-        php7-redis \
-        php7-pecl-memcached \
        curl \
        wget \
        vim \
@@ -86,4 +84,4 @@ ENTRYPOINT ["/sbin/tini", "--"]

 CMD ["/entrypoint.sh"]

-EXPOSE 80
+EXPOSE 80
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -75,14 +75,14 @@ RUN set -eux; \
 	rm snipeit.tar.gz; \
 # Install composer php dependencies
    if [ "$ENVIRONMENT" = "production" ]; then \
-        echo "production environment detected!"; \
+        echo "production enviroment detected!"; \
        composer update \
            --no-cache \
            --no-dev \
            --optimize-autoloader \
            --working-dir=/var/www/html; \
    else \
-        echo "development environment detected!"; \
+        echo "development enviroment detected!"; \
        apk add --no-cache \
            ${DEV_PACKAGES}; \
        composer update \
@@ -100,4 +100,4 @@ COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
 COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
 COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
 ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
-CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
+CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
--- a/README.md
+++ b/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&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-312-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-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)

 ## 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 8](http://laravel.com).
+It is built on [Laravel 6](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/).)

@@ -59,17 +59,14 @@ Since the release of the JSON REST API, several third-party developers have been
 - [SnipeSharp - .NET module in C#](https://github.com/barrycarey/SnipeSharp) by [@barrycarey](https://github.com/barrycarey)
 - [InQRy -unmaintained-](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
 - [SnipeitPS](https://github.com/snazy2000/SnipeitPS) by [@snazy2000](https://github.com/snazy2000) - Powershell API Wrapper for Snipe-it
- [jamf2snipe](https://github.com/grokability/jamf2snipe) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
- [jamf-snipe-rename](https://macblog.org/jamf-snipe-rename/) - Python script to rename computers in Jamf from Snipe-IT
+- [jamf2snipe](https://github.com/ParadoxGuitarist/jamf2snipe) by [@ParadoxGuitarist](https://github.com/ParadoxGuitarist) - Python script to sync assets between a JAMFPro instance and a Snipe-IT instance
 - [Marksman](https://github.com/Scope-IT/marksman) - A Windows agent for Snipe-IT
 - [Snipe-IT plugin for Jira Service Desk](https://marketplace.atlassian.com/apps/1220964/snipe-it-for-jira)
 - [Python 3 CSV importer](https://github.com/gastamper/snipeit-csvimporter) - allows importing assets into Snipe-IT based on Item Name rather than Asset Tag.
 - [Snipe-IT Kubernetes Helm Chart](https://github.com/t3n/helm-charts/tree/master/snipeit) - For more information, [click here](https://hub.helm.sh/charts/t3n/snipeit).
 - [Snipe-IT Bulk Edit](https://github.com/bricelabelle/snipe-it-bulkedit) - Google Script files to use Google Sheets as a bulk checkout/checkin/edit tool for Snipe-it.
- [MosyleSnipeSync](https://github.com/RodneyLeeBrands/MosyleSnipeSync) by [@RodneyLeeBrands](https://github.com/RodneyLeeBrands) - Python script to synchronize information between Mosyle and Snipe-IT
- [WWW::SnipeIT](https://github.com/SEDC/perl-www-snipeit) by [@SEDC](https://github.com/SEDC) - perl module for accessing the API
                                                     
-As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :)
+As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :) 

 -----

@@ -80,8 +77,6 @@ Please see the documentation on [contributing and developing for Snipe-IT](https

 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

-The ERD is available [online here](https://drawsql.app/templates/snipe-it).
-
 -----

 ### Security
@@ -136,11 +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/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") | [<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/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") | [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [<img src="https://avatars.githubusercontent.com/u/94169344?v=4" width="110px;"/><br /><sub>BasO12</sub>](https://github.com/BasO12)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") | [<img src="https://avatars.githubusercontent.com/u/111710123?v=4" width="110px;"/><br /><sub>Vautia</sub>](https://github.com/Vautia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Vautia "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") | [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "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") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,75 +0,0 @@
-# Using the Test Suite
-
-This document is targeted at developers looking to make modifications to
-this application's code base and want to run the existing test suite.
-
-
-## Setup
-
-Follow the instructions for installing the application locally,
-making sure to have also run the [database migrations](link to db migrations).
-
-
-## Unit Tests 
-
-The application will use values in the `.env.testing` file located
-in the root directory to override the
-default settings and/or other values that exist in your `.env` files.
-
-Make sure to modify the section in `.env.testing` that has the
-database settings. In the example below, it is connecting to the
-[MariaDB](link-to-maria-db) server that is used if you install the
-application using [Docker](https://docker.com).
-
-```dotenv
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_DATABASE=snipeit
-DB_USERNAME=root
-DB_PASSWORD=changeme1234
-```
-
-To run the entire unit test suite, use the following command from your terminal:
-
-`php artisan test --env=testing`
-
-To run individual test files, you can pass the path to the test that
-you want to run.
-
-`php artisan test --env=testing tests/Unit/AccessoryTest.php`
-
-## Browser Tests 
-
-Browser tests are run via [Laravel Dusk](https://laravel.com/docs/8.x/dusk) and require Google Chrome to be installed.
-
-Before attempting to run Dusk tests copy the example environment file for Dusk and update the values to match your environment:
-
-`cp .env.dusk.example .env.dusk.local`
-> `local` refers to the value of `APP_ENV` in your `.env` so if you have it set to `dev` then the file should be named `.env.dusk.dev`.
-
-**Important**: Dusk tests cannot be run using an in-memory SQLite database. Additionally, the Dusk test suite uses the `DatabaseMigrations` trait which will leave the database in a fresh state after running. Therefore, it is recommended that you create a test database and point `DB_DATABASE` in `.env.dusk.local` to it.  
-
-### Test Setup
-
-Your application needs to be configured and up and running in order for the browser
-tests to actually run. When running the tests locally, you can start the application
-using the following command:
-
-`php artisan serve`
-
-Now you are ready to run the test suite. Use the following command from another terminal tab or window:
-
-`php artisan dusk`
-
-To run individual test files, you can pass the path to the test that you want to run:
-
-`php artisan dusk tests/Browser/LoginTest.php`
-
-If you get an error when attempting to run Dusk tests that says `Couldn't connect to server` run:
-
-`php artisan dusk:chrome-driver --detect`
-
-This command will install the specific ChromeDriver Dusk needs for your operating system and Chrome version.
--- a/app.json
+++ b/app.json
@@ -118,7 +118,7 @@
        "description": "The duration (in seconds) that the user should be blocked from attempting to authenticate again.",
        "value": "60"
      },
-      "LOG_CHANNEL": {
+      "APP_LOG": {
        "description": "Driver to send logs to. (errorlog for stderr)",
        "value": "errorlog"
      },
@@ -148,7 +148,7 @@
    "image": "heroku/php",
    "addons": [
      "cleardb:ignite",
-      "heroku-redis:mini",
+      "heroku-redis:hobby-dev",
      "papertrail:choklad"
    ]
-  }
+  }
--- a/app/Console/Commands/CheckoutLicenseToAllUsers.php
+++ b/app/Console/Commands/CheckoutLicenseToAllUsers.php
@@ -22,7 +22,7 @@ class CheckoutLicenseToAllUsers extends Command
     *
     * @var string
     */
-    protected $description = 'Checks out licenses to all users';
+    protected $description = 'Command description';

    /**
     * Create a new command instance.
--- a/app/Console/Commands/GeneratePersonalAccessToken.php
+++ b/app/Console/Commands/GeneratePersonalAccessToken.php
@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Helpers\Helper;
-use Illuminate\Console\Command;
-use App\Models\User;
-use Laravel\Passport\TokenRepository;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
-use DB;
-
-class GeneratePersonalAccessToken extends Command
-{
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:make-api-key 
-                        {--user_id= : The ID of the user to create the token for.}
-                        {--name= : The name of the new API token}
-                        {--key-only : Only return the value of the API key}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This console command allows you to generate Personal API tokens to be used with the Snipe-IT JSON REST API on behalf of a user.';
-
-
-    /**
-     * The token repository implementation.
-     *
-     * @var \Laravel\Passport\TokenRepository
-     */
-    protected $tokenRepository;
-
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(TokenRepository $tokenRepository, ValidationFactory $validation)
-    {
-        $this->validation = $validation;
-        $this->tokenRepository = $tokenRepository;
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-
-        $accessTokenName = $this->option('name');
-        if ($accessTokenName=='') {
-            $accessTokenName = 'CLI Auth Token';
-        }
-
-        if ($this->option('user_id')=='') {
-            return $this->error('ERROR: user_id cannot be blank.');
-        }
-
-        if ($user = User::find($this->option('user_id'))) {
-
-            $createAccessToken = $user->createToken($accessTokenName)->accessToken;
-
-            if ($this->option('key-only')) {
-                $this->info($createAccessToken);
-
-            } else {
-
-                $this->warn('Your API Token has been created. Be sure to copy this token now, as it will not be accessible again.');
-
-                if ($token = DB::table('oauth_access_tokens')->where('user_id', '=', $user->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first()) {
-                    $this->info('API Token ID: '.$token->id);
-                }
-
-                $this->info('API Token User: '.$user->present()->fullName.' ('.$user->username.')');
-                $this->info('API Token Name: '.$accessTokenName);
-                $this->info('API Token: '.$createAccessToken);
-            }
-        } else {
-           return $this->error('ERROR: Invalid user. API key was not created.');
-        }
-
-
-
-
-    }
-}
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -3,7 +3,6 @@
 namespace App\Console\Commands;

 use App\Models\Department;
-use App\Models\Group;
 use Illuminate\Console\Command;
 use App\Models\Setting;
 use App\Models\Ldap;
@@ -18,7 +17,7 @@ class LdapSync extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--filter=} {--summary} {--json_summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--summary} {--json_summary}';

    /**
     * The console command description.
@@ -44,27 +43,19 @@ class LdapSync extends Command
     */
    public function handle()
    {
-
-        // If LDAP enabled isn't set to 1 (ldap_enabled!=1) then we should cut this short immediately without going any further
-        if (Setting::getSettings()->ldap_enabled!='1') {
-            $this->error('LDAP is not enabled. Aborting. See Settings > LDAP to enable it.');
-            exit();
-        }
-
        ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
        ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
        $ldap_result_username = Setting::getSettings()->ldap_username_field;
        $ldap_result_last_name = Setting::getSettings()->ldap_lname_field;
        $ldap_result_first_name = Setting::getSettings()->ldap_fname_field;
-        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag;
+
+        $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field;
        $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num;
        $ldap_result_email = Setting::getSettings()->ldap_email;
        $ldap_result_phone = Setting::getSettings()->ldap_phone_field;
        $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;
-        $ldap_default_group = Setting::getSettings()->ldap_default_group;

        try {
            $ldapconn = Ldap::connectToLdap();
@@ -88,11 +79,7 @@ class LdapSync extends Command
            } else {
                $search_base = null;
            }
-            if ($this->option('filter') != '') {
-                $results = Ldap::findLdapUsers($search_base, -1, $this->option('filter'));
-            } else {
-                $results = Ldap::findLdapUsers($search_base);
-            }
+            $results = Ldap::findLdapUsers($search_base);
        } catch (\Exception $e) {
            if ($this->option('json_summary')) {
                $json_summary = ['error' => true, 'error_message' => $e->getMessage(), 'summary' => []];
@@ -121,7 +108,7 @@ class LdapSync extends Command
        }

        /* Process locations with explicitly defined OUs, if doing a full import. */
-        if ($this->option('base_dn') == '' && $this->option('filter') == '') {
+        if ($this->option('base_dn') == '') {
            // Retrieve locations with a mapped OU, and sort them from the shallowest to deepest OU (see #3993)
            $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
            $ldap_ou_lengths = [];
@@ -183,19 +170,8 @@ class LdapSync extends Command
        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
        $pass = bcrypt($tmp_pass);

-        $manager_cache = [];
-
-        if($ldap_default_group != null) {
-
-            $default = Group::find($ldap_default_group);
-            if (!$default) {
-                $ldap_default_group = null; // un-set the default group if that group doesn't exist
-            }
-
-        }
-
-
        for ($i = 0; $i < $results['count']; $i++) {
+            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == 'TRUE') {
                $item = [];
                $item['username'] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : '';
                $item['employee_number'] = isset($results[$i][$ldap_result_emp_num][0]) ? $results[$i][$ldap_result_emp_num][0] : '';
@@ -208,13 +184,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.
@@ -223,7 +198,7 @@ class LdapSync extends Command
                    // Creating a new user.
                    $user = new User;
                    $user->password = $pass;
-                    $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
+                    $user->activated = 0;
                    $item['createorupdate'] = 'created';
                }

@@ -237,62 +212,9 @@ class LdapSync extends Command
                $user->country = $item['country'];
                $user->department_id = $department->id;

-                if($item['manager'] != null) {
-                    // Check Cache first
-                    if (isset($manager_cache[$item['manager']])) {
-                        // found in cache; use that and avoid extra lookups
-                        $user->manager_id = $manager_cache[$item['manager']];
-                    } else {
-                        // Get the LDAP Manager
-                        try {
-                            $ldap_manager = Ldap::findLdapUsers($item['manager'], -1, $this->option('filter'));
-                        } catch (\Exception $e) {
-                            \Log::warning("Manager lookup caused an exception: " . $e->getMessage() . ". Falling back to direct username lookup");
-                            // Hail-mary for Okta manager 'shortnames' - will only work if
-                            // Okta configuration is using full email-address-style usernames
-                            $ldap_manager = [
-                                "count" => 1,
-                                0 => [
-                                    $ldap_result_username => [$item['manager']]
-                                ]
-                            ];
-                        }
-
-                        if ($ldap_manager["count"] > 0) {
-
-                            // Get the Manager's username
-                            // PHP LDAP returns every LDAP attribute as an array, and 90% of the time it's an array of just one item. But, hey, it's an array.
-                            $ldapManagerUsername = $ldap_manager[0][$ldap_result_username][0];
-
-                            // Get User from Manager username.
-                            $ldap_manager = User::where('username', $ldapManagerUsername)->first();
-
-                            if ($ldap_manager && isset($ldap_manager->id)) {
-                                // Link user to manager id.
-                                $user->manager_id = $ldap_manager->id;
-                            }
-                        }
-                        $manager_cache[$item['manager']] = $ldap_manager && isset($ldap_manager->id)  ? $ldap_manager->id : null; // Store results in cache, even if 'failed'
-
-                    }
-                }
-
                // Sync activated state for Active Directory.
-                if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
-                    // ....then *most* things that are truthy will activate the user. Anything falsey will deactivate them.
-                    // (Specifically, we don't handle a value of '0.0' correctly)
-                    $raw_value = @$results[$i][$ldap_result_active_flag][0];
-                    $filter_var = filter_var($raw_value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
-                    $boolean_cast = (bool)$raw_value;
-
-                    $user->activated = $filter_var ?? $boolean_cast; // if filter_var() was true or false, use that. If it's null, use the $boolean_cast
-
-                } elseif (array_key_exists('useraccountcontrol', $results[$i]) ) {
-                    // ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
-                    // ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
-
-
-                   /* The following is _probably_ the correct logic, but we can't use it because
+                if (array_key_exists('useraccountcontrol', $results[$i])) {
+                    /* The following is _probably_ the correct logic, but we can't use it because
                       some users may have been dependent upon the previous behavior, and this
                       could cause additional access to be available to users they don't want
                       to allow to log in.
@@ -309,25 +231,25 @@ class LdapSync extends Command
                        $user->activated = 0;
                    } */
                    $enabled_accounts = [
-                    '512',    //     0x200 NORMAL_ACCOUNT
-                    '544',    //     0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD
-                    '66048',  //   0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
-                    '66080',  //   0x10220 NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
-                    '262656', //   0x40200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED
-                    '262688', //   0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
-                    '328192', //   0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '328224', //   0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '4194816',//  0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
+                    '512',    // 0x200    NORMAL_ACCOUNT
+                    '544',    // 0x220    NORMAL_ACCOUNT, PASSWD_NOTREQD
+                    '66048',  // 0x10200  NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
+                    '66080',  // 0x10220  NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
+                    '262656', // 0x40200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED
+                    '262688', // 0x40220  NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
+                    '328192', // 0x50200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '328224', // 0x50220  NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
                    '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
                    '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
-                    '1114624', // 0x110200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, NOT_DELEGATED,
                  ];
                    $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0;
+                }

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

                if ($item['ldap_location_override'] == true) {
                    $user->location_id = $item['location_id'];
@@ -346,10 +268,6 @@ class LdapSync extends Command
                if ($user->save()) {
                    $item['note'] = $item['createorupdate'];
                    $item['status'] = 'success';
-                    if ( $item['createorupdate'] === 'created' && $ldap_default_group) {
-                         $user->groups()->attach($ldap_default_group);
-                    }
-
                } else {
                    foreach ($user->getErrors()->getMessages() as $key => $err) {
                        $errors .= $err[0];
@@ -359,6 +277,7 @@ class LdapSync extends Command
                }

                array_push($summary, $item);
+            }
        }

        if ($this->option('summary')) {
--- a/app/Console/Commands/LdapTroubleshooter.php
+++ b/app/Console/Commands/LdapTroubleshooter.php
@@ -27,19 +27,6 @@ function ip_in_range( $ip, $range ) {
 }
 // NOTE - this function was shamelessly stolen from this gist: https://gist.github.com/tott/7684443

-/**
- * Ensure LDAP filters are parentheses-wrapped
- */
-function parenthesized_filter($filter)
-{
-    if(substr($filter,0,1) == "(" ) {
-        return $filter;
-    } else {
-        return "(".$filter.")";
-    }
-
-}
-
 class LdapTroubleshooter extends Command
 {
    /**
@@ -83,47 +70,6 @@ class LdapTroubleshooter extends Command
        }
    }

-    /**
-     * Clean the results from ldap_get_entries into something useful
-     * @param array $array
-     * @return array
-     */
-    public function ldap_results_cleaner ($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;
-    }
-
    /**
     * Execute the console command.
     *
@@ -156,12 +102,16 @@ class LdapTroubleshooter extends Command
                $output[] = "LDAPTLS_KEY=storage/ldap_client_tls.key";
            }
            $output[] = "ldapsearch";
-            $output[] = "-H ".$settings->ldap_server;
+            $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));
-            $output[] = escapeshellarg(parenthesized_filter($settings->ldap_filter));
+            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";
@@ -340,8 +290,45 @@ class LdapTroubleshooter extends Command
        }
        $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),$settings)) {
+            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.");
@@ -435,9 +422,9 @@ class LdapTroubleshooter extends Command
        });
    }

-    public function test_informational_bind($ldap_url, $check_cert, $start_tls, $username, $password,$settings)
+    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, $settings) {
+        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);
@@ -448,13 +435,12 @@ class LdapTroubleshooter extends Command
                $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 = $this->ldap_results_cleaner($results);
+                $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?");
-                $this->debugout("Base DN is: ".$settings->ldap_basedn." and filter is: ".parenthesized_filter($settings->ldap_filter));
-                $search_results = ldap_search($conn, $settings->ldap_basedn, parenthesized_filter($settings->ldap_filter));
+                $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]);
--- a/app/Console/Commands/MergeUsersByUsername.php
+++ b/app/Console/Commands/MergeUsersByUsername.php
@@ -41,20 +41,10 @@ class MergeUsersByUsername extends Command
    {
        // Get the list of users who have an email address as their username
        $users = User::where('username', 'LIKE', '%@%')->whereNull('deleted_at')->get();
-        $this->info($users->count().' total non-deleted users whose usernames contain a @ symbol.');
-

        foreach ($users as $user) {
-            $parts = explode('@', trim($user->username));
-            $this->info('Checking against username '.trim($parts[0]).'.');
-
-
-            $bad_users = User::where('username', '=', trim($parts[0]))
-                ->whereNull('deleted_at')
-                ->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations')
-                ->get();
-
-
+            $parts = explode('@', $user->username);
+            $bad_users = User::where('username', '=', $parts[0])->whereNull('deleted_at')->with('assets', 'manager', 'userlog', 'licenses', 'consumables', 'accessories', 'managedLocations')->get();

            foreach ($bad_users as $bad_user) {
                $this->info($bad_user->username.' ('.$bad_user->id.')  will be merged into '.$user->username.'  ('.$user->id.') ');
--- a/app/Console/Commands/MoveUploadsToNewDisk.php
+++ b/app/Console/Commands/MoveUploadsToNewDisk.php
@@ -46,31 +46,30 @@ class MoveUploadsToNewDisk extends Command
        }
        $delete_local = $this->argument('delete_local');

-        $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'."/*.*");
-
+        $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'.'/*.*');

        // 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) {
@@ -80,87 +79,83 @@ 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/backups'."/*.*");
-        
+        $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'.'/*.*');

        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;

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

-                $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);
-                            }
+            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);
-                            }
-                        }
-                    }
-
-                    $this->info($public_delete_count . ' PUBLIC local files and ' . $private_delete_count . ' PRIVATE local files were deleted from your filesystem.');
                }
+
+                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.');
            }
        }
    }
--- a/app/Console/Commands/ReEncodeCustomFieldNames.php
+++ b/app/Console/Commands/ReEncodeCustomFieldNames.php
@@ -71,31 +71,22 @@ class ReEncodeCustomFieldNames extends Command
                     */
                    $last_part = substr(strrchr($asset_column, '_snipeit_'), 1);
                    $custom_field_columns[$last_part] = $asset_column;
-
                }
            }

            foreach ($fields as $field) {
-                $this->info($field->name.' ('.$field->id.') column should be '.$field->convertUnicodeDbSlug());
+                $this->info($field->name.' ('.$field->id.') column should be '.$field->convertUnicodeDbSlug().'');

                /** The assets table has the column it should have, all is well */
-                if ($field->db_column == $field->convertUnicodeDbSlug() && \Schema::hasColumn('assets', $field->convertUnicodeDbSlug())) {
-                    $this->info('-- ✓ This field exists on the assets table and the value for db_column matches in the custom_fields table.');
+                if (\Schema::hasColumn('assets', $field->convertUnicodeDbSlug())) {
+                    $this->info('-- ✓ This field exists - all good');

                /**
                 * There is a mismatch between the fieldname on the assets table and
                 * what $field->convertUnicodeDbSlug() is *now* expecting.
                 */
                } else {
-
-                    if ($field->db_column != $field->convertUnicodeDbSlug()) {
-                        $this->error('-- ✘ Field mismatch: '.$field->name.' value should be '.$field->convertUnicodeDbSlug().' but is '.$field->db_column.' in the custom_fields table');
-
-                    } else {
-                        $this->error('-- ✘ Field mismatch: '.$field->name.' column should be '.$field->convertUnicodeDbSlug().' but is '.$custom_field_columns[$field->id].' on the assets table.');
-
-                    }
-
+                    $this->warn('-- X Field mismatch: updating... ');

                    /** Make sure the custom_field_columns array has the ID */
                    if (array_key_exists($field->id, $custom_field_columns)) {
@@ -104,19 +95,13 @@ class ReEncodeCustomFieldNames extends Command
                         * Update the asset schema to the corrected fieldname that will be recognized by the
                         *  system elsewhere that we use $field->convertUnicodeDbSlug()
                         */
-                        $this->info('-- ✓ Updating field from '.$field->db_column.' to '.$field->convertUnicodeDbSlug().' in the assets table');
                        \Schema::table('assets', function ($table) use ($custom_field_columns, $field) {
                            $table->renameColumn($custom_field_columns[$field->id], $field->convertUnicodeDbSlug());
                        });

-                        $this->info('-- ✓ Updating field from '.$field->db_column.' to '.$field->convertUnicodeDbSlug().' in the custom fields table');
-
-                        $field->db_column = $field->convertUnicodeDbSlug();
-                        $field->save();
-
-
+                        $this->warn('-- ✓ Field updated from '.$custom_field_columns[$field->id].' to '.$field->convertUnicodeDbSlug());
                    } else {
-                        $this->warn('-- ✘ WARNING: There is no field on the assets table ending in  '.$field->id.'. This may require more in-depth investigation and may mean the schema was altered manually.');
+                        $this->warn('-- X WARNING: There is no field on the assets table ending in  '.$field->id.'. This may require more in-depth investigation and may mean the schema was altered manually.');
                    }
                }

--- a/app/Console/Commands/RegenerateAssetTags.php
+++ b/app/Console/Commands/RegenerateAssetTags.php
@@ -60,7 +60,7 @@ class RegenerateAssetTags extends Command
            }

            foreach ($total_assets as $asset) {
-
+                $start_tag++;
                $output['info'][] = 'Asset tag:'.$asset->asset_tag;
                $asset->asset_tag = $settings->auto_increment_prefix.$settings->auto_increment_prefix.$start_tag;

@@ -72,15 +72,8 @@ class RegenerateAssetTags extends Command

                // Use forceSave here to override model level validation
                $asset->forceSave();
-                $start_tag++;
-                if ($bar) {
-                    $bar->advance();
-                }
            }

-            $settings->next_auto_tag_base = Asset::zerofill($start_tag, $settings->zerofill_count);
-            $settings->save();
-
            $bar->finish();
            $this->info("\n");

--- a/app/Console/Commands/ResetDemoSettings.php
+++ b/app/Console/Commands/ResetDemoSettings.php
@@ -48,7 +48,6 @@ class ResetDemoSettings extends Command
        $settings->auto_increment_assets = 1;
        $settings->logo = 'snipe-logo.png';
        $settings->alert_email = 'service@snipe-it.io';
-        $settings->login_note = 'Use `admin` / `password` to login to the demo.';
        $settings->header_color = null;
        $settings->barcode_type = 'QRCODE';
        $settings->default_currency = 'USD';
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/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 enter "y"} 
-                                            {filename : The zip file to be migrated}
+                                            {--force : Skip the danger prompt; assuming you hit "y"} 
+                                            {filename : The full path of the .zip file to be migrated}
                                            {--no-progress : Don\'t show a progress bar}';

    /**
@@ -149,7 +149,7 @@ class RestoreFromBackup extends Command
                $boring_files[] = $raw_path;
                continue;
            }
-            if (@pathinfo($raw_path, PATHINFO_EXTENSION) == 'sql') {
+            if (@pathinfo($raw_path)['extension'] == 'sql') {
                \Log::debug("Found a sql file!");
                $sqlfiles[] = $raw_path;
                $sqlfile_indices[] = $i;
@@ -214,7 +214,7 @@ class RestoreFromBackup extends Command
        $env_vars['MYSQL_PWD'] = config('database.connections.mysql.password');
        // TODO notes: we are stealing the dump_binary_path (which *probably* also has your copy of the mysql binary in it. But it might not, so we might need to extend this)
        //             we unilaterally prepend a slash to the `mysql` command. This might mean your path could look like /blah/blah/blah//mysql - which should be fine. But maybe in some environments it isn't?
-        $mysql_binary = config('database.connections.mysql.dump.dump_binary_path').\DIRECTORY_SEPARATOR.'mysql'.(\DIRECTORY_SEPARATOR == '\\' ? ".exe" : "");
+        $mysql_binary = config('database.connections.mysql.dump.dump_binary_path').'/mysql';
        if( ! file_exists($mysql_binary) ) {
            return $this->error("mysql tool at: '$mysql_binary' does not exist, cannot restore. Please edit DB_DUMP_PATH in your .env to point to a directory that contains the mysqldump and mysql binary");
        }
@@ -227,9 +227,6 @@ class RestoreFromBackup extends Command
            return $this->error('Unable to invoke mysql via CLI');
        }

-        stream_set_blocking($pipes[1], false); // use non-blocking reads for stdout
-        stream_set_blocking($pipes[2], false); // use non-blocking reads for stderr
-
        // $this->info("Stdout says? ".fgets($pipes[1])); //FIXME: I think we might need to set non-blocking mode to use this properly?
        // $this->info("Stderr says? ".fgets($pipes[2])); //FIXME: ditto, same.
        // should we read stdout?
@@ -250,25 +247,18 @@ class RestoreFromBackup extends Command
        }
        $bytes_read = 0;

-        try {
-            while (($buffer = fgets($sql_contents, self::$buffer_size)) !== false) {
-                $bytes_read += strlen($buffer);
-                // \Log::debug("Buffer is: '$buffer'");
-                    $bytes_written = fwrite($pipes[0], $buffer);
+        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) {
-                    throw new Exception("Unable to write to pipe");
-                }
+            if ($bytes_written === false) {
+                $stdout = fgets($pipes[1]);
+                $this->info($stdout);
+                $stderr = fgets($pipes[2]);
+                $this->info($stderr);
+                return false;
            }
-        } catch (\Exception $e) {
-            \Log::error("Error during restore!!!! ".$e->getMessage());
-            $err_out = fgets($pipes[1]);
-            $err_err = fgets($pipes[2]);
-            \Log::error("Error OUTPUT: ".$err_out);
-            $this->info($err_out);
-            \Log::error("Error ERROR : ".$err_err);
-            $this->error($err_err);
-            throw $e;
        }
        
        if (!feof($sql_contents) || $bytes_read == 0) {
--- a/app/Console/Commands/SyncAssetCounters.php
+++ b/app/Console/Commands/SyncAssetCounters.php
@@ -39,39 +39,33 @@ class SyncAssetCounters extends Command
    public function handle()
    {
        $start = microtime(true);
-
-        // We need the whole count of all assets in order to set up the progress bar
-        $assets_count = Asset::withTrashed()->count();
-        $bar = $this->output->createProgressBar($assets_count);
-
        $assets = Asset::withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')
-            ->withTrashed()->chunk(100, function ($assets) use ($bar) {
+            ->withTrashed()->get();

-                if ($assets->count() > 0) {
+        if ($assets) {
+            if ($assets->count() > 0) {
+                $bar = $this->output->createProgressBar($assets->count());

-                    foreach ($assets as $asset) {
+                foreach ($assets as $asset) {
+                    $asset->checkin_counter = (int) $asset->checkins_count;
+                    $asset->checkout_counter = (int) $asset->checkouts_count;
+                    $asset->requests_counter = (int) $asset->user_requests_count;
+                    $asset->unsetEventDispatcher();
+                    $asset->save();
+                    $output['info'][] = 'Asset: '.$asset->id.' has '.$asset->checkin_counter.' checkins, '.$asset->checkout_counter.' checkouts, and '.$asset->requests_counter.' requests';
+                    $bar->advance();
+                }
+                $bar->finish();

-                        $asset->checkin_counter = (int) $asset->checkins_count;
-                        $asset->checkout_counter = (int) $asset->checkouts_count;
-                        $asset->requests_counter = (int) $asset->user_requests_count;
-                        $asset->unsetEventDispatcher();
-                        $asset->save();
-                        $bar->advance();
-
-                        \Log::debug('Asset: '.$asset->id.' has '.$asset->checkin_counter.' checkins, '.$asset->checkout_counter.' checkouts, and '.$asset->requests_counter.' requests');
-
-                    }
+                foreach ($output['info'] as $key => $output_text) {
+                    $this->info($output_text);
+                }

+                $time_elapsed_secs = microtime(true) - $start;
+                $this->info('Sync executed in '.$time_elapsed_secs.' seconds');
            } else {
                $this->info('No assets to sync');
            }
-        });
-        
-
-        $bar->finish();
-        $time_elapsed_secs = microtime(true) - $start;
-        $this->info("\nSync of ".$assets_count.' assets executed in '.$time_elapsed_secs.' seconds');
-
-
+        }
    }
 }
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -24,7 +24,6 @@ class Kernel extends ConsoleKernel
        $schedule->command('snipeit:backup')->weekly();
        $schedule->command('backup:clean')->daily();
        $schedule->command('snipeit:upcoming-audits')->daily();
-        $schedule->command('auth:clear-resets')->everyFifteenMinutes();
    }

    /**
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -41,7 +41,7 @@ class Handler extends ExceptionHandler
    public function report(Throwable $exception)
    {
        if ($this->shouldReport($exception)) {
-            \Log::error($exception);
+            Log::error($exception);
            return parent::report($exception);
        }
    }
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1,6 +1,7 @@
 <?php

 namespace App\Helpers;
+
 use App\Models\Accessory;
 use App\Models\Component;
 use App\Models\Consumable;
@@ -12,7 +13,6 @@ use App\Models\Statuslabel;
 use Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Image;
-use Carbon\Carbon;

 class Helper
 {
@@ -23,13 +23,12 @@ class Helper
     * @since [v2.0]
     * @return string
     */
-    public static function parseEscapedMarkedown($str = null)
+    public static function parseEscapedMarkedown($str)
    {
        $Parsedown = new \Parsedown();
-        $Parsedown->setSafeMode(true);

        if ($str) {
-            return $Parsedown->text($str);
+            return $Parsedown->text(e($str));
        }
    }

@@ -625,7 +624,7 @@ class Helper
    {
        $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
        $accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get();
-        $components = Component::whereNotNull('min_amt')->get();
+        $components = Component::withCount('assets as assets_count')->whereNotNull('min_amt')->get();

        $avail_consumables = 0;
        $items_array = [];
@@ -670,7 +669,7 @@ class Helper
        }

        foreach ($components as $component) {
-            $avail = $component->numRemaining();
+            $avail = $component->qty - $component->assets_count;
            if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
                if ($component->qty > 0) {
                    $percent = number_format((($avail / $component->qty) * 100), 0);
@@ -843,16 +842,6 @@ class Helper
        return preg_replace('/\s+/u', '_', trim($string));
    }

-    /**
-     * Return an array (or null) of the the raw and formatted date object for easy use in
-     * the API and the bootstrap table listings.
-     *
-     * @param $date
-     * @param $type
-     * @param $array
-     * @return array|string|null
-     */
-
    public static function getFormattedDateObject($date, $type = 'datetime', $array = true)
    {
        if ($date == '') {
@@ -860,42 +849,21 @@ class Helper
        }

        $settings = Setting::getSettings();
+        $tmp_date = new \Carbon($date);

-        /**
-         * Wrap this in a try/catch so that if Carbon crashes, for example if the $date value
-         * isn't actually valid, we don't crash out completely.
-         *
-         * While this *shouldn't* typically happen since we validate dates before entering them
-         * into the database (and we use date/datetime fields for native fields in the system),
-         * it is a possible scenario that a custom field could be created as an "ANY" field, data gets
-         * added, and then the custom field format gets edited later. If someone put bad data in the
-         * database before then - or if they manually edited the field's value - it will crash.
-         *
-         */
-
-
-        try {
-            $tmp_date = new \Carbon($date);
-
-            if ($type == 'datetime') {
-                $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
-                $dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format);
-            } else {
-                $dt['date'] = $tmp_date->format('Y-m-d');
-                $dt['formatted'] = $tmp_date->format($settings->date_display_format);
-            }
-
-            if ($array == 'true') {
-                return $dt;
-            }
-
-            return $dt['formatted'];
-
-        } catch (\Exception $e) {
-            \Log::warning($e);
-            return $date.' (Invalid '.$type.' value.)';
+        if ($type == 'datetime') {
+            $dt['datetime'] = $tmp_date->format('Y-m-d H:i:s');
+            $dt['formatted'] = $tmp_date->format($settings->date_display_format.' '.$settings->time_display_format);
+        } else {
+            $dt['date'] = $tmp_date->format('Y-m-d');
+            $dt['formatted'] = $tmp_date->format($settings->date_display_format);
        }

+        if ($array == 'true') {
+            return $dt;
+        }
+
+        return $dt['formatted'];
    }

    // Nicked from Drupal :)
@@ -1091,60 +1059,4 @@ 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;
-    }
-    public static function SettingUrls(){
-        $settings=['#','fields.index', 'statuslabels.index', 'models.index', 'categories.index', 'manufacturers.index', 'suppliers.index', 'departments.index', 'locations.index', 'companies.index', 'depreciations.index'];
-
-        return $settings;
-        }
-    public static function AgeFormat($date) {
-        $year = Carbon::parse($date)
-            ->diff(now())->y;
-        $month = Carbon::parse($date)
-            ->diff(now())->m;
-        $days = Carbon::parse($date)
-            ->diff(now())->d;
-        $age='';
-        if ($year) {
-            $age .= $year.'y ';
-        }
-        if ($month) {
-            $age .= $month.'m ';
-        }
-        if ($days) {
-            $age .= $days.'d';
-        }
-
-        return $age;
-
-    }
 }
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -9,7 +9,6 @@ use App\Models\Accessory;
 use App\Models\Company;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
 use Redirect;

 /** This controller handles all actions related to Accessories for
@@ -63,7 +62,6 @@ class AccessoriesController extends Controller
    public function store(ImageUploadRequest $request)
    {
        $this->authorize(Accessory::class);
-        
        // create a new model instance
        $accessory = new Accessory();

@@ -83,6 +81,7 @@ class AccessoriesController extends Controller
        $accessory->supplier_id             = request('supplier_id');
        $accessory->notes                   = request('notes');

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

        // Was the accessory created?
@@ -127,47 +126,34 @@ class AccessoriesController extends Controller
     */
    public function update(ImageUploadRequest $request, $accessoryId = null)
    {
-        if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {
-
-            $this->authorize($accessory);
-
-            $validator = Validator::make($request->all(), [
-                "qty" => "required|numeric|min:$accessory->users_count"
-            ]);
-
-            if ($validator->fails()) {
-                return redirect()->back()
-                    ->withErrors($validator)
-                    ->withInput();
-            }
-
-
-
-            // Update the accessory data
-            $accessory->name = request('name');
-            $accessory->location_id = request('location_id');
-            $accessory->min_amt = request('min_amt');
-            $accessory->category_id = request('category_id');
-            $accessory->company_id = Company::getIdForCurrentUser(request('company_id'));
-            $accessory->manufacturer_id = request('manufacturer_id');
-            $accessory->order_number = request('order_number');
-            $accessory->model_number = request('model_number');
-            $accessory->purchase_date = request('purchase_date');
-            $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
-            $accessory->qty = request('qty');
-            $accessory->supplier_id = request('supplier_id');
-            $accessory->notes = request('notes');
-
-            $accessory = $request->handleImages($accessory);
-
-            // Was the accessory updated?
-            if ($accessory->save()) {
-                return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
-            }
-        } else {
+        if (is_null($accessory = Accessory::find($accessoryId))) {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
        }

+        $this->authorize($accessory);
+
+        // Update the accessory data
+        $accessory->name                    = request('name');
+        $accessory->location_id             = request('location_id');
+        $accessory->min_amt                 = request('min_amt');
+        $accessory->category_id             = request('category_id');
+        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
+        $accessory->manufacturer_id         = request('manufacturer_id');
+        $accessory->order_number            = request('order_number');
+        $accessory->model_number            = request('model_number');
+        $accessory->purchase_date           = request('purchase_date');
+        $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
+        $accessory->qty                     = request('qty');
+        $accessory->supplier_id             = request('supplier_id');
+        $accessory->notes                   = request('notes');
+
+        $accessory = $request->handleImages($accessory);
+
+        // Was the accessory updated?
+        if ($accessory->save()) {
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
+        }
+
        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
    }

@@ -219,7 +205,7 @@ class AccessoriesController extends Controller
     */
    public function show($accessoryID = null)
    {
-        $accessory = Accessory::withCount('users as users_count')->find($accessoryID);
+        $accessory = Accessory::find($accessoryID);
        $this->authorize('view', $accessory);
        if (isset($accessory->id)) {
            return view('accessories/view', compact('accessory'));
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -1,186 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Accessories;
-
-use App\Helpers\StorageHelper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetFileRequest;
-use App\Models\Actionlog;
-use App\Models\Accessory;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Accessory\HttpFoundation\JsonResponse;
-use enshrined\svgSanitize\Sanitizer;
-
-class AccessoriesFilesController extends Controller
-{
-    /**
-     * Validates and stores files associated with a accessory.
-     *
-     * @todo Switch to using the AssetFileRequest form request validator.
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param AssetFileRequest $request
-     * @param int $accessoryId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(AssetFileRequest $request, $accessoryId = null)
-    {
-
-        if (config('app.lock_passwords')) {
-            return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled'));
-        }
-
-
-        $accessory = Accessory::find($accessoryId);
-
-        if (isset($accessory->id)) {
-            $this->authorize('accessories.files', $accessory);
-
-            if ($request->hasFile('file')) {
-                if (! Storage::exists('private_uploads/accessories')) {
-                    Storage::makeDirectory('private_uploads/accessories', 775);
-                }
-
-                foreach ($request->file('file') as $file) {
-
-                    $extension = $file->getClientOriginalExtension();
-                    $file_name = 'accessory-'.$accessory->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-
-
-                    // Check for SVG and sanitize it
-                    if ($extension == 'svg') {
-                        \Log::debug('This is an SVG');
-                        \Log::debug($file_name);
-
-                        $sanitizer = new Sanitizer();
-                        $dirtySVG = file_get_contents($file->getRealPath());
-                        $cleanSVG = $sanitizer->sanitize($dirtySVG);
-
-                        try {
-                            Storage::put('private_uploads/accessories/'.$file_name, $cleanSVG);
-                        } catch (\Exception $e) {
-                            \Log::debug('Upload no workie :( ');
-                            \Log::debug($e);
-                        }
-
-                    } else {
-                        Storage::put('private_uploads/accessories/'.$file_name, file_get_contents($file));
-                    }
-
-                    //Log the upload to the log
-                    $accessory->logUpload($file_name, e($request->input('notes')));
-                }
-
-
-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
-
-            }
-
-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
-        }
-        // Prepare the error message
-        return redirect()->route('accessories.index')
-            ->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Deletes the selected accessory file.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param int $accessoryId
-     * @param int $fileId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function destroy($accessoryId = null, $fileId = null)
-    {
-        $accessory = Accessory::find($accessoryId);
-
-        // the asset is valid
-        if (isset($accessory->id)) {
-            $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);
-
-            // Remove the file if one exists
-            if (Storage::exists('accessories/'.$log->filename)) {
-                try {
-                    Storage::delete('accessories/'.$log->filename);
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
-            }
-
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
-        }
-
-        // Redirect to the licence management page
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Allows the selected file to be viewed.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.4]
-     * @param int $accessoryId
-     * @param int $fileId
-     * @return \Symfony\Accessory\HttpFoundation\Response
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function show($accessoryId = null, $fileId = null, $download = true)
-    {
-
-        \Log::debug('Private filesystem is: '.config('filesystems.default'));
-        $accessory = Accessory::find($accessoryId);
-
-
-
-        // the accessory is valid
-        if (isset($accessory->id)) {
-            $this->authorize('view', $accessory);
-            $this->authorize('accessories.files', $accessory);
-
-            if (! $log = Actionlog::find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $file = 'private_uploads/accessories/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                \Log::debug('FILE DOES NOT EXISTS for '.$file);
-                \Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
-                // won't work, as they're not accessible via the web
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
-                } else {
-                    if ($download != 'true') {
-                        \Log::debug('display the file');
-                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
-                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
-                        }
-
-                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
-                    }
-
-                    return StorageHelper::downloader($file);
-
-                }
-            }
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
-    }
-}
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -63,7 +63,7 @@ class AccessoryCheckoutController extends Controller
        $this->authorize('checkout', $accessory);

        if (! $user = User::find($request->input('assigned_to'))) {
-            return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
+            return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
        }

        // Update the accessory data
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -7,29 +7,13 @@ 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\Setting;
-use App\Models\User;
-use App\Models\AssetModel;
-use App\Models\Accessory;
-use App\Models\License;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Notifications\AcceptanceAssetAcceptedNotification;
-use App\Notifications\AcceptanceAssetDeclinedNotification;
 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;
-use phpDocumentor\Reflection\Types\Compound;

 class AcceptanceController extends Controller
 {
@@ -55,7 +39,6 @@ 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'));
        }
@@ -113,180 +96,29 @@ class AcceptanceController extends Controller
            Storage::makeDirectory('private_uploads/signatures', 775);
        }

-
-
-        $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
-        $display_model = '';
-        $pdf_view_route = '';
-        $pdf_filename = 'accepted-eula-'.date('Y-m-d-h-i-s').'.pdf';
-        $sig_filename='';
-
+        $sig_filename = '';
+        if ($request->filled('signature_output')) {
+            $sig_filename = 'siglog-'.Str::uuid().'-'.date('Y-m-d-his').'.png';
+            $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);
+        }

        if ($request->input('asset_acceptance') == 'accepted') {
+            $acceptance->accept($sig_filename);

-            /**
-             * Check for the eula-pdfs directory
-             */
-            if (! Storage::exists('private_uploads/eula-pdfs')) {
-                Storage::makeDirectory('private_uploads/eula-pdfs', 775);
-            }
-
-            if (Setting::getSettings()->require_accept_signature == '1') {
-                
-                // Check if the signature directory exists, if not create it
-                if (!Storage::exists('private_uploads/signatures')) {
-                    Storage::makeDirectory('private_uploads/signatures', 775);
-                }
-
-                // The item was accepted, check for a signature
-                if ($request->filled('signature_output')) {
-                    $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
-                    $data_uri = $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);
-
-                    // No image data is present, kick them back.
-                    // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
-                } else {
-                    return redirect()->back()->with('error', trans('general.shitty_browser'));
-                }
-            }
-
-
-            // this is horrible
-            switch($acceptance->checkoutable_type){
-                case 'App\Models\Asset':
-                        $pdf_view_route ='account.accept.accept-asset-eula';
-                        $asset_model = AssetModel::find($item->model_id);
-                        $display_model = $asset_model->name;
-                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                break;
-
-                case 'App\Models\Accessory':
-                        $pdf_view_route ='account.accept.accept-accessory-eula';
-                        $accessory = Accessory::find($item->id);
-                        $display_model = $accessory->name;
-                        $assigned_to = User::find($item->assignedTo);
-                break;
-
-                case 'App\Models\LicenseSeat':
-                        $pdf_view_route ='account.accept.accept-license-eula';
-                        $license = License::find($item->license_id);
-                        $display_model = $license->name;
-                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                break;
-
-                case 'App\Models\Component':
-                        $pdf_view_route ='account.accept.accept-component-eula';
-                        $component = Component::find($item->id);
-                        $display_model = $component->name;
-                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                break;
-
-                case 'App\Models\Consumable':
-                        $pdf_view_route ='account.accept.accept-consumable-eula';
-                        $consumable = Consumable::find($item->id);
-                        $display_model = $consumable->name;
-                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                break;
-            }
-//            if ($acceptance->checkoutable_type == 'App\Models\Asset') {
-//                $pdf_view_route ='account.accept.accept-asset-eula';
-//                $asset_model = AssetModel::find($item->model_id);
-//                $display_model = $asset_model->name;
-//                $assigned_to = User::find($item->assigned_to)->present()->fullName;
-//
-//            } elseif ($acceptance->checkoutable_type== 'App\Models\Accessory') {
-//                $pdf_view_route ='account.accept.accept-accessory-eula';
-//                $accessory = Accessory::find($item->id);
-//                $display_model = $accessory->name;
-//                $assigned_to = User::find($item->assignedTo);
-//
-//            }
-
-            /**
-             * Gather the data for the PDF. We fire this whether there is a signature required or not,
-             * since we want the moment-in-time proof of what the EULA was when they accepted it.
-             */
-            $branding_settings = SettingsController::getPDFBranding();
-
-            if (is_null($branding_settings->logo)){
-                $path_logo = "";
-            } else {
-                $path_logo = public_path() . '/uploads/' . $branding_settings->logo;
-            }
-            
-            $data = [
-                'item_tag' => $item->asset_tag,
-                'item_model' => $display_model,
-                'item_serial' => $item->serial,
-                'eula' => $item->getEula(),
-                'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
-                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'),
-                'assigned_to' => $assigned_to,
-                'company_name' => $branding_settings->site_name,
-                'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
-                'logo' => $path_logo,
-                'date_settings' => $branding_settings->date_display_format,
-            ];
-
-            if ($pdf_view_route!='') {
-                \Log::debug($pdf_filename.' is the filename, and the route was specified.');
-                $pdf = Pdf::loadView($pdf_view_route, $data);
-                Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output());
-            }
-
-            $acceptance->accept($sig_filename, $item->getEula(), $pdf_filename);
-            $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
            event(new CheckoutAccepted($acceptance));

            $return_msg = trans('admin/users/message.accepted');
-
        } else {
-            // Format the data to send the declined notification
-            $branding_settings = SettingsController::getPDFBranding();
-
-            // This is the most horriblest
-            switch($acceptance->checkoutable_type){
-                case 'App\Models\Asset':
-                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                    break;
-
-                case 'App\Models\Accessory':
-                    $assigned_to = User::find($item->assignedTo);
-                    break;
-
-                case 'App\Models\LicenseSeat':
-                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                    break;
-
-                case 'App\Models\Component':
-                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                    break;
-
-                case 'App\Models\Consumable':
-                    $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
-                    break;
-            }
-            $data = [
-                'item_tag' => $item->asset_tag,
-                'item_model' => $display_model,
-                'item_serial' => $item->serial,
-                'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
-                'assigned_to' => $assigned_to,
-                'company_name' => $branding_settings->site_name,
-                'date_settings' => $branding_settings->date_display_format,
-            ];
-
            $acceptance->decline($sig_filename);
-            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
+
            event(new CheckoutDeclined($acceptance));
+
            $return_msg = trans('admin/users/message.declined');
        }

-
        return redirect()->to('account/accept')->with('success', $return_msg);
-
    }
-}
+}
--- a/app/Http/Controllers/ActionlogController.php
+++ b/app/Http/Controllers/ActionlogController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;

 use App\Helpers\Helper;
-use App\Models\Actionlog;
 use Response;

 class ActionlogController extends Controller
@@ -27,10 +26,4 @@ class ActionlogController extends Controller
        }
       
    }
-    public function getStoredEula($filename){
-        $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
-
-        return Response::download($file);
-    }
 }
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -27,7 +27,8 @@ class AccessoriesController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Accessory::class);
-
+        $allowed_columns = ['id', 'name', 'model_number', 'eol', 'notes', 'created_at', 'min_amt', 'company_id'];
+        
        // This array is what determines which fields should be allowed to be sorted on ON the table itself, no relations
        // Relations will be handled in query scopes a little further down.
        $allowed_columns = 
@@ -41,13 +42,10 @@ class AccessoriesController extends Controller
                'min_amt',
                'company_id',
                'notes',
-                'users_count',
-                'qty',
            ];


-        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier')
-                                ->withCount('users as users_count');
+        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier');

        if ($request->filled('search')) {
            $accessories = $accessories->TextSearch($request->input('search'));
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -35,8 +35,7 @@ class AssetMaintenancesController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Asset::class);
-
-        $maintenances = AssetMaintenance::select('asset_maintenances.*')->with('asset', 'asset.model', 'asset.location', 'supplier', 'asset.company', 'admin');
+        $maintenances = AssetMaintenance::with('asset', 'asset.model', 'asset.location', 'supplier', 'asset.company', 'admin');

        if ($request->filled('search')) {
            $maintenances = $maintenances->TextSearch($request->input('search'));
@@ -46,15 +45,6 @@ class AssetMaintenancesController extends Controller
            $maintenances->where('asset_id', '=', $request->input('asset_id'));
        }

-        if ($request->filled('supplier_id')) {
-            $maintenances->where('supplier_id', '=', $request->input('supplier_id'));
-        }
-
-        if ($request->filled('asset_maintenance_type')) {
-            $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
-        }
-
-
        // 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 = (($maintenances) && ($request->get('offset') > $maintenances->count())) ? $maintenances->count() : $request->get('offset', 0);
@@ -74,7 +64,6 @@ class AssetMaintenancesController extends Controller
                                'asset_tag',
                                'asset_name',
                                'user_id',
-                                'supplier'
                            ];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
@@ -83,9 +72,6 @@ class AssetMaintenancesController extends Controller
            case 'user_id':
                $maintenances = $maintenances->OrderAdmin($order);
                break;
-            case 'supplier':
-                $maintenances = $maintenances->OrderBySupplier($order);
-                break;
            case 'asset_tag':
                $maintenances = $maintenances->OrderByTag($order);
                break;
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -70,10 +70,6 @@ class AssetModelsController extends Controller
            $assetmodels->onlyTrashed();
        }

-        if ($request->filled('category_id')) {
-            $assetmodels = $assetmodels->where('models.category_id', '=', $request->input('category_id'));
-        }
-
        if ($request->filled('search')) {
            $assetmodels->TextSearch($request->input('search'));
        }
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/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;

        /**
@@ -100,7 +100,6 @@ class AssetsController extends Controller
            'checkout_counter',
            'checkin_counter',
            'requests_counter',
-            'byod',
        ];

        $filter = [];
@@ -121,6 +120,7 @@ class AssetsController extends Controller

        if ($filter_non_deprecable_assets) {
            $non_deprecable_models = AssetModel::select('id')->whereNotNull('depreciation_id')->get();
+
            $assets->InModelList($non_deprecable_models->toArray());
        }

@@ -141,14 +141,6 @@ class AssetsController extends Controller
            $assets->where('assets.status_id', '=', $request->input('status_id'));
        }

-        if ($request->filled('asset_tag')) {
-            $assets->where('assets.asset_tag', '=', $request->input('asset_tag'));
-        }
-
-        if ($request->filled('serial')) {
-            $assets->where('assets.serial', '=', $request->input('serial'));
-        }
-
        if ($request->input('requestable') == 'true') {
            $assets->where('assets.requestable', '=', '1');
        }
@@ -190,10 +182,6 @@ class AssetsController extends Controller
            $assets->ByDepreciationId($request->input('depreciation_id'));
        }

-        if ($request->filled('byod')) {
-            $assets->where('assets.byod', '=', $request->input('byod'));
-        }
-
        $request->filled('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';

        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
@@ -271,11 +259,6 @@ class AssetsController extends Controller
                // more sad, horrible workarounds for laravel bugs when doing full text searches
                $assets->where('assets.assigned_to', '>', '0');
                break;
-            case 'byod':
-                // This is kind of redundant, since we already check for byod=1 above, but this keeps the
-                // sidebar nav links a little less chaotic
-                $assets->where('assets.byod', '=', '1');
-                break;
            default:

                if ((! $request->filled('status_id')) && ($settings->show_archived_in_list != '1')) {
@@ -362,7 +345,6 @@ 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.
@@ -374,38 +356,19 @@ class AssetsController extends Controller
    /**
     * Returns JSON with information about an asset (by tag) for detail view.
     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param string $tag
     * @since [v4.2.1]
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function showByTag(Request $request, $tag)
    {
-        $this->authorize('index', Asset::class);
-        $assets = Asset::where('asset_tag', $tag)->with('assetstatus')->with('assignedTo');
+        if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag', $tag)->first()) {
+            $this->authorize('view', $asset);

-        // Check if they've passed ?deleted=true
-        if ($request->input('deleted', 'false') == 'true') {
-            $assets = $assets->withTrashed();
+            return (new AssetsTransformer)->transformAsset($asset, $request);
        }
-
-        if (($assets = $assets->get()) && ($assets->count()) > 0) {
-
-            // If there is exactly one result and the deleted parameter is not passed, we should pull the first (and only)
-            // asset from the returned collection, since transformAsset() expects an Asset object, NOT a collection
-            if (($assets->count() == 1) && ($request->input('deleted') != 'true')) {
-                return (new AssetsTransformer)->transformAsset($assets->first());
-
-                // If there is more than one result OR if the endpoint is requesting deleted items (even if there is only one
-                // match, return the normal collection transformed.
-            } else {
-                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
-            }
-
-        }
-
-        // If there are 0 results, return the "no such asset" response
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

    }

@@ -415,25 +378,29 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param string $serial
     * @since [v4.2.1]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function showBySerial(Request $request, $serial)
    {
        $this->authorize('index', Asset::class);
-        $assets = Asset::where('serial', $serial)->with('assetstatus')->with('assignedTo');
+        if ($assets = Asset::with('assetstatus')->with('assignedTo')
+            ->withTrashed()->where('serial', $serial)->get()) {
+                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

-        // Check if they've passed ?deleted=true
-        if ($request->input('deleted', 'false') == 'true') {
+        $assets = Asset::with('assetstatus')->with('assignedTo');
+
+        if ($request->input('deleted', 'false') === 'true') {
            $assets = $assets->withTrashed();
-        }
-        
-        if (($assets = $assets->get()) && ($assets->count()) > 0) {
-             return (new AssetsTransformer)->transformAssets($assets, $assets->count());
-        }
-
-        // If there are 0 results, return the "no such asset" response
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
+    }

+        $assets = $assets->where('serial', $serial)->get();
+        if ($assets) {
+            return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+        } else {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
+        }
    }

    /**
@@ -554,7 +521,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');
+        $asset->supplier_id             = $request->get('supplier_id', 0);
        $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);
@@ -576,11 +543,11 @@ class AssetsController extends Controller
            foreach ($model->fieldset->fields as $field) {

                // Set the field value based on what was sent in the request
-                $field_val = $request->input($field->db_column, null);
+                $field_val = $request->input($field->convertUnicodeDbSlug(), null);

                // If input value is null, use custom field's default value
                if ($field_val == null) {
-                    \Log::debug('Field value for '.$field->db_column.' is null');
+                    \Log::debug('Field value for '.$field->convertUnicodeDbSlug().' is null');
                    $field_val = $field->defaultValue($request->get('model_id'));
                    \Log::debug('Use the default fieldset value of '.$field->defaultValue($request->get('model_id')));
                }
@@ -595,13 +562,13 @@ class AssetsController extends Controller
                        if (($field_val == null) && ($request->has('model_id') != '')) {
                            $field_val = \Crypt::encrypt($field->defaultValue($request->get('model_id')));
                        } else {
-                            $field_val = \Crypt::encrypt($request->input($field->db_column));
+                            $field_val = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                        }
                    }
                }


-                $asset->{$field->db_column} = $field_val;
+                $asset->{$field->convertUnicodeDbSlug()} = $field_val;
            }
        }

@@ -666,13 +633,13 @@ class AssetsController extends Controller
            // Update custom fields
            if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
                foreach ($model->fieldset->fields as $field) {
-                    if ($request->has($field->db_column)) {
+                    if ($request->has($field->convertUnicodeDbSlug())) {
                        if ($field->field_encrypted == '1') {
                            if (Gate::allows('admin')) {
-                                $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
+                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                            }
                        } else {
-                            $asset->{$field->db_column} = $request->input($field->db_column);
+                            $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                        }
                    }
                }
@@ -746,53 +713,29 @@ class AssetsController extends Controller
     * @since [v5.1.18]
     * @return JsonResponse
     */
-    public function restore(Request $request, $assetId = null)
+    public function restore($assetId = null)
    {
        // Get asset information
        $asset = Asset::withTrashed()->find($assetId);
        $this->authorize('delete', $asset);
-
        if (isset($asset->id)) {
+            // Restore the asset
+            Asset::withTrashed()->where('id', $assetId)->restore();

-            if ($asset->deleted_at=='') {
-               $message = 'Asset was not deleted. No data was changed.';
+            $logaction = new Actionlog();
+            $logaction->item_type = Asset::class;
+            $logaction->item_id = $asset->id;
+            $logaction->created_at =  date("Y-m-d H:i:s");
+            $logaction->user_id = Auth::user()->id;
+            $logaction->logaction('restored');

-            } else {
-
-                $message = trans('admin/hardware/message.restore.success');
-                // Restore the asset
-                Asset::withTrashed()->where('id', $assetId)->restore();
-
-                $logaction = new Actionlog();
-                $logaction->item_type = Asset::class;
-                $logaction->item_id = $asset->id;
-                $logaction->created_at =  date("Y-m-d H:i:s");
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restored');
-            }
-
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset, $request), $message));
-        
+            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);
    }

-    /**
-     * Checkout an asset by its tag.
-     *
-     * @author [N. Butler]
-     * @param string $tag
-     * @since [v6.0.5]
-     * @return JsonResponse
-     */
-    public function checkoutByTag(AssetCheckoutRequest $request, $tag)
-    {
-        if ($asset = Asset::where('asset_tag', $tag)->first()) {
-            return $this->checkout($request, $asset->id);
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
-    }
+

    /**
     * Checkout an asset
@@ -843,9 +786,6 @@ class AssetsController extends Controller
            $error_payload['target_type'] = 'user';
        }

-        if ($request->filled('status_id')) {
-            $asset->status_id = $request->get('status_id');
-        }


        if (! isset($target)) {
@@ -857,8 +797,7 @@ class AssetsController extends Controller
        $checkout_at = request('checkout_at', date('Y-m-d H:i:s'));
        $expected_checkin = request('expected_checkin', null);
        $note = request('note', null);
-        // Using `->has` preserves the asset name if the name parameter was not included in request.
-        $asset_name = request()->has('name') ? request('name') : $asset->name;
+        $asset_name = request('name', null);

        // Set the location ID to the RTD location id if there is one
        // Wait, why are we doing this? This overrides the stuff we set further up, which makes no sense.
@@ -905,7 +844,7 @@ class AssetsController extends Controller
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;

-        if ($request->has('name')) {
+        if ($request->filled('name')) {
            $asset->name = $request->input('name');
        }

@@ -918,9 +857,11 @@ class AssetsController extends Controller
        if ($request->has('status_id')) {
            $asset->status_id = $request->input('status_id');
        }
-        
-        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '. date('H:i:s') : date('Y-m-d H:i:s');

+        $checkin_at = null;
+        if ($request->filled('checkin_at')) {
+            $checkin_at = $request->input('checkin_at');
+        }

        if ($asset->save()) {
            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at));
@@ -943,7 +884,7 @@ class AssetsController extends Controller
        $this->authorize('checkin', Asset::class);
        $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();

-        if ($asset) {
+        if($asset) {
            return $this->checkin($request, $asset->id);
        }

--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -10,7 +10,6 @@ use App\Models\Category;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;

 class CategoriesController extends Controller
 {
@@ -33,28 +32,6 @@ class CategoriesController extends Controller
            $categories = $categories->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $categories->where('name', '=', $request->input('name'));
-        }
-
-        if ($request->filled('category_type')) {
-            $categories->where('category_type', '=', $request->input('category_type'));
-        }
-
-        if ($request->filled('use_default_eula')) {
-            $categories->where('use_default_eula', '=', $request->input('use_default_eula'));
-        }
-
-        if ($request->filled('require_acceptance')) {
-            $categories->where('require_acceptance', '=', $request->input('require_acceptance'));
-        }
-
-        if ($request->filled('checkin_email')) {
-            $categories->where('checkin_email', '=', $request->input('checkin_email'));
-        }
-
-
-
        // 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 = (($categories) && ($request->get('offset') > $categories->count())) ? $categories->count() : $request->get('offset', 0);
@@ -108,7 +85,7 @@ class CategoriesController extends Controller
    public function show($id)
    {
        $this->authorize('view', Category::class);
-        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
+        $category = Category::findOrFail($id);
        return (new CategoriesTransformer)->transformCategory($category);

    }
@@ -127,14 +104,8 @@ class CategoriesController extends Controller
    {
        $this->authorize('update', Category::class);
        $category = Category::findOrFail($id);
-
-        // Don't allow the user to change the category_type once it's been created
-        if (($request->filled('category_type')) && ($category->category_type != $request->input('category_type'))) {
-            return response()->json(
-                Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.update.cannot_change_category_type'))
-            );
-        }
        $category->fill($request->all());
+        $category->category_type = strtolower($request->input('category_type'));
        $category = $request->handleImages($category);

        if ($category->save()) {
@@ -155,7 +126,7 @@ class CategoriesController extends Controller
    public function destroy($id)
    {
        $this->authorize('delete', Category::class);
-        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
+        $category = Category::findOrFail($id);

        if (! $category->isDeletable()) {
            return response()->json(
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -43,11 +43,6 @@ class CompaniesController extends Controller
            $companies->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $companies->where('name', '=', $request->input('name'));
-        }
-
-
        // 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 = (($companies) && ($request->get('offset') > $companies->count())) ? $companies->count() : $request->get('offset', 0);
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -51,10 +51,6 @@ class ComponentsController extends Controller
            $components = $components->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $components->where('name', '=', $request->input('name'));
-        }
-
        if ($request->filled('company_id')) {
            $components->where('company_id', '=', $request->input('company_id'));
        }
@@ -246,8 +242,7 @@ class ComponentsController extends Controller
                'created_at' => \Carbon::now(),
                'assigned_qty' => $request->get('assigned_qty', 1),
                'user_id' => \Auth::id(),
-                'asset_id' => $request->get('assigned_to'),
-                'note' => $request->get('note'),
+                'asset_id' => $request->get('assigned_to')
            ]);

            $component->logCheckout($request->input('note'), $asset);
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\ComponentsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
@@ -56,10 +55,6 @@ class ConsumablesController extends Controller
            $consumables = $consumables->TextSearch(e($request->input('search')));
        }

-        if ($request->filled('name')) {
-            $consumables->where('name', '=', $request->input('name'));
-        }
-
        if ($request->filled('company_id')) {
            $consumables->where('company_id', '=', $request->input('company_id'));
        }
@@ -210,23 +205,35 @@ class ConsumablesController extends Controller
    * @param int $consumableId
    * @return array
     */
-    public function checkedout($consumableId)
+    public function getDataView($consumableId)
    {
-        $consumable = Consumable::with('users')->findOrFail($consumableId);
+        $consumable = Consumable::with(['consumableAssignments'=> function ($query) {
+            $query->orderBy($query->getModel()->getTable().'.created_at', 'DESC');
+        },
+        'consumableAssignments.admin'=> function ($query) {
+        },
+        'consumableAssignments.user'=> function ($query) {
+        },
+        ])->find($consumableId);
+
        if (! Company::isCurrentUserHasAccess($consumable)) {
            return ['total' => 0, 'rows' => []];
        }
+        $this->authorize('view', Consumable::class);
+        $rows = [];

-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
-        $consumables_users = $consumable->users;
-        $total = $consumables_users->count();
-
-        if ($total < $offset) {
-            $offset = 0;
+        foreach ($consumable->consumableAssignments as $consumable_assignment) {
+            $rows[] = [
+                'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User',
+                'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),
+                'admin' => ($consumable_assignment->admin) ? $consumable_assignment->admin->present()->nameUrl() : '',
+            ];
        }
-        return (new ConsumablesTransformer)->transformCheckedoutConsumables($consumable, $consumables_users, $total);
+
+        $consumableCount = $consumable->users->count();
+        $data = ['total' => $consumableCount, 'rows' => $rows];
+
+        return $data;
    }

    /**
@@ -262,7 +269,6 @@ class ConsumablesController extends Controller
                'consumable_id' => $consumable->id,
                'user_id' => $user->id,
                'assigned_to' => $assigned_to,
-                'note' => $request->input('note'),
            ]);

            // Log checkout event
--- a/app/Http/Controllers/Api/CustomFieldsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsController.php
@@ -96,7 +96,7 @@ class CustomFieldsController extends Controller
        $data = $request->all();
        $regex_format = null;

-        if ((array_key_exists('format', $data)) && (str_contains($data['format'], 'regex:'))) {
+        if (str_contains($data['format'], 'regex:')) {
            $regex_format = $data['format'];
        }

--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -33,7 +33,7 @@ class CustomFieldsetsController extends Controller
     */
    public function index()
    {
-        $this->authorize('index', CustomField::class);
+        $this->authorize('index', CustomFieldset::class);
        $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();

        return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
@@ -49,7 +49,7 @@ class CustomFieldsetsController extends Controller
     */
    public function show($id)
    {
-        $this->authorize('view', CustomField::class);
+        $this->authorize('view', CustomFieldset::class);
        if ($fieldset = CustomFieldset::find($id)) {
            return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset);
        }
@@ -68,7 +68,7 @@ class CustomFieldsetsController extends Controller
     */
    public function update(Request $request, $id)
    {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', CustomFieldset::class);
        $fieldset = CustomFieldset::findOrFail($id);
        $fieldset->fill($request->all());

@@ -89,7 +89,7 @@ class CustomFieldsetsController extends Controller
     */
    public function store(Request $request)
    {
-        $this->authorize('create', CustomField::class);
+        $this->authorize('create', CustomFieldset::class);
        $fieldset = new CustomFieldset;
        $fieldset->fill($request->all());

@@ -109,7 +109,7 @@ class CustomFieldsetsController extends Controller
     */
    public function destroy($id)
    {
-        $this->authorize('delete', CustomField::class);
+        $this->authorize('delete', CustomFieldset::class);
        $fieldset = CustomFieldset::findOrFail($id);

        $modelsCount = $fieldset->models->count();
@@ -136,7 +136,7 @@ class CustomFieldsetsController extends Controller
     */
    public function fields($id)
    {
-        $this->authorize('view', CustomField::class);
+        $this->authorize('view', CustomFieldset::class);
        $set = CustomFieldset::findOrFail($id);
        $fields = $set->fields;

@@ -153,7 +153,7 @@ class CustomFieldsetsController extends Controller
     */
    public function fieldsWithDefaultValues($fieldsetId, $modelId)
    {
-        $this->authorize('view', CustomField::class);
+        $this->authorize('view', CustomFieldset::class);

        $set = CustomFieldset::findOrFail($fieldsetId);

--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -42,22 +42,6 @@ class DepartmentsController extends Controller
            $departments = $departments->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $departments->where('name', '=', $request->input('name'));
-        }
-
-        if ($request->filled('company_id')) {
-            $departments->where('company_id', '=', $request->input('company_id'));
-        }
-
-        if ($request->filled('manager_id')) {
-            $departments->where('manager_id', '=', $request->input('manager_id'));
-        }
-
-        if ($request->filled('location_id')) {
-            $departments->where('location_id', '=', $request->input('location_id'));
-        }
-
        // 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 = (($departments) && ($request->get('offset') > $departments->count())) ? $departments->count() : $request->get('offset', 0);
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -28,10 +28,6 @@ class GroupsController extends Controller
            $groups = $groups->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $groups->where('name', '=', $request->input('name'));
-        }
-
        // 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 = (($groups) && ($request->get('offset') > $groups->count())) ? $groups->count() : $request->get('offset', 0);
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -10,7 +10,6 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
 use Artisan;
-use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
@@ -36,7 +35,7 @@ class ImportController extends Controller
     * Process and store a CSV upload file.
     *
     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Response
     */
    public function store()
    {
@@ -57,7 +56,7 @@ class ImportController extends Controller
                    'text/tsv', ])) {
                    $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();

-                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
+                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
                }

                //TODO: is there a lighter way to do this?
@@ -65,19 +64,7 @@ class ImportController extends Controller
                    ini_set('auto_detect_line_endings', '1');
                }
                $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
-
-                try {
-                    $import->header_row = $reader->fetchOne(0);
-                } catch (JsonEncodingException $e) {
-                    return response()->json(
-                        Helper::formatStandardApiResponse(
-                            'error',
-                            null,
-                            trans('admin/hardware/message.import.header_row_has_malformed_characters')
-                        ),
-                        422
-                    );
-                }
+                $import->header_row = $reader->fetchOne(0);

                //duplicate headers check
                $duplicate_headers = [];
@@ -95,22 +82,11 @@ class ImportController extends Controller
                    }
                }
                if (count($duplicate_headers) > 0) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)),422);
+                    return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'?
                }

-                try {
-                    // Grab the first row to display via ajax as the user picks fields
-                    $import->first_row = $reader->fetchOne(1);
-                } catch (JsonEncodingException $e) {
-                    return response()->json(
-                        Helper::formatStandardApiResponse(
-                            'error',
-                            null,
-                            trans('admin/hardware/message.import.content_row_has_malformed_characters')
-                        ),
-                        422
-                    );
-                }
+                // Grab the first row to display via ajax as the user picks fields
+                $import->first_row = $reader->fetchOne(1);

                $date = date('Y-m-d-his');
                $fixed_filename = str_slug($file->getClientOriginalName());
@@ -132,12 +108,12 @@ class ImportController extends Controller
            }
            $results = (new ImportsTransformer)->transformImports($results);

-            return response()->json([
+            return [
                'files' => $results,
-            ]);
+            ];
        }

-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 422);
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500);
    }

    /**
@@ -151,21 +127,14 @@ class ImportController extends Controller
        $this->authorize('import');

        // Run a backup immediately before processing
-        if ($request->get('run-backup')) {
+        if ($request->has('run-backup')) {
            \Log::debug('Backup manually requested via importer');
            Artisan::call('backup:run');
        } else {
            \Log::debug('NO BACKUP requested via importer');
        }

-        $import = Import::find($import_id);
-
-        if(is_null($import)){
-            $error[0][0] = trans("validation.exists", ["attribute" => "file"]);
-            return response()->json(Helper::formatStandardApiResponse('import-errors', null, $error), 500);
-        }
-
-        $errors = $request->import($import);
+        $errors = $request->import(Import::find($import_id));
        $redirectTo = 'hardware.index';
        switch ($request->get('import-type')) {
            case 'asset':
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -39,7 +39,7 @@ class LicenseSeatsController extends Controller
            }

            $total = $seats->count();
-            $offset = (($seats) && (request('offset') >= $total)) ? 0 : request('offset', 0);
+            $offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0);
            $limit = request('limit', 50);

            $seats = $seats->skip($offset)->take($limit)->get();
@@ -116,20 +116,16 @@ class LicenseSeatsController extends Controller
            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
        }

-        // the logging functions expect only one "target". if both asset and user are present in the request,
-        // we simply let assets take precedence over users...
-        if ($licenseSeat->isDirty('assigned_to')) {
-            $target = $is_checkin ? $oldUser : User::find($licenseSeat->assigned_to);
-        }
-        if ($licenseSeat->isDirty('asset_id')) {
-            $target = $is_checkin ? $oldAsset : Asset::find($licenseSeat->asset_id);
-        }
-
-        if (is_null($target)){
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));
-        }
-
        if ($licenseSeat->save()) {
+            // the logging functions expect only one "target". if both asset and user are present in the request,
+            // we simply let assets take precedence over users...
+            $changes = $licenseSeat->getChanges();
+            if (array_key_exists('assigned_to', $changes)) {
+                $target = $is_checkin ? $oldUser : User::find($changes['assigned_to']);
+            }
+            if (array_key_exists('asset_id', $changes)) {
+                $target = $is_checkin ? $oldAsset : Asset::find($changes['asset_id']);
+            }

            if ($is_checkin) {
                $licenseSeat->logCheckin($target, $request->input('note'));
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -26,8 +26,7 @@ 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'));
@@ -73,6 +72,9 @@ class LicensesController extends Controller
            $licenses->where('depreciation_id', '=', $request->input('depreciation_id'));
        }

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

        if (($request->filled('maintained')) && ($request->input('maintained')=='true')) {
            $licenses->where('maintained','=',1);
@@ -146,10 +148,9 @@ class LicensesController extends Controller
        }

        $total = $licenses->count();
-
        $licenses = $licenses->skip($offset)->take($limit)->get();
-        return (new LicensesTransformer)->transformLicenses($licenses, $total);

+        return (new LicensesTransformer)->transformLicenses($licenses, $total);
    }

    /**
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -27,7 +27,7 @@ class LocationsController extends Controller
        $allowed_columns = [
            'id', 'name', 'address', 'address2', 'city', 'state', 'country', 'zip', 'created_at',
            'updated_at', 'manager_id', 'image',
-            'assigned_assets_count', 'users_count', 'assets_count','assigned_assets_count', 'assets_count', 'rtd_assets_count', 'currency', 'ldap_ou', ];
+            'assigned_assets_count', 'users_count', 'assets_count', 'currency', 'ldap_ou', ];

        $locations = Location::with('parent', 'manager', 'children')->select([
            'locations.id',
@@ -47,37 +47,12 @@ class LocationsController extends Controller
            'locations.currency',
        ])->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
-            ->withCount('rtd_assets as rtd_assets_count')
            ->withCount('users as users_count');

        if ($request->filled('search')) {
            $locations = $locations->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $locations->where('locations.name', '=', $request->input('name'));
-        }
-
-        if ($request->filled('address')) {
-            $locations->where('locations.address', '=', $request->input('address'));
-        }
-
-        if ($request->filled('address2')) {
-            $locations->where('locations.address2', '=', $request->input('address2'));
-        }
-
-        if ($request->filled('city')) {
-            $locations->where('locations.city', '=', $request->input('city'));
-        }
-
-        if ($request->filled('zip')) {
-            $locations->where('locations.zip', '=', $request->input('zip'));
-        }
-
-        if ($request->filled('country')) {
-            $locations->where('locations.country', '=', $request->input('country'));
-        }
-
        $offset = (($locations) && (request('offset') > $locations->count())) ? $locations->count() : request('offset', 0);

        // Check to make sure the limit is not higher than the max allowed
@@ -158,9 +133,7 @@ class LocationsController extends Controller
            ])
            ->withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
-            ->withCount('rtd_assets as rtd_assets_count')
-            ->withCount('users as users_count')
-            ->findOrFail($id);
+            ->withCount('users as users_count')->findOrFail($id);

        return (new LocationsTransformer)->transformLocation($location);
    }
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -37,26 +37,6 @@ class ManufacturersController extends Controller
            $manufacturers = $manufacturers->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $manufacturers->where('name', '=', $request->input('name'));
-        }
-
-        if ($request->filled('url')) {
-            $manufacturers->where('url', '=', $request->input('url'));
-        }
-
-        if ($request->filled('support_url')) {
-            $manufacturers->where('support_url', '=', $request->input('support_url'));
-        }
-
-        if ($request->filled('support_phone')) {
-            $manufacturers->where('support_phone', '=', $request->input('support_phone'));
-        }
-
-        if ($request->filled('support_email')) {
-            $manufacturers->where('support_email', '=', $request->input('support_email'));
-        }
-
        // 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 = (($manufacturers) && ($request->get('offset') > $manufacturers->count())) ? $manufacturers->count() : $request->get('offset', 0);
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -5,37 +5,10 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\CheckoutRequest;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-use Laravel\Passport\TokenRepository;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
-use Gate;
-use DB;
+use Auth;

 class ProfileController extends Controller
 {
-
-    /**
-     * The token repository implementation.
-     *
-     * @var \Laravel\Passport\TokenRepository
-     */
-    protected $tokenRepository;
-
-    /**
-     * Create a controller instance.
-     *
-     * @param  \Laravel\Passport\TokenRepository  $tokenRepository
-     * @param  \Illuminate\Contracts\Validation\Factory  $validation
-     * @return void
-     */
-    public function __construct(TokenRepository $tokenRepository, ValidationFactory $validation)
-    {
-        $this->validation = $validation;
-        $this->tokenRepository = $tokenRepository;
-    }
-
    /**
     * Display a listing of requested assets.
     *
@@ -56,11 +29,11 @@ class ProfileController extends Controller
            // Make sure the asset and request still exist
            if ($checkoutRequest && $checkoutRequest->itemRequested()) {
                $results['rows'][] = [
-                    '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,
+                    'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
+                    'name' => $checkoutRequest->itemRequested()->present()->name(),
+                    'type' => $checkoutRequest->itemType(),
+                    'qty' => $checkoutRequest->quantity,
+                    'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
                    'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
                    'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
                ];
@@ -69,90 +42,4 @@ class ProfileController extends Controller

        return $results;
    }
-
-
-    /**
-     * Delete an API token
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function createApiToken(Request $request) {
-
-        if (!Gate::allows('self.api')) {
-            abort(403);
-        }
-
-        $accessTokenName = $request->input('name', 'Auth Token');
-
-        if ($accessToken = Auth::user()->createToken($accessTokenName)->accessToken) {
-
-            // Get the ID so we can return that with the payload
-            $token = DB::table('oauth_access_tokens')->where('user_id', '=', Auth::user()->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first();
-            $accessTokenData['id'] = $token->id;
-            $accessTokenData['token'] = $accessToken;
-            $accessTokenData['name'] = $accessTokenName;
-            return response()->json(Helper::formatStandardApiResponse('success', $accessTokenData, 'Personal access token '.$accessTokenName.' created successfully'));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Token could not be created.'));
-
-    }
-
-
-    /**
-     * Delete an API token
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function deleteApiToken($tokenId) {
-
-        if (!Gate::allows('self.api')) {
-            abort(403);
-        }
-
-        $token = $this->tokenRepository->findForUser(
-            $tokenId, Auth::user()->getAuthIdentifier()
-        );
-
-        if (is_null($token)) {
-            return new Response('', 404);
-        }
-
-        $token->revoke();
-
-        return new Response('', Response::HTTP_NO_CONTENT);
-
-    }
-
-
-    /**
-     * Show user's API tokens
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v6.0.5]
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function showApiTokens(Request $request) {
-
-        if (!Gate::allows('self.api')) {
-            abort(403);
-        }
-        
-        $tokens = $this->tokenRepository->forUser(Auth::user()->getAuthIdentifier());
-        $token_values = $tokens->load('client')->filter(function ($token) {
-            return $token->client->personal_access_client && ! $token->revoked;
-        })->values();
-
-        return response()->json(Helper::formatStandardApiResponse('success', $token_values, null));
-
-    }
-
-
-
 }
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -20,7 +20,7 @@ class ReportsController extends Controller
    {
        $this->authorize('reports.view');

-        $actionlogs = Actionlog::with('item', 'user', 'admin', 'target', 'location');
+        $actionlogs = Actionlog::with('item', 'user', 'target', 'location');

        if ($request->filled('search')) {
            $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -2,9 +2,6 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Helpers\StorageHelper;
-use App\Http\Transformers\DatatablesTransformer;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ldap;
@@ -21,7 +18,6 @@ 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
@@ -268,52 +264,4 @@ class SettingsController extends Controller

        return (new LoginAttemptsTransformer)->transformLoginAttempts($login_attempt_results, $total);
    }
-
-
-    public function listBackups() {
-        $settings = Setting::getSettings();
-        $path = 'app/backups';
-        $backup_files = Storage::files($path);
-        $files_raw = [];
-        $count = 0;
-
-        if (count($backup_files) > 0) {
-
-            for ($f = 0; $f < count($backup_files); $f++) {
-
-                // Skip dotfiles like .gitignore and .DS_STORE
-                if ((substr(basename($backup_files[$f]), 0, 1) != '.')) {
-                    $file_timestamp = Storage::lastModified($backup_files[$f]);
-
-                    $files_raw[] = [
-                        'filename' => basename($backup_files[$f]),
-                        'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
-                        'modified_value' => $file_timestamp,
-                        'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp),
-
-                    ];
-                    $count++;
-                }
-
-
-            }
-        }
-
-        $files = array_reverse($files_raw);
-        return (new DatatablesTransformer)->transformDatatables($files, $count);
-
-    }
-
-
-    public function downloadBackup($file) {
-
-        $path = 'app/backups';
-        if (Storage::exists($path.'/'.$file)) {
-            $headers = ['ContentType' => 'application/zip'];
-            return Storage::download($path.'/'.$file, $file, $headers);
-        } else {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'File not found'));
-        }
-
-    }
 }
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -9,8 +9,6 @@ use App\Http\Transformers\StatuslabelsTransformer;
 use App\Models\Asset;
 use App\Models\Statuslabel;
 use Illuminate\Http\Request;
-use App\Http\Transformers\PieChartTransformer;
-use Illuminate\Support\Arr;

 class StatuslabelsController extends Controller
 {
@@ -32,20 +30,16 @@ class StatuslabelsController extends Controller
            $statuslabels = $statuslabels->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $statuslabels->where('name', '=', $request->input('name'));
-        }
-

        // if a status_type is passed, filter by that
        if ($request->filled('status_type')) {
-            if (strtolower($request->input('status_type')) == 'pending') {
+            if (strtolower($request->input('status_type'))== 'pending') {
                $statuslabels = $statuslabels->Pending();
-            } elseif (strtolower($request->input('status_type')) == 'archived') {
+            } elseif (strtolower($request->input('status_type'))== 'archived') {
                $statuslabels = $statuslabels->Archived();
-            } elseif (strtolower($request->input('status_type')) == 'deployable') {
+            } elseif (strtolower($request->input('status_type'))== 'deployable') {
                $statuslabels = $statuslabels->Deployable();
-            } elseif (strtolower($request->input('status_type')) == 'undeployable') {
+            } elseif (strtolower($request->input('status_type'))== 'undeployable') {
                $statuslabels = $statuslabels->Undeployable();
            }
        }
@@ -100,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()));

+        return response()->json(Helper::formatStandardApiResponse('error', null, $statuslabel->getErrors()));
    }

    /**
@@ -120,7 +114,6 @@ class StatuslabelsController extends Controller
        return (new StatuslabelsTransformer)->transformStatuslabel($statuslabel);
    }

-
    /**
     * Update the specified resource in storage.
     *
@@ -137,7 +130,6 @@ 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.'));
        }
@@ -183,61 +175,48 @@ 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
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.0]
-     * @return array
+     * @return \Illuminate\Http\Response
     */
    public function getAssetCountByStatuslabel()
    {
        $this->authorize('view', Statuslabel::class);
+
        $statuslabels = Statuslabel::withCount('assets')->get();

+        $labels = [];
+        $points = [];
+        $default_color_count = 0;
+        $colors_array = [];
+
        foreach ($statuslabels as $statuslabel) {
+            if ($statuslabel->assets_count > 0) {
+                $labels[] = $statuslabel->name.' ('.number_format($statuslabel->assets_count).')';
+                $points[] = $statuslabel->assets_count;

-            $total[$statuslabel->name]['label'] = $statuslabel->name;
-            $total[$statuslabel->name]['count'] = $statuslabel->assets_count;
-
-            if ($statuslabel->color != '') {
-                $total[$statuslabel->name]['color'] = $statuslabel->color;
+                if ($statuslabel->color != '') {
+                    $colors_array[] = $statuslabel->color;
+                } else {
+                    $colors_array[] = Helper::defaultChartColors($default_color_count);
+                }
+                $default_color_count++;
            }
        }

-        return (new PieChartTransformer())->transformPieChartDate($total);
+        $result = [
+            'labels' => $labels,
+            'datasets' => [[
+                'data' => $points,
+                'backgroundColor' => $colors_array,
+                'hoverBackgroundColor' =>  $colors_array,
+            ]],
+        ];

-    }
-
-    /**
-     * Show a count of assets by meta status type for pie chart
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v6.0.11]
-     * @return array
-     */
-    public function getAssetCountByMetaStatus()
-    {
-        $this->authorize('view', Statuslabel::class);
-
-        $total['rtd']['label'] = trans('general.ready_to_deploy');
-        $total['rtd']['count'] = Asset::RTD()->count();
-
-        $total['deployed']['label'] = trans('general.deployed');
-        $total['deployed']['count'] = Asset::Deployed()->count();
-
-        $total['archived']['label'] = trans('general.archived');
-        $total['archived']['count'] = Asset::Archived()->count();
-
-        $total['pending']['label'] = trans('general.pending');
-        $total['pending']['count'] = Asset::Pending()->count();
-
-        $total['undeployable']['label'] = trans('general.undeployable');
-        $total['undeployable']['count'] = Asset::Undeployable()->count();
-
-        return (new PieChartTransformer())->transformPieChartDate($total);
+        return $result;
    }

    /**
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -34,46 +34,6 @@ class SuppliersController extends Controller
            $suppliers = $suppliers->TextSearch($request->input('search'));
        }

-        if ($request->filled('name')) {
-            $suppliers->where('name', '=', $request->input('name'));
-        }
-
-        if ($request->filled('address')) {
-            $suppliers->where('address', '=', $request->input('address'));
-        }
-
-        if ($request->filled('address2')) {
-            $suppliers->where('address2', '=', $request->input('address2'));
-        }
-
-        if ($request->filled('city')) {
-            $suppliers->where('city', '=', $request->input('city'));
-        }
-
-        if ($request->filled('zip')) {
-            $suppliers->where('zip', '=', $request->input('zip'));
-        }
-
-        if ($request->filled('country')) {
-            $suppliers->where('country', '=', $request->input('country'));
-        }
-
-        if ($request->filled('fax')) {
-            $suppliers->where('fax', '=', $request->input('fax'));
-        }
-
-        if ($request->filled('email')) {
-            $suppliers->where('email', '=', $request->input('email'));
-        }
-
-        if ($request->filled('url')) {
-            $suppliers->where('url', '=', $request->input('url'));
-        }
-
-        if ($request->filled('notes')) {
-            $suppliers->where('notes', '=', $request->input('notes'));
-        }
-
        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
        $offset = (($suppliers) && ($request->get('offset') > $suppliers->count())) ? $suppliers->count() : $request->get('offset', 0);
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -15,7 +15,6 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\License;
 use App\Models\User;
-use App\Notifications\CurrentInventory;
 use Auth;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
@@ -37,7 +36,6 @@ class UsersController extends Controller

        $users = User::select([
            'users.activated',
-            'users.created_by',
            'users.address',
            'users.avatar',
            'users.city',
@@ -67,10 +65,8 @@ class UsersController extends Controller
            'users.zip',
            'users.remote',
            'users.ldap_import',
-            'users.start_date',
-            'users.end_date',

-        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables')
            ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
        $users = Company::scopeCompanyables($users);

@@ -93,10 +89,6 @@ class UsersController extends Controller
            $users = $users->where('users.location_id', '=', $request->input('location_id'));
        }

-        if ($request->filled('created_by')) {
-            $users = $users->where('users.created_by', '=', $request->input('created_by'));
-        }
-
        if ($request->filled('email')) {
            $users = $users->where('users.email', '=', $request->input('email'));
        }
@@ -149,22 +141,6 @@ class UsersController extends Controller
            $users = $users->where('remote', '=', $request->input('remote'));
        }

-        if ($request->filled('two_factor_enrolled')) {
-            $users = $users->where('two_factor_enrolled', '=', $request->input('two_factor_enrolled'));
-        }
-
-        if ($request->filled('two_factor_optin')) {
-            $users = $users->where('two_factor_optin', '=', $request->input('two_factor_optin'));
-        }
-
-        if ($request->filled('start_date')) {
-            $users = $users->where('users.start_date', '=', $request->input('start_date'));
-        }
-
-        if ($request->filled('end_date')) {
-            $users = $users->where('users.end_date', '=', $request->input('end_date'));
-        }
-
        if ($request->filled('assets_count')) {
           $users->has('assets', '=', $request->input('assets_count'));
        }
@@ -206,48 +182,17 @@ class UsersController extends Controller
            case 'department':
                $users = $users->OrderDepartment($order);
                break;
-            case 'created_by':
-                $users = $users->OrderByCreatedBy($order);
-                break;
            case 'company':
                $users = $users->OrderCompany($order);
                break;
            default:
                $allowed_columns =
                    [
-                        'last_name',
-                        'first_name',
-                        'email',
-                        'jobtitle',
-                        'username',
-                        'employee_num',
-                        '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',
-                        'two_factor_optin',
-                        'two_factor_enrolled',
-                        'remote',
-                        'start_date',
-                        'end_date',
+                        'last_name', 'first_name', 'email', 'jobtitle', 'username', 'employee_num',
+                        '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', 'remote',
                    ];

                $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';
@@ -526,27 +471,6 @@ class UsersController extends Controller
        return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
    }

-    /**
-     * Notify a specific user via email with all of their assigned assets.
-     *
-     * @author [Lukas Fehling] [<lukas.fehling@adabay.rocks>]
-     * @since [v6.0.13]
-     * @param Request $request
-     * @param $id
-     * @return string JSON
-     */
-    public function emailAssetList(Request $request, $id)
-    {
-        $user = User::findOrFail($id);
-
-        if (empty($user->email)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error')));
-        }
-
-        $user->notify((new CurrentInventory($user)));
- 
-        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')));
-    }

    /**
     * Return JSON containing a list of consumables assigned to a user.
@@ -595,14 +519,10 @@ class UsersController extends Controller
    {
        $this->authorize('view', User::class);
        $this->authorize('view', License::class);
-        
-        if ($user = User::where('id', $id)->withTrashed()->first()) {
-            $licenses = $user->licenses()->get();
-            return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))));
+        $user = User::where('id', $id)->withTrashed()->first();
+        $licenses = $user->licenses()->get();

+        return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
    }

    /**
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -8,7 +8,6 @@ use App\Models\AssetModel;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
-use Illuminate\Support\Facades\Validator;
 use Redirect;
 use Request;
 use Storage;
@@ -91,9 +90,7 @@ class AssetModelsController extends Controller
        // Was it created?
        if ($model->save()) {
            if ($this->shouldAddDefaultValues($request->input())) {
-                if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
-                    return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
-                }
+                $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'));
            }

            // Redirect to the new model  page
@@ -166,9 +163,7 @@ class AssetModelsController extends Controller
            $model->fieldset_id = $request->input('custom_fieldset');

            if ($this->shouldAddDefaultValues($request->input())) {
-                if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
-                    return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
-                }
+                $this->assignCustomFieldsDefaultValues($model, $request->input('default_values'));
            }
        }

@@ -456,32 +451,6 @@ class AssetModelsController extends Controller
     */
    private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues)
    {
-        $data = array();
-        foreach ($defaultValues as $customFieldId => $defaultValue) {
-            $customField = \App\Models\CustomField::find($customFieldId);
-
-            $data[$customField->db_column] = $defaultValue;
-        }
-
-        $fieldsets = $model->fieldset->validation_rules();
-        $rules = array();
-
-        foreach ($fieldsets as $fieldset => $validation){
-            // If the field is marked as required, eliminate the rule so it doesn't interfere with the default values
-            // (we are at model level, the rule still applies when creating a new asset using this model)
-            $index = array_search('required', $validation);
-            if ($index !== false){
-                $validation[$index] = 'nullable';
-            }
-            $rules[$fieldset] = $validation;
-        }
-
-        $validator = Validator::make($data, $rules);
-
-        if($validator->fails()){
-            return false;
-        }
-
        foreach ($defaultValues as $customFieldId => $defaultValue) {
            if(is_array($defaultValue)){
                $model->defaultValues()->attach($customFieldId, ['default_value' => implode(', ', $defaultValue)]);
@@ -489,7 +458,6 @@ class AssetModelsController extends Controller
                $model->defaultValues()->attach($customFieldId, ['default_value' => $defaultValue]);
            }
        }
-        return true;
    }

    /**
--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -1,155 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Helpers\StorageHelper;
-use App\Http\Requests\AssetFileRequest;
-use App\Models\Actionlog;
-use App\Models\AssetModel;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\Storage;
-use enshrined\svgSanitize\Sanitizer;
-
-class AssetModelsFilesController extends Controller
-{
-    /**
-     * Upload a file to the server.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param AssetFileRequest $request
-     * @param int $modelId
-     * @return Redirect
-     * @since [v1.0]
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(AssetFileRequest $request, $modelId = null)
-    {
-        if (! $model = AssetModel::find($modelId)) {
-            return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-
-        $this->authorize('update', $model);
-
-        if ($request->hasFile('file')) {
-            if (! Storage::exists('private_uploads/assetmodels')) {
-                Storage::makeDirectory('private_uploads/assetmodels', 775);
-            }
-
-            foreach ($request->file('file') as $file) {
-
-                $extension = $file->getClientOriginalExtension();
-                $file_name = 'model-'.$model->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-
-                // Check for SVG and sanitize it
-                if ($extension=='svg') {
-                    \Log::debug('This is an SVG');
-
-                    $sanitizer = new Sanitizer();
-                    $dirtySVG = file_get_contents($file->getRealPath());
-                    $cleanSVG = $sanitizer->sanitize($dirtySVG);
-
-                    try {
-                        Storage::put('private_uploads/assetmodels/'.$file_name, $cleanSVG);
-                    } catch (\Exception $e) {
-                        \Log::debug('Upload no workie :( ');
-                        \Log::debug($e);
-                    }
-                } else {
-                    Storage::put('private_uploads/assetmodels/'.$file_name, file_get_contents($file));
-                }
-
-
-                $model->logUpload($file_name, e($request->get('notes')));
-            }
-
-            return redirect()->back()->with('success', trans('general.file_upload_success'));
-        }
-
-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
-    }
-
-    /**
-     * Check for permissions and display the file.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $modelId
-     * @param  int $fileId
-     * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function show($modelId = null, $fileId = null, $download = true)
-    {
-        $model = AssetModel::find($modelId);
-        // the asset is valid
-        if (isset($model->id)) {
-            $this->authorize('view', $model);
-
-            if (! $log = Actionlog::find($fileId)) {
-                return response('No matching record for that model/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $file = 'private_uploads/assetmodels/'.$log->filename;
-            \Log::debug('Checking for '.$file);
-
-
-            if (! Storage::exists($file)) {
-                return response('File '.$file.' not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            if ($download != 'true') {
-                if ($contents = file_get_contents(Storage::url($file))) {
-                    return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
-                }
-
-                return JsonResponse::create(['error' => 'Failed validation: '], 500);
-            }
-
-            return StorageHelper::downloader($file);
-        }
-        // Prepare the error message
-        $error = trans('admin/hardware/message.does_not_exist', ['id' => $fileId]);
-
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', $error);
-    }
-
-    /**
-     * Delete the associated file
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $modelId
-     * @param  int $fileId
-     * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function destroy($modelId = null, $fileId = null)
-    {
-        $model = AssetModel::find($modelId);
-        $this->authorize('update', $model);
-        $rel_path = 'private_uploads/assetmodels';
-
-        // the asset is valid
-        if (isset($model->id)) {
-            $this->authorize('update', $model);
-            $log = Actionlog::find($fileId);
-            if ($log) {
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-                }
-                $log->delete();
-
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
-            }
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
-        }
-
-        // Redirect to the hardware management page
-        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
-    }
-}
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -98,22 +98,17 @@ class AssetCheckinController extends Controller
        }

        $asset->location_id = $asset->rtd_location_id;
+        \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 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();
-            }
+        $checkin_at = date('Y-m-d');
+        if ($request->filled('checkin_at')) {
+            $checkin_at = $request->input('checkin_at');
        }

        // Get all pending Acceptances for this asset and delete them
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -80,15 +80,6 @@ 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'));
            }
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -20,7 +20,6 @@ use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Cookie;
 use Input;
 use Intervention\Image\Facades\Image;
 use League\Csv\Reader;
@@ -138,15 +137,14 @@ class AssetsController extends Controller
            $asset->archived                = '0';
            $asset->physical                = '1';
            $asset->depreciate              = '0';
-            $asset->status_id               = request('status_id');
+            $asset->status_id               = request('status_id', 0);
            $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', null);
+            $asset->supplier_id             = request('supplier_id', 0);
            $asset->requestable             = request('requestable', 0);
            $asset->rtd_location_id         = request('rtd_location_id', null);
-            $asset->byod                    = request('byod', 0);

            if (! empty($settings->audit_interval)) {
                $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
@@ -169,17 +167,17 @@ class AssetsController extends Controller
                foreach ($model->fieldset->fields as $field) {
                    if ($field->field_encrypted == '1') {
                        if (Gate::allows('admin')) {
-                            if (is_array($request->input($field->db_column))) {
-                                $asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                            if (is_array($request->input($field->convertUnicodeDbSlug()))) {
+                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug()))));
                            } else {
-                                $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
+                                $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug())));
                            }
                        }
                    } else {
-                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                        if (is_array($request->input($field->convertUnicodeDbSlug()))) {
+                            $asset->{$field->convertUnicodeDbSlug()} = implode(', ', $request->input($field->convertUnicodeDbSlug()));
                        } else {
-                            $asset->{$field->db_column} = $request->input($field->db_column);
+                            $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                        }
                    }
                }
@@ -203,30 +201,18 @@ class AssetsController extends Controller
                }

                $success = true;
-                
            }
        }

        if ($success) {
            // Redirect to the asset listing page
-            $minutes = 518400;
-            // dd( $_POST['options']);
-            // Cookie::queue(Cookie::make('optional_info', json_decode($_POST['options']), $minutes));
            return redirect()->route('hardware.index')
                ->with('success', trans('admin/hardware/message.create.success'));
-               
-      
        }

        return redirect()->back()->withInput()->withErrors($asset->getErrors());
    }

-    public function getOptionCookie(Request $request){
-        $value = $request->cookie('optional_info');
-        echo $value;
-        return $value;
-     }
-
    /**
     * Returns a view that presents a form to edit an existing asset.
     *
@@ -319,7 +305,6 @@ class AssetsController extends Controller
        // If the box isn't checked, it's not in the request at all.
        $asset->requestable = $request->filled('requestable');
        $asset->rtd_location_id = $request->input('rtd_location_id', null);
-        $asset->byod = $request->input('byod', 0);

        if ($asset->assigned_to == '') {
            $asset->location_id = $request->input('rtd_location_id', null);
@@ -358,17 +343,17 @@ class AssetsController extends Controller
            foreach ($model->fieldset->fields as $field) {
                if ($field->field_encrypted == '1') {
                    if (Gate::allows('admin')) {
-                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                        if (is_array($request->input($field->convertUnicodeDbSlug()))) {
+                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e(implode(', ', $request->input($field->convertUnicodeDbSlug()))));
                        } else {
-                            $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
+                            $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt(e($request->input($field->convertUnicodeDbSlug())));
                        }
                    }
                } else {
-                    if (is_array($request->input($field->db_column))) {
-                        $asset->{$field->db_column} = implode(', ', $request->input($field->db_column));
+                    if (is_array($request->input($field->convertUnicodeDbSlug()))) {
+                        $asset->{$field->convertUnicodeDbSlug()} = implode(', ', $request->input($field->convertUnicodeDbSlug()));
                    } else {
-                        $asset->{$field->db_column} = $request->input($field->db_column);
+                        $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                    }
                }
            }
@@ -876,13 +861,12 @@ class AssetsController extends Controller


            $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
-            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->to('hardware')->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) {
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -11,8 +11,6 @@ use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Session;
-use App\Http\Requests\AssetCheckoutRequest;

 class BulkAssetsController extends Controller
 {
@@ -32,12 +30,9 @@ class BulkAssetsController extends Controller
        $this->authorize('update', Asset::class);

        if (! $request->filled('ids')) {
-            return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
+            return redirect()->back()->with('error', '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]);

        $asset_ids = array_values(array_unique($request->input('ids')));

@@ -78,15 +73,10 @@ class BulkAssetsController extends Controller
    {
        $this->authorize('update', Asset::class);

-        // 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');
-        }
-
+        \Log::debug($request->input('ids'));

        if (! $request->filled('ids') || count($request->input('ids')) <= 0) {
-            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
+            return redirect()->route('hardware.index')->with('warning', trans('No assets selected, so nothing was updated.'));
        }

        $assets = array_keys($request->input('ids'));
@@ -102,8 +92,6 @@ class BulkAssetsController extends Controller
            || ($request->filled('company_id'))
            || ($request->filled('status_id'))
            || ($request->filled('model_id'))
-            || ($request->filled('null_purchase_date'))
-            || ($request->filled('null_expected_checkin_date'))
        ) {
            foreach ($assets as $assetId) {

@@ -118,14 +106,6 @@ class BulkAssetsController extends Controller
                    ->conditionallyAddItem('supplier_id')
                    ->conditionallyAddItem('warranty_months');

-                if ($request->input('null_purchase_date')=='1') {
-                    $this->update_array['purchase_date'] = null;
-                }
-
-                if ($request->input('null_expected_checkin_date')=='1') {
-                    $this->update_array['expected_checkin'] = null;
-                }
-
                if ($request->filled('purchase_cost')) {
                    $this->update_array['purchase_cost'] =  Helper::ParseCurrency($request->input('purchase_cost'));
                }
@@ -167,13 +147,11 @@ class BulkAssetsController extends Controller
                    ->update($this->update_array);
            } // endforeach

-            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
-
-
+            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.update.success'));
+            // no values given, nothing to update
        }

-        // no values given, nothing to update
-        return redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));
+        return redirect()->route('hardware.index')->with('warning', trans('admin/hardware/message.update.nothing_updated'));
    }

    /**
@@ -210,11 +188,6 @@ 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) {
@@ -226,11 +199,11 @@ class BulkAssetsController extends Controller
                    ->update($update_array);
            } // endforeach

-            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
+            return redirect()->to('hardware')->with('success', trans('admin/hardware/message.delete.success'));
            // no values given, nothing to update
        }

-        return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.delete.nothing_updated'));
+        return redirect()->to('hardware')->with('info', trans('admin/hardware/message.delete.nothing_updated'));
    }

    /**
@@ -249,18 +222,15 @@ class BulkAssetsController extends Controller
     * Process Multiple Checkout Request
     * @return View
     */
-    public function storeCheckout(AssetCheckoutRequest $request)
+    public function storeCheckout(Request $request)
    {
-
-        $this->authorize('checkout', Asset::class);
-
        try {
            $admin = Auth::user();

            $target = $this->determineCheckoutTarget();

            if (! is_array($request->get('selected_assets'))) {
-                return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
+                return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
            }

            $asset_ids = array_filter($request->get('selected_assets'));
@@ -307,9 +277,9 @@ class BulkAssetsController extends Controller
                return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success'));
            }
            // Redirect to the asset management page with error
-            return redirect()->route('hardware.bulkcheckout.show')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+            return redirect()->to('hardware/bulk-checkout')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
        } catch (ModelNotFoundException $e) {
-            return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
+            return redirect()->to('hardware/bulk-checkout')->with('error', $e->getErrors());
        }
    }
 }
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -68,21 +68,18 @@ class LoginController extends Controller
            return redirect()->intended('/');
        }

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

@@ -106,17 +103,15 @@ class LoginController extends Controller
    {
        $saml = $this->saml;
        $samlData = $request->session()->get('saml_login');
-
        if ($saml->isEnabled() && ! empty($samlData)) {
-
            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();
-                    \Log::debug("SAML user '$username' could not be found in database.");
+                    \Log::warning("SAML user '$username' could not be found in database.");
                    $request->session()->flash('error', trans('auth/message.signin.error'));
                    $saml->clearData();
                }
@@ -125,23 +120,11 @@ class LoginController extends Controller
                    $user->last_login = \Carbon::now();
                    $user->save();
                }
-                
            } catch (\Exception $e) {
-                \Log::debug('There was an error authenticating the SAML user: '.$e->getMessage());
+                \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 (empty($samlData)) {
-                \Log::debug("SAML page requested, but samlData seems empty.");
-            }
        }
-
-
-
    }

    /**
@@ -179,7 +162,7 @@ class LoginController extends Controller
             Log::debug("Local user ".$request->input('username')." does not exist");
             Log::debug("Creating local user ".$request->input('username'));

-             if ($user = Ldap::createUserFromLdap($ldap_user, $request->input('password'))) {
+             if ($user = Ldap::createUserFromLdap($ldap_user)) { //this handles passwords on its own
                 Log::debug("Local user created.");
             } else {
                 Log::debug("Could not create local user.");
@@ -256,12 +239,10 @@ 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');
        }

@@ -352,6 +333,7 @@ class LoginController extends Controller

        $secret = Google2FA::generateSecretKey();
        $user->two_factor_secret = $secret;
+        $user->save();

        $barcode = new Barcode();
        $barcode_obj =
@@ -369,8 +351,6 @@ 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);
    }

@@ -415,7 +395,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')) { // TODO this seems almost the same as above?
+        if (! $request->has('two_factor_secret')) {
            return redirect()->route('two-factor')->with('error', 'Two-factor code is required.');
        }

@@ -443,17 +423,10 @@ 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();
@@ -472,10 +445,7 @@ class LoginController extends Controller

        $request->session()->regenerate(true);

-        if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())){
-            $request->session()->remove('password_hash_'.Auth::getDefaultDriver());
-        }
-
+        $request->session()->regenerate(true);
        Auth::logout();

        if (! empty($sloRedirectUrl)) {
@@ -505,7 +475,6 @@ class LoginController extends Controller
        ]);
    }

-
    public function username()
    {
        return 'username';
@@ -532,7 +501,6 @@ class LoginController extends Controller
            ->withErrors([$this->username() => $message]);
    }

-
    /**
     * Override the lockout time and duration
     *
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -3,11 +3,13 @@
 namespace App\Http\Controllers\Auth;

 use App\Http\Controllers\Controller;
+use App\Http\Requests\SaveUserRequest;
 use App\Models\Setting;
 use App\Models\User;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
-
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;

 class ResetPasswordController extends Controller
 {
@@ -41,7 +43,6 @@ class ResetPasswordController extends Controller
    public function __construct()
    {
        $this->middleware('guest');
-        $this->middleware('throttle:10,1');
    }

    protected function rules()
@@ -62,14 +63,6 @@ class ResetPasswordController extends Controller

    public function showResetForm(Request $request, $token = null)
    {
-
-        $credentials =  $request->only('email', 'token');
-
-        if (is_null($this->broker()->getUser($credentials))) {
-            \Log::debug('Password reset form FAILED - this token is not valid.');
-            return redirect()->route('password.request')->with('error', trans('passwords.token'));
-        }
-
        return view('auth.passwords.reset')->with(
            [
                'token' => $token,
@@ -80,53 +73,38 @@ class ResetPasswordController extends Controller

    public function reset(Request $request)
    {
-
-        $broker = $this->broker();
-
        $messages = [
            'password.not_in' => trans('validation.disallow_same_pwd_as_user_fields'),
        ];

        $request->validate($this->rules(), $request->all(), $this->validationErrorMessages());

-        \Log::debug('Checking if '.$request->input('username').' exists');
-        // Check to see if the user even exists - we'll treat the response the same to prevent user sniffing
-        if ($user = User::where('username', '=', $request->input('username'))->where('activated', '1')->whereNotNull('email')->first()) {
-            \Log::debug($user->username.' exists');
-
-
-            // handle the password validation rules set by the admin settings
-            if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) {
-                $request->validate(
-                    [
-                        'password' => 'required|notIn:["'.$user->email.'","'.$user->username.'","'.$user->first_name.'","'.$user->last_name.'"',
-                    ], $messages);
-            }
-
-
-            // set the response
-            $response = $broker->reset(
-                $this->credentials($request), function ($user, $password) {
-                $this->resetPassword($user, $password);
-            });
-
-            // Check if the password reset above actually worked
-            if ($response == \Password::PASSWORD_RESET) {
-                \Log::debug('Password reset for '.$user->username.' worked');
-                return redirect()->guest('login')->with('success', trans('passwords.reset'));
-            }
-
-            \Log::debug('Password reset for '.$user->username.' FAILED - this user exists but the token is not valid');
-            return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
+        // Check to see if the user even exists
+        $user = User::where('username', '=', $request->input('username'))->first();

+        $broker = $this->broker();
+        if (strpos(Setting::passwordComplexityRulesSaving('store'), 'disallow_same_pwd_as_user_fields') !== false) {
+            $request->validate(
+                [
+                'password' => 'required|notIn:["'.$user->email.'","'.$user->username.'","'.$user->first_name.'","'.$user->last_name.'"',
+            ], $messages);
        }

+        $response = $broker->reset(
+            $this->credentials($request), function ($user, $password) {
+                $this->resetPassword($user, $password);
+            }
+        );

-        \Log::debug('Password reset for '.$request->input('username').' FAILED - user does not exist or does not have an email address - but make it look like it succeeded');
-        return redirect()->guest('login')->with('success', trans('passwords.reset'));
-
+        return $response == \Password::PASSWORD_RESET
+            ? $this->sendResetResponse($request, $response)
+            : $this->sendResetFailedResponse($request, $response);
    }

-
-
+    protected function sendResetFailedResponse(Request $request, $response)
+    {
+        return redirect()->back()
+            ->withInput(['username'=> $request->input('username')])
+            ->withErrors(['username' => trans($response), 'password' => trans($response)]);
+    }
 }
--- a/app/Http/Controllers/Auth/SamlController.php
+++ b/app/Http/Controllers/Auth/SamlController.php
@@ -51,7 +51,6 @@ 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);
        }

@@ -142,6 +141,6 @@ class SamlController extends Controller
            return view('errors.403');
        }

-        return redirect()->route('logout.get')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
+        return redirect()->route('logout')->with('saml_slo_redirect_url', $sloUrl);
    }
 }
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -87,7 +87,6 @@ class ComponentCheckoutController extends Controller
            'created_at' => date('Y-m-d H:i:s'),
            'assigned_qty' => $request->input('assigned_qty'),
            'asset_id' => $asset_id,
-            'note' => $request->input('note'),
        ]);

        event(new CheckoutableCheckedOut($component, $asset, Auth::user(), $request->input('note')));
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -129,7 +129,7 @@ class ComponentsController extends Controller
        if (is_null($component = Component::find($componentId))) {
            return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
        }
-        $min = $component->numCheckedOut();
+        $min = $component->numCHeckedOut();
        $validator = Validator::make($request->all(), [
            'qty' => "required|numeric|min:$min",
        ]);
--- a/app/Http/Controllers/Components/ComponentsFilesController.php
+++ b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -1,180 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Components;
-
-use App\Helpers\StorageHelper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetFileRequest;
-use App\Models\Actionlog;
-use App\Models\Component;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use enshrined\svgSanitize\Sanitizer;
-
-class ComponentsFilesController extends Controller
-{
-    /**
-     * Validates and stores files associated with a component.
-     *
-     * @todo Switch to using the AssetFileRequest form request validator.
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param AssetFileRequest $request
-     * @param int $componentId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(AssetFileRequest $request, $componentId = null)
-    {
-
-        if (config('app.lock_passwords')) {
-            return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled'));
-        }
-
-        $component = Component::find($componentId);
-
-        if (isset($component->id)) {
-            $this->authorize('update', $component);
-
-            if ($request->hasFile('file')) {
-                if (! Storage::exists('private_uploads/components')) {
-                    Storage::makeDirectory('private_uploads/components', 775);
-                }
-
-                foreach ($request->file('file') as $file) {
-
-                    $extension = $file->getClientOriginalExtension();
-                    $file_name = 'component-'.$component->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-
-
-                    // Check for SVG and sanitize it
-                    if ($extension == 'svg') {
-                        \Log::debug('This is an SVG');
-                        \Log::debug($file_name);
-
-                        $sanitizer = new Sanitizer();
-                        $dirtySVG = file_get_contents($file->getRealPath());
-                        $cleanSVG = $sanitizer->sanitize($dirtySVG);
-
-                        try {
-                            Storage::put('private_uploads/components/'.$file_name, $cleanSVG);
-                        } catch (\Exception $e) {
-                            \Log::debug('Upload no workie :( ');
-                            \Log::debug($e);
-                        }
-
-                    } else {
-                        Storage::put('private_uploads/components/'.$file_name, file_get_contents($file));
-                    }
-
-                    //Log the upload to the log
-                    $component->logUpload($file_name, e($request->input('notes')));
-                }
-
-
-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
-
-            }
-
-            return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded'));
-        }
-        // Prepare the error message
-        return redirect()->route('components.index')
-            ->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Deletes the selected component file.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param int $componentId
-     * @param int $fileId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function destroy($componentId = null, $fileId = null)
-    {
-        $component = Component::find($componentId);
-
-        // the asset is valid
-        if (isset($component->id)) {
-            $this->authorize('update', $component);
-            $log = Actionlog::find($fileId);
-
-            // Remove the file if one exists
-            if (Storage::exists('components/'.$log->filename)) {
-                try {
-                    Storage::delete('components/'.$log->filename);
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
-            }
-
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
-        }
-
-        // Redirect to the licence management page
-        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Allows the selected file to be viewed.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.4]
-     * @param int $componentId
-     * @param int $fileId
-     * @return \Symfony\Component\HttpFoundation\Response
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function show($componentId = null, $fileId = null, $download = true)
-    {
-        \Log::debug('Private filesystem is: '.config('filesystems.default'));
-        $component = Component::find($componentId);
-
-        // the component is valid
-        if (isset($component->id)) {
-            $this->authorize('view', $component);
-            $this->authorize('components.files', $component);
-
-            if (! $log = Actionlog::find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $file = 'private_uploads/components/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                \Log::debug('FILE DOES NOT EXISTS for '.$file);
-                \Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
-                } else {
-                    if ($download != 'true') {
-                        \Log::debug('display the file');
-                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
-                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
-                        }
-
-                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
-                    }
-
-                    return StorageHelper::downloader($file);
-
-                }
-            }
-        }
-
-        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
-    }
-}
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -56,7 +56,7 @@ class ConsumableCheckoutController extends Controller
        // Check if the user exists
        if (is_null($user = User::find($assigned_to))) {
            // Redirect to the consumable management page with error
-            return redirect()->route('consumables.checkout.show', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'))->withInput();
+            return redirect()->route('checkout/consumable', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
        }

        // Update the consumable data
@@ -66,7 +66,6 @@ class ConsumableCheckoutController extends Controller
            'consumable_id' => $consumable->id,
            'user_id' => $admin_user->id,
            'assigned_to' => e($request->input('assigned_to')),
-            'note' => $request->input('note'),
        ]);

        event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -9,7 +9,6 @@ use App\Models\Company;
 use App\Models\Consumable;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Validator;

 /**
 * This controller handles all actions related to Consumables for
@@ -129,17 +128,6 @@ class ConsumablesController extends Controller
            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
        }

-        $min = $consumable->numCheckedOut();
-        $validator = Validator::make($request->all(), [
-            "qty" => "required|numeric|min:$min"
-        ]);
-
-        if ($validator->fails()) {
-            return redirect()->back()
-                ->withErrors($validator)
-                ->withInput();
-        }
-
        $this->authorize($consumable);

        $consumable->name                   = $request->input('name');
--- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -1,180 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Consumables;
-
-use App\Helpers\StorageHelper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AssetFileRequest;
-use App\Models\Actionlog;
-use App\Models\Consumable;
-use Illuminate\Support\Facades\Response;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Consumable\HttpFoundation\JsonResponse;
-use enshrined\svgSanitize\Sanitizer;
-
-class ConsumablesFilesController extends Controller
-{
-    /**
-     * Validates and stores files associated with a consumable.
-     *
-     * @todo Switch to using the AssetFileRequest form request validator.
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param AssetFileRequest $request
-     * @param int $consumableId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(AssetFileRequest $request, $consumableId = null)
-    {
-        if (config('app.lock_passwords')) {
-            return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled'));
-        }
-
-        $consumable = Consumable::find($consumableId);
-
-        if (isset($consumable->id)) {
-            $this->authorize('update', $consumable);
-
-            if ($request->hasFile('file')) {
-                if (! Storage::exists('private_uploads/consumables')) {
-                    Storage::makeDirectory('private_uploads/consumables', 775);
-                }
-
-                foreach ($request->file('file') as $file) {
-
-                    $extension = $file->getClientOriginalExtension();
-                    $file_name = 'consumable-'.$consumable->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-
-
-                    // Check for SVG and sanitize it
-                    if ($extension == 'svg') {
-                        \Log::debug('This is an SVG');
-                        \Log::debug($file_name);
-
-                        $sanitizer = new Sanitizer();
-                        $dirtySVG = file_get_contents($file->getRealPath());
-                        $cleanSVG = $sanitizer->sanitize($dirtySVG);
-
-                        try {
-                            Storage::put('private_uploads/consumables/'.$file_name, $cleanSVG);
-                        } catch (\Exception $e) {
-                            \Log::debug('Upload no workie :( ');
-                            \Log::debug($e);
-                        }
-
-                    } else {
-                        Storage::put('private_uploads/consumables/'.$file_name, file_get_contents($file));
-                    }
-
-                    //Log the upload to the log
-                    $consumable->logUpload($file_name, e($request->input('notes')));
-                }
-
-
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
-
-            }
-
-            return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));
-        }
-        // Prepare the error message
-        return redirect()->route('consumables.index')
-            ->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Deletes the selected consumable file.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.0]
-     * @param int $consumableId
-     * @param int $fileId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function destroy($consumableId = null, $fileId = null)
-    {
-        $consumable = Consumable::find($consumableId);
-
-        // the asset is valid
-        if (isset($consumable->id)) {
-            $this->authorize('update', $consumable);
-            $log = Actionlog::find($fileId);
-
-            // Remove the file if one exists
-            if (Storage::exists('consumables/'.$log->filename)) {
-                try {
-                    Storage::delete('consumables/'.$log->filename);
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
-            }
-
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
-        }
-
-        // Redirect to the licence management page
-        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist'));
-    }
-
-    /**
-     * Allows the selected file to be viewed.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v1.4]
-     * @param int $consumableId
-     * @param int $fileId
-     * @return \Symfony\Consumable\HttpFoundation\Response
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function show($consumableId = null, $fileId = null, $download = true)
-    {
-        $consumable = Consumable::find($consumableId);
-
-        // the consumable is valid
-        if (isset($consumable->id)) {
-            $this->authorize('view', $consumable);
-            $this->authorize('consumables.files', $consumable);
-
-            if (! $log = Actionlog::find($fileId)) {
-                return response('No matching record for that asset/file', 500)
-                    ->header('Content-Type', 'text/plain');
-            }
-
-            $file = 'private_uploads/consumables/'.$log->filename;
-
-            if (Storage::missing($file)) {
-                \Log::debug('FILE DOES NOT EXISTS for '.$file);
-                \Log::debug('URL should be '.Storage::url($file));
-
-                return response('File '.$file.' ('.Storage::url($file).') not found on server', 404)
-                    ->header('Content-Type', 'text/plain');
-            } else {
-
-                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
-                // won't work, as they're not accessible via the web
-                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
-                    return StorageHelper::downloader($file);
-                } else {
-                    if ($download != 'true') {
-                        \Log::debug('display the file');
-                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
-                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
-                        }
-
-                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
-                    }
-
-                    return StorageHelper::downloader($file);
-
-                }
-            }
-        }
-
-        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
-    }
-}
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -86,32 +86,22 @@ class CustomFieldsController extends Controller
    {
        $this->authorize('create', CustomField::class);

-        $show_in_email = $request->get("show_in_email", 0);
-        $display_in_user_view = $request->get("display_in_user_view", 0);
-
-        // Override the display settings if the field is encrypted
-        if ($request->get("field_encrypted") == '1') {
-            $show_in_email = '0';
-            $display_in_user_view = '0';
-        }
-
        $field = new CustomField([
            "name" => trim($request->get("name")),
            "element" => $request->get("element"),
            "help_text" => $request->get("help_text"),
            "field_values" => $request->get("field_values"),
            "field_encrypted" => $request->get("field_encrypted", 0),
-            "show_in_email" => $show_in_email,
+            "show_in_email" => $request->get("show_in_email", 0),
            "is_unique" => $request->get("is_unique", 0),
-            "display_in_user_view" => $display_in_user_view,
            "user_id" => Auth::id()
        ]);


        if ($request->filled('custom_format')) {
-            $field->format = $request->get('custom_format');
+            $field->format = e($request->get('custom_format'));
        } else {
-            $field->format = $request->get('format');
+            $field->format = e($request->get('format'));
        }

        if ($field->save()) {
@@ -231,24 +221,13 @@ class CustomFieldsController extends Controller

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

-
-        $show_in_email = $request->get("show_in_email", 0);
-        $display_in_user_view = $request->get("display_in_user_view", 0);
-
-        // Override the display settings if the field is encrypted
-        if ($request->get("field_encrypted") == '1') {
-            $show_in_email = '0';
-            $display_in_user_view = '0';
-        }
-        
        $field->name          = trim(e($request->get("name")));
        $field->element       = e($request->get("element"));
        $field->field_values  = e($request->get("field_values"));
        $field->user_id       = Auth::id();
        $field->help_text     = $request->get("help_text");
-        $field->show_in_email = $show_in_email;
+        $field->show_in_email = $request->get("show_in_email", 0);
        $field->is_unique     = $request->get("is_unique", 0);
-        $field->display_in_user_view = $display_in_user_view;

        if ($request->get('format') == 'CUSTOM REGEX') {
            $field->format = e($request->get('custom_format'));
@@ -256,10 +235,6 @@ class CustomFieldsController extends Controller
            $field->format = e($request->get('format'));
        }

-        if($field->element == 'checkbox' || $field->element == 'radio'){
-            $field->format = 'ANY';
-        }
-
        if ($field->save()) {
            return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/message.field.update.success'));
        }
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -75,9 +75,9 @@ class CustomFieldsetsController extends Controller
     */
    public function create()
    {
-        $this->authorize('create', CustomField::class);
+        $this->authorize('create', CustomFieldset::class);

-        return view('custom_fields.fieldsets.edit')->with('item', new CustomFieldset());
+        return view('custom_fields.fieldsets.edit');
    }

    /**
@@ -91,7 +91,7 @@ class CustomFieldsetsController extends Controller
     */
    public function store(Request $request)
    {
-        $this->authorize('create', CustomField::class);
+        $this->authorize('create', CustomFieldset::class);

        $cfset = new CustomFieldset([
                'name' => e($request->get('name')),
@@ -110,52 +110,31 @@ class CustomFieldsetsController extends Controller
    }

    /**
-     * Presents edit form for fieldset
+     * What the actual fuck, Brady?
     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @todo Uhh, build this?
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @param  int  $id
-     * @since [v6.0.14]
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v1.8]
+     * @return Fuckall
     */
    public function edit($id)
    {
-        $this->authorize('create', CustomField::class);
-
-        if ($fieldset = CustomFieldset::find($id)) {
-            return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
-        }
-
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
-
+        //
    }

    /**
-     * Saves updated fieldset data
+     * GET IN THE SEA BRADY.
     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @todo Uhh, build this too?
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @param  int  $id
-     * @since [v6.0.14]
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v1.8]
+     * @return Fuckall
     */
-    public function update(Request $request, $id)
+    public function update($id)
    {
-        $this->authorize('create', CustomField::class);
-
-        if ($fieldset = CustomFieldset::find($id)) {
-
-            $fieldset->name = $request->input('name');
-
-            if ($fieldset->save()) {
-                return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
-            }
-
-            return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
-
-        }
-
-        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
+        //
    }

    /**
@@ -207,7 +186,7 @@ class CustomFieldsetsController extends Controller
                }
            }

-            $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => (int)$request->input('order', 1)]);
+            $results = $set->fields()->attach($request->input('field_id'), ['required' => ($request->input('required') == 'on'), 'order' => $request->input('order', 1)]);

            return redirect()->route('fieldsets.show', [$id])->with('success', trans('admin/custom_fields/message.field.create.assoc_success'));
        }
@@ -223,7 +202,7 @@ class CustomFieldsetsController extends Controller
     */
    public function makeFieldRequired($fieldset_id, $field_id)
    {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', CustomFieldset::class);
        $field = CustomField::findOrFail($field_id);
        $fieldset = CustomFieldset::findOrFail($fieldset_id);
        $fields[$field->id] = ['required' => 1];
@@ -241,7 +220,7 @@ class CustomFieldsetsController extends Controller
     */
    public function makeFieldOptional($fieldset_id, $field_id)
    {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', CustomFieldset::class);
        $field = CustomField::findOrFail($field_id);
        $fieldset = CustomFieldset::findOrFail($fieldset_id);
        $fields[$field->id] = ['required' => 0];
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -34,7 +34,7 @@ class DashboardController extends Controller
            $counts['license'] = \App\Models\License::assetcount();
            $counts['consumable'] = \App\Models\Consumable::count();
            $counts['component'] = \App\Models\Component::count();
-            $counts['user'] = \App\Models\Company::scopeCompanyables(Auth::user())->count();
+            $counts['user'] = \App\Models\User::count();
            $counts['grand_total'] = $counts['asset'] + $counts['accessory'] + $counts['license'] + $counts['consumable'];

            if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -54,8 +54,7 @@ class DepartmentsController extends Controller
        $department->fill($request->all());
        $department->user_id = Auth::user()->id;
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
-        $department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);
-        $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);
+
        $department = $request->handleImages($department);

        if ($department->save()) {
@@ -168,8 +167,6 @@ class DepartmentsController extends Controller

        $department->fill($request->all());
        $department->manager_id = ($request->filled('manager_id') ? $request->input('manager_id') : null);
-        $department->location_id = ($request->filled('location_id') ? $request->input('location_id') : null);
-        $department->company_id = ($request->filled('company_id') ? $request->input('company_id') : null);

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

--- a/app/Http/Controllers/Kits/CheckoutKitController.php
+++ b/app/Http/Controllers/Kits/CheckoutKitController.php
@@ -5,7 +5,6 @@ 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;
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -61,7 +61,6 @@ class LicenseCheckoutController extends Controller

        $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
        $licenseSeat->user_id = Auth::id();
-        

        $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
        if ($this->$checkoutMethod($licenseSeat)) {
@@ -77,14 +76,14 @@ class LicenseCheckoutController extends Controller

        if (! $licenseSeat) {
            if ($seatId) {
-                throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.'));
+                return redirect()->route('licenses.index')->with('error', 'This Seat is not available for checkout.');
            }
-            
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'There are no available seats for this license.'));
+
+            return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
        }

        if (! $licenseSeat->license->is($license)) {
-            throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.'));
+            return redirect()->route('licenses.index')->with('error', 'The license seat provided does not match the license.');
        }

        return $licenseSeat;
--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -135,7 +135,6 @@ class LicenseFilesController extends Controller
        // the license is valid
        if (isset($license->id)) {
            $this->authorize('view', $license);
-            $this->authorize('licenses.files', $license);

            if (! $log = Actionlog::find($fileId)) {
                return response('No matching record for that asset/file', 500)
@@ -172,6 +171,6 @@ class LicenseFilesController extends Controller
            }
        }

-        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId]));
+        return redirect()->route('license.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId]));
    }
 }
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -134,7 +134,6 @@ class LicensesController extends Controller
            ->with('maintained_list', $maintained_list);
    }

-
    /**
     * Validates and stores the license form data submitted from the edit
     * license form.
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -211,35 +211,23 @@ class LocationsController extends Controller

    public function print_assigned($id)
    {
+        $location = Location::where('id', $id)->first();
+        $parent = Location::where('id', $location->parent_id)->first();
+        $manager = User::where('id', $location->manager_id)->first();
+        $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
+        $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();

-        if ($location = Location::where('id', $id)->first()) {
-            $parent = Location::where('id', $location->parent_id)->first();
-            $manager = User::where('id', $location->manager_id)->first();
-            $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
-            $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();
-            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
-
-        }
-
-        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-
-
-
+        return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
    }

    public function print_all_assigned($id)
    {
-        if ($location = Location::where('id', $id)->first()) {
-            $parent = Location::where('id', $location->parent_id)->first();
-            $manager = User::where('id', $location->manager_id)->first();
-            $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
-            $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();
-            return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
-
-        }
-        return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist'));
-
-
+        $location = Location::where('id', $id)->first();
+        $parent = Location::where('id', $location->parent_id)->first();
+        $manager = User::where('id', $location->manager_id)->first();
+        $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
+        $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();

+        return view('locations/print')->with('assets', $assets)->with('users', $users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
    }
 }
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -3,11 +3,8 @@
 namespace App\Http\Controllers;

 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Asset;
 use App\Models\Setting;
-use App\Models\User;
-use App\Notifications\CurrentInventory;
-use Illuminate\Support\Facades\Auth;
+use Auth;
 use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -67,9 +64,37 @@ class ProfileController extends Controller
            $user->location_id = $request->input('location_id');
        }

-        // Handle the avatar upload and/or delete if necessary
-        app('\App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');

+        if ($request->input('avatar_delete') == 1) {
+            $user->avatar = null;
+        }
+
+
+        if ($request->hasFile('avatar')) {
+            $path = 'avatars';
+
+            if (! Storage::disk('public')->exists($path)) {
+                Storage::disk('public')->makeDirectory($path, 775);
+            }
+
+            $upload = $image = $request->file('avatar');
+            $ext = $image->getClientOriginalExtension();
+            $file_name = 'avatar-'.str_random(18).'.'.$ext;
+
+            if ($image->getClientOriginalExtension() != 'svg') {
+                $upload = Image::make($image->getRealPath())->resize(84, 84);
+            }
+
+            // This requires a string instead of an object, so we use ($string)
+            Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode());
+
+            // Remove Current image if exists
+            if (($user->avatar) && (Storage::disk('public')->exists($path.'/'.$user->avatar))) {
+                Storage::disk('public')->delete($path.'/'.$user->avatar);
+            }
+
+            $user->avatar = $file_name;
+        }

        if ($user->save()) {
            return redirect()->route('profile')->with('success', 'Account successfully updated');
@@ -108,7 +133,7 @@ class ProfileController extends Controller
    public function password()
    {
        $user = Auth::user();
-        
+
        return view('account/change-password', compact('user'));
    }

@@ -136,7 +161,7 @@ class ProfileController extends Controller
        $validator = \Validator::make($request->all(), $rules);
        $validator->after(function ($validator) use ($request, $user) {
            if (! Hash::check($request->input('current_password'), $user->password)) {
-                $validator->errors()->add('current_password', trans('validation.custom.hashed_pass'));
+                $validator->errors()->add('current_password', trans('validation.hashed_pass'));
            }

            // This checks to make sure that the user's password isn't the same as their username,
@@ -161,9 +186,6 @@ class ProfileController extends Controller
        if (! $validator->fails()) {
            $user->password = Hash::make($request->input('password'));
            $user->save();
-
-            // Log the user out of other devices
-            Auth::logoutOtherDevices($request->input('password'));
            return redirect()->route('account.password.index')->with('success', 'Password updated!');

        }
@@ -191,47 +213,4 @@ class ProfileController extends Controller
            $request->session()->put('menu_state', 'closed');
        }
    }
-
-
-    /**
-     * Print inventory
-     *
-     * @author A. Gianotto
-     * @since [v6.0.12]
-     * @return Illuminate\View\View
-     */
-    public function printInventory()
-    {
-        $show_user = Auth::user();
-
-        return view('users/print')
-            ->with('assets', Auth::user()->assets)
-            ->with('licenses', $show_user->licenses()->get())
-            ->with('accessories', $show_user->accessories()->get())
-            ->with('consumables', $show_user->consumables()->get())
-            ->with('show_user', $show_user)
-            ->with('settings', Setting::getSettings());
-    }
-
-    /**
-     * Emails user a list of assigned assets
-     *
-     * @author A. Gianotto
-     * @since [v6.0.12]
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function emailAssetList()
-    {
-
-        if (!$user = User::find(Auth::user()->id)) {
-            return redirect()->back()
-                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
-        }
-        if (empty($user->email)) {
-            return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
-        }
-
-        $user->notify((new CurrentInventory($user)));
-        return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
-    }
 }
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -22,8 +22,6 @@ use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use League\Csv\EscapeFormula;
-

 /**
 * This controller handles all actions related to Reports for
@@ -277,18 +275,13 @@ 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 : $item_name,
+                        ($actionlog->itemType() == 'user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()),
                        $target_name,
                        ($actionlog->note) ? e($actionlog->note) : '',
                        $actionlog->log_meta,
@@ -413,7 +406,6 @@ class ReportsController extends Controller
        $customfields = CustomField::get();
        $response = new StreamedResponse(function () use ($customfields, $request) {
            \Log::debug('Starting streamed response');
-            \Log::debug('CSV escaping is set to: '.config('app.escape_formulas'));

            // Open output stream
            $handle = fopen('php://output', 'w');
@@ -425,9 +417,6 @@ class ReportsController extends Controller

            $header = [];

-            if ($request->filled('id')) {
-                $header[] = trans('general.id');
-            }

            if ($request->filled('company')) {
                $header[] = trans('general.company');
@@ -558,10 +547,6 @@ class ReportsController extends Controller
                $header[] = trans('general.updated_at');
            }

-            if ($request->filled('deleted_at')) {
-                $header[] = trans('general.deleted');
-            }
-
            if ($request->filled('last_audit_date')) {
                $header[] = trans('general.last_audit');
            }
@@ -574,10 +559,6 @@ class ReportsController extends Controller
                $header[] = trans('general.notes');
            }

-            if ($request->filled('url')) {
-                $header[] = trans('admin/manufacturers/table.url');
-            }
-

            foreach ($customfields as $customfield) {
                if ($request->input($customfield->db_column_name()) == '1') {
@@ -592,7 +573,7 @@ class ReportsController extends Controller
            \Log::debug('Added headers: '.$executionTime);

            $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
-                'location', 'assetstatus', 'company', 'defaultLoc', 'assignedTo',
+                'location', 'assetstatus', 'assetlog', 'company', 'defaultLoc', 'assignedTo',
                'model.category', 'model.manufacturer', 'supplier');
            
            if ($request->filled('by_location_id')) {
@@ -600,6 +581,7 @@ class ReportsController extends Controller
            }

            if ($request->filled('by_rtd_location_id')) {
+                \Log::debug('RTD location should match: '.$request->input('by_rtd_location_id'));
                $assets->where('assets.rtd_location_id', $request->input('by_rtd_location_id'));
            }

@@ -620,6 +602,7 @@ class ReportsController extends Controller
            }

            if ($request->filled('by_dept_id')) {
+                \Log::debug('Only users in dept '.$request->input('by_dept_id'));
                $assets->CheckedOutToTargetInDepartment($request->input('by_dept_id'));
            }

@@ -654,32 +637,15 @@ class ReportsController extends Controller
            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
            }
-            if ($request->filled('exclude_archived')) {
-                $assets->notArchived();
-            }
-            if ($request->input('deleted_assets') == '1') {
-                $assets->withTrashed();
-            }
-            if ($request->input('deleted_assets') == '0') {
-                $assets->onlyTrashed();
-            }
-
            $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) {
            
                $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
                \Log::debug('Walking results: '.$executionTime);
                $count = 0;
-
-                $formatter = new EscapeFormula("`");
-
                foreach ($assets as $asset) {
                    $count++;
                    $row = [];
-
-                    if ($request->filled('id')) {
-                        $row[] = ($asset->id) ? $asset->id : '';
-                    }
-
+                    
                    if ($request->filled('company')) {
                        $row[] = ($asset->company) ? $asset->company->name : '';
                    }
@@ -808,7 +774,7 @@ class ReportsController extends Controller

                    if ($request->filled('warranty')) {
                        $row[] = ($asset->warranty_months) ? $asset->warranty_months : '';
-                        $row[] = $asset->present()->warranty_expires();
+                        $row[] = $asset->present()->warrantee_expires();
                    }

                    if ($request->filled('depreciation')) {
@@ -835,10 +801,6 @@ class ReportsController extends Controller
                        $row[] = ($asset->updated_at) ? $asset->updated_at : '';
                    }

-                    if ($request->filled('deleted_at')) {
-                        $row[] = ($asset->deleted_at) ? $asset->deleted_at : '';
-                    }
-
                    if ($request->filled('last_audit_date')) {
                        $row[] = ($asset->last_audit_date) ? $asset->last_audit_date : '';
                    }
@@ -851,27 +813,13 @@ class ReportsController extends Controller
                        $row[] = ($asset->notes) ? $asset->notes : '';
                    }

-                    if ($request->filled('url')) {
-                        $row[] = config('app.url').'/hardware/'.$asset->id ;
-                    }
-
                    foreach ($customfields as $customfield) {
                        $column_name = $customfield->db_column_name();
                        if ($request->filled($customfield->db_column_name())) {
                            $row[] = $asset->$column_name;
                        }
                    }
-
-                    
-                    // CSV_ESCAPE_FORMULAS is set to false in the .env
-                    if (config('app.escape_formulas') === false) {
-                        fputcsv($handle, $row);
-
-                   // CSV_ESCAPE_FORMULAS is set to true or is not set in the .env
-                    } else {
-                        fputcsv($handle, $formatter->escapeRecord($row));
-                    }
-
+                    fputcsv($handle, $row);
                    $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
                    \Log::debug('-- Record '.$count.' Asset ID:'.$asset->id.' in '.$executionTime);
                }
@@ -985,17 +933,12 @@ class ReportsController extends Controller
        /**
         * Get all assets with pending checkout acceptances
         */
-        if($showDeleted) {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
-        } else {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo' => function ($query) {
-                $query->withTrashed();
-            }, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
-        }
+
+        $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();

        $assetsForReport = $acceptances
-            ->filter(function ($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
            })
            ->map(function($acceptance) {
                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
@@ -1022,11 +965,7 @@ class ReportsController extends Controller
        }
        $assetItem = $acceptance->checkoutable;

-        if (is_null($acceptance->created_at)){
-            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
-        } else {
-            $logItem = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get()[0];
-        }
+        $logItem = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get()[0];

        if(!$assetItem->assignedTo->locale){
            Notification::locale(Setting::getSettings()->locale)->send(
@@ -1083,9 +1022,9 @@ class ReportsController extends Controller
         * Get all assets with pending checkout acceptances
         */
        if($showDeleted) {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+            $acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
        } else {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+            $acceptances = CheckoutAcceptance::pending()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
        }

        $assetsForReport = $acceptances
@@ -1110,19 +1049,13 @@ class ReportsController extends Controller
        $rows[] = implode(',', $header);

        foreach ($assetsForReport as $item) {
-
-            if ($item['assetItem'] != null){
-            
-                $row    = [ ];
-                $row[]  = str_replace(',', '', e($item['assetItem']->model->category->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->model->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
-                $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
-                $rows[] = implode(',', $row);
-            } else {
-                // Log the error maybe?
-            }
+            $row    = [ ];
+            $row[]  = str_replace(',', '', e($item['assetItem']->model->category->name));
+            $row[]  = str_replace(',', '', e($item['assetItem']->model->name));
+            $row[]  = str_replace(',', '', e($item['assetItem']->name));
+            $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
+            $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
+            $rows[] = implode(',', $row);
        }

        // spit out a csv
@@ -1205,4 +1138,18 @@ class ReportsController extends Controller
            $this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance())
        );
    }
+
+    /**
+     * getAssetsNotAcceptedYet
+     *
+     * @return array
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     */
+    protected function getAssetsNotAcceptedYet()
+    {
+        $this->authorize('reports.view');
+
+        return Asset::unaccepted();
+    }
 }
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -7,7 +7,6 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
-use App\Models\Group;
 use App\Models\Setting;
 use App\Models\Asset;
 use App\Models\User;
@@ -26,7 +25,6 @@ use Response;
 use App\Http\Requests\SlackSettingsRequest;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
-use Validator;

 /**
 * This controller handles all actions related to Settings for
@@ -340,7 +338,6 @@ class SettingsController extends Controller
        $setting->email_format = $request->input('email_format');
        $setting->username_format = $request->input('username_format');
        $setting->require_accept_signature = $request->input('require_accept_signature');
-        $setting->display_username = $request->input('display_username', 0);
        $setting->show_assigned_assets = $request->input('show_assigned_assets', '0');
        if (! config('app.lock_passwords')) {
            $setting->login_note = $request->input('login_note');
@@ -351,7 +348,6 @@ class SettingsController extends Controller
        $setting->privacy_policy_link = $request->input('privacy_policy_link');

        $setting->depreciation_method = $request->input('depreciation_method');
-        $setting->dash_chart_type = $request->input('dash_chart_type');

        if ($request->input('per_page') != '') {
            $setting->per_page = $request->input('per_page');
@@ -913,27 +909,8 @@ class SettingsController extends Controller
    public function getLdapSettings()
    {
        $setting = Setting::getSettings();
-        $groups = Group::pluck('name', 'id');

-
-        /**
-         * This validator is only temporary (famous last words.) - @snipe
-         */
-        $messages = [
-            'ldap_username_field.not_in' => '<code>sAMAccountName</code> (mixed case) will likely not work. You should use <code>samaccountname</code> (lowercase) instead. ',
-            'ldap_auth_filter_query.not_in' => '<code>uid=samaccountname</code> is probably not a valid auth filter. You probably want <code>uid=</code> ',
-            'ldap_filter.regex' => 'This value should probably not be wrapped in parentheses.',
-        ];
-
-        $validator = Validator::make($setting->toArray(), [
-            'ldap_username_field' => 'not_in:sAMAccountName',
-            'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
-            'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
-        ],  $messages);
-
-
-
-        return view('settings.ldap', compact('setting', 'groups'))->withErrors($validator);
+        return view('settings.ldap', compact('setting'));
    }

    /**
@@ -960,17 +937,15 @@ class SettingsController extends Controller
                $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
            }
            $setting->ldap_basedn = $request->input('ldap_basedn');
-            $setting->ldap_default_group = $request->input('ldap_default_group');
            $setting->ldap_filter = $request->input('ldap_filter');
            $setting->ldap_username_field = $request->input('ldap_username_field');
            $setting->ldap_lname_field = $request->input('ldap_lname_field');
            $setting->ldap_fname_field = $request->input('ldap_fname_field');
            $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
-            $setting->ldap_version = $request->input('ldap_version', 3);
+            $setting->ldap_version = $request->input('ldap_version');
            $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');
@@ -1050,12 +1025,6 @@ 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.
@@ -1068,7 +1037,7 @@ class SettingsController extends Controller
     */
    public function getBackups()
    {
-        $settings = Setting::getSettings();
+
        $path = 'app/backups';
        $backup_files = Storage::files($path);
        $files_raw = [];
@@ -1085,7 +1054,7 @@ class SettingsController extends Controller
                        'filename' => basename($backup_files[$f]),
                        'filesize' => Setting::fileSizeConvert(Storage::size($backup_files[$f])),
                        'modified_value' => $file_timestamp,
-                        'modified_display' => date($settings->date_display_format.' '.$settings->time_display_format, $file_timestamp),
+                        'modified_display' => Helper::getFormattedDateObject($file_timestamp, $type = 'datetime', false),
                        
                    ];
                }
@@ -1171,31 +1140,23 @@ class SettingsController extends Controller
     */
    public function deleteFile($filename = null)
    {
-        if (config('app.allow_backup_delete')=='true') {
+        if (! config('app.lock_passwords')) {
+            $path = 'app/backups';

-            if (!config('app.lock_passwords')) {
-                $path = 'app/backups';
+            if (Storage::exists($path.'/'.$filename)) {
+                try {
+                    Storage::delete($path.'/'.$filename);

-                if (Storage::exists($path . '/' . $filename)) {
-
-                    try {
-                        Storage::delete($path . '/' . $filename);
-                        return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted'));
-                    } catch (\Exception $e) {
-                        \Log::debug($e);
-                    }
-
-                } else {
-                    return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
+                    return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted'));
+                } catch (\Exception $e) {
+                    \Log::debug($e);
                }
+            } else {
+                return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
            }
-
+        } else {
            return redirect()->route('settings.backups.index')->with('error', trans('general.feature_disabled'));
        }
-
-        // Hell to the no
-        \Log::warning('User ID '.Auth::user()->id.' is attempting to delete backup file '.$filename.' and is not authorized to.');
-        return redirect()->route('settings.backups.index')->with('error', trans('general.backup_delete_not_allowed'));
    }


@@ -1230,10 +1191,9 @@ class SettingsController extends Controller
                        Storage::putFileAs('app/backups', $request->file('file'), $upload_filename);
            
                        return redirect()->route('settings.backups.index')->with('success', 'File uploaded');
+                } else {
+                    return redirect()->route('settings.backups.index')->withErrors($request->getErrors());
                }
-
-                return redirect()->route('settings.backups.index')->withErrors($request->getErrors());
-
            }

        } else {
@@ -1267,11 +1227,7 @@ class SettingsController extends Controller
                // TODO: run a backup


-                Artisan::call('db:wipe', [
-                    '--force' => true,
-                ]);
-
-                \Log::debug('Attempting to restore from: '. storage_path($path).'/'.$filename);
+                Artisan::call('db:wipe');

                // run the restore command
                Artisan::call('snipeit:restore', 
@@ -1283,31 +1239,28 @@ class SettingsController extends Controller

                // If it's greater than 300, it probably worked
                $output = Artisan::output();
+                if (strlen($output) > 300) {
+                    $find_user = DB::table('users')->where('first_name', $user->first_name)->where('last_name', $user->last_name)->exists();
+                    if(!$find_user){
+                        \Log::warning('Attempting to restore user: ' . $user->first_name . ' ' . $user->last_name);
+                        $new_user = $user->replicate();
+                        $new_user->push();
+                    }

-                /* Run migrations */
-                \Log::debug('Migrating database...');
-                Artisan::call('migrate', ['--force' => true]);
-                $migrate_output = Artisan::output();
-                \Log::debug($migrate_output);
+                    $session_files = glob(storage_path("framework/sessions/*"));
+                    foreach ($session_files as $file) {
+                        if (is_file($file))
+                            unlink($file);
+                    }
+                    DB::table('users')->update(['remember_token' => null]);
+                    \Auth::logout();

-                $find_user = DB::table('users')->where('username', $user->username)->exists();
-                
-                if (!$find_user){
-                    \Log::warning('Attempting to restore user: ' . $user->username);
-                    $new_user = $user->replicate();
-                    $new_user->push();
+                    return redirect()->route('login')->with('success', 'Your system has been restored. Please login again.');
                } else {
-                    \Log::debug('User: ' . $user->username .' already exists.');
+                    return redirect()->route('settings.backups.index')->with('error', $output);
+
                }

-                \Log::debug('Logging all users out..');
-                Artisan::call('snipeit:global-logout', ['--force' => true]);
-
-                DB::table('users')->update(['remember_token' => null]);
-                \Auth::logout();
-
-                return redirect()->route('login')->with('success', 'Your system has been restored. Please login again.');
-                
            } else {
                return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.backup.file_not_found'));
            }
@@ -1327,15 +1280,9 @@ class SettingsController extends Controller
     */
    public function getPurge()
    {
+        \Log::warning('User ID '.Auth::user()->id.' is attempting a PURGE');

-        \Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');
-
-        if (config('app.allow_purge')=='true') {
-            return view('settings.purge-form');
-        }
-
-        return redirect()->route('settings.index')->with('error', trans('general.purge_not_allowed'));
-
+        return view('settings.purge-form');
    }

    /**
@@ -1349,40 +1296,22 @@ class SettingsController extends Controller
     */
    public function postPurge(Request $request)
    {
-        \Log::warning('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting a PURGE');
+        if (! config('app.lock_passwords')) {
+            if ('DELETE' == $request->input('confirm_purge')) {
+                \Log::warning('User ID '.Auth::user()->id.' initiated a PURGE!');
+                // Run a backup immediately before processing
+                Artisan::call('backup:run');
+                Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);
+                $output = Artisan::output();

-        if (config('app.allow_purge')=='true') {
-            \Log::debug('Purging is not allowed via the .env');
-
-            if (!config('app.lock_passwords')) {
-
-                if ($request->input('confirm_purge')=='DELETE') {
-
-                    \Log::warning('User ID ' . Auth::user()->id . ' initiated a PURGE!');
-                    // Run a backup immediately before processing
-                    Artisan::call('backup:run');
-                    Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);
-                    $output = Artisan::output();
-
-                    return redirect()->route('settings.index')
-                        ->with('output', $output)->with('success', trans('admin/settings/message.purge.success'));
-
-                } else {
-                    return redirect()->route('settings.purge.index')
-                        ->with('error', trans('admin/settings/message.purge.validation_failed'));
-                }
+                return view('settings/purge')
+                    ->with('output', $output)->with('success', trans('admin/settings/message.purge.success'));
            } else {
-                return redirect()->route('settings.index')
-                    ->with('error', trans('general.feature_disabled'));
+                return redirect()->back()->with('error', trans('admin/settings/message.purge.validation_failed'));
            }
+        } else {
+            return redirect()->back()->with('error', trans('general.feature_disabled'));
        }
-
-        \Log::error('User '.Auth::user()->username.' (ID'.Auth::user()->id.') is attempting to purge deleted data and is not authorized to.');
-
-
-        // Nope.
-        return redirect()->route('settings.index')
-            ->with('error', trans('general.purge_not_allowed'));
    }

    /**
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -5,13 +5,10 @@ namespace App\Http\Controllers\Users;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
-use App\Models\License;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Group;
 use App\Models\LicenseSeat;
-use App\Models\ConsumableAssignment;
-use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -49,13 +46,13 @@ class BulkUsersController extends Controller
                foreach ($users as $user) {
                    if (($user->activated == '1') && ($user->email != '')) {
                        $credentials = ['email' => $user->email];
-                        Password::sendResetLink($credentials/* , function (Message $message) {
-                        $message->subject($this->getEmailSubject()); // TODO - I'm not sure if we still need this, but this second parameter is no longer accepted in later Laravel versions.
-                        } */ );                                      // TODO - so hopefully this doesn't give us generic password reset messages? But it at least _works_
+                        Password::sendResetLink($credentials, function (Message $message) {
+                            $message->subject($this->getEmailSubject());
+                        });
                    }
                }
-                return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));

+                return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));
            }
        }

@@ -94,10 +91,8 @@ class BulkUsersController extends Controller
            ->conditionallyAddItem('company_id')
            ->conditionallyAddItem('locale')
            ->conditionallyAddItem('remote')
-            ->conditionallyAddItem('ldap_import')
            ->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;
@@ -108,16 +103,11 @@ 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) {
@@ -165,11 +155,13 @@ class BulkUsersController extends Controller
        if ((! $request->filled('ids')) || (count($request->input('ids')) == 0)) {
            return redirect()->back()->with('error', 'No users selected');
        }
+        if ((! $request->filled('status_id')) || ($request->input('status_id') == '')) {
+            return redirect()->route('users.index')->with('error', 'No status selected');
+        }

        if (config('app.lock_passwords')) {
            return redirect()->route('users.index')->with('error', 'Bulk delete is not enabled in this installation');
        }
-
        $user_raw_array = request('ids');

        if (($key = array_search(Auth::id(), $user_raw_array)) !== false) {
@@ -180,48 +172,25 @@ class BulkUsersController extends Controller
        $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', \App\Models\User::class)->get();
        $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
        $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
-        $consumables = DB::table('consumables_users')->whereIn('assigned_to', $user_raw_array)->get();
-
-        if ((($assets->count() > 0) && ((!$request->filled('status_id')) || ($request->input('status_id') == '')))) {
-            return redirect()->route('users.index')->with('error', 'No status selected');
-        }
-

        $this->logItemCheckinAndDelete($assets, Asset::class);
        $this->logItemCheckinAndDelete($accessories, Accessory::class);
-        $this->logItemCheckinAndDelete($licenses, License::class);
-        $this->logItemCheckinAndDelete($consumables, Consumable::class);
-
+        $this->logItemCheckinAndDelete($licenses, LicenseSeat::class);

        Asset::whereIn('id', $assets->pluck('id'))->update([
            'status_id'     => e(request('status_id')),
            'assigned_to'   => null,
            'assigned_type' => null,
-            'expected_checkin' => null,
        ]);

-
        LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]);
-        ConsumableAssignment::whereIn('id', $consumables->pluck('id'))->delete();
-

        foreach ($users as $user) {
-
-            $user->consumables()->sync([]);
            $user->accessories()->sync([]);
-            if ($request->input('delete_user')=='1') {
-                $user->delete();
-            }
-
+            $user->delete();
        }

-        $msg = trans('general.bulk_checkin_success');
-        if ($request->input('delete_user')=='1') {
-            $msg = trans('general.bulk_checkin_delete_success');
-        }
-
-
-        return redirect()->route('users.index')->with('success', $msg);
+        return redirect()->route('users.index')->with('success', 'Your selected users have been deleted and their assets have been updated.');
    }

    /**
@@ -232,20 +201,14 @@ class BulkUsersController extends Controller
    protected function logItemCheckinAndDelete($items, $itemType)
    {
        foreach ($items as $item) {
-            $item_id = $item->id;
            $logAction = new Actionlog();
-
-            if ($itemType == License::class){
-                $item_id = $item->license_id;
-            }
-            
-            $logAction->item_id = $item_id;
+            $logAction->item_id = $item->id;
            // We can't rely on get_class here because the licenses/accessories fetched above are not eloquent models, but simply arrays.
            $logAction->item_type = $itemType;
            $logAction->target_id = $item->assigned_to;
            $logAction->target_type = User::class;
            $logAction->user_id = Auth::id();
-            $logAction->note = 'Bulk checkin items';
+            $logAction->note = 'Bulk checkin items and delete user';
            $logAction->logaction('checkin from');
        }
    }
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -23,7 +23,6 @@ use Redirect;
 use Str;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use View;
-use App\Notifications\CurrentInventory;

 /**
 * This controller handles all actions related to Users for
@@ -117,10 +116,6 @@ class UsersController extends Controller
        $user->country = $request->input('country', null);
        $user->zip = $request->input('zip', null);
        $user->remote = $request->input('remote', 0);
-        $user->website = $request->input('website', null);
-        $user->created_by = Auth::user()->id;
-        $user->start_date = $request->input('start_date', null);
-        $user->end_date = $request->input('end_date', null);

        // Strip out the superuser permission if the user isn't a superadmin
        $permissions_array = $request->input('permission');
@@ -131,7 +126,7 @@ class UsersController extends Controller
        $user->permissions = json_encode($permissions_array);

        // we have to invoke the
-        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'image', 'avatars', 'avatar');

        if ($user->save()) {
            if ($request->filled('groups')) {
@@ -271,9 +266,6 @@ class UsersController extends Controller
        $user->activated = $request->input('activated', 0);
        $user->zip = $request->input('zip', null);
        $user->remote = $request->input('remote', 0);
-        $user->website = $request->input('website', null);
-        $user->start_date = $request->input('start_date', null);
-        $user->end_date = $request->input('end_date', null);

        // Update the location of any assets checked out to this user
        Asset::where('assigned_type', User::class)
@@ -296,7 +288,7 @@ class UsersController extends Controller
        $user->permissions = json_encode($permissions_array);

        // Handle uploaded avatar
-        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');

        //\Log::debug(print_r($user, true));

@@ -598,7 +590,7 @@ class UsersController extends Controller
    }

    /**
-     * Print inventory
+     * LDAP form processing.
     *
     * @author Aladin Alaily
     * @since [v1.8]
@@ -620,30 +612,6 @@ class UsersController extends Controller
            ->with('settings', Setting::getSettings());
    }

-    /**
-     * Emails user a list of assigned assets
-     *
-     * @author [G. Martinez] [<godmartinz@gmail.com>]
-     * @since [v6.0.5]
-     * @param  \App\Http\Controllers\Users\UsersController  $id
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function emailAssetList($id)
-    {
-        $this->authorize('view', User::class);
-
-        if (!$user = User::find($id)) {
-            return redirect()->back()
-                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
-        }
-        if (empty($user->email)) {
-            return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
-        }
-
-        $user->notify((new CurrentInventory($user)));
-        return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
-    }
-
    /**
     * Send individual password reset email
     *
@@ -657,8 +625,9 @@ class UsersController extends Controller
            $credentials = ['email' => trim($user->email)];

            try {
-
-                Password::sendResetLink($credentials);
+                \Password::sendResetLink($credentials, function (Message $message) use ($user) {
+                    $message->subject($this->getEmailSubject());
+                });

                return redirect()->back()->with('success', trans('admin/users/message.password_reset_sent', ['email' => $user->email]));
            } catch (\Exception $e) {
@@ -668,4 +637,4 @@ class UsersController extends Controller

        return redirect()->back()->with('error', 'User is not activated, is LDAP synced, or does not have an email address ');
    }
-}
+}
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -8,7 +8,6 @@ use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
-use App\Models\CustomField;
 use App\Notifications\RequestAssetCancelation;
 use App\Notifications\RequestAssetNotification;
 use Illuminate\Http\Request;
@@ -30,41 +29,23 @@ class ViewAssetsController extends Controller
    public function getIndex()
    {
        $user = User::with(
-            'assets',
            'assets.model',
-            'assets.model.fieldset.fields',
            'consumables',
            'accessories',
            'licenses',
-        )->find(Auth::user()->id);
+            'userloc',
+            'userlog'
+        )->withTrashed()->find(Auth::user()->id);

-        $field_array = array();
-
-        // Loop through all the custom fields that are applied to any model the user has assigned
-        foreach ($user->assets as $asset) {
-
-            // Make sure the model has a custom fieldset before trying to loop through the associated fields
-            if ($asset->model->fieldset) {
-
-                foreach ($asset->model->fieldset->fields as $field) {
-                    // check and make sure they're allowed to see the value of the custom field
-                    if ($field->display_in_user_view == '1') {
-                        $field_array[$field->db_column] = $field->name;
-                    }
-                    
-                }
-            }
-
-        }
-
-        // Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns
-        array_unique($field_array);
+        $userlog = $user->userlog->load('item', 'user', 'target');

        if (isset($user->id)) {
-            return view('account/view-assets', compact('user', 'field_array' ))
+            return view('account/view-assets', compact('user', 'userlog'))
                ->with('settings', Setting::getSettings());
+        } else {
+            // Redirect to the user management page
+            return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
        }
-
        // Redirect to the user management page
        return redirect()->route('users.index')
            ->with('error', trans('admin/users/message.user_not_found', $user->id));
@@ -184,7 +165,7 @@ class ViewAssetsController extends Controller
            $settings->notify(new RequestAssetCancelation($data));

            return redirect()->route('requestable-assets')
-                ->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
+                ->with('success')->with('success', trans('admin/hardware/message.requests.cancel'));
        }

        $logaction->logaction('requested');
@@ -199,4 +180,123 @@ class ViewAssetsController extends Controller
    {
        return view('account/requested');
    }
+
+    // Get the acceptance screen
+    public function getAcceptAsset($logID = null)
+    {
+        $findlog = Actionlog::where('id', $logID)->first();
+
+        if (! $findlog) {
+            return redirect()->to('account/view-assets')->with('error', 'No matching record.');
+        }
+
+        if ($findlog->accepted_id != '') {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted'));
+        }
+
+        $user = Auth::user();
+
+        // TODO - Fix this for non-assets
+        if (($findlog->item_type == Asset::class) && ($user->id != $findlog->item->assigned_to)) {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
+        }
+
+        $item = $findlog->item;
+
+        // Check if the asset exists
+        if (is_null($item)) {
+            // Redirect to the asset management page
+            return redirect()->to('account')->with('error', trans('admin/hardware/message.does_not_exist'));
+        } elseif (! Company::isCurrentUserHasAccess($item)) {
+            return redirect()->route('requestable-assets')->with('error', trans('general.insufficient_permissions'));
+        } else {
+            return view('account/accept-asset', compact('item'))->with('findlog', $findlog)->with('item', $item);
+        }
+    }
+
+    // Save the acceptance
+    public function postAcceptAsset(Request $request, $logID = null)
+    {
+
+        // Check if the asset exists
+        if (is_null($findlog = Actionlog::where('id', $logID)->first())) {
+            // Redirect to the asset management page
+            return redirect()->to('account/view-assets')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        if ($findlog->accepted_id != '') {
+            // Redirect to the asset management page
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.asset_already_accepted'));
+        }
+
+        if ($request->missing('asset_acceptance')) {
+            return redirect()->back()->with('error', trans('admin/users/message.error.accept_or_decline'));
+        }
+
+        $user = Auth::user();
+
+        if (($findlog->item_type == Asset::class) && ($user->id != $findlog->item->assigned_to)) {
+            return redirect()->to('account/view-assets')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
+        }
+
+        if ($request->filled('signature_output')) {
+            $path = config('app.private_uploads').'/signatures';
+            $sig_filename = 'siglog-'.$findlog->id.'-'.date('Y-m-d-his').'.png';
+            $data_uri = e($request->get('signature_output'));
+            $encoded_image = explode(',', $data_uri);
+            $decoded_image = base64_decode($encoded_image[1]);
+
+            Storage::putFileAs($path, $decoded_image, $sig_filename);
+            //file_put_contents($path.'/'.$sig_filename, $decoded_image);
+        }
+
+        $logaction = new Actionlog();
+
+        if ($request->input('asset_acceptance') == 'accepted') {
+            $logaction_msg = 'accepted';
+            $accepted = 'accepted';
+            $return_msg = trans('admin/users/message.accepted');
+        } else {
+            $logaction_msg = 'declined';
+            $accepted = 'rejected';
+            $return_msg = trans('admin/users/message.declined');
+        }
+        $logaction->item_id = $findlog->item_id;
+        $logaction->item_type = $findlog->item_type;
+
+        // Asset
+        if (($findlog->item_id != '') && ($findlog->item_type == Asset::class)) {
+            if ($request->input('asset_acceptance') != 'accepted') {
+                DB::table('assets')
+                ->where('id', $findlog->item_id)
+                ->update(['assigned_to' => null]);
+            }
+        }
+
+        $logaction->target_id = $findlog->target_id;
+        $logaction->target_type = User::class;
+        $logaction->note = e($request->input('note'));
+        $logaction->updated_at = date('Y-m-d H:i:s');
+
+        if (isset($sig_filename)) {
+            $logaction->accept_signature = $sig_filename;
+        }
+        $log = $logaction->logaction($logaction_msg);
+
+        $update_checkout = DB::table('action_logs')
+        ->where('id', $findlog->id)
+        ->update(['accepted_id' => $logaction->id]);
+
+        if (($findlog->item_id != '') && ($findlog->item_type == Asset::class)) {
+            $affected_asset = $logaction->item;
+            $affected_asset->accepted = $accepted;
+            $affected_asset->save();
+        }
+
+        if ($update_checkout) {
+            return redirect()->to('account/view-assets')->with('success', $return_msg);
+        } else {
+            return redirect()->to('account/view-assets')->with('error', 'Something went wrong ');
+        }
+    }
 }
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -39,11 +39,9 @@ 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,
-            \Illuminate\Session\Middleware\AuthenticateSession::class,
        ],

        'api' => [
--- a/app/Http/Middleware/AssetCountForSidebar.php
+++ b/app/Http/Middleware/AssetCountForSidebar.php
@@ -52,13 +52,6 @@ class AssetCountForSidebar
            \Log::debug($e);
        }

-        try {
-            $total_byod_sidebar = Asset::where('byod', '=', '1')->count();
-            view()->share('total_byod_sidebar', $total_byod_sidebar);
-        } catch (\Exception $e) {
-            \Log::debug($e);
-        }
-
        return $next($request);
    }
 }
--- a/app/Http/Middleware/CheckUserIsActivated.php
+++ b/app/Http/Middleware/CheckUserIsActivated.php
@@ -4,9 +4,8 @@ namespace App\Http\Middleware;

 use Closure;
 use Illuminate\Contracts\Auth\Guard;
-use Auth;

-class CheckUserIsActivated
+class Authenticate
 {
    /**
     * The Guard implementation.
@@ -35,16 +34,14 @@ class CheckUserIsActivated
     */
    public function handle($request, Closure $next)
    {
-
-        // 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');
+        if ($this->auth->guest()) {
+            if ($request->ajax()) {
+                return response('Unauthorized.', 401);
+            } else {
+                return redirect()->guest('login');
+            }
        }

        return $next($request);
-
    }
 }
--- a/app/Http/Middleware/CheckForTwoFactor.php
+++ b/app/Http/Middleware/CheckForTwoFactor.php
@@ -24,13 +24,7 @@ class CheckForTwoFactor
    public function handle($request, Closure $next)
    {
        // Skip the logic if the user is on the two factor pages or the setup pages
-
-        // 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)) {
+        if (in_array($request->route()->getName(), self::IGNORE_ROUTES)) {
            return $next($request);
        }

--- a/app/Http/Requests/AssetCheckoutRequest.php
+++ b/app/Http/Requests/AssetCheckoutRequest.php
@@ -25,7 +25,6 @@ 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',
        ];

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	8a206e6c8e	Beginning refactor Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 22:26:23 +00:00
snipe	73acf6e5e8	Squashed commit of the following: commit `d55c176199` Merge: `93ff9524d` `c0451fe17` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:35:42 2022 +0000 Merge pull request #10831 from snipe/merges/master_down_to_develop_march_16 v6.0.0-RC-5 - Merges master down to develop commit `c0451fe17a` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:10:17 2022 +0000 Bumped version to v6.0.0-RC-5 Signed-off-by: snipe <snipe@snipe.net> commit `0f95802699` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:05:47 2022 +0000 Fixed mis-automerge Signed-off-by: snipe <snipe@snipe.net> commit `9db8bd782d` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 18:02:07 2022 +0000 Merging master down into develop Signed-off-by: snipe <snipe@snipe.net> commit `93ff9524d6` Merge: `40a947077` `89ddbddad` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 10:04:58 2022 -0700 Merge pull request #10829 from snipe/features/add_statuslabel_filter_by_type_in_api Added filter by status_type in StatusLabels API index endpoint commit `89ddbddada` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 16:53:18 2022 +0000 Fixed comment Signed-off-by: snipe <snipe@snipe.net> commit `7498fe36e9` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 16:45:03 2022 +0000 Removed extra space because pedantry Signed-off-by: snipe <snipe@snipe.net> commit `babf7c064b` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 16:38:45 2022 +0000 Added ability to filter status label index endpoint by status type Signed-off-by: snipe <snipe@snipe.net> commit `40a9470770` Merge: `f499dcf7c` `781b42601` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:54:10 2022 -0700 Merge pull request #10828 from snipe/fixes/10826_parse_error_on_print_all Fixed #10826 - parse error on translation string for print all assets commit `781b426018` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:50:47 2022 -0700 Fixed #10826 - parse error on translation string for print all assets Signed-off-by: snipe <snipe@snipe.net> commit `f499dcf7c3` Merge: `84aa26dd5` `54d6a4d97` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:25:29 2022 -0700 Merge pull request #10827 from snipe/fixes/modal_dropdowns_broken Fixed #10825 - selectlists in modals b0rked commit `54d6a4d978` Author: snipe <snipe@snipe.net> Date: Wed Mar 16 08:23:50 2022 -0700 Fixed #10825 - selectlists in modals b0rked Signed-off-by: snipe <snipe@snipe.net> commit `84aa26dd50` Merge: `8984b3a59` `14bd07e97` Author: snipe <snipe@snipe.net> Date: Thu Mar 10 13:02:45 2022 -0800 Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu Fixed #10191 - font color contrast on mobile menu commit `8984b3a59d` Merge: `d06ef4bde` `cdc0805fc` Author: snipe <snipe@snipe.net> Date: Thu Mar 10 10:40:33 2022 -0800 Merge pull request #10812 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime_develop Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string develop commit `cdc0805fc4` Author: Ivan Nieto Vivanco <inietov@gmail.com> Date: Thu Mar 10 12:07:07 2022 -0600 Sanitize dates input in the importer before saving commit `14bd07e97d` Merge: `4435ea95f` `16fd10954` Author: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 10:14:30 2022 -0800 gerge branchevelop' into gh10191-css-dropdownmenu commit `4435ea95fd` Author: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 09:47:11 2022 -0800 removes changes to mix-manifest commit `f115385243` Author: Godfrey M <godmartinz@gmail.com> Date: Thu Mar 3 09:32:05 2022 -0800 C&P mix-manifest to be tracked commit `708dc08b4f` Author: Godfrey M <godmartinz@gmail.com> Date: Wed Feb 23 11:17:44 2022 -0800 mixes color contrast on dropdown menu from navbar on file Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 20:31:14 +00:00
snipe	9ae2d17579	Minor changes Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 20:06:20 -08:00
snipe	3404b63922	Removed stray echo Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 18:12:23 -08:00
snipe	b1796e6ff2	Make the box header colors different if they are superadmin or admin permisions Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 18:10:54 -08:00
snipe	471527dfc6	Removed unneeded title Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 18:09:57 -08:00
snipe	12c24d7c0f	Some jquery fixes Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 17:40:05 -08:00
snipe	5651d060d8	Initial rework of UI for groups Signed-off-by: snipe <snipe@snipe.net>	2022-03-09 17:10:42 -08:00