Change variable name to be clearer

DIsable CORS allowed origins by default to replicate existing behavior
More clarification
2019-07-23 18:23:51 -07:00 · 2019-07-23 18:23:39 -07:00 · 2019-07-23 18:07:45 -07:00 · 2019-07-23 18:05:07 -07:00 · 2019-07-23 18:03:53 -07:00 · 2019-07-23 18:02:51 -07:00
4420 changed files with 210321 additions and 173717 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -135,8 +135,7 @@
      "avatar_url": "https://avatars0.githubusercontent.com/u/10137?v=3",
      "profile": "https://github.com/ghost",
      "contributions": [
-        "translation",
-        "code"
+        "translation"
      ]
    },
    {
@@ -1652,186 +1651,6 @@
        "code"
      ]
    },
-    {
-      "login": "jwhulette",
-      "name": "Wes Hulette",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/4930051?v=4",
-      "profile": "http://macfoo.wordpress.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "patrict",
-      "name": "patrict",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/8134591?v=4",
-      "profile": "https://github.com/patrict",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "VELIKII-DIVAN",
-      "name": "Dmitriy Minaev",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/2611616?v=4",
-      "profile": "https://github.com/VELIKII-DIVAN",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "liquidhorse",
-      "name": "liquidhorse",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/5132245?v=4",
-      "profile": "https://github.com/liquidhorse",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Seldaek",
-      "name": "Jordi Boggiano",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/183678?v=4",
-      "profile": "https://seld.be/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "inietov",
-      "name": "Ivan Nieto",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/653557?v=4",
-      "profile": "https://github.com/inietov",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "benrubson",
-      "name": "Ben RUBSON",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/6764151?v=4",
-      "profile": "https://github.com/benrubson",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "NMathar",
-      "name": "NMathar",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/8554558?v=4",
-      "profile": "https://github.com/NMathar",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "smb",
-      "name": "Steffen",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/139566?v=4",
-      "profile": "https://github.com/smb",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Sxderp",
-      "name": "Sxderp",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/6609453?v=4",
-      "profile": "https://github.com/Sxderp",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "fanta8897",
-      "name": "fanta8897",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/4807843?v=4",
-      "profile": "https://github.com/fanta8897",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "andreybolonin",
-      "name": "Andrey Bolonin",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/2576509?v=4",
-      "profile": "https://andreybolonin.com/phpconsulting/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "shinayoshi",
-      "name": "shinayoshi",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/2173307?v=4",
-      "profile": "http://www.shinayoshi.net/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "reuser",
-      "name": "Hubert",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/2130159?v=4",
-      "profile": "https://github.com/reuser",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "KeenRivals",
-      "name": "KeenRivals",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/6865789?v=4",
-      "profile": "https://brashear.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "omyno",
-      "name": "omyno",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/2902513?v=4",
-      "profile": "https://github.com/omyno",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jackka",
-      "name": "Evgeny",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/6271335?v=4",
-      "profile": "https://github.com/jackka",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "colin-campbell",
-      "name": "Colin Campbell",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/1169963?v=4",
-      "profile": "https://digitalist.se",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "lubo",
-      "name": "Ľubomír Kučera",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/2872098?v=4",
-      "profile": "https://github.com/lubo",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Mezzle",
-      "name": "Martin Meredith",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/570639?v=4",
-      "profile": "https://www.sourceguru.net",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "timothyfarmer",
      "name": "Tim Farmer",
@@ -1840,733 +1659,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "mskrip",
-      "name": "Marián Skrip",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/17459600?v=4",
-      "profile": "https://github.com/mskrip",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Godmartinz",
-      "name": "Godfrey Martinez",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/47435081?v=4",
-      "profile": "https://github.com/Godmartinz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "bigtreeEdo",
-      "name": "bigtreeEdo",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/2075128?v=4",
-      "profile": "https://github.com/bigtreeEdo",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ColinMcNeil",
-      "name": "Colin  McNeil",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/5000430?v=4",
-      "profile": "https://colinmcneil.me/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "JoKneeMo",
-      "name": "JoKneeMo",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/421625?v=4",
-      "profile": "https://github.com/JoKneeMo",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "joshi-redbridge",
-      "name": "Joshi",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/54849013?v=4",
-      "profile": "http://www.redbridge.se",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "anthonypburns",
-      "name": "Anthony Burns",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/15731458?v=4",
-      "profile": "https://github.com/anthonypburns",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "johnson-yi",
-      "name": "johnson-yi",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/63399474?v=4",
-      "profile": "https://github.com/johnson-yi",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sanjay900",
-      "name": "Sanjay Govind",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/1862720?v=4",
-      "profile": "https://tangentmc.net",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "PeterUpfold",
-      "name": "Peter Upfold",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/1255375?v=4",
-      "profile": "https://peter.upfold.org.uk/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jbiel",
-      "name": "Jared Biel",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/961717?v=4",
-      "profile": "https://github.com/jbiel",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "dampfklon",
-      "name": "Dampfklon",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/1733625?v=4",
-      "profile": "https://github.com/dampfklon",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "chamilton-ccn",
-      "name": "Charles Hamilton",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/52973156?v=4",
-      "profile": "https://communityclosing.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "giannello",
-      "name": "Giuseppe Iannello",
-      "avatar_url": "https://avatars.githubusercontent.com/u/551789?v=4",
-      "profile": "https://github.com/giannello",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "PeterDaveHello",
-      "name": "Peter Dave Hello",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3691490?v=4",
-      "profile": "https://www.peterdavehello.org/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sigmoidal",
-      "name": "sigmoidal",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6106332?v=4",
-      "profile": "https://github.com/sigmoidal",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "phenixdotnet",
-      "name": "Vincent Lainé",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2082554?v=4",
-      "profile": "https://github.com/phenixdotnet",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "derlucas",
-      "name": "Lucas Pleß",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1943040?v=4",
-      "profile": "http://www.lucas-pless.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "iansltx",
-      "name": "Ian Littman",
-      "avatar_url": "https://avatars.githubusercontent.com/u/472804?v=4",
-      "profile": "http://twitter.com/iansltx",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "PauloLuna",
-      "name": "João Paulo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3519029?v=4",
-      "profile": "https://github.com/PauloLuna",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ThoBur",
-      "name": "ThoBur",
-      "avatar_url": "https://avatars.githubusercontent.com/u/70443365?v=4",
-      "profile": "https://github.com/ThoBur",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "alek13",
-      "name": "Alexander Chibrikin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1972329?v=4",
-      "profile": "http://phpprofi.ru/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "winstan",
-      "name": "Anthony Winstanley",
-      "avatar_url": "https://avatars.githubusercontent.com/u/438332?v=4",
-      "profile": "https://github.com/winstan",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "fashberg",
-      "name": "Folke",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3075214?v=4",
-      "profile": "https://github.com/fashberg",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "benwa",
-      "name": "Bennett Blodinger",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1351571?v=4",
-      "profile": "https://github.com/benwa",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ncareau",
-      "name": "NMC",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2974631?v=4",
-      "profile": "https://nmc.dev",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "andres-baller",
-      "name": "andres-baller",
-      "avatar_url": "https://avatars.githubusercontent.com/u/52182449?v=4",
-      "profile": "https://github.com/andres-baller",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sean-borg",
-      "name": "sean-borg",
-      "avatar_url": "https://avatars.githubusercontent.com/u/67109348?v=4",
-      "profile": "https://github.com/sean-borg",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "EDVLeer",
-      "name": "EDVLeer",
-      "avatar_url": "https://avatars.githubusercontent.com/u/32170051?v=4",
-      "profile": "https://github.com/EDVLeer",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Kurokat",
-      "name": "Kurokat",
-      "avatar_url": "https://avatars.githubusercontent.com/u/23075196?v=4",
-      "profile": "https://github.com/Kurokat",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "koelle25",
-      "name": "Kevin Köllmann",
-      "avatar_url": "https://avatars.githubusercontent.com/u/915514?v=4",
-      "profile": "https://www.kevinkoellmann.de",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sw-mreyes",
-      "name": "sw-mreyes",
-      "avatar_url": "https://avatars.githubusercontent.com/u/49025941?v=4",
-      "profile": "https://github.com/sw-mreyes",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "joelpittet",
-      "name": "Joel Pittet",
-      "avatar_url": "https://avatars.githubusercontent.com/u/70129?v=4",
-      "profile": "https://pittet.ca",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "elyscape",
-      "name": "Eli Young",
-      "avatar_url": "https://avatars.githubusercontent.com/u/792695?v=4",
-      "profile": "https://elyscape.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "raelldottin",
-      "name": "Raell Dottin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/317015?v=4",
-      "profile": "https://github.com/raelldottin",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "misilot",
-      "name": "Tom Misilo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1446856?v=4",
-      "profile": "https://github.com/misilot",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "JuustoMestari",
-      "name": "David Davenne",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4496300?v=4",
-      "profile": "http://david.davenne.be",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ocelotsloth",
-      "name": "Mark Stenglein",
-      "avatar_url": "https://avatars.githubusercontent.com/u/9255772?v=4",
-      "profile": "https://markstenglein.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ajsy",
-      "name": "ajsy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/35658596?v=4",
-      "profile": "https://github.com/ajsy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "t3easy",
-      "name": "Jan Kiesewetter",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3628035?v=4",
-      "profile": "https://github.com/t3easy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Tetrachloromethane250",
-      "name": "Tetrachloromethane250",
-      "avatar_url": "https://avatars.githubusercontent.com/u/79449630?v=4",
-      "profile": "https://github.com/Tetrachloromethane250",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "kajes",
-      "name": "Lars Kajes",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22004482?v=4",
-      "profile": "https://www.kajes.se/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Joly0",
-      "name": "Joly0",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13993216?v=4",
-      "profile": "https://github.com/Joly0",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "limeless",
-      "name": "theburger",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1501022?v=4",
-      "profile": "https://github.com/limeless",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "deivishome",
-      "name": "David Valin Alonso",
-      "avatar_url": "https://avatars.githubusercontent.com/u/36065681?v=4",
-      "profile": "https://github.com/deivishome",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "andreaci",
-      "name": "andreaci",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8290389?v=4",
-      "profile": "https://github.com/andreaci",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Jelle-S",
-      "name": "Jelle Sebreghts",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1828542?v=4",
-      "profile": "http://www.jellesebreghts.be",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Skywalker-11",
-      "name": "Michael Pietsch",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11180862?v=4",
-      "profile": "https://github.com/Skywalker-11",
-      "contributions": []
-    },
-    {
-      "login": "sh1hab",
-      "name": "Masudul Haque Shihab",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22068886?v=4",
-      "profile": "https://github.com/sh1hab",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "zybersup",
-      "name": "Supapong Areeprasertkul",
-      "avatar_url": "https://avatars.githubusercontent.com/u/16099942?v=4",
-      "profile": "http://www.freedomdive.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "psarossy",
-      "name": "Peter Sarossy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/207358?v=4",
-      "profile": "https://github.com/psarossy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "nepella",
-      "name": "Renee Margaret McConahy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11823649?v=4",
-      "profile": "https://github.com/nepella",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "JohnnyPicnic",
-      "name": "JohnnyPicnic",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5553884?v=4",
-      "profile": "https://github.com/JohnnyPicnic",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "markbrule",
-      "name": "markbrule",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8799594?v=4",
-      "profile": "https://github.com/markbrule",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mikecmpbll",
-      "name": "Mike Campbell",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1962801?v=4",
-      "profile": "https://github.com/mikecmpbll",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "tbrconnect",
-      "name": "tbrconnect",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11973217?v=4",
-      "profile": "https://github.com/tbrconnect",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "kcoyo",
-      "name": "kcoyo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/12447225?v=4",
-      "profile": "https://github.com/kcoyo",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "travismiller",
-      "name": "Travis Miller",
-      "avatar_url": "https://avatars.githubusercontent.com/u/494017?v=4",
-      "profile": "https://travismiller.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "PetriAsi",
-      "name": "Petri Asikainen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8735148?v=4",
-      "profile": "https://github.com/PetriAsi",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "derdeagle",
-      "name": "derdeagle",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11424540?v=4",
-      "profile": "https://github.com/derdeagle",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "vapier",
-      "name": "Mike Frysinger",
-      "avatar_url": "https://avatars.githubusercontent.com/u/176950?v=4",
-      "profile": "https://wh0rd.org/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "AL4AL",
-      "name": "ALPHA",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22044358?v=4",
-      "profile": "https://github.com/AL4AL",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "FliegenKLATSCH",
-      "name": "FliegenKLATSCH",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1042587?v=4",
-      "profile": "https://www.ifern.de",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jerm",
-      "name": "Jeremy Price",
-      "avatar_url": "https://avatars.githubusercontent.com/u/442138?v=4",
-      "profile": "https://github.com/jerm",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Toreg87",
-      "name": "Toreg87",
-      "avatar_url": "https://avatars.githubusercontent.com/u/84392209?v=4",
-      "profile": "https://github.com/Toreg87",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Computroniks",
-      "name": "Matthew Nickson",
-      "avatar_url": "https://avatars.githubusercontent.com/u/67638596?v=4",
-      "profile": "https://github.com/Computroniks",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jethron",
-      "name": "Jethro Nederhof",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1646397?v=4",
-      "profile": "https://jethron.id.au",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "01ste02",
-      "name": "Oskar Stenberg",
-      "avatar_url": "https://avatars.githubusercontent.com/u/23289826?v=4",
-      "profile": "https://github.com/01ste02",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Robert-Azelis",
-      "name": "Robert-Azelis",
-      "avatar_url": "https://avatars.githubusercontent.com/u/82208283?v=4",
-      "profile": "https://github.com/Robert-Azelis",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "alwism",
-      "name": "Alexander William Smith",
-      "avatar_url": "https://avatars.githubusercontent.com/u/60648387?v=4",
-      "profile": "https://github.com/alwism",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "leitwerk-ag",
-      "name": "LEITWERK AG",
-      "avatar_url": "https://avatars.githubusercontent.com/u/24418301?v=4",
-      "profile": "https://www.leitwerk.de/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "adamboutcher",
-      "name": "Adam",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1911435?v=4",
-      "profile": "http://www.aboutcher.co.uk",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "sneak-it",
-      "name": "Ian",
-      "avatar_url": "https://avatars.githubusercontent.com/u/16104273?v=4",
-      "profile": "https://snksrv.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "bestlong",
-      "name": "Shao Yu-Lung (Allen)",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4023909?v=4",
-      "profile": "http://blog.bestlong.idv.tw/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Haxatron",
-      "name": "Haxatron",
-      "avatar_url": "https://avatars.githubusercontent.com/u/76475453?v=4",
-      "profile": "https://github.com/Haxatron",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "exula",
-      "name": "Bradley Coudriet",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3842948?v=4",
-      "profile": "http://bjcpgd.cias.rit.edu",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "UniversalSuperBox",
-      "name": "Dalton Durst",
-      "avatar_url": "https://avatars.githubusercontent.com/u/21966173?v=4",
-      "profile": "https://daltondur.st",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "TenOfTens",
-      "name": "TenOfTens",
-      "avatar_url": "https://avatars.githubusercontent.com/u/48162670?v=4",
-      "profile": "https://github.com/TenOfTens",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "savornicesei",
-      "name": "Simona Avornicesei",
-      "avatar_url": "https://avatars.githubusercontent.com/u/917232?v=4",
-      "profile": "http://www.avornicesei.com",
-      "contributions": [
-        "test"
-      ]
-    },
-    {
-      "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"
-      ]
    }
  ]
 }
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,13 +1,5 @@
 .git
-.github
-.gitattributes
-.gitignore
 .dockerignore
 app/storage/logs/*
 app/storage/views/*
 vendor/*
-storage/framework/cache/*
-node_modules
-.vagrant
-.idea
-
--- a/.env.docker
+++ b/.env.docker
@@ -1,157 +0,0 @@
-# --------------------------------------------
-# REQUIRED: DB SETUP
-# --------------------------------------------
-MYSQL_DATABASE=snipeit
-MYSQL_USER=snipeit
-MYSQL_PASSWORD=changeme1234
-MYSQL_ROOT_PASSWORD=changeme1234
-# --------------------------------------------
-# REQUIRED: BASIC APP SETTINGS
-# --------------------------------------------
-APP_ENV=develop
-APP_DEBUG=false
-# please regenerate the APP_KEY value by calling `docker-compose run --rm snipeit bash` and then `php artisan key:generate --show` and then copy paste the value here
-APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
-APP_URL=http://localhost:8000
-APP_TIMEZONE='UTC'
-APP_LOCALE=en
-MAX_RESULTS=500
-
-# --------------------------------------------
-# REQUIRED: UPLOADED FILE STORAGE SETTINGS
-# --------------------------------------------
-PRIVATE_FILESYSTEM_DISK=local
-PUBLIC_FILESYSTEM_DISK=local_public
-
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=mysql
-DB_HOST=mariadb
-DB_DATABASE=snipeit
-DB_USERNAME=snipeit
-DB_PASSWORD=changeme1234
-DB_PREFIX=null
-DB_DUMP_PATH='/usr/bin'
-DB_CHARSET=utf8mb4
-DB_COLLATION=utf8mb4_unicode_ci
-
-# --------------------------------------------
-# OPTIONAL: SSL DATABASE SETTINGS
-# --------------------------------------------
-DB_SSL=false
-DB_SSL_IS_PAAS=false
-DB_SSL_KEY_PATH=null
-DB_SSL_CERT_PATH=null
-DB_SSL_CA_PATH=null
-DB_SSL_CIPHER=null
-
-# --------------------------------------------
-# REQUIRED: OUTGOING MAIL SERVER SETTINGS
-# --------------------------------------------
-MAIL_DRIVER=smtp
-MAIL_HOST=mailhog
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDR=you@example.com
-MAIL_FROM_NAME='Snipe-IT'
-MAIL_REPLYTO_ADDR=you@example.com
-MAIL_REPLYTO_NAME='Snipe-IT'
-MAIL_AUTO_EMBED_METHOD='attachment'
-
-# --------------------------------------------
-# REQUIRED: IMAGE LIBRARY
-# This should be gd or imagick
-# --------------------------------------------
-IMAGE_LIB=gd
-
-
-# --------------------------------------------
-# OPTIONAL: BACKUP SETTINGS
-# --------------------------------------------
-MAIL_BACKUP_NOTIFICATION_DRIVER=null
-MAIL_BACKUP_NOTIFICATION_ADDRESS=null
-BACKUP_ENV=true
-
-
-# --------------------------------------------
-# OPTIONAL: SESSION SETTINGS
-# --------------------------------------------
-SESSION_LIFETIME=12000
-EXPIRE_ON_CLOSE=false
-ENCRYPT=false
-COOKIE_NAME=snipeit_session
-COOKIE_DOMAIN=null
-SECURE_COOKIES=false
-API_TOKEN_EXPIRATION_YEARS=40
-
-# --------------------------------------------
-# OPTIONAL: SECURITY HEADER SETTINGS
-# --------------------------------------------
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
-ALLOW_IFRAMING=false
-REFERRER_POLICY=same-origin
-ENABLE_CSP=false
-CORS_ALLOWED_ORIGINS=null
-ENABLE_HSTS=false
-
-# --------------------------------------------
-# OPTIONAL: CACHE SETTINGS
-# --------------------------------------------
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=sync
-CACHE_PREFIX=snipeit
-
-# --------------------------------------------
-# OPTIONAL: REDIS SETTINGS
-# --------------------------------------------
-REDIS_HOST=redis
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-# --------------------------------------------
-# OPTIONAL: MEMCACHED SETTINGS
-# --------------------------------------------
-MEMCACHED_HOST=null
-MEMCACHED_PORT=null
-
-# --------------------------------------------
-# OPTIONAL: PUBLIC S3 Settings
-# --------------------------------------------
-PUBLIC_AWS_SECRET_ACCESS_KEY=null
-PUBLIC_AWS_ACCESS_KEY_ID=null
-PUBLIC_AWS_DEFAULT_REGION=null
-PUBLIC_AWS_BUCKET=null
-PUBLIC_AWS_URL=null
-PUBLIC_AWS_BUCKET_ROOT=null
-
-# --------------------------------------------
-# OPTIONAL: PRIVATE S3 Settings
-# --------------------------------------------
-PRIVATE_AWS_ACCESS_KEY_ID=null
-PRIVATE_AWS_SECRET_ACCESS_KEY=null
-PRIVATE_AWS_DEFAULT_REGION=null
-PRIVATE_AWS_BUCKET=null
-PRIVATE_AWS_URL=null
-PRIVATE_AWS_BUCKET_ROOT=null
-
-# --------------------------------------------
-# OPTIONAL: LOGIN THROTTLING
-# --------------------------------------------
-LOGIN_MAX_ATTEMPTS=5
-LOGIN_LOCKOUT_DURATION=60
-RESET_PASSWORD_LINK_EXPIRES=900
-
-# --------------------------------------------
-# OPTIONAL: MISC
-# --------------------------------------------
-APP_LOG=stderr
-APP_LOG_MAX_FILES=10
-APP_LOCKED=false
-APP_CIPHER=AES-256-CBC
-GOOGLE_MAPS_API=
-LDAP_MEM_LIM=500M
-LDAP_TIME_LIM=600
--- a/.env.example
+++ b/.env.example
@@ -7,13 +7,6 @@ APP_KEY=ChangeMe
 APP_URL=null
 APP_TIMEZONE='UTC'
 APP_LOCALE=en
-MAX_RESULTS=500
-
-# --------------------------------------------
-# REQUIRED: UPLOADED FILE STORAGE SETTINGS
-# --------------------------------------------
-PRIVATE_FILESYSTEM_DISK=local
-PUBLIC_FILESYSTEM_DISK=local_public

 # --------------------------------------------
 # REQUIRED: DATABASE SETTINGS
@@ -32,7 +25,6 @@ DB_COLLATION=utf8mb4_unicode_ci
 # OPTIONAL: SSL DATABASE SETTINGS
 # --------------------------------------------
 DB_SSL=false
-DB_SSL_IS_PAAS=false
 DB_SSL_KEY_PATH=null
 DB_SSL_CERT_PATH=null
 DB_SSL_CA_PATH=null
@@ -51,7 +43,7 @@ MAIL_FROM_ADDR=you@example.com
 MAIL_FROM_NAME='Snipe-IT'
 MAIL_REPLYTO_ADDR=you@example.com
 MAIL_REPLYTO_NAME='Snipe-IT'
-MAIL_AUTO_EMBED_METHOD='attachment'
+MAIL_BACKUP_NOTIFICATION_ADDRESS=you@example.com

 # --------------------------------------------
 # REQUIRED: IMAGE LIBRARY
@@ -59,15 +51,6 @@ MAIL_AUTO_EMBED_METHOD='attachment'
 # --------------------------------------------
 IMAGE_LIB=gd

-
-# --------------------------------------------
-# OPTIONAL: BACKUP SETTINGS
-# --------------------------------------------
-MAIL_BACKUP_NOTIFICATION_DRIVER=null
-MAIL_BACKUP_NOTIFICATION_ADDRESS=null
-BACKUP_ENV=true
-
-
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
@@ -77,17 +60,13 @@ ENCRYPT=false
 COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
-API_TOKEN_EXPIRATION_YEARS=15

 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
 # --------------------------------------------
-APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
-ALLOW_IFRAMING=false
 REFERRER_POLICY=same-origin
 ENABLE_CSP=false
 CORS_ALLOWED_ORIGINS=null
-ENABLE_HSTS=false

 # --------------------------------------------
 # OPTIONAL: CACHE SETTINGS
@@ -111,31 +90,18 @@ MEMCACHED_HOST=null
 MEMCACHED_PORT=null

 # --------------------------------------------
-# OPTIONAL: PUBLIC S3 Settings
+# OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
-PUBLIC_AWS_SECRET_ACCESS_KEY=null
-PUBLIC_AWS_ACCESS_KEY_ID=null
-PUBLIC_AWS_DEFAULT_REGION=null
-PUBLIC_AWS_BUCKET=null
-PUBLIC_AWS_URL=null
-PUBLIC_AWS_BUCKET_ROOT=null
-
-# --------------------------------------------
-# OPTIONAL: PRIVATE S3 Settings
-# --------------------------------------------
-PRIVATE_AWS_ACCESS_KEY_ID=null
-PRIVATE_AWS_SECRET_ACCESS_KEY=null
-PRIVATE_AWS_DEFAULT_REGION=null
-PRIVATE_AWS_BUCKET=null
-PRIVATE_AWS_URL=null
-PRIVATE_AWS_BUCKET_ROOT=null
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
+AWS_BUCKET=null

 # --------------------------------------------
 # OPTIONAL: LOGIN THROTTLING
 # --------------------------------------------
 LOGIN_MAX_ATTEMPTS=5
 LOGIN_LOCKOUT_DURATION=60
-RESET_PASSWORD_LINK_EXPIRES=900

 # --------------------------------------------
 # OPTIONAL: MISC
@@ -143,14 +109,9 @@ RESET_PASSWORD_LINK_EXPIRES=900
 APP_LOG=single
 APP_LOG_MAX_FILES=10
 APP_LOCKED=false
+FILESYSTEM_DISK=local
+APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1
+ALLOW_IFRAMING=false
 APP_CIPHER=AES-256-CBC
-APP_FORCE_TLS=false
-APP_ALLOW_INSECURE_HOSTS=false
 GOOGLE_MAPS_API=
-LDAP_MEM_LIM=500M
-LDAP_TIME_LIM=600
-IMPORT_TIME_LIMIT=600
-IMPORT_MEMORY_LIMIT=500M
-REPORT_TIME_LIMIT=12000
-REQUIRE_SAML=false
-API_THROTTLE_PER_MINUTE=120
+BACKUP_ENV=true
--- a/.env.testing
+++ b/.env.testing
@@ -40,12 +40,10 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
-AWS_SECRET_ACCESS_KEY=null
-AWS_ACCESS_KEY_ID=null
-AWS_DEFAULT_REGION=null
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
 AWS_BUCKET=null
-AWS_BUCKET_ROOT=null
-AWS_URL=null


 # --------------------------------------------
--- a/.env.testing-ci
+++ b/.env.testing-ci
@@ -2,7 +2,7 @@
 # REQUIRED: BASIC APP SETTINGS
 # --------------------------------------------
 APP_ENV=testing-ci
-APP_DEBUG=false
+APP_DEBUG=true
 APP_KEY=ChangeMe
 APP_URL=http://localhost:8000
 APP_TIMEZONE='US/Pacific'
@@ -40,12 +40,10 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
-AWS_SECRET_ACCESS_KEY=null
-AWS_ACCESS_KEY_ID=null
-AWS_DEFAULT_REGION=null
+AWS_SECRET=null
+AWS_KEY=null
+AWS_REGION=null
 AWS_BUCKET=null
-AWS_BUCKET_ROOT=null
-AWS_URL=null


 # --------------------------------------------
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1 @@
-* text=auto
-public/js/** binary
-public/css/** binary
+* text=auto
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+#### Please confirm you have done the following before posting your bug report:
+
+- [ ] I have enabled debug mode 
+- [ ] I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - Snipe-IT Version 
+ - OS: [e.g. Ubuntu, CentOS]
+ - Web Server: [e.g. Apache, IIS]
+ - PHP Version 
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Error Messages**
+- WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
+- If a stacktrace is provided in the error, include that too.
+- Any errors that appear in your browser's error console.
+- Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
+- Include any additional information you can find in `storage/logs` and your webserver's logs.
+
+**Additional context**
+- Is this a fresh install or an upgrade? 
+- What OS and web server you're running Snipe-IT on
+- What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
+- Include what you've done so far in the installation, and if you got any error messages along the way.
+- Indicate whether or not you've manually edited any data directly in the database
+
+Add any other context about the problem here.
+
+Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Server (please complete the following information):**
+ - Snipe-IT Version 
+ - OS: [e.g. Ubuntu, CentOS]
+ - Web Server: [e.g. Apache, IIS]
+ - PHP Version 
+
+**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 [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,129 +0,0 @@
-name: Bug Report
-description: Create a report to help us improve
-body:
-  - type: checkboxes
-    attributes:
-      label: Debug mode
-      description: Please confirm you have done the following before posting your bug report
-      options:
-        - label: I have enabled debug mode
-          required: true
-        - label: I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
-          required: true
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: Steps to reproduce the behavior.
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-        required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Screenshots
-      description: 'If applicable, add screenshots to help explain your problem.'
-  - type: markdown
-    attributes:
-      value: "### Server"
-  - 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: markdown
-    attributes:
-      value: "### Desktop"
-  - type: input
-    id: desktop_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. Ubuntu, Windows'
-  - type: input
-    id: desktop_browser
-    attributes:
-      label: Browser
-      description: 'e.g. Google Chrome, Safari'
-  - type: input
-    id: desktop_version
-    attributes:
-      label: Version
-      description: 'e.g. 93'
-  - type: markdown
-    attributes:
-      value: "### Mobile"
-  - type: input
-    attributes:
-      label: Device
-      description: 'e.g. iPhone 6, Pixel 4a'
-  - type: input
-    id: mobile_operatingSystem
-    attributes:
-      label: Operating System
-      description: 'e.g. iOS 8.1, Android 9'
-  - type: input
-    id: mobile_browser
-    attributes:
-      label: Browser
-      description: 'e.g. Google Chrome, Safari'
-  - type: input
-    id: mobile_version
-    attributes:
-      label: Version
-      description: 'e.g. 93'
-  - type: textarea
-    attributes:
-      label: Error messages
-      description: |
-        WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
-        If a stacktrace is provided in the error, include that too.
-        Any errors that appear in your browser's error console.
-        Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
-        Include any additional information you can find in `storage/logs` and your webserver's logs.
-        Include the output from `php -m` (this should display what modules you have enabled.)
-      render: shell
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: |
-        Is this a fresh install or an upgrade?
-        What OS and web server you're running Snipe-IT on
-        What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
-        Include what you've done so far in the installation, and if you got any error messages along the way.
-        Indicate whether or not you've manually edited any data directly in the database
-        Add any other context about the problem here.
-  - type: markdown
-    attributes:
-      value: Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,42 +0,0 @@
-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,4 +0,0 @@
-frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*"]
-backend: ["/app", "*.php"]
-legal: ["LICENSE*", "NOTICES*"]
-config: .github
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,33 +0,0 @@
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: |
-  👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: |
-  💖 Thanks for this pull request! 💖
-
-  We use [semantic commit messages](https://snipe-it.readme.io/docs/contributing-overview#section-pull-request-guidelines) to streamline the release process and easily generate changelogs between versions. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix if it doesn't have one already.
-
-  Examples of commit messages with semantic prefixes:
-
-  - `Fixed #<issue number>: don't overwrite prevent_default if default wasn't prevented`
-  - `Added #<issue number>: add checkout functionality to assets`
-  - `Improved Asset Checkout: use new notification method for checkout`
-
-  Things that will help get your PR across the finish line:
-
-  - Document any user-facing changes you've made.
-  - Include tests when adding/changing behavior.
-  - Include screenshots and animated GIFs whenever possible.
-
-  We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request! 🎉🎉🎉
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,40 +0,0 @@
-# Description
-
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context, providing screenshots where practical. List any dependencies that are required for this change.
-
-Fixes # (issue)
-
-## Type of change
-
-Please delete options that are not relevant.
-
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update
-
-# How Has This Been Tested?
-
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
-
- [ ] Test A
- [ ] Test B
-
-**Test Configuration**:
-* PHP version:
-* MySQL version
-* Webserver version
-* OS version
-
-
-# Checklist:
-
- [ ] I have read the Contributing documentation available here: https://snipe-it.readme.io/docs/contributing-overview
- [ ] I have formatted this PR according to the project guidelines: https://snipe-it.readme.io/docs/contributing-overview#pull-request-guidelines
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
--- a/.github/weekly-digest.yml
+++ b/.github/weekly-digest.yml
@@ -1,7 +0,0 @@
-# Configuration for weekly-digest - https://github.com/apps/weekly-digest
-publishDay: sun
-canPublishIssues: true
-canPublishPullRequests: true
-canPublishContributors: true
-canPublishStargazers: true
-canPublishCommits: true
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -1,49 +0,0 @@
-# This workflow checks out code, performs a Codacy security scan
-# and integrates the results with the
-# GitHub Advanced Security code scanning feature.  For more information on
-# the Codacy security scan action usage and parameters, see
-# https://github.com/codacy/codacy-analysis-cli-action.
-# For more information on Codacy Analysis CLI in general, see
-# https://github.com/codacy/codacy-analysis-cli.
-
-name: Codacy Security Scan
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '36 23 * * 3'
-
-jobs:
-  codacy-security-scan:
-    name: Codacy Security Scan
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repository to the GitHub Actions runner
-      - name: Checkout code
-        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@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
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          verbose: true
-          output: results.sarif
-          format: sarif
-          # Adjust severity of non-security issues
-          gh-code-scanning-compat: true
-          # Force 0 exit code to allow SARIF file generation
-          # This will handover control about PR rejection to the GitHub side
-          max-allowed-issues: 2147483647
-
-      # Upload the SARIF file generated in the previous step
-      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -1,82 +0,0 @@
-# Snipe-IT (Alpine) Docker image build for hub.docker.com
-name: Docker images (Alpine)
-
-# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
-# Also run for PRs to ensure PR doesn't break Docker build process
-on:
-  push:
-    branches:
-      - master
-      - develop
-    tags:
-      - 'v**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  pull_request:
-
-jobs:
-  docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
-    runs-on: ubuntu-latest
-    env:
-      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
-      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
-        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
-        type=ref,event=tag,suffix=-alpine
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v2
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        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@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'snipe/snipe-it' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # 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@v3
-        with:
-          images: snipe/snipe-it
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'snipe-it' image
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile.alpine
-          platforms: linux/amd64
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,82 +0,0 @@
-# Snipe-IT Docker image build for hub.docker.com
-name: Docker images
-
-# Run this Build for all pushes to 'master' or develop branch, or tagged releases.
-# Also run for PRs to ensure PR doesn't break Docker build process
-on:
-  push:
-    branches:
-      - master
-      - develop
-    tags:
-      - 'v**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  pull_request:
-
-jobs:
-  docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
-    runs-on: ubuntu-latest
-    env:
-      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
-      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
-        type=ref,event=tag
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v2
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        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@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'snipe/snipe-it' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # 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@v3
-        with:
-          images: snipe/snipe-it
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'snipe-it' image
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.gitignore
+++ b/.gitignore
@@ -48,20 +48,6 @@ tests/_support/_generated/*
 /npm-debug.log
 /storage/oauth-private.key
 /storage/oauth-public.key
-logs/*
+
 *.cache
-
-.vagrant
-*.log
-*.retry
-
-\.php_cs\.dist
-
-phpmd\.xml
 /public/storage
-_ide_helper.php
-.phpstorm.meta.php
-_ide_helper_models.php
-/.phplint-cache
-storage/ldap_client_tls.cert
-storage/ldap_client_tls.key
--- a/.htaccess
+++ b/.htaccess
@@ -5,15 +5,7 @@

    # Make sure .env files not not browseable if in a sub-directory.
    <FilesMatch "\.env$">
-       # Apache 2.2
-       <IfModule !authz_core_module>
-          Deny from all
-       </IfModule>
-       
-       # Apache 2.4+
-       <IfModule authz_core_module>
-          Require all denied
-       </IfModule>
+    Deny from all
    </FilesMatch>
    
 </IfModule>
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-v10.15.1
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,82 @@
+addons:
+    code_climate:
+      repo_token:
+        secure: "C/bUAEpwfZB82dkzI2Nxx3PW5w/BzbKkSyCkp6YjT046jD2/QKvz6ngCFlt3tAWV11TXWFI6D8DzkMmdWOrQl3SGlPZXRD8QOvCiz0HiGMDvlxjAaPaQecGaQZdx/H4m6xTUXRNUVaYmxlMgkkFCWhAp+HZDs0iyOEVamp0Jszg="
+    hosts:
+        - localhost
+sudo: false
+
+# see http://about.travis-ci.org/docs/user/languages/php/ for more hints
+language: php
+
+services:
+  - mysql
+
+# list any PHP version you want to test against
+php:
+  - 7.1.2
+  - 7.2
+  - 7.3
+
+matrix:
+  allow_failures:
+    - php: 7.3
+
+# execute any number of scripts before the test run, custom env's are available as variables
+before_script:
+  - phpenv config-add .github/travis-memory.ini
+  - phantomjs --webdriver=4444  &
+  - sleep 4
+  - mysql -e 'CREATE DATABASE snipeit_unit;'
+  - mysql -e 'CREATE USER "travis'@'localhost";'
+  - mysql -e 'GRANT ALL PRIVILEGES ON * . * TO "travis'@'localhost";'
+  - mysql -e 'FLUSH PRIVILEGES;'
+  - composer self-update
+  - composer install -n --prefer-source
+  - chmod -R 777 storage
+  - php artisan migrate --env=testing-ci --database=mysql --force
+  - ./vendor/bin/codecept build
+  - php artisan --env=testing-ci key:generate 
+  - php artisan --env=testing-ci snipeit:travisci-install
+  - php artisan --env=testing-ci db:seed --database=mysql --force
+  - php artisan --env=testing-ci snipeit:create-admin --first_name=Alison --last_name=Foobar --email=me@example.com --username=snipe --password=password
+  - php artisan --env=testing-ci passport:install
+  - php artisan serve --env=testing-ci --port=8000 --host=localhost &
+  - sleep 5
+  - pip install --user codecov
+  - sleep 5
+
+
+
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+# script: ./vendor/bin/codecept run --env testing-ci
+script:
+  - ./vendor/bin/codecept run unit
+#  - ./vendor/bin/codecept run acceptance --env=testing-ci
+  - ./vendor/bin/codecept run functional --env=functional-travis -g func1
+  - ./vendor/bin/codecept run functional --env=functional-travis -g func2
+  - ./vendor/bin/codecept run api --env=functional-travis
+
+after_script:
+  - vendor/bin/test-reporter
+
+after_success:
+  - codecov
+
+after_failure:
+  - cat tests/_output/*.fail.html
+  - curl http://localhost:8000/login
+  - cat storage/logs/laravel.log
+
+# configure notifications (email, IRC, campfire etc)
+notifications:
+  email: false
+  slack:
+    secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/5e136eb0c1965f3918d0
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: change  # options: [always|never|change] default: always
+    on_start: false     # default: false
--- a/79
+++ b/79
@@ -1,62 +1,36 @@
-FROM ubuntu:focal
-LABEL maintainer Brady Wetherington <bwetherington@grokability.com>
+FROM ubuntu:xenial
+LABEL maintainer="uberbrady, hinchk"

-# No need to add `apt-get clean` here, reference:
-# - https://github.com/snipe/snipe-it/pull/9201
-# - https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get
-
-RUN export DEBIAN_FRONTEND=noninteractive; \
-    export DEBCONF_NONINTERACTIVE_SEEN=true; \
-    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
-    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
-    apt-get update -qqy \
- && apt-get install -qqy --no-install-recommends \
-apt-utils \
+RUN apt-get update && apt-get install -y software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php
+RUN apt-get update && apt-get install -y \
 apache2 \
 apache2-bin \
-libapache2-mod-php7.4 \
-php7.4-curl \
-php7.4-ldap \
-php7.4-mysql \
-php7.4-gd \
-php7.4-xml \
-php7.4-mbstring \
-php7.4-zip \
-php7.4-bcmath \
+libapache2-mod-php7.1 \
+php7.1-curl \
+php7.1-ldap \
+php7.1-mysql \
+php7.1-mcrypt \
+php7.1-gd \
+php7.1-xml \
+php7.1-mbstring \
+php7.1-zip \
+php7.1-bcmath \
 patch \
 curl \
-wget  \
 vim \
 git \
-cron \
 mysql-client \
 supervisor \
-cron \
-gcc \
-make \
-autoconf \
-libc-dev \
-pkg-config \
-libmcrypt-dev \
-php7.4-dev \
-ca-certificates \
-unzip \
+&& apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

-
-RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
-RUN php go-pear.phar
-
-RUN pecl install mcrypt-1.0.3
-
-RUN bash -c "echo extension=/usr/lib/php/20190902/mcrypt.so > /etc/php/7.4/mods-available/mcrypt.ini"
-
 RUN phpenmod mcrypt
 RUN phpenmod gd
 RUN phpenmod bcmath

-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/apache2/php.ini
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/cli/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.1/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.1/cli/php.ini

 RUN useradd -m --uid 1000 --gid 50 docker

@@ -67,18 +41,16 @@ COPY docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf

 #SSL
 RUN mkdir -p /var/lib/snipeit/ssl
-#COPY docker/001-default-ssl.conf /etc/apache2/sites-enabled/001-default-ssl.conf
-COPY docker/001-default-ssl.conf /etc/apache2/sites-available/001-default-ssl.conf
+COPY docker/001-default-ssl.conf /etc/apache2/sites-enabled/001-default-ssl.conf
+#COPY docker/001-default-ssl.conf /etc/apache2/sites-available/001-default-ssl.conf

 RUN a2enmod ssl
-RUN a2ensite 001-default-ssl.conf
+#RUN a2ensite 001-default-ssl.conf

 COPY . /var/www/html

 RUN a2enmod rewrite

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

 WORKDIR /var/www/html
@@ -96,23 +68,20 @@ RUN \
 	rm -r "/var/www/html/storage/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
      && rm -rf "/var/www/html/public/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
-      && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
+      && mkdir "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
      && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-      && ln -fs "/var/lib/snipeit/keys/ldap_client_tls.cert" "/var/www/html/storage/ldap_client_tls.cert" \
-      && ln -fs "/var/lib/snipeit/keys/ldap_client_tls.key" "/var/www/html/storage/ldap_client_tls.key" \
      && chown docker "/var/lib/snipeit/keys/" \
-      && chown -h docker "/var/www/html/storage/" \
      && chmod +x /var/www/html/artisan \
      && echo "Finished setting up application in /var/www/html"

 ############## DEPENDENCIES via COMPOSER ###################

 #global install of composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer

 # Get dependencies
 USER docker
-RUN composer install --no-dev --working-dir=/var/www/html
+RUN cd /var/www/html;composer install && rm -rf /home/docker/.composer/cache
 USER root

 ############### APPLICATION INSTALL/INIT #################
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,85 +0,0 @@
-FROM alpine:3
-# Apache + PHP
-RUN  apk add --no-cache \
-        apache2 \
-        php7 \
-        php7-common \
-        php7-apache2 \
-        php7-curl \
-        php7-ldap \
-        php7-mysqli \
-        php7-gd \
-        php7-xml \
-        php7-mbstring \
-        php7-zip \
-        php7-ctype \
-        php7-tokenizer \
-        php7-pdo_mysql \
-        php7-openssl \
-        php7-bcmath \
-        php7-phar \
-        php7-json \
-        php7-iconv \
-        php7-fileinfo \
-        php7-simplexml \
-        php7-session \
-        php7-dom \
-        php7-xmlwriter \
-        curl \
-        wget \
-        vim \
-        git \
-        mysql-client \
-        tini
-
-COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
-
-# Where apache's PID lives
-RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2
-
-RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php7/php.ini
-COPY  docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf
-
-# Enable mod_rewrite
-RUN sed -i '/LoadModule rewrite_module/s/^#//g' /etc/apache2/httpd.conf
-
-COPY . /var/www/html
-
-WORKDIR /var/www/html
-
-COPY docker/docker.env /var/www/html/.env
-
-RUN chown -R apache:apache /var/www/html
-
-RUN \
-	rm -r "/var/www/html/storage/private_uploads" \
-	&& mkdir -p "/var/lib/snipeit/data/private_uploads" && ln -fs "/var/lib/snipeit/data/private_uploads" "/var/www/html/storage/private_uploads" \
-    && rm -rf "/var/www/html/public/uploads" \
-    && mkdir -p "/var/lib/snipeit/data/uploads" && ln -fs "/var/lib/snipeit/data/uploads" "/var/www/html/public/uploads" \
-    && mkdir -p "/var/lib/snipeit/dumps" && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
-    && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
-    && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-    && chown -hR apache "/var/www/html/storage/" \
-    && chown -R apache "/var/lib/snipeit"
-
-# Install composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-RUN mkdir -p /var/www/.composer && chown apache /var/www/.composer
-
-# Install dependencies
-USER apache
-RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html
-
-USER root
-
-VOLUME ["/var/lib/snipeit"]
-
-# Entrypoints
-COPY docker/entrypoint_alpine.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-ENTRYPOINT ["/sbin/tini", "--"]
-
-CMD ["/entrypoint.sh"]
-
-EXPOSE 80
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -1,103 +0,0 @@
-ARG ENVIRONMENT=production
-ARG SNIPEIT_RELEASE=5.1.3
-ARG PHP_VERSION=7.4.16
-ARG PHP_ALPINE_VERSION=3.13
-ARG COMPOSER_VERSION=2.0.11
-
-# Cannot use arguments with 'COPY --from' workaround
-# https://github.com/moby/moby/issues/34482#issuecomment-454716952
-FROM composer:${COMPOSER_VERSION} AS composer
-
-# Final stage
-FROM php:${PHP_VERSION}-fpm-alpine${PHP_ALPINE_VERSION} AS source
-LABEL maintainer="Mateus Villar <mromeravillar@gmail.com>"
-
-ARG PACKAGES="\
-		mysql-client \
-"
-ARG DEV_PACKAGES="\
-		git \
-"
-ARG ENVIRONMENT
-ENV ENVIRONMENT ${ENVIRONMENT}
-ARG SNIPEIT_RELEASE
-ENV SNIPEIT_RELEASE ${SNIPEIT_RELEASE}
-
-# Cribbed from wordpress-fpm-alpine image
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN set -eux; \
-	docker-php-ext-enable opcache; \
-	{ \
-		echo 'opcache.memory_consumption=128'; \
-		echo 'opcache.interned_strings_buffer=8'; \
-		echo 'opcache.max_accelerated_files=4000'; \
-		echo 'opcache.revalidate_freq=2'; \
-		echo 'opcache.fast_shutdown=1'; \
-	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
-# https://wordpress.org/support/article/editing-wp-config-php/#configure-error-logging
-RUN { \
-# https://www.php.net/manual/en/errorfunc.constants.php
-# https://github.com/docker-library/wordpress/issues/420#issuecomment-517839670
-		echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
-		echo 'display_errors = Off'; \
-		echo 'display_startup_errors = Off'; \
-		echo 'log_errors = On'; \
-		echo 'error_log = /dev/stderr'; \
-		echo 'log_errors_max_len = 1024'; \
-		echo 'ignore_repeated_errors = On'; \
-		echo 'ignore_repeated_source = Off'; \
-		echo 'html_errors = Off'; \
-	} > /usr/local/etc/php/conf.d/error-logging.ini
-
-# Install php extensions inside docker containers easily
-# https://github.com/mlocati/docker-php-extension-installer
-COPY --from=mlocati/php-extension-installer:1.2.19 /usr/bin/install-php-extensions /usr/local/bin/
-RUN set -eux; \
-    install-php-extensions \
-        bcmath \
-        gd \
-        ldap \
-        mysqli \
-        pdo_mysql \
-        zip; \
-    rm -f /usr/local/bin/install-php-extensions; \
-# Install prerequisites packages
-    apk add --no-cache \
-        ${PACKAGES};
-
-COPY --from=composer /usr/bin/composer /usr/local/bin
-ARG COMPOSER_ALLOW_SUPERUSER=1
-RUN set -eux; \
-# Download and extract snipeit tarball
-	curl -o snipeit.tar.gz -fL "https://github.com/snipe/snipe-it/archive/v$SNIPEIT_RELEASE.tar.gz"; \
-	tar -xzf snipeit.tar.gz --strip-components=1 -C /var/www/html/; \
-	rm snipeit.tar.gz; \
-# Install composer php dependencies
-    if [ "$ENVIRONMENT" = "production" ]; then \
-        echo "production enviroment detected!"; \
-        composer update \
-            --no-cache \
-            --no-dev \
-            --optimize-autoloader \
-            --working-dir=/var/www/html; \
-    else \
-        echo "development enviroment detected!"; \
-        apk add --no-cache \
-            ${DEV_PACKAGES}; \
-        composer update \
-            --no-cache \
-			--prefer-source \
-            --optimize-autoloader \
-            --working-dir=/var/www/html; \
-    fi; \
-	rm -f /usr/local/bin/composer; \
-	chown -R www-data:www-data /var/www/html;
-
-VOLUME [ "/var/lib/snipeit" ]
-
-COPY --chown=www-data:www-data docker/docker-secrets.env /var/www/html/.env
-COPY --chmod=655 docker/docker-entrypoint.sh /usr/local/bin/docker-snipeit-entrypoint
-COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
-ENTRYPOINT [ "/usr/local/bin/docker-snipeit-entrypoint" ]
-CMD [ "/usr/local/bin/docker-php-entrypoint", "php-fpm" ]
--- a/1
+++ b/1
@@ -1 +0,0 @@
-web: php heroku/startup.php && heroku-php-apache2 public/
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
-![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-282-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)
+[![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=master)](https://travis-ci.org/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![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-181-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)
+

 ## Snipe-IT - Open Source Asset Management System

 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

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

@@ -19,8 +20,6 @@ For instructions on installing and configuring Snipe-IT on your server, check ou

 If you're having trouble with the installation, please check the [Common Issues](https://snipe-it.readme.io/docs/common-issues) and [Getting Help](https://snipe-it.readme.io/docs/getting-help) documentation, and search this repository's open *and* closed issues for help.

-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
-
 -----
 ### User's Manual
 For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.io/docs/overview).
@@ -57,28 +56,16 @@ Since the release of the JSON REST API, several third-party developers have been

 - [Python Module](https://github.com/jbloomer/SnipeIT-PythonAPI) by [@jbloomer](https://github.com/jbloomer)
 - [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)
+- [InQRy](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/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.
-                                                     
+- [Snipe-IT plugin for Jira Service Desk (beta)](https://marketplace.atlassian.com/apps/1220379/snipe-it-for-jira-service-desk-beta?hosting=cloud&tab=overview) - for the upcoming Snipe-IT v5 only
+
 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. :) 

 -----

-### Contributing
-
-Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
-
-
-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.
-
-----
-
 ### Security

 To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. 
@@ -92,7 +79,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 | [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/snipe/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/snipe/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/snipe/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mtucker6784 "Code") | [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/snipe/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions") | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vjandrea "Code") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=ghost "Code") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
+| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
 | [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zjean "Code") | [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FREImedia "Code") | [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=opsydev "Code") | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rassie "Code") |
 | [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/snipe/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balous "Code") | [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/snipe/snipe-it/commits?author=reidblomquist "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mathieuk "Code") | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/snipe/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamdunson "Code") |
 | [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Ahimta "Code") | [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues "Code") | [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=patgmac "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hawk554 "Code") |
@@ -116,23 +103,16 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars2.githubusercontent.com/u/982885?v=4" width="110px;"/><br /><sub>Martin Stub</sub>](http://martinstub.dk)<br />[🌍](#translation-stubben "Translation") | [<img src="https://avatars2.githubusercontent.com/u/28959963?v=4" width="110px;"/><br /><sub>Meyer Flavio</sub>](https://github.com/meyerf99)<br />[🌍](#translation-meyerf99 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/796443?v=4" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[🌍](#translation-MicaelRodrigues "Translation") | [<img src="https://avatars0.githubusercontent.com/u/10481331?v=4" width="110px;"/><br /><sub>Mikael Rasmussen</sub>](http://rubixy.com/)<br />[🌍](#translation-mikaelssen "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1544552?v=4" width="110px;"/><br /><sub>IxFail</sub>](https://github.com/IxFail)<br />[🌍](#translation-IxFail "Translation") | [<img src="https://avatars3.githubusercontent.com/u/18483118?v=4" width="110px;"/><br /><sub>Mohammed Fota</sub>](http://www.mohammedfota.com)<br />[🌍](#translation-MohammedFota "Translation") | [<img src="https://avatars0.githubusercontent.com/u/227080?v=4" width="110px;"/><br /><sub>Moayad Alserihi</sub>](https://github.com/omego)<br />[🌍](#translation-omego "Translation") |
 | [<img src="https://avatars0.githubusercontent.com/u/1680266?v=4" width="110px;"/><br /><sub>saymd</sub>](https://github.com/saymd)<br />[🌍](#translation-saymd "Translation") | [<img src="https://avatars0.githubusercontent.com/u/1826808?v=4" width="110px;"/><br /><sub>Patrik Larsson</sub>](https://nordsken.se)<br />[🌍](#translation-pooot "Translation") | [<img src="https://avatars1.githubusercontent.com/u/20584746?v=4" width="110px;"/><br /><sub>drcryo</sub>](https://github.com/drcryo)<br />[🌍](#translation-drcryo "Translation") | [<img src="https://avatars1.githubusercontent.com/u/19408004?v=4" width="110px;"/><br /><sub>pawel1615</sub>](https://github.com/pawel1615)<br />[🌍](#translation-pawel1615 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/23340468?v=4" width="110px;"/><br /><sub>bodrovics</sub>](https://github.com/bodrovics)<br />[🌍](#translation-bodrovics "Translation") | [<img src="https://avatars0.githubusercontent.com/u/3257654?v=4" width="110px;"/><br /><sub>priatna</sub>](https://github.com/priatna)<br />[🌍](#translation-priatna "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5358374?v=4" width="110px;"/><br /><sub>Fan Jiang</sub>](https://amayume.net)<br />[🌍](#translation-ProfFan "Translation") |
 | [<img src="https://avatars1.githubusercontent.com/u/22555451?v=4" width="110px;"/><br /><sub>ragnarcx</sub>](https://github.com/ragnarcx)<br />[🌍](#translation-ragnarcx "Translation") | [<img src="https://avatars2.githubusercontent.com/u/18654582?v=4" width="110px;"/><br /><sub>Rein van Haaren</sub>](http://www.reinvanhaaren.nl/)<br />[🌍](#translation-reinvanhaaren "Translation") | [<img src="https://avatars1.githubusercontent.com/u/386672?v=4" width="110px;"/><br /><sub>Teguh Dwicaksana</sub>](http://dheche.songolimo.net)<br />[🌍](#translation-dheche "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2572552?v=4" width="110px;"/><br /><sub>fraccie</sub>](https://github.com/FRaccie)<br />[🌍](#translation-FRaccie "Translation") | [<img src="https://avatars0.githubusercontent.com/u/35182720?v=4" width="110px;"/><br /><sub>vinzruzell</sub>](https://github.com/vinzruzell)<br />[🌍](#translation-vinzruzell "Translation") | [<img src="https://avatars1.githubusercontent.com/u/7883603?v=4" width="110px;"/><br /><sub>Kevin Austin</sub>](http://kevinaustin.com)<br />[🌍](#translation-vipsystem "Translation") | [<img src="https://avatars3.githubusercontent.com/u/3861828?v=4" width="110px;"/><br /><sub>Wira Sandy</sub>](http://azuraweb.xyz)<br />[🌍](#translation-wira-sandy "Translation") |
-| [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") | [<img src="https://avatars1.githubusercontent.com/u/4930051?v=4" width="110px;"/><br /><sub>Wes Hulette</sub>](http://macfoo.wordpress.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jwhulette "Code") | [<img src="https://avatars0.githubusercontent.com/u/8134591?v=4" width="110px;"/><br /><sub>patrict</sub>](https://github.com/patrict)<br />[💻](https://github.com/snipe/snipe-it/commits?author=patrict "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/2611616?v=4" width="110px;"/><br /><sub>Dmitriy Minaev</sub>](https://github.com/VELIKII-DIVAN)<br />[💻](https://github.com/snipe/snipe-it/commits?author=VELIKII-DIVAN "Code") | [<img src="https://avatars0.githubusercontent.com/u/5132245?v=4" width="110px;"/><br /><sub>liquidhorse</sub>](https://github.com/liquidhorse)<br />[💻](https://github.com/snipe/snipe-it/commits?author=liquidhorse "Code") | [<img src="https://avatars1.githubusercontent.com/u/183678?v=4" width="110px;"/><br /><sub>Jordi Boggiano</sub>](https://seld.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Seldaek "Code") | [<img src="https://avatars0.githubusercontent.com/u/653557?v=4" width="110px;"/><br /><sub>Ivan Nieto</sub>](https://github.com/inietov)<br />[💻](https://github.com/snipe/snipe-it/commits?author=inietov "Code") | [<img src="https://avatars2.githubusercontent.com/u/6764151?v=4" width="110px;"/><br /><sub>Ben RUBSON</sub>](https://github.com/benrubson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benrubson "Code") | [<img src="https://avatars2.githubusercontent.com/u/8554558?v=4" width="110px;"/><br /><sub>NMathar</sub>](https://github.com/NMathar)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NMathar "Code") | [<img src="https://avatars1.githubusercontent.com/u/139566?v=4" width="110px;"/><br /><sub>Steffen</sub>](https://github.com/smb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smb "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/6609453?v=4" width="110px;"/><br /><sub>Sxderp</sub>](https://github.com/Sxderp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Sxderp "Code") | [<img src="https://avatars1.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>fanta8897</sub>](https://github.com/fanta8897)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fanta8897 "Code") | [<img src="https://avatars2.githubusercontent.com/u/2576509?v=4" width="110px;"/><br /><sub>Andrey Bolonin</sub>](https://andreybolonin.com/phpconsulting/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreybolonin "Code") | [<img src="https://avatars3.githubusercontent.com/u/2173307?v=4" width="110px;"/><br /><sub>shinayoshi</sub>](http://www.shinayoshi.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=shinayoshi "Code") | [<img src="https://avatars3.githubusercontent.com/u/2130159?v=4" width="110px;"/><br /><sub>Hubert</sub>](https://github.com/reuser)<br />[💻](https://github.com/snipe/snipe-it/commits?author=reuser "Code") | [<img src="https://avatars0.githubusercontent.com/u/6865789?v=4" width="110px;"/><br /><sub>KeenRivals</sub>](https://brashear.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KeenRivals "Code") | [<img src="https://avatars3.githubusercontent.com/u/2902513?v=4" width="110px;"/><br /><sub>omyno</sub>](https://github.com/omyno)<br />[💻](https://github.com/snipe/snipe-it/commits?author=omyno "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/6271335?v=4" width="110px;"/><br /><sub>Evgeny</sub>](https://github.com/jackka)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jackka "Code") | [<img src="https://avatars2.githubusercontent.com/u/1169963?v=4" width="110px;"/><br /><sub>Colin Campbell</sub>](https://digitalist.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=colin-campbell "Code") | [<img src="https://avatars3.githubusercontent.com/u/2872098?v=4" width="110px;"/><br /><sub>Ľubomír Kučera</sub>](https://github.com/lubo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lubo "Code") | [<img src="https://avatars3.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://www.sourceguru.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mezzle "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") | [<img src="https://avatars0.githubusercontent.com/u/17459600?v=4" width="110px;"/><br /><sub>Marián Skrip</sub>](https://github.com/mskrip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mskrip "Code") | [<img src="https://avatars2.githubusercontent.com/u/47435081?v=4" width="110px;"/><br /><sub>Godfrey Martinez</sub>](https://github.com/Godmartinz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Godmartinz "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/2075128?v=4" width="110px;"/><br /><sub>bigtreeEdo</sub>](https://github.com/bigtreeEdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bigtreeEdo "Code") | [<img src="https://avatars0.githubusercontent.com/u/5000430?v=4" width="110px;"/><br /><sub>Colin  McNeil</sub>](https://colinmcneil.me/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ColinMcNeil "Code") | [<img src="https://avatars0.githubusercontent.com/u/421625?v=4" width="110px;"/><br /><sub>JoKneeMo</sub>](https://github.com/JoKneeMo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JoKneeMo "Code") | [<img src="https://avatars0.githubusercontent.com/u/54849013?v=4" width="110px;"/><br /><sub>Joshi</sub>](http://www.redbridge.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joshi-redbridge "Code") | [<img src="https://avatars2.githubusercontent.com/u/15731458?v=4" width="110px;"/><br /><sub>Anthony Burns</sub>](https://github.com/anthonypburns)<br />[💻](https://github.com/snipe/snipe-it/commits?author=anthonypburns "Code") | [<img src="https://avatars1.githubusercontent.com/u/63399474?v=4" width="110px;"/><br /><sub>johnson-yi</sub>](https://github.com/johnson-yi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=johnson-yi "Code") | [<img src="https://avatars1.githubusercontent.com/u/1862720?v=4" width="110px;"/><br /><sub>Sanjay Govind</sub>](https://tangentmc.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sanjay900 "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/917232?v=4" width="110px;"/><br /><sub>Simona Avornicesei</sub>](http://www.avornicesei.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=savornicesei "Tests") |
-| [<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://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

+-----
+
+### Contributing
+
+Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview).
+
+
+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.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,27 +0,0 @@
-# Security Policy
-
-We take security issues very seriously, and will always attempt to address any 
-vulnerabilities as quickly as possible. 
-
-## Supported Versions
-
-We try to make a reasonable effort to support older versions of Snipe-IT, 
-however there are times when library dependencies and/or PHP/MySQL dependencies 
-make it impossible to backport security fixes on older versions. 
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-Security vulnerabilities should be sent to security@snipeitapp.com. You can typically expect a 
-response within two business days, and we typically have fixes out in under a week from the initial disclosure.
-
-This obviously varies based on the severity of the  security issue and the difficulty in remediation, 
-but those have historically been the timelines we worm around.
-
-For a full breakdown of our security policies, please see https://snipeitapp.com/security.
--- a/45
+++ b/45
@@ -8,34 +8,25 @@ Vagrant.configure("2") do |config|
  config.vm.define "bionic" do |bionic|
    bionic.vm.box = "ubuntu/bionic64"
    bionic.vm.hostname = 'bionic'
-    bionic.vm.network "forwarded_port", guest: 80, host: 8080
-    bionic.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
-      :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
-    bionic.vm.provision "ansible_local" do |ansible|
-      ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
-    end
+    bionic.vm.network "public_network", bridge: NETWORK_BRIDGE
+    bionic.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    bionic.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
  end

  config.vm.define "xenial" do |xenial|
    xenial.vm.box = "ubuntu/xenial64"
    xenial.vm.hostname = 'xenial'
-    xenial.vm.network "forwarded_port", guest: 80, host: 8080
-    xenial.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
-      :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
-    xenial.vm.provision "ansible_local" do |ansible|
-      ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
-    end
+    xenial.vm.network "public_network", bridge: NETWORK_BRIDGE
+    xenial.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    xenial.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
  end

  config.vm.define "trusty" do |trusty|
    trusty.vm.box = "ubuntu/trusty32"
    trusty.vm.hostname = 'trusty'
-    trusty.vm.network "forwarded_port", guest: 80, host: 8080
-    trusty.vm.synced_folder ".", "/vagrant", :owner => 'www-data',
-      :group => 'vagrant', :mount_options => ['dmode=775', 'fmode=775']
-    trusty.vm.provision "ansible_local" do |ansible|
-      ansible.playbook = "ansible/ubuntu/vagrant_playbook.yml"
-    end
+    trusty.vm.network "public_network", bridge: NETWORK_BRIDGE
+    trusty.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    trusty.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
  end

  config.vm.define "centos7" do |centos7|
@@ -90,22 +81,4 @@ Vagrant.configure("2") do |config|
    fedora26.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
    fedora26.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
  end
-
-  config.vm.define "freebsd" do |freebsd|
-    freebsd.vm.box = "freebsd/FreeBSD-11.2-RELEASE"
-    freebsd.vm.hostname = 'freebsd12'
-    freebsd.vm.network "forwarded_port", guest: 80, host: 8080
-    freebsd.vm.network "forwarded_port", guest:3306, host:3306 # mysql    
-    freebsd.vm.network "private_network", type: "dhcp"
-    freebsd.ssh.shell = "sh"
-    freebsd.vm.base_mac = "080027D14C66"
-    freebsd.vm.synced_folder ".", "/vagrant", :nfs => true, id: "vagrant-root",
-    :mount_options => ['rw', 'vers=3', 'tcp', 'actimeo=2']    
-    freebsd.vm.provision "shell", inline: <<-SHELL
-        pkg install -y python27;
-    SHELL
-    freebsd.vm.provision "ansible" do |ansible|
-        ansible.playbook = "ansible/freebsd/vagrant_playbook.yml"
-    end    
-  end  
 end
--- a/ansible/freebsd/vagrant_playbook.yml
+++ b/ansible/freebsd/vagrant_playbook.yml
@@ -1,260 +0,0 @@
---
- name: Set up local server
-  hosts: all
-  remote_user: vagrant
-  become_user: root
-  become_method: sudo
-  vars:
-    - ansible_python_interpreter: /usr/local/bin/python2.7
-  gather_facts: no
-
-# Tasks    
-  tasks:
-
-    #
-    # Update the PKG database
-    #
-    - name: Upgrade PKG database
-      raw: sudo pkg upgrade -y  
-
-    #
-    # Mount the shared folders
-    #
-    - name: Update Vagrant Shared Folders
-      command:  "{{ item }}"
-      with_items:
-        - sysrc rpc_lockd_enable=YES
-        - sysrc rpc_statd_enable=YES
-      become: true   
-
-    #
-    # Install required utilities
-    #
-    - name: Install Utilities
-      pkgng:
-        name: "{{ item }}"
-        state: present 
-      with_items: 
-        - openssl
-        - node
-        - npm
-        - git
-        - nano
-        - wget
-        - bash
-      become: true          
-
-    #
-    # Install php and php dependancies
-    #
-    - name: Install PHP dependancies
-      pkgng:
-        name: "{{ item }}"
-        state: present
-      with_items: 
-        - php72
-        - php72-zip    
-        - php72-zlib   
-        - php72-extensions 
-        - php72-mbstring 
-        - php72-openssl 
-        # - php72-mysqli 
-        - php72-curl 
-        - php72-soap 
-        - php72-pdo_mysql 
-        # - php72-pdo_pgsql
-        - php72-ldap
-        - php72-curl
-        - php72-fileinfo
-        - php72-bcmath
-        - php72-gd
-      become: true
-
-    #
-    # Create a php.ini file
-    #
-    - name: PHP INI check
-      stat:
-        path: /usr/local/etc/php.ini
-      register: php_ini_exits
-
-    - name: Create PHP ini
-      command: cp /usr/local/etc/php.ini-development /usr/local/etc/php.ini
-      become: true
-      when: not php_ini_exits.stat.exists
-
-    - name: Enable PHP-FPM auto-start
-      command: sysrc php_fpm_enable=YES
-      become: true
-
-    - name: Start PHP-FPM service
-      service:
-        name: php-fpm
-        state: started
-      become: true   
-
-    #
-    # Install the lastest version of composer
-    #
-    - name: Composer check
-      stat:
-        path: /usr/local/bin/composer
-      register: composer_exits
-
-    - name: Install Composer
-      shell: |
-        EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig)
-        php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-        ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');")
-
-        if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-        then
-            >&2 echo 'ERROR: Invalid installer signature'
-            rm composer-setup.php
-            exit 1
-        fi
-
-        php composer-setup.php --quiet
-        RESULT=$?
-        rm composer-setup.php
-        mv composer.phar /usr/local/bin/composer
-        exit $RESULT
-      when: not composer_exits.stat.exists
-      become: true
-
-    #
-    # Install MySQL Server
-    
-    - name: Install MySQL 5.7
-      pkgng:
-        name: mysql57-server
-        state: present
-      become: true    
-      register: sql_server
-
-    - name: Start MySQL server
-      service:
-        name: mysql-server
-        state: started
-      become: true 
-
-    - name: MySQL 5.7 auto-start
-      command: sysrc mysql_enable=YES
-      become: true
-      when: sql_server.changed == true
-      
-    - name: Get MySQL root password
-      command: tail -1 /root/.mysql_secret
-      register: myql_root_pwd
-      become: true 
-      when: sql_server.changed == true
-
-    - name: Change MySQL root password
-      command: mysqladmin -u root -p'{{myql_root_pwd.stdout}}' password vagrant
-      when: sql_server.changed == true
-
-    - name: Enable remote mysql
-      replace:
-        path: /usr/local/etc/mysql/my.cnf
-        regexp: "127.0.0.1"
-        replace: "0.0.0.0" 
-      become: true         
-      when: sql_server.changed == true 
-
-    - name: Grant user vagrant privelages
-      shell: mysql -u root -pvagrant -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'vagrant' WITH GRANT OPTION; FLUSH PRIVILEGES;"
-      become: true 
-      when: sql_server.changed == true
-      ignore_errors: true
-
-    - name: Restart MySQL server
-      service:
-        name: mysql-server
-        state: restarted
-      become: true          
-
-
-    #  
-    # Install Apache Web Server
-    #
-    - name: Install Apache 2.4
-      pkgng:
-        name: apache24
-        state: present
-      become: true    
-      register: apache24_server     
-
-    - name: Apache 2.4 auto-start
-      command: sysrc apache24_enable=YES
-      become: true
-      when: apache24_server.changed == true 
-
-    - name: Enable Apache modules
-      replace:
-        path: /usr/local/etc/apache24/httpd.conf
-        regexp: "#{{ item }}"
-        replace: "{{ item }}" 
-      become: true 
-      with_items: 
-        - LoadModule rewrite_module libexec/apache24/mod_rewrite.so
-        - LoadModule vhost_alias_module libexec/apache24/mod_vhost_alias.so
-        - LoadModule deflate_module libexec/apache24/mod_deflate.so
-        - LoadModule expires_module libexec/apache24/mod_expires.so
-        - LoadModule mpm_worker_module libexec/apache24/mod_mpm_worker.so
-        - LoadModule proxy_fcgi_module libexec/apache24/mod_proxy_fcgi.so
-        - LoadModule proxy_module libexec/apache24/mod_proxy.so      
-        - Include etc/apache24/extra/httpd-vhosts.conf
-      when: apache24_server.changed == true  
-
-    - name: Disable Apache modules
-      replace:
-        path: /usr/local/etc/apache24/httpd.conf
-        regexp: "{{ item }}"
-        replace: "#{{ item }}" 
-      become: true 
-      with_items: 
-        - LoadModule mpm_prefork_module libexec/apache24/mod_mpm_prefork.so
-      when: apache24_server.changed == true            
-
-    - name: Backup vhosts
-      command: cp /usr/local/etc/apache24/extra/httpd-vhosts.conf /usr/local/etc/apache24/extra/httpd-vhosts.conf.bak
-      become: true
-      when: apache24_server.changed == true 
-
-    - name: Truncate vhosts
-      command: truncate -s 0 /usr/local/etc/apache24/extra/httpd-vhosts.conf
-      become: true
-      when: apache24_server.changed == true 
-
-    - name: Set up vhost
-      blockinfile:
-        path: "/usr/local/etc/apache24/extra/httpd-vhosts.conf"    
-        block: |
-          <VirtualHost *>
-              DocumentRoot /usr/local/www/apache24/data/public
-              ServerName vagrant.app              
-              ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/local/www/apache24/data/public/$1
-              DirectoryIndex /index.php index.php
-              <Directory /usr/local/www/apache24/data/public>
-                  Options -Indexes +FollowSymLinks
-                  AllowOverride All
-                  Require all granted
-              </Directory>
-            </VirtualHost>
-      become: true
-      when: apache24_server.changed == true 
-
-    - name: Map apache dir to local folder
-      shell: |
-        if ! [ -L /var/www ]; then
-          rm -rf /usr/local/www/apache24/data;
-          ln -fs /vagrant /usr/local/www/apache24/data;
-        fi
-      become: true
-      when: apache24_server.changed == true
-
-    - name: Start Apache 2.4 server
-      service:
-        name: apache24
-        state: started
-      become: true     
--- a/ansible/ubuntu/apachevirtualhost.conf.j2
+++ b/ansible/ubuntu/apachevirtualhost.conf.j2
@@ -1,10 +0,0 @@
-<VirtualHost *:80>
-    <Directory {{ app_path }}/public>
-        Allow From All
-        AllowOverride All
-        Options -Indexes
-    </Directory>
-
-    DocumentRoot {{ app_path }}/public
-    ServerName {{ fqdn }}
-</VirtualHost>
--- a/ansible/ubuntu/vagrant_playbook.yml
+++ b/ansible/ubuntu/vagrant_playbook.yml
@@ -1,226 +0,0 @@
---
- name: Set up local server
-  hosts: all
-  remote_user: vagrant
-  become_user: root
-  become_method: sudo
-  vars:
-    app_path: "/var/www/snipeit"
-    fqdn: "localhost"
-  tasks:
-    - name: Update and upgrade existing apt packages
-      become: true
-      apt:
-        upgrade: yes
-        update_cache: yes
-    - name: Install Utilities
-      become: true          
-      apt:
-        name: "{{ packages }}"
-        state: present 
-      vars: 
-        packages:
-          - nano
-          - vim
-    - name: Installing Apache httpd, PHP, MariaDB and other requirements.
-      become: true
-      apt:
-        name: "{{ packages }}"
-        state: present
-      vars:
-        packages:
-          - mariadb-client
-          - php
-          - php-curl
-          - php-mysql
-          - php-gd
-          - php-ldap
-          - php-zip
-          - php-mbstring
-          - php-xml
-          - php-bcmath
-          - curl
-          - git
-          - unzip
-          - python-pymysql
-    #
-    # Install the lastest version of composer
-    #
-    - name: Composer check
-      stat:
-        path: /usr/local/bin/composer
-      register: composer_exits
-    - name: Install Composer
-      shell: |
-        EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig)
-        php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-        ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');")
-
-        if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
-        then
-            >&2 echo 'ERROR: Invalid installer signature'
-            rm composer-setup.php
-            exit 1
-        fi
-
-        php composer-setup.php --quiet
-        RESULT=$?
-        rm composer-setup.php
-        mv composer.phar /usr/local/bin/composer
-        exit $RESULT
-      when: not composer_exits.stat.exists
-      args:
-        creates: /usr/local/bin/composer
-      become: true
-    #
-    # Install and Configure MariaDB
-    #
-    - name: Install MariaDB
-      become: true
-      apt:
-        name: mariadb-server
-        state: present
-      register: sql_server
-    - name: Start and Enable MySQL server
-      become: true 
-      systemd:
-        state: started
-        enabled: yes
-        name: mariadb
-    - name: Create Vagrant mysql password
-      become: true
-      mysql_user:
-        name: vagrant
-        password: vagrant
-        login_unix_socket: /var/run/mysqld/mysqld.sock
-        priv: "*.*:ALL"
-        state: present
-    - name: Enable remote mysql
-      replace:
-        path: /etc/mysql/mariadb.conf.d/50-server.cnf
-        regexp: "127.0.0.1"
-        replace: "0.0.0.0" 
-      become: true         
-      notify:
-        - restart mysql
-    - name: Create snipeit database
-      become: true
-      mysql_db:
-        name: snipeit
-        state: present
-        login_unix_socket: /var/run/mysqld/mysqld.sock
-    #  
-    # Install Apache Web Server
-    #
-    - name: Install Apache 2.4
-      apt:
-        name: "{{ packages }}"
-        state: present
-      vars:
-        packages:
-          - apache2
-          - libapache2-mod-php
-      become: true    
-      register: apache2_server     
-    - name: Start and Enable Apache2 Server
-      become: true
-      systemd:
-        name: apache2
-        state: started
-        enabled: yes
-    #- name: Disable Apache modules
-    #  become: true 
-    #  apache2_module:
-    #    state: absent
-    #    name: "{{ item }}"
-    #  with_items: 
-    #    #- mpm_prefork
-    #  notify:
-    #    - restart apache2
-    - name: Enable Apache modules
-      become: true
-      apache2_module:
-        state: present
-        name: "{{ item }}"
-      with_items:
-        - rewrite
-        - vhost_alias
-        - deflate
-        - expires
-        - proxy_fcgi
-        - proxy
-      notify:
-        - restart apache2
-    - name: Install Apache VirtualHost File
-      become: true
-      template:
-        src: apachevirtualhost.conf.j2
-        dest: "/etc/apache2/sites-available/snipeit.conf"
-    - name: Enable VirtualHost
-      become: true
-      command: a2ensite snipeit
-      args:
-        creates: /etc/apache2/sites-enabled/snipeit.conf
-      notify:
-        - restart apache2
-    - name: Map apache dir to local folder
-      become: true
-      file:
-        src: /vagrant
-        dest: "{{ app_path }}"
-        state: link
-      notify:
-        - restart apache2
-    #
-    # Install dependencies from composer
-    #
-    - name: Install dependencies from composer
-      composer:
-        command: install
-        working_dir: "{{ app_path }}"
-      notify:
-        - restart apache2
-    #
-    # Configure .env file
-    #
-    - name: Copy .env file
-      copy:
-        src: "{{ app_path }}/.env.example"
-        dest: "{{ app_path }}/.env"
-    - name: Configure .env file
-      lineinfile:
-        path: "{{ app_path }}/.env"
-        regexp: "{{ item.regexp }}"
-        line: "{{ item.line }}"
-      with_items:
-        - { regexp: '^DB_HOST=', line: 'DB_HOST=127.0.0.1'}
-        - { regexp: '^DB_DATABASE=', line: 'DB_DATABASE=snipeit' }
-        - { regexp: '^DB_USERNAME=', line: 'DB_USERNAME=vagrant' }
-        - { regexp: '^DB_PASSWORD=', line: 'DB_PASSWORD=vagrant' }
-        - { regexp: '^APP_URL=', line: "APP_URL=http://{{ fqdn }}" }
-        - { regexp: '^APP_ENV=', line: "APP_ENV=development" }
-        - { regexp: '^APP_DEBUG=', line: "APP_DEBUG=true" }
-    - name: Generate application key
-      shell: "php {{ app_path }}/artisan key:generate --force"
-    - name: Artisan Migrate
-      shell: "php {{ app_path }}/artisan migrate --force"
-    #
-    # Create Cron Job
-    #
-    - name: Create scheduler cron job
-      become: true
-      cron:
-        name: "Snipe-IT Artisan Scheduler"
-        job: "/usr/bin/php {{ app_path }}/artisan schedule:run"
-  handlers:
-    - name: restart apache2
-      become: true
-      systemd:
-        name: apache2
-        state: restarted
-    - name: restart mysql
-      become: true
-      systemd:
-        name: mysql
-        state: restarted
-
--- a/app.json
+++ b/app.json
@@ -1,154 +0,0 @@
-{
-    "name": "Snipe-IT",
-    "description": "Open source asset management.",
-    "keywords": [
-      "asset management",
-      "it asset"
-    ],
-    "website": "https://snipeitapp.com/",
-    "repository": "https://github.com/snipe/snipe-it",
-    "logo": "https://pbs.twimg.com/profile_images/976748875733020672/K-HnZCCK_400x400.jpg",
-    "success_url": "/setup",
-    "env": {
-      "APP_ENV": {
-        "description": "Laravel environment mode. Unless developing the application, this should be production.",
-        "value": "production"
-      },
-      "APP_DEBUG": {
-        "description": "Laravel debug mode. Unless developing the application or actively debugging a problem, this should be set to false.",
-        "value": "false"
-      },
-      "APP_KEY": {
-        "description": "A secret key for verifying the integrity of signed cookies. (See either https://snipe-it.readme.io/docs/generate-your-app-key or generate at https://coderstoolbox.online/toolbox/generate-symfony-secret)",
-        "value": ""
-      },
-      "APP_URL": {
-        "description": "URL where your Snipe-IT install will be available at.",
-        "value": "https://your-app-name.herokuapp.com"
-      },
-      "APP_TIMEZONE": {
-        "description": "Which timezone do you want to use for your install? (http://php.net/manual/en/timezones.php)",
-        "value": "UTC"
-      },
-      "APP_LOCALE": {
-        "description": "Which language do you want to use for your install? (https://snipe-it.readme.io/docs/configuration#setting-a-language)",
-        "value": "en"
-      },
-      "MAX_RESULTS": {
-        "description": "The maximum number of search results that can be returned at one time.",
-        "value": "500"
-      },
-      "MAIL_DRIVER": {
-        "description": "Mail driver - Generally SMTP on Heroku - https://snipe-it.readme.io/docs/configuration#required-outgoing-mail-settings",
-        "value": "smtp"
-      },
-      "MAIL_HOST": {
-        "description": "SMTP Server Hostname",
-        "value": "smtp.your.domain.name"
-      },
-      "MAIL_PORT": {
-        "description": "SMTP Server Port",
-        "value": "25"
-      },
-      "MAIL_USERNAME": {
-        "description": "SMTP Server Username",
-        "value": "YOURUSERNAME"
-      },
-      "MAIL_PASSWORD": {
-        "description": "SMTP Server Password",
-        "value": "YOURPASSWORD"
-      },
-      "MAIL_ENCRYPTION": {
-        "description": "Encryption protocol for email sending.",
-        "value": "null"
-      },
-      "MAIL_FROM_ADDR": {
-        "description": "Email from address",
-        "value": "no-reply@domain.name"
-      },
-      "MAIL_FROM_NAME": {
-        "description": "Email from Name",
-        "value": "Snipe-IT"
-      },
-      "MAIL_REPLYTO_ADDR": {
-        "description": "Email Reply-To address",
-        "value": "your@domain.name"
-      },
-      "MAIL_REPLYTO_NAME": {
-        "description": "Email Reply-To Name",
-        "value": "Snipe-IT"
-      },
-      "MAIL_AUTO_EMBED": {
-        "description": "Whether or not to embed images in emails (via CID or base64) versus linking to them.",
-        "value": "true"
-      },
-      "MAIL_AUTO_EMBED_METHOD": {
-        "description": "Method that should be used for attaching inline images.",
-        "value": "base64"
-      },
-      "SESSION_LIFETIME": {
-        "description": "Specify the time in minutes that the session should remain valid.",
-        "value": "12000"
-      },
-      "EXPIRE_ON_CLOSE": {
-        "description": "Specify whether or not the logged in session should be expired when the user closes their browser window.",
-        "value": "false"
-      },
-      "ENCRYPT": {
-        "description": "Specify whether you wish to use encrypted cookies for your Snipe-IT sessions.",
-        "value": "true"
-      },
-      "COOKIE_NAME": {
-        "description": "The name of the cookie set by Snipe-IT for session management.",
-        "value": "snipeit_session"
-      },
-      "COOKIE_DOMAIN": {
-        "description": "The domain name that the session cookie should be sent for.",
-        "value": "your-app-name.herokuapp.com"
-      },
-      "SECURE_COOKIES": {
-        "description": "Should cookies only be sent for HTTPS connections? Generally true on Heroku.",
-        "value": "true"
-      },
-      "LOGIN_MAX_ATTEMPTS": {
-        "description": "The maximum number of failed attempts allowed before the user is throttled.",
-        "value": "5"
-      },
-      "LOGIN_LOCKOUT_DURATION": {
-        "description": "The duration (in seconds) that the user should be blocked from attempting to authenticate again.",
-        "value": "60"
-      },
-      "APP_LOG": {
-        "description": "Driver to send logs to. (errorlog for stderr)",
-        "value": "errorlog"
-      },
-      "ALLOW_IFRAMING": {
-        "description": "Allow Snipe-IT to be loaded using an iFrame?",
-        "value": "false"
-      },
-      "GOOGLE_MAPS_API": {
-        "description": "Include your Google Maps API key here if you'd like Snipe-IT to load maps from Google on your locations and suppliers pages.",
-        "required": false
-      },
-      "BACKUP_ENV": {
-        "description": "Set this to true if you wish to backup your .env file in your Admin > Backups process.",
-        "value": "true"
-      },
-      "ENABLE_HSTS": {
-        "description": "Whether or not to send the HSTS security policy header.",
-        "value": "false"
-      }
-    },
-    "formation": {
-      "web": {
-        "quantity": 1,
-        "size": "free"
-      }
-    },
-    "image": "heroku/php",
-    "addons": [
-      "cleardb:ignite",
-      "heroku-redis:hobby-dev",
-      "papertrail:choklad"
-    ]
-  }
--- a/app/Console/Commands/CheckinLicensesFromAllUsers.php
+++ b/app/Console/Commands/CheckinLicensesFromAllUsers.php
@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\LicenseSeat;
-use Illuminate\Console\Command;
-use App\Models\User;
-use App\Models\License;
-use Illuminate\Database\Eloquent\Model;
-
-class CheckinLicensesFromAllUsers extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:checkin-from-all {--license_id=} {--notify}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Checks in licenses from all users';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $license_id = $this->option('license_id');
-        $notify = $this->option('notify');
-
-        if (!$license_id) {
-            $this->error('ERROR: License ID is required.');
-            return false;
-        }
-
-
-        if (!$license = License::where('id','=',$license_id)->first()) {
-            $this->error('Invalid license ID');
-            return false;
-        }
-
-        $this->info('Checking in ALL seats for '.$license->name);
-
-
-        $licenseSeats = LicenseSeat::where('license_id', '=', $license_id)
-            ->whereNotNull('assigned_to')
-            ->with('user')
-            ->get();
-
-        $this->info(' There are ' .$licenseSeats->count(). ' seats checked out: ');
-
-        if (!$notify) {
-            $this->info('No mail will be sent.');
-        }
-
-        foreach ($licenseSeats as $seat) {
-            $this->info($seat->user->username .' has a license seat for '.$license->name);
-            $seat->assigned_to = null;
-
-            if ($seat->save()) {
-
-                // Override the email address so we don't notify on checkin
-                if (!$notify) {
-                    $seat->user->email = null;
-                }
-
-                // Log the checkin
-                $seat->logCheckin($seat->user, 'Checked in via cli tool');
-            }
-
-
-
-
-        }
-        
-
-    }
-}
--- a/app/Console/Commands/CheckoutLicenseToAllUsers.php
+++ b/app/Console/Commands/CheckoutLicenseToAllUsers.php
@@ -1,112 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\LicenseSeat;
-use Illuminate\Console\Command;
-use App\Models\User;
-use App\Models\License;
-use Illuminate\Database\Eloquent\Model;
-
-class CheckoutLicenseToAllUsers extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:checkout-to-all {--license_id=} {--notify}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $license_id = $this->option('license_id');
-        $notify = $this->option('notify');
-
-        if (!$license_id) {
-             $this->error('ERROR: License ID is required.');
-             return false;
-        }
-
-
-        if (!$license = License::where('id','=',$license_id)->with('assignedusers')->first()) {
-            $this->error('Invalid license ID');
-            return false;
-        }
-
-        $users = User::whereNull('deleted_at')->with('licenses')->get();
-
-        if ($users->count() > $license->getAvailSeatsCountAttribute()) {
-            $this->info('You do not have enough free seats to complete this task, so we will check out as many as we can. ');
-        }
-
-        $this->info('Checking out '.$users->count().' of '.$license->getAvailSeatsCountAttribute().' seats for '.$license->name);
-
-        if (!$notify) {
-            $this->info('No mail will be sent.');
-        }
-
-        foreach ($users as $user) {
-
-            // Check to make sure this user doesn't already have this license checked out
-            // to them
-
-            if ($user->licenses->where('id', '=', $license_id)->count()) {
-                $this->info($user->username .' already has this license checked out to them. Skipping... ');
-                continue;
-            }
-
-            
-            // If the license is valid, check that there is an available seat
-            if ($license->availCount()->count() < 1) {
-                $this->error('ERROR: No available seats');
-                return false;
-            }
-
-            $this->info($license->availCount()->count().' seats left');
-            // Get the seat ID
-            $licenseSeat = $license->freeSeat();
-
-
-            // Update the seat with checkout info,
-           $licenseSeat->assigned_to = $user->id;
-            if ($licenseSeat->save()) {
-
-                // Temporarily null the user's email address so we don't send mail if we're not supposed to
-                if (!$notify) {
-                    $user->email = null;
-                }
-
-                // Log the checkout
-                $licenseSeat->logCheckout('Checked out via cli tool', $user);
-                $this->info('License '.$license_id.' seat '.$licenseSeat->id.' checked out to '.$user->username);
-            }
-
-        }
-
-
-
-    }
-}
--- a/app/Console/Commands/CreateAdmin.php
+++ b/app/Console/Commands/CreateAdmin.php
@@ -76,4 +76,10 @@ class CreateAdmin extends Command

    }

+  //   protected function getArguments()
+  // 	{
+  // 		return array(
+  // 			array('username', InputArgument::REQUIRED, 'Username'),
+  // 		);
+    // }
 }
--- a/app/Console/Commands/DisableLDAP.php
+++ b/app/Console/Commands/DisableLDAP.php
@@ -2,8 +2,8 @@

 namespace App\Console\Commands;

-use App\Models\Setting;
 use Illuminate\Console\Command;
+use App\Models\Setting;

 class DisableLDAP extends Command
 {
@@ -41,7 +41,7 @@ class DisableLDAP extends Command

        if ($this->confirm("\n****************************************************\nThis will disable LDAP support. You will not be able \nto login with an account that does not exist \nlocally in the Snipe-IT local database. \n****************************************************\n\nDo you wish to continue? [y|N]")) {

-            $setting = Setting::getSettings();
+            $setting = Setting::first();
            $setting->ldap_enabled = 0;
            if ($setting->save()) {
                $this->info('LDAP has been set to disabled.');
--- a/app/Console/Commands/FixDoubleEscape.php
+++ b/app/Console/Commands/FixDoubleEscape.php
@@ -40,7 +40,7 @@ class FixDoubleEscape extends Command

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

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

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

                    }
--- a/app/Console/Commands/FixMismatchedAssetsAndLogs.php
+++ b/app/Console/Commands/FixMismatchedAssetsAndLogs.php
@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\Actionlog;
-use App\Models\Asset;
-use Illuminate\Console\Command;
-
-class FixMismatchedAssetsAndLogs extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:fix-assets-and-logs {--dryrun : Run the sync process but don\'t update the database}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This script attempts to check the log table and check that the assets.assigned_to matches the last checkout.';
-
-    /**
-     * Is dry-run?
-     *
-     * @var bool
-     */
-    private $dryrun = false;
-
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        if ($this->option('dryrun')) {
-            $this->dryrun = true;
-        }
-
-        if ($this->dryrun) {
-            $this->info('This is a DRY RUN - no changes will be saved.' );
-        }
-
-        $mismatch_count = 0;
-        $assets = Asset::whereNotNull('assigned_to')
-            ->where('assigned_type', '=', 'App\\Models\\User')
-            ->orderBy('id', 'ASC')->get();
-        foreach ($assets as $asset) {
-
-            // get the last checkout of the asset
-            if ($checkout_log = Actionlog::where('target_type', '=', 'App\\Models\\User')
-                ->where('action_type', '=', 'checkout')
-                ->where('item_id', '=', $asset->id)
-                ->orderBy('created_at', 'DESC')
-                ->first()) {
-
-                    // Now check for a subsequent checkin log - we want to ignore those
-                    if (!$checkin_log = Actionlog::where('target_type', '=', 'App\\Models\\User')
-                        ->where('action_type', '=', 'checkin from')
-                        ->where('item_id', '=', $asset->id)
-                        ->whereDate('created_at', '>', $checkout_log->created_at)
-                        ->orderBy('created_at', 'DESC')
-                        ->first()) {
-
-                        //print_r($asset);
-                        if ($checkout_log->target_id != $asset->assigned_to) {
-                            $this->error('Log ID: '.$checkout_log->id.' -- Asset ID '. $checkout_log->item_id.' SHOULD BE checked out to User '.$checkout_log->target_id.' but its assigned_to is '.$asset->assigned_to );
-
-                            if (!$this->dryrun) {
-                                $asset->assigned_to = $checkout_log->target_id;
-                                if ($asset->save()) {
-                                    $this->info('Asset record updated.');
-                                } else {
-                                    $this->error('Error updating asset: '.$asset->getErrors());
-                                }
-                            }
-                            $mismatch_count++;
-                        }
-                    } else {
-                        //$this->info('Asset ID '.$asset->id.': There is a checkin '.$checkin_log->created_at.' after this checkout '.$checkout_log->created_at);
-
-                    }
-
-            }
-
-        }
-        $this->info($mismatch_count.' mismatched assets.');
-
-    }
-}
--- a/app/Console/Commands/ImportLocations.php
+++ b/app/Console/Commands/ImportLocations.php
@@ -88,13 +88,11 @@ class ImportLocations extends Command

            if (array_key_exists('Parent Name', $row)) {
                $parent_name = trim($row['Parent Name']);
-            } else {
-                $parent_name = null;
            }

            // Set the location attributes to save
            if (array_key_exists('Name', $row)) {
-                $location = Location::firstOrCreate(array('name' => trim($row['Name'])));
+                $location = Location::firstOrNew(array('name' => trim($row['Name'])));
                $location->name = trim($row['Name']);
                $this->info('Checking location: '.$location->name);
            } else {
@@ -122,7 +120,7 @@ class ImportLocations extends Command
            if (array_key_exists('Country', $row)) {
                $location->country = trim($row['Country']);
            }
-            if (array_key_exists('OU', $row)) {
+            if (array_key_exists('Country', $row)) {
                $location->ldap_ou = trim($row['OU']);
            }

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

 namespace App\Console\Commands;

-use App\Models\Department;
 use Illuminate\Console\Command;
 use App\Models\Setting;
 use App\Models\Ldap;
@@ -43,19 +42,16 @@ class LdapSync extends Command
     */
    public function handle()
    {
-        ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
-        ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));
+        ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+        ini_set('memory_limit', '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;

        try {
            $ldapconn = Ldap::connectToLdap();
@@ -89,7 +85,7 @@ class LdapSync extends Command
        }

        /* Determine which location to assign users to by default. */
-        $location = NULL; // FIXME - this would be better called "$default_location", which is more explicit about its purpose
+        $location = NULL;

        if ($this->option('location')!='') {
            $location = Location::where('name', '=', $this->option('location'))->first();
@@ -111,8 +107,8 @@ class LdapSync extends Command
            $ldap_ou_locations = Location::where('ldap_ou', '!=', '')->get()->toArray();
            $ldap_ou_lengths = array();

-            foreach ($ldap_ou_locations as $ou_loc) {
-                $ldap_ou_lengths[] = strlen($ou_loc["ldap_ou"]);
+            foreach ($ldap_ou_locations as $location) {
+                $ldap_ou_lengths[] = strlen($location["ldap_ou"]);
            }

            array_multisort($ldap_ou_lengths, SORT_ASC, $ldap_ou_locations);
@@ -129,16 +125,7 @@ class LdapSync extends Command

            // Grab subsets based on location-specific DNs, and overwrite location for these users.
            foreach ($ldap_ou_locations as $ldap_loc) {
-                try {
-                    $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
-                } catch (\Exception $e) { // FIXME: this is stolen from line 77 or so above
-                    if ($this->option('json_summary')) {
-                        $json_summary = [ "error" => true, "error_message" => trans('admin/users/message.error.ldap_could_not_search')." Location: ".$ldap_loc['name']." (ID: ".$ldap_loc['id'].") cannot connect to \"".$ldap_loc["ldap_ou"]."\" - ".$e->getMessage(), "summary" => [] ];
-                        $this->info(json_encode($json_summary));
-                    }
-                    LOG::info($e);
-                    return [];
-                }
+                $location_users = Ldap::findLdapUsers($ldap_loc["ldap_ou"]);
                $usernames = array();
                for ($i = 0; $i < $location_users["count"]; $i++) {

@@ -170,6 +157,7 @@ class LdapSync extends Command
        $pass = bcrypt($tmp_pass);

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

                $item = array();
                $item["username"] = isset($results[$i][$ldap_result_username][0]) ? $results[$i][$ldap_result_username][0] : "";
@@ -179,19 +167,8 @@ class LdapSync extends Command
                $item["email"] = isset($results[$i][$ldap_result_email][0]) ? $results[$i][$ldap_result_email][0] : "" ;
                $item["ldap_location_override"] = isset($results[$i]["ldap_location_override"]) ? $results[$i]["ldap_location_override"]:"";
                $item["location_id"] = isset($results[$i]["location_id"]) ? $results[$i]["location_id"]:"";
-                $item["telephone"] = isset($results[$i][$ldap_result_phone][0]) ? $results[$i][$ldap_result_phone][0] : "";
-                $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] : "";
-
-
-                $department = Department::firstOrCreate([
-                    'name' => $item["department"],
-                ]);
-

                $user = User::where('username', $item["username"])->first();
-
                if ($user) {
                    // Updating an existing user.
                    $item["createorupdate"] = 'updated';
@@ -199,7 +176,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';
                }

@@ -208,57 +185,19 @@ class LdapSync extends Command
                $user->username = $item["username"];
                $user->email = $item["email"];
                $user->employee_num = e($item["employee_number"]);
-                $user->phone = $item["telephone"];
-                $user->jobtitle = $item["jobtitle"];
-                $user->country = $item["country"];
-                $user->department_id = $department->id;

-                if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
-                    // ....then *most* things that are truthy will activate the user. Anything falsey will deactivate them.
-                    // (Specifically, we don't handle a value of '0.0' correctly)
-                    $raw_value = @$results[$i][$ldap_result_active_flag][0];
-                    $filter_var = filter_var($raw_value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
-                    $boolean_cast = (bool)$raw_value;
-
-                    $user->activated = $filter_var ?? $boolean_cast; // if filter_var() was true or false, use that. If it's null, use the $boolean_cast
-
-                } elseif ( array_key_exists('useraccountcontrol', $results[$i]) ) {
-                    // ....otherwise, (ie if no 'active' LDAP flag is defined), IF the UAC setting exists,
-                    // ....then use the UAC setting on the account to determine can-log-in vs. cannot-log-in
-
-                    /* The following is _probably_ the correct logic, but we can't use it because
-                       some users may have been dependent upon the previous behavior, and this
-                       could cause additional access to be available to users they don't want
-                       to allow to log in.
-
-                    $useraccountcontrol = $results[$i]['useraccountcontrol'][0];
-                    if(
-                        // based on MS docs at: https://support.microsoft.com/en-us/help/305144/how-to-use-useraccountcontrol-to-manipulate-user-account-properties
-                        ($useraccountcontrol & 0x200) && // is a NORMAL_ACCOUNT
-                        !($useraccountcontrol & 0x02) && // *and* _not_ ACCOUNTDISABLE
-                        !($useraccountcontrol & 0x10)    // *and* _not_ LOCKOUT
-                    ) {
-                        $user->activated = 1;
-                    } else {
-                        $user->activated = 0;
-                    } */
+                // Sync activated state for Active Directory.
+                if ( array_key_exists('useraccountcontrol', $results[$i]) ) {
                  $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 
-                    '4260352',// 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
-                    '1049088',// 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
+                    '512', '544', '66048', '66080', '262656', '262688', '328192', '328224'
                  ];
                  $user->activated = ( in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts) ) ? 1 : 0;
+                }

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

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

                array_push($summary, $item);
+            }

        }

@@ -300,7 +240,7 @@ class LdapSync extends Command
                }
            }
        } else if ($this->option('json_summary')) {
-            $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ]; // hardcoding the error to false and the error_message to blank seems a bit weird
+            $json_summary = [ "error" => false, "error_message" => "", "summary" => $summary ];
            $this->info(json_encode($json_summary));
        } else {
            return $summary;
--- a/app/Console/Commands/LdapSyncNg.php
+++ b/app/Console/Commands/LdapSyncNg.php
@@ -1,399 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Console\Commands;
-
-use Log;
-use Exception;
-use App\Models\User;
-use App\Services\LdapAd;
-use App\Models\Location;
-use Illuminate\Console\Command;
-use Adldap\Models\User as AdldapUser;
-
-/**
- * LDAP / AD sync command.
- *
- * @author Wes Hulette <jwhulette@gmail.com>
- *
- * @since 5.0.0
- */
-class LdapSyncNg extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:ldap-sync-ng 
-                {--location= : A location name } 
-                {--location_id= : A location id} 
-                {--base_dn= : A diffrent base DN to use } 
-                {--summary : Print summary } 
-                {--json_summary : Print summary in json format } 
-                {--dryrun : Run the sync process but don\'t update the database}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command line LDAP/AD sync';
-
-    /**
-     * An LdapAd instance.
-     *
-     * @var \App\Models\LdapAd
-     */
-    private $ldap;
-
-    /**
-     * LDAP settings collection.
-     *
-     * @var \Illuminate\Support\Collection
-     */
-    private $settings = null;
-
-    /**
-     * A default location collection.
-     *
-     * @var \Illuminate\Support\Collection
-     */
-    private $defaultLocation = null;
-
-    /**
-     * Mapped locations collection.
-     *
-     * @var \Illuminate\Support\Collection
-     */
-    private $mappedLocations = null;
-
-    /**
-     * The summary collection.
-     *
-     * @var \Illuminate\Support\Collection
-     */
-    private $summary;
-
-    /**
-     * Is dry-run?
-     *
-     * @var bool
-     */
-    private $dryrun = false;
-
-    /**
-     * Show users to be imported.
-     *
-     * @var array
-     */
-    private $userlist = [];
-
-    /**
-     * Create a new command instance.
-     */
-    public function __construct(LdapAd $ldap)
-    {
-        parent::__construct();
-        $this->ldap     = $ldap;
-        $this->settings = $this->ldap->ldapSettings;
-        $this->summary  = collect();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $dispatcher =  \Adldap\Adldap::getEventDispatcher();
-
-        // Listen for all model events.
-        $dispatcher->listen('Adldap\Models\Events\*', function ($eventName, array $data) {
-            echo $eventName; // Returns 'Adldap\Models\Events\Updating'
-            var_dump($data); // Returns [0] => (object) Adldap\Models\Events\Updating;
-            \Log::debug("Event: ".$eventName." data - ".print_r($data, true));
-        });
-        $dispatcher->listen('Adldap\Auth\Events\*', function ($eventName, array $data) {
-            echo $eventName; // Returns 'Adldap\Models\Events\Updating'
-            var_dump($data); // Returns [0] => (object) Adldap\Models\Events\Updating;
-            \Log::debug("Event: ".$eventName." data - ".print_r($data, true));
-        });
-
-        ini_set('max_execution_time', env('LDAP_TIME_LIM', "600")); //600 seconds = 10 minutes
-        ini_set('memory_limit', '500M');
-        $old_error_reporting = error_reporting(); // grab old error_reporting .ini setting, for later re-enablement
-        error_reporting($old_error_reporting & ~E_DEPRECATED); // disable deprecation warnings, for LDAP in PHP 7.4 (and greater)
-
-        if ($this->option('dryrun')) {
-            $this->dryrun = true;
-        }
-        $this->checkIfLdapIsEnabled();
-        $this->checkLdapConnection();
-        $this->setBaseDn();
-        $this->getUserDefaultLocation();
-        /*
-         * Use the default location if set, this is needed for the LDAP users sync page
-         */
-        if (!$this->option('base_dn') && null == $this->defaultLocation) {
-            $this->getMappedLocations();
-        }
-        $this->processLdapUsers();
-        // Print table of users
-        if ($this->dryrun) {
-            $this->info('The following users will be synced!');
-            $headers = ['First Name', 'Last Name', 'Username', 'Email', 'Employee #', 'Location Id', 'Status'];
-            $this->table($headers, $this->summary->toArray());
-        }
-
-        error_reporting($old_error_reporting); // re-enable deprecation warnings.
-        return $this->getSummary();
-    }
-
-    /**
-     * Generate the LDAP sync summary.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     *
-     * @return string
-     */
-    private function getSummary(): string
-    {
-        if ($this->option('summary') && null === $this->dryrun) {
-            $this->summary->each(function ($item) {
-                $this->info('USER: '.$item['note']);
-
-                if ('ERROR' === $item['status']) {
-                    $this->error('ERROR: '.$item['note']);
-                }
-            });
-        } elseif ($this->option('json_summary')) {
-            $json_summary = [
-                'error' => false,
-                'error_message' => '',
-                'summary' => $this->summary->toArray(),
-            ];
-            $this->info(json_encode($json_summary));
-        }
-
-        return '';
-    }
-
-    /**
-     * Create a new user or update an existing user.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     *
-     * @param \Adldap\Models\User $snipeUser
-     */
-    private function updateCreateUser(AdldapUser $snipeUser): void
-    {
-        $user = $this->ldap->processUser($snipeUser, $this->defaultLocation, $this->mappedLocations);
-        $summary = [
-            'firstname'       => $user->first_name,
-            'lastname'        => $user->last_name,
-            'username'        => $user->username,
-            'employee_number' => $user->employee_num,
-            'email'           => $user->email,
-            'location_id'     => $user->location_id,
-        ];
-        // Only update the database if is not a dry run
-        if (!$this->dryrun) {
-            if ($user->isDirty()) { //if nothing on the user changed, don't bother trying to save anything nor put anything in the summary
-                if ($user->save()) {
-                    $summary['note']   = ($user->wasRecentlyCreated ? 'CREATED' : 'UPDATED');
-                    $summary['status'] = 'SUCCESS';
-                } else {
-                    $errors = '';
-                    foreach ($user->getErrors()->getMessages() as  $error) {
-                        $errors .= implode(", ",$error);
-                    }
-                    $summary['note']   = $snipeUser->getDN().' was not imported. REASON: '.$errors;
-                    $summary['status'] = 'ERROR';
-                }
-            } else {
-                $summary = null;
-            }
-        }
-
-        // $summary['note'] = ($user->getOriginal('username') ? 'UPDATED' : 'CREATED'); // this seems, kinda, like, superfluous, relative to the $summary['note'] thing above, yeah?
-        if($summary) { //if the $user wasn't dirty, $summary was set to null so that we will skip the following push()
-            $this->summary->push($summary);
-        }
-    }
-
-    /**
-     * Process the users to update / create.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     *
-     */
-    private function processLdapUsers(): void
-    {
-        try {
-            \Log::debug("CAL:LING GET LDAP SUSERS");
-            $ldapUsers = $this->ldap->getLdapUsers();
-            \Log::debug("END CALLING GET LDAP USERS");
-        } catch (Exception $e) {
-            $this->outputError($e);
-            exit($e->getMessage());
-        }
-
-        if (0 == $ldapUsers->count()) {
-            $msg = 'ERROR: No users found!';
-            Log::error($msg);
-            if ($this->dryrun) {
-                $this->error($msg);
-            }
-            exit($msg);
-        }
-
-        // Process each individual users
-        foreach ($ldapUsers->getResults() as $user) { // AdLdap2's paginate() method is weird, it gets *everything* and ->getResults() returns *everything*
-            $this->updateCreateUser($user);
-        }
-    }
-
-    /**
-     * Get the mapped locations if a base_dn is provided.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     */
-    private function getMappedLocations()
-    {
-        $ldapOuLocation = Location::where('ldap_ou', '!=', '')->select(['id', 'ldap_ou'])->get();
-        $locations = $ldapOuLocation->sortBy(function ($ou, $key) {
-            return strlen($ou->ldap_ou);
-        });
-        if ($locations->count() > 0) {
-            $msg = 'Some locations have special OUs set. Locations will be automatically set for users in those OUs.';
-            LOG::debug($msg);
-            if ($this->dryrun) {
-                $this->info($msg);
-            }
-
-            $this->mappedLocations = $locations->pluck('ldap_ou', 'id'); // TODO: this seems ok-ish, but the key-> value is going location_id -> OU name, and the primary action here is the opposite of that - going from OU's to location ID's.
-        }
-    }
-
-    /**
-     * Set the base dn if supplied.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     */
-    private function setBaseDn(): void
-    {
-        if ($this->option('base_dn')) {
-            $this->ldap->baseDn = $this->option('base_dn');
-            $msg = sprintf('Importing users from specified base DN: "%s"', $this->ldap->baseDn);
-            LOG::debug($msg);
-            if ($this->dryrun) {
-                $this->info($msg);
-            }
-        }
-    }
-
-    /**
-     * Get a default location id for imported users.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     */
-    private function getUserDefaultLocation(): void
-    {
-        $location = $this->option('location_id') ?? $this->option('location');
-        if ($location) {
-            $userLocation = Location::where('name', '=', $location)
-                ->orWhere('id', '=', intval($location))
-                ->select(['name', 'id'])
-                ->first();
-            if ($userLocation) {
-                $msg = 'Importing users with default location: '.$userLocation->name.' ('.$userLocation->id.')';
-                LOG::debug($msg);
-
-                if ($this->dryrun) {
-                    $this->info($msg);
-                }
-
-                $this->defaultLocation = collect([
-                    $userLocation->id => $userLocation->name,
-                ]);
-            } else {
-                $msg = 'The supplied location is invalid!';
-                LOG::error($msg);
-                if ($this->dryrun) {
-                    $this->error($msg);
-                }
-                exit(0);
-            }
-        }
-    }
-
-    /**
-     * Check if LDAP intergration is enabled.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     */
-    private function checkIfLdapIsEnabled(): void
-    {
-        if (false === $this->settings['ldap_enabled']) {
-            $msg = 'LDAP intergration is not enabled. Exiting sync process.';
-            $this->info($msg);
-            Log::info($msg);
-            exit(0);
-        }
-    }
-
-    /**
-     * Check to make sure we can access the server.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     */
-    private function checkLdapConnection(): void
-    {
-        try {
-            $this->ldap->testLdapAdUserConnection();
-            $this->ldap->testLdapAdBindConnection();
-        } catch (Exception $e) {
-            $this->outputError($e);
-            exit(0);
-        }
-    }
-
-    /**
-     * Output the json summary to the screen if enabled.
-     *
-     * @param Exception $error
-     */
-    private function outputError($error): void
-    {
-        if ($this->option('json_summary')) {
-            $json_summary = [
-                'error' => true,
-                'error_message' => $error->getMessage(),
-                'summary' => [],
-            ];
-            $this->info(json_encode($json_summary));
-        }
-        $this->error($error->getMessage());
-        LOG::error($error);
-    }
-}
--- a/app/Console/Commands/MergeUsersByUsername.php
+++ b/app/Console/Commands/MergeUsersByUsername.php
@@ -1,112 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use App\Models\User;
-use Carbon\Carbon;
-
-
-class MergeUsersByUsername extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:merge-users';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This command allows you to merge the history of users. It looks for users without an email address as their username and merges them into the version that does have an email username.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        // Get the list of users who have an email address as their username
-        $users = User::where('username', 'LIKE', '%@%')->whereNull('deleted_at')->get();
-
-        foreach ($users as $user) {
-            $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.') ');
-
-                // Walk the list of assets
-                foreach ($bad_user->assets as $asset) {
-                    $this->info( 'Updating asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id);
-                    $asset->assigned_to = $user->id;
-                    if (!$asset->save()) {
-                        $this->error( 'Could not update assigned_to field on asset '.$asset->asset_tag.' '.$asset->id.' to user '.$user->id);
-                        $this->error( 'Error saving: '.$asset->getErrors());
-                    }
-                }
-
-                // Walk the list of licenses
-                foreach ($bad_user->licenses as $license) {
-                    $this->info( 'Updating license '.$license->name.' '.$license->id.' to user '.$user->id);
-                    $bad_user->licenses()->updateExistingPivot($license->id, ['assigned_to' => $user->id]);
-                }
-
-                // Walk the list of consumables
-                foreach ($bad_user->consumables as $consumable) {
-                    $this->info( 'Updating consumable '.$consumable->id.' to user '.$user->id);
-                    $bad_user->consumables()->updateExistingPivot($consumable->id, ['assigned_to' => $user->id]);
-                }
-
-                // Walk the list of accessories
-                foreach ($bad_user->accessories as $accessory) {
-                    $this->info( 'Updating accessory '.$accessory->id.' to user '.$user->id);
-                    $bad_user->accessories()->updateExistingPivot($accessory->id, ['assigned_to' => $user->id]);
-                }
-
-                // Walk the list of logs
-                foreach ($bad_user->userlog as $log) {
-                    $this->info( 'Updating action log record '.$log->id.' to user '.$user->id);
-                    $log->target_id = $user->id;
-                    $log->save();
-                }
-
-                // Update any manager IDs
-                $this->info( 'Updating managed user records to user '.$user->id);
-                User::where('manager_id', '=', $bad_user->id)->update(['manager_id' => $user->id]);
-
-
-                // Update location manager IDs
-                foreach ($bad_user->managedLocations as $managedLocation) {
-                    $this->info( 'Updating managed location record '.$managedLocation->name.' to manager '.$user->id);
-                    $managedLocation->manager_id = $user->id;
-                    $managedLocation->save();
-                }
-
-                // Mark the user as deleted
-                $this->info( 'Marking the user as deleted');
-                $bad_user->deleted_at = Carbon::now()->timestamp;
-                $bad_user->save();
-
-
-            }
-
-        }
-
-
-    }
-}
--- a/app/Console/Commands/MoveUploadsToNewDisk.php
+++ b/app/Console/Commands/MoveUploadsToNewDisk.php
@@ -1,183 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-
-class MoveUploadsToNewDisk extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:move-uploads {delete_local?}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This will move your locally uploaded files to whatever your current disk is.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        if (config('filesystems.default')=='local') {
-            $this->error('Your current disk is set to local so we cannot proceed.');
-            $this->warn("Please configure your .env settings for S3. \nChange your PUBLIC_FILESYSTEM_DISK value to 's3_public' and your PRIVATE_FILESYSTEM_DISK to s3_private.");
-            return false;
-        }
-        $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'."/*.*");
-
-
-        // iterate files
-        foreach($public_uploads as $public_type => $public_upload)
-        {
-            $type_count = 0;
-            $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]));
-                    $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) {
-                    \Log::debug($e);
-                    $this->error($e);
-                }
-
-            }
-
-        }
-
-        $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);
-        }
-
-        $private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*");
-        $private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*");
-        $private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*");
-        $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*");
-        $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
-        $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
-        $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");
-        $private_uploads['backups'] = glob('storage/private_uploads/backups'."/*.*");
-
-
-        foreach($private_uploads as $private_type => $private_upload)
-        {
-            $this->info("- There are ".count($private_upload).' PRIVATE '.$private_type.' files.');
-
-            $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);
-                }
-
-            }
-
-        }
-
-
-        if ($delete_local=='true') {
-            $public_delete_count = 0;
-            $private_delete_count = 0;
-
-            $this->info("\n\n");
-            $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-            $this->warn("\nTHIS WILL DELETE ALL OF YOUR LOCAL UPLOADED FILES. \n\nThis cannot be undone, so you should take a backup of your system before you proceed.\n");
-            $this->error('!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-
-            if ($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.");
-            }
-        }
-
-
-
-
-    }
-}
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -1,12 +1,34 @@
 <?php
 namespace App\Console\Commands;

+use App\Helpers\Helper;
+use App\Importer\AccessoryImporter;
+use App\Importer\AssetImporter;
+use App\Importer\ConsumableImporter;
+use App\Importer\Importer;
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\CustomField;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Setting;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
+use App\Models\User;
+use DB;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
+use League\Csv\Reader;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use ForceUTF8\Encoding;

-ini_set('max_execution_time', env('IMPORT_TIME_LIMIT', 600)); //600 seconds = 10 minutes
-ini_set('memory_limit', env('IMPORT_MEMORY_LIMIT', '500M'));
+ini_set('max_execution_time', 600); //600 seconds = 10 minutes
+ini_set('memory_limit', '500M');

 /**
 * Class ObjectImportCommand
@@ -55,10 +77,8 @@ class ObjectImportCommand extends Command
                 ->setShouldNotify($this->option('send-welcome'))
                 ->setUsernameFormat($this->option('username_format'));

-
-        // This $logFile/useFiles() bit is currently broken, so commenting it out for now
-        // $logFile = $this->option('logfile');
-        // \Log::useFiles($logFile);
+        $logFile = $this->option('logfile');
+        \Log::useFiles($logFile);
        $this->comment('======= Importing Items from '.$filename.' =========');
        $importer->import();

--- a/app/Console/Commands/PaveIt.php
+++ b/app/Console/Commands/PaveIt.php
@@ -2,9 +2,23 @@

 namespace App\Console\Commands;

+use App\Models\Accessory;
 use App\Models\Asset;
-use App\Models\CustomField;
-use Schema;
+use App\Models\AssetModel;
+use App\Models\Category;
+use App\Models\Company;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\Department;
+use App\Models\Depreciation;
+use App\Models\Group;
+use App\Models\Import;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Location;
+use App\Models\Manufacturer;
+use App\Models\Statuslabel;
+use App\Models\Supplier;
 use DB;
 use Illuminate\Console\Command;

@@ -15,14 +29,15 @@ class PaveIt extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:pave  {--force : Skip the interactive yes/no prompt for confirmation}';
+    protected $signature = 'snipeit:pave
+              {--soft : Perform a "Soft" Delete, leaving all migrations, table structure, and the first user in place.}';

    /**
     * The console command description.
     *
     * @var string
     */
-    protected $description = 'Clear the database tables, leaving all migrations, table structure, and the first user in place. (It is primarily a quick tool for developers.) If you want to destroy all tables as well, use php artisan db:wipe.';
+    protected $description = 'Pave the database to start over. This should ALMOST NEVER BE USED. (It is primarily a quick tool for developers.)';

    /**
     * Create a new command instance.
@@ -41,51 +56,88 @@ class PaveIt extends Command
     */
    public function handle()
    {
+        if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE DATA IN YOUR DATABASE. \nThere is NO undo. This WILL destroy ALL of your data. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) {
+            if ($this->option('soft')) {
+                Accessory::getQuery()->delete();
+                Asset::getQuery()->delete();
+                Category::getQuery()->delete();
+                Company::getQuery()->delete();
+                Component::getQuery()->delete();
+                Consumable::getQuery()->delete();
+                Department::getQuery()->delete();
+                Depreciation::getQuery()->delete();
+                License::getQuery()->delete();
+                LicenseSeat::getQuery()->delete();
+                Location::getQuery()->delete();
+                Manufacturer::getQuery()->delete();
+                AssetModel::getQuery()->delete();
+                Statuslabel::getQuery()->delete();
+                Supplier::getQuery()->delete();
+                Group::getQuery()->delete();
+                Import::getQuery()->delete();

-        if (!$this->option('force')) {
-            $confirmation = $this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE DATA IN YOUR DATABASE. \nThere is NO undo. This WILL destroy ALL of your data, \nINCLUDING ANY non-Snipe-IT tables you have in this database. \n****************************************************\n\nDo you wish to continue? No backsies! ");
-            if (!$confirmation) {
-                $this->error('ABORTING');
-                exit(-1);
-            }
-        }
-
-        // List all the tables in the database so we don't have to worry about missing some as the app grows
-        $tables = DB::connection()->getDoctrineSchemaManager()->listTableNames();
-
-        $except_tables = [
-            'oauth_access_tokens',
-            'oauth_clients',
-            'oauth_personal_access_clients',
-            'migrations',
-            'settings',
-            'users',
-        ];
-
-        // We only need to find out what these are so we can nuke these columns on the assets table.
-        $custom_fields = CustomField::get();
-        foreach ($custom_fields as $custom_field) {
-            $this->info('DROP the '.$custom_field->db_column.' column from assets as well.');
-
-            if (\Schema::hasColumn('assets', $custom_field->db_column)) {
-                \Schema::table('assets', function ($table) use ($custom_field) {
-                    $table->dropColumn($custom_field->db_column);
-                });
-            }
-        }
-
-        foreach ($tables as $table) {
-            if (in_array($table, $except_tables)) {
-                $this->info($table. ' is SKIPPED.');
+                DB::statement('delete from accessories_users');
+                DB::statement('delete from asset_logs');
+                DB::statement('delete from asset_maintenances');
+                DB::statement('delete from login_attempts');
+                DB::statement('delete from asset_uploads');
+                DB::statement('delete from action_logs');
+                DB::statement('delete from checkout_requests');
+                DB::statement('delete from consumables_users');
+                DB::statement('delete from custom_field_custom_fieldset');
+                DB::statement('delete from custom_fields');
+                DB::statement('delete from custom_fieldsets');
+                DB::statement('delete from components_assets');
+                DB::statement('delete from password_resets');
+                DB::statement('delete from requested_assets');
+                DB::statement('delete from requests');
+                DB::statement('delete from throttle');
+                DB::statement('delete from users_groups');
+                DB::statement('delete from users WHERE id!=1');
            } else {
-                \DB::statement('truncate '.$table);
-                $this->info($table. ' is TRUNCATED.');
+                \DB::statement('drop table IF EXISTS accessories_users');
+                \DB::statement('drop table IF EXISTS accessories');
+                \DB::statement('drop table IF EXISTS asset_logs');
+                \DB::statement('drop table IF EXISTS action_logs');
+                \DB::statement('drop table IF EXISTS asset_maintenances');
+                \DB::statement('drop table IF EXISTS asset_uploads');
+                \DB::statement('drop table IF EXISTS assets');
+                \DB::statement('drop table IF EXISTS categories');
+                \DB::statement('drop table IF EXISTS checkout_requests');
+                \DB::statement('drop table IF EXISTS companies');
+                \DB::statement('drop table IF EXISTS consumables_users');
+                \DB::statement('drop table IF EXISTS consumables');
+                \DB::statement('drop table IF EXISTS custom_field_custom_fieldset');
+                \DB::statement('drop table IF EXISTS custom_fields');
+                \DB::statement('drop table IF EXISTS custom_fieldsets');
+                \DB::statement('drop table IF EXISTS depreciations');
+                \DB::statement('drop table IF EXISTS departments');
+                \DB::statement('drop table IF EXISTS groups');
+                \DB::statement('drop table IF EXISTS history');
+                \DB::statement('drop table IF EXISTS components');
+                \DB::statement('drop table IF EXISTS components_assets');
+                \DB::statement('drop table IF EXISTS license_seats');
+                \DB::statement('drop table IF EXISTS licenses');
+                \DB::statement('drop table IF EXISTS locations');
+                \DB::statement('drop table IF EXISTS manufacturers');
+                \DB::statement('drop table IF EXISTS models');
+                \DB::statement('drop table IF EXISTS migrations');
+                \DB::statement('drop table IF EXISTS oauth_access_tokens');
+                \DB::statement('drop table IF EXISTS oauth_auth_codes');
+                \DB::statement('drop table IF EXISTS oauth_clients');
+                \DB::statement('drop table IF EXISTS oauth_personal_access_clients');
+                \DB::statement('drop table IF EXISTS oauth_refresh_tokens');
+                \DB::statement('drop table IF EXISTS password_resets');
+                \DB::statement('drop table IF EXISTS requested_assets');
+                \DB::statement('drop table IF EXISTS requests');
+                \DB::statement('drop table IF EXISTS settings');
+                \DB::statement('drop table IF EXISTS status_labels');
+                \DB::statement('drop table IF EXISTS suppliers');
+                \DB::statement('drop table IF EXISTS throttle');
+                \DB::statement('drop table IF EXISTS users_groups');
+                \DB::statement('drop table IF EXISTS users');
+                \DB::statement('drop table IF EXISTS imports');
            }
        }
-
-        // Leave in the demo oauth keys so we don't have to reset them every day in the demos
-        \DB::statement('delete from oauth_clients WHERE id > 2');
-        \DB::statement('delete from oauth_access_tokens WHERE id > 2');
-    
    }
-}
+}
--- a/app/Console/Commands/Purge.php
+++ b/app/Console/Commands/Purge.php
@@ -2,19 +2,22 @@

 namespace App\Console\Commands;

-use App\Models\Accessory;
-use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\License;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Statuslabel;
-use App\Models\Supplier;
-use App\Models\User;
 use Illuminate\Console\Command;
+use DB;
+use \App\Models\Asset;
+use \App\Models\AssetModel;
+use \App\Models\Location;
+use \App\Models\Company;
+use \App\Models\License;
+use \App\Models\Accessory;
+use \App\Models\Component;
+use \App\Models\Consumable;
+use \App\Models\Category;
+use \App\Models\User;
+use \App\Models\Supplier;
+use \App\Models\Manufacturer;
+use \App\Models\Depreciation;
+use \App\Models\Statuslabel;

 class Purge extends Command
 {
--- a/app/Console/Commands/PurgeLoginAttempts.php
+++ b/app/Console/Commands/PurgeLoginAttempts.php
@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-class PurgeLoginAttempts extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:purge-logins';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Clears the login_attempts table';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE YOUR LOGIN ATTEMPT RECORDS. \nThere is NO undo! \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) {
-                \DB::statement('delete from login_attempts');
-        }
-    }
-}
--- a/app/Console/Commands/RecryptFromMcrypt.php
+++ b/app/Console/Commands/RecryptFromMcrypt.php
@@ -2,11 +2,11 @@

 namespace App\Console\Commands;

-use App\LegacyEncrypter\McryptEncrypter;
-use App\Models\Asset;
 use App\Models\CustomField;
-use App\Models\Setting;
 use Illuminate\Console\Command;
+use App\LegacyEncrypter\McryptEncrypter;
+use App\Models\Setting;
+use App\Models\Asset;
 use Illuminate\Support\Facades\Storage;

 class RecryptFromMcrypt extends Command
--- a/app/Console/Commands/RegenerateAssetTags.php
+++ b/app/Console/Commands/RegenerateAssetTags.php
@@ -2,10 +2,11 @@

 namespace App\Console\Commands;

+use Illuminate\Console\Command;
 use App\Models\Asset;
 use App\Models\Setting;
+use DB;
 use Artisan;
-use Illuminate\Console\Command;

 class RegenerateAssetTags extends Command
 {
--- a/app/Console/Commands/ResetDemoSettings.php
+++ b/app/Console/Commands/ResetDemoSettings.php
@@ -3,9 +3,9 @@
 namespace App\Console\Commands;


+use Illuminate\Console\Command;
 use App\Models\Setting;
 use App\Models\User;
-use Illuminate\Console\Command;

 class ResetDemoSettings extends Command
 {
@@ -51,9 +51,9 @@ class ResetDemoSettings extends Command
        $settings->header_color = null;
        $settings->barcode_type = 'QRCODE';
        $settings->default_currency = 'USD';
-        $settings->brand = 2;
+        $settings->brand = 3;
        $settings->ldap_enabled = 0;
-        $settings->full_multiple_companies_support = 0;
+        $settings->full_multiple_companies_support = 1;
        $settings->alt_barcode = 'C128';
        $settings->skin = '';
        $settings->email_domain = 'snipeitapp.com';
@@ -64,16 +64,7 @@ class ResetDemoSettings extends Command
        $settings->thumbnail_max_h = '30';
        $settings->locale = 'en';
        $settings->version_footer = 'on';
-        $settings->support_footer = null;
-        $settings->saml_enabled = '0';
-        $settings->saml_sp_x509cert = null;
-        $settings->saml_idp_metadata = null;
-        $settings->saml_attr_mapping_username = null;
-        $settings->saml_forcelogin = '0';
-        $settings->saml_slo = null;
-        $settings->saml_custom_settings = null;
-
-
+        $settings->support_footer = 'on';
        $settings->save();

        if ($user = User::where('username', '=', 'admin')->first()) {
@@ -81,9 +72,7 @@ class ResetDemoSettings extends Command
            $user->save();
        }

-        \Storage::disk('public')->put('snipe-logo.png', file_get_contents(public_path('img/demo/snipe-logo.png')));
-        \Storage::disk('public')->put('snipe-logo-lg.png', file_get_contents(public_path('img/demo/snipe-logo-lg.png')));
-
+        
    }

 }
--- a/app/Console/Commands/RestoreDeletedUsers.php
+++ b/app/Console/Commands/RestoreDeletedUsers.php
@@ -2,13 +2,16 @@

 namespace App\Console\Commands;

+use Illuminate\Console\Command;
+use App\Models\User;
 use App\Models\Actionlog;
 use App\Models\Asset;
+use App\Models\Consumable;
+use App\Models\Accessory;
+use App\Models\LicenseSeat;
 use App\Models\License;
-use App\Models\User;
-use Artisan;
 use DB;
-use Illuminate\Console\Command;
+use Artisan;

 class RestoreDeletedUsers extends Command
 {
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -1,297 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-
-use ZipArchive;
-
-class RestoreFromBackup extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:restore 
-                                            {--force : Skip the danger prompt; assuming you enter "y"} 
-                                            {filename : The zip file to be migrated}
-                                            {--no-progress : Don\'t show a progress bar}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Restore from a previously created backup';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $dir = getcwd();
-        print "Current working directory is: $dir\n";
-        //
-        $filename = $this->argument('filename');
-
-        if (!$filename) {
-            return $this->error("Missing required filename");
-        }
-
-        if (!$this->option('force') && !$this->confirm('Are you sure you wish to restore from the given backup file? This can lead to MASSIVE DATA LOSS!')) {
-            return $this->error("Data loss not confirmed");
-        }
-
-        if (config('database.default') != 'mysql') {
-            return $this->error("DB_CONNECTION must be MySQL in order to perform a restore. Detected: ".config('database.default'));
-        }
-
-        $za = new ZipArchive();
-
-        $errcode = $za->open($filename/* , ZipArchive::RDONLY */); // that constant only exists in PHP 7.4 and higher
-        if ($errcode !== true) {
-            $errors = [
-                ZipArchive::ER_EXISTS => "File already exists.",
-                ZipArchive::ER_INCONS => "Zip archive inconsistent.",
-                ZipArchive::ER_INVAL => "Invalid argument.",
-                ZipArchive::ER_MEMORY => "Malloc failure.",
-                ZipArchive::ER_NOENT => "No such file.",
-                ZipArchive::ER_NOZIP => "Not a zip archive.",
-                ZipArchive::ER_OPEN => "Can't open file.",
-                ZipArchive::ER_READ => "Read error.",
-                ZipArchive::ER_SEEK => "Seek error."
-            ];
-
-            return $this->error("Could not access file: ".$filename." - ".array_key_exists($errcode,$errors) ? $errors[$errcode] : " Unknown reason: $errcode");
-        }
-
-
-        $private_dirs = [
-            'storage/private_uploads/assets', // these are asset _files_, not the pictures.
-            'storage/private_uploads/audits',
-            'storage/private_uploads/imports',
-            'storage/private_uploads/assetmodels',
-            'storage/private_uploads/users',
-            'storage/private_uploads/licenses',
-            'storage/private_uploads/signatures'
-        ];
-        $private_files = [
-            'storage/oauth-private.key',
-            'storage/oauth-public.key'
-        ];
-        $public_dirs = [
-            'public/uploads/companies',
-            'public/uploads/components',
-            'public/uploads/categories',
-            'public/uploads/manufacturers',
-            //'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated
-            'public/uploads/consumables',
-            'public/uploads/departments',
-            'public/uploads/avatars',
-            'public/uploads/suppliers',
-            'public/uploads/assets', // these are asset _pictures_, not asset files
-            'public/uploads/locations',
-            'public/uploads/accessories',
-            'public/uploads/models',
-            'public/uploads/categories',
-            'public/uploads/avatars',
-            'public/uploads/manufacturers'
-        ];
-        
-        $public_files = [
-            'public/uploads/logo.*',
-            'public/uploads/setting-email_logo*',
-            'public/uploads/setting-label_logo*',
-            'public/uploads/setting-logo*',
-            'public/uploads/favicon.*',
-            'public/uploads/favicon-uploaded.*'
-        ];
-
-        $all_files = $private_dirs + $public_dirs;
-
-        $sqlfiles = [];
-        $sqlfile_indices = [];
-
-        $interesting_files = [];
-        $boring_files = [];
-        
-        for ($i=0; $i<$za->numFiles;$i++) {
-            $stat_results = $za->statIndex($i);
-            // echo "index: $i\n";
-            // print_r($stat_results);
-        
-            $raw_path = $stat_results['name'];
-            if(strpos($raw_path,'\\')!==false) { //found a backslash, swap it to forward-slash
-                $raw_path = strtr($raw_path,'\\','/');
-                //print "Translating file: ".$stat_results['name']." to: ".$raw_path."\n";
-            }
-        
-            // skip macOS resource fork files (?!?!?!)
-            if(strpos($raw_path,"__MACOSX")!==false && strpos($raw_path,"._") !== false) {
-                //print "SKIPPING macOS Resource fork file: $raw_path\n";
-                $boring_files[] = $raw_path;
-                continue;
-            }
-            if(@pathinfo($raw_path)['extension'] == "sql") {
-                print "Found a sql file!\n";
-                $sqlfiles[] = $raw_path;
-                $sqlfile_indices[] = $i;
-                continue;
-            }
-        
-            foreach(array_merge($private_dirs,$public_dirs) as $dir) {
-                $last_pos = strrpos($raw_path,$dir.'/');
-                if($last_pos !== false ) {
-                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $dir - last_pos+strlen(\$dir) is: ".($last_pos+strlen($dir))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                    //print("We would copy $raw_path to $dir.\n"); //FIXME append to a path?
-                    $interesting_files[$raw_path] = ['dest' =>$dir, 'index' => $i];
-                    continue 2;
-                    if($last_pos + strlen($dir) +1 == strlen($raw_path)) {
-                        // we don't care about that; we just want files with the appropriate prefix
-                        //print("FOUND THE EXACT DIRECTORY: $dir AT: $raw_path!!!\n");
-                    }
-                }
-            }
-            $good_extensions = ["png","gif","jpg","svg","jpeg","doc","docx","pdf","txt",
-                                "zip","rar","xls","xlsx","lic","xml","rtf", "webp","key","ico"];
-            foreach(array_merge($private_files, $public_files) as $file) {
-                $has_wildcard = (strpos($file,"*") !== false);
-                if($has_wildcard) {
-                    $file = substr($file,0,-1); //trim last character (which should be the wildcard)
-                }
-                $last_pos = strrpos($raw_path,$file); // no trailing slash!
-                if($last_pos !== false ) {
-                    $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
-                    if(!in_array($extension, $good_extensions)) {
-                        $this->warn("Potentially unsafe file ".$raw_path." is being skipped");
-                        $boring_files[] = $raw_path;
-                        continue 2;
-                    }
-                    //print("INTERESTING - last_pos is $last_pos when searching $raw_path for $file - last_pos+strlen(\$file) is: ".($last_pos+strlen($file))." and strlen(\$rawpath) is: ".strlen($raw_path)."\n");
-                    //no wildcards found in $file, process 'normally'
-                    if($last_pos + strlen($file) == strlen($raw_path) || $has_wildcard) { //again, no trailing slash. or this is a wildcard and we just take it.
-                        // print("FOUND THE EXACT FILE: $file AT: $raw_path!!!\n"); //we *do* care about this, though.
-                        $interesting_files[$raw_path] = ['dest' => dirname($file),'index' => $i];
-                        continue 2;
-                    }
-                }
-            }
-            $boring_files[] = $raw_path; //if we've gotten to here and haven't continue'ed our way into the next iteration, we don't want this file
-        } // end of pre-processing the ZIP file for-loop
-
-        // print_r($interesting_files);exit(-1);
-
-        if( count($sqlfiles) != 1) {
-            return $this->error("There should be exactly *one* sql backup file found, found: ".( count($sqlfiles) == 0 ? "None" : implode(", ",$sqlfiles)));
-        }
-
-        if( strpos($sqlfiles[0], "db-dumps") === false ) {
-            //return $this->error("SQL backup file is missing 'db-dumps' component of full pathname: ".$sqlfiles[0]);
-            //older Snipe-IT installs don't have the db-dumps subdirectory component
-        }
-
-        //how to invoke the restore?
-        $pipes = [];
-
-        $env_vars = getenv();
-        $env_vars['MYSQL_PWD'] = config("database.connections.mysql.password");
-        $proc_results = proc_open("mysql -h ".escapeshellarg(config('database.connections.mysql.host'))." -u ".escapeshellarg(config('database.connections.mysql.username'))." ".escapeshellarg(config('database.connections.mysql.database')), // yanked -p since we pass via ENV
-                                  [0 => ['pipe','r'],1 => ['pipe','w'],2 => ['pipe','w']],
-                                  $pipes,
-                                  null,
-                                  $env_vars); // this is not super-duper awesome-secure, but definitely more secure than showing it on the CLI, or dropping temporary files with passwords in them.
-        if($proc_results === false) {
-            return $this->error("Unable to invoke mysql via CLI");
-        }
-
-        // $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?
-        // fwrite($pipes[0],config("database.connections.mysql.password")."\n"); //this doesn't work :(
-
-        //$sql_contents = fopen($sqlfiles[0], "r"); //NOPE! This isn't a real file yet, silly-billy!
-
-        $sql_stat = $za->statIndex($sqlfile_indices[0]);
-        //$this->info("SQL Stat is: ".print_r($sql_stat,true));
-        $sql_contents = $za->getStream($sql_stat['name']);
-        if ($sql_contents === false) {
-            $stdout = fgets($pipes[1]);
-            $this->info($stdout);
-            $stderr = fgets($pipes[2]);
-            $this->info($stderr);
-            return false;
-        }
-
-        while(($buffer = fgets($sql_contents)) !== false ) {
-            //$this->info("Buffer is: '$buffer'");
-            $bytes_written = fwrite($pipes[0],$buffer);
-            if($bytes_written === false) {
-                $stdout = fgets($pipes[1]);
-                $this->info($stdout);
-                $stderr = fgets($pipes[2]);
-                $this->info($stderr);
-                return false;
-            }
-        }
-        fclose($pipes[0]);
-        fclose($sql_contents);
-        
-        $this->line(stream_get_contents($pipes[1]));
-        fclose($pipes[1]);
-
-        $this->error(stream_get_contents($pipes[2]));
-        fclose($pipes[2]);
-
-        //wait, have to do fclose() on all pipes first?
-        $close_results = proc_close($proc_results);
-        if($close_results != 0) {
-            return $this->error("There may have been a problem with the database import: Error number ".$close_results);
-        }
-        
-        //and now copy the files over too (right?)
-        //FIXME - we don't prune the filesystem space yet!!!!
-        if($this->option('no-progress')) {
-            $bar = null;
-        } else {
-            $bar = $this->output->createProgressBar(count($interesting_files));
-        }
-        foreach($interesting_files AS $pretty_file_name => $file_details) {
-            $ugly_file_name = $za->statIndex($file_details['index'])['name'];
-            $fp = $za->getStream($ugly_file_name);
-            //$this->info("Weird problem, here are file details? ".print_r($file_details,true));
-            $migrated_file = fopen($file_details['dest']."/".basename($pretty_file_name),"w");
-            while(($buffer = fgets($fp))!== false) {
-                fwrite($migrated_file,$buffer);
-            }
-            fclose($migrated_file);
-            fclose($fp);
-            //$this->info("Wrote $ugly_file_name to $pretty_file_name");
-            if($bar) {
-                $bar->advance();
-            }
-        }
-        if($bar) {
-            $bar->finish();
-            $this->line("");
-        } else {
-            $this->info(count($interesting_files)." files were succesfully transferred");
-        }
-        foreach($boring_files as $boring_file) {
-            $this->warn($boring_file." was skipped.");
-        }
-        
-    }
-}
--- a/app/Console/Commands/RotateAppKey.php
+++ b/app/Console/Commands/RotateAppKey.php
@@ -1,135 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Artisan;
-use App\Models\CustomField;
-use App\Models\Asset;
-use App\Models\Setting;
-use \Illuminate\Encryption\Encrypter;
-
-class RotateAppKey extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:rotate-key';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Command description';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        if ($this->confirm("\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? "))  {
-
-
-
-            // Get the existing app_key and ciphers
-            // We put them in a variable since we clear the cache partway through here.
-            $old_app_key = config('app.key');
-            $cipher = config('app.cipher');
-
-            // Generate a new one
-            Artisan::call('key:generate', ['--show' => true]);
-            $new_app_key = Artisan::output();
-
-            // Clear the config cache
-            Artisan::call('config:clear');
-
-            $this->warn('Your app cipher is: '.$cipher);
-            $this->warn('Your old APP_KEY is: '.$old_app_key);
-            $this->warn('Your new APP_KEY is: '.$new_app_key);
-
-            // Write the new app key to the .env file
-            $this->writeNewEnvironmentFileWith($new_app_key);
-
-            // Manually create an old encrypter instance using the old app key
-            // and also create a new encrypter instance so we can re-crypt the field
-            // using the newly generated app key
-            $oldEncrypter = new Encrypter(base64_decode(substr($old_app_key, 7)), $cipher);
-            $newEncrypter = new Encrypter(base64_decode(substr($new_app_key, 7)), $cipher);
-
-            $fields = CustomField::where('field_encrypted', '1')->get();
-
-
-            foreach ($fields as $field) {
-
-                $assets = Asset::whereNotNull($field->db_column)->get();
-
-                foreach ($assets as $asset) {
-
-                    $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column});
-                    $this->line('DECRYPTED: '. $field->db_column);
-                    $asset->{$field->db_column} = $newEncrypter->encrypt($asset->{$field->db_column});
-                    $this->line('ENCRYPTED: '.$field->db_column);
-                    $asset->save();
-
-                }
-
-            }
-
-            // Handle the LDAP password if one is provided
-            $setting = Setting::first();
-            if ($setting->ldap_pword!='') {
-                $setting->ldap_pword =  $oldEncrypter->decrypt($setting->ldap_pword);
-                $setting->ldap_pword =  $newEncrypter->encrypt($setting->ldap_pword);
-                $setting->save();
-                $this->warn('LDAP password has been re-encrypted.');
-            }
-
-
-        } else {
-            $this->info('This operation has been canceled. No changes have been made.');
-        }
-    }
-
-    /**
-     * Write a new environment file with the given key.
-     *
-     * @param  string  $key
-     * @return void
-     */
-    protected function writeNewEnvironmentFileWith($key)
-    {
-
-        file_put_contents($this->laravel->environmentFilePath(), preg_replace(
-            $this->keyReplacementPattern(),
-            'APP_KEY='.$key,
-            file_get_contents($this->laravel->environmentFilePath())
-        ));
-    }
-
-    /**
-     * Get a regex pattern that will match env APP_KEY with any random key.
-     *
-     * @return string
-     */
-    protected function keyReplacementPattern()
-    {
-        $escaped = preg_quote('='.$this->laravel['config']['app.key'], '/');
-        return "/^APP_KEY{$escaped}/m";
-    }
-
-}
--- a/app/Console/Commands/SendCurrentInventoryToUsers.php
+++ b/app/Console/Commands/SendCurrentInventoryToUsers.php
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\User;
-use App\Notifications\CurrentInventory;
-use Illuminate\Console\Command;
-
-class SendCurrentInventoryToUsers extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:user-inventory';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This will send users a report of all of the items currently checked out to them.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-
-        $users = User::whereNull('deleted_at')->whereNotNull('email')->with('assets', 'accessories', 'licenses')->get();
-
-        $count = 0;
-        foreach ($users as $user) {
-
-            if (($user->assets->count() > 0) || ($user->accessories->count() > 0) || ($user->licenses->count() > 0))
-            {
-                $count++;
-                $user->notify((new CurrentInventory($user)));
-            }
-
-        }
-
-        $this->info($count.' users notified.');
-
-
-    }
-}
--- a/app/Console/Commands/SendExpectedCheckinAlerts.php
+++ b/app/Console/Commands/SendExpectedCheckinAlerts.php
@@ -2,16 +2,17 @@

 namespace App\Console\Commands;

+
 use App\Models\Asset;
 use App\Models\Setting;
-use App\Notifications\ExpectedCheckinAdminNotification;
-use App\Notifications\ExpectedCheckinNotification;
-use Carbon\Carbon;
 use Illuminate\Console\Command;
-use App\Models\Recipients\AlertRecipient;
+use App\Notifications\ExpectedCheckinNotification;
+use App\Notifications\ExpectedCheckinAdminNotification;
+use Carbon\Carbon;

 class SendExpectedCheckinAlerts extends Command
 {
+
    /**
     * The console command name.
     *
@@ -28,6 +29,8 @@ class SendExpectedCheckinAlerts extends Command

    /**
     * Create a new command instance.
+     *
+     * @return void
     */
    public function __construct()
    {
@@ -41,15 +44,15 @@ class SendExpectedCheckinAlerts extends Command
     */
    public function handle()
    {
-        $settings   = Setting::getSettings();
+        $settings = Setting::getSettings();
        $whenNotify = Carbon::now()->addDays(7);
-        $assets     = Asset::with('assignedTo')->whereNotNull('assigned_to')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get();
+        $assets = Asset::with('assignedTo')->whereNotNull('assigned_to')->whereNotNull('expected_checkin')->where('expected_checkin', '<=', $whenNotify)->get();

-        $this->info($whenNotify . ' is deadline');
-        $this->info($assets->count() . ' assets');
+        $this->info($whenNotify.' is deadline');
+        $this->info($assets->count().' assets');

        foreach ($assets as $asset) {
-            if ($asset->assigned && $asset->checkedOutToUser()) {
+            if ($asset->assigned  && $asset->checkedOutToUser()) {
                $asset->assigned->notify((new ExpectedCheckinNotification($asset)));
            }
        }
@@ -57,9 +60,14 @@ class SendExpectedCheckinAlerts extends Command
        if (($assets) && ($assets->count() > 0) && ($settings->alert_email != '')) {
            // Send a rollup to the admin, if settings dictate
            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
-                return new AlertRecipient($item);
+                return new \App\Models\Recipients\AlertRecipient($item);
            });
            \Notification::send($recipients, new ExpectedCheckinAdminNotification($assets));
        }
+
+
+
+
+
    }
 }
--- a/app/Console/Commands/SendExpirationAlerts.php
+++ b/app/Console/Commands/SendExpirationAlerts.php
@@ -4,14 +4,16 @@ namespace App\Console\Commands;

 use App\Models\Asset;
 use App\Models\License;
-use App\Models\Recipients\AlertRecipient;
 use App\Models\Setting;
-use App\Notifications\ExpiringAssetsNotification;
+use DB;
 use App\Notifications\ExpiringLicenseNotification;
+use App\Notifications\ExpiringAssetsNotification;
+
 use Illuminate\Console\Command;

 class SendExpirationAlerts extends Command
 {
+
    /**
     * The console command name.
     *
@@ -28,6 +30,8 @@ class SendExpirationAlerts extends Command

    /**
     * Create a new command instance.
+     *
+     * @return void
     */
    public function __construct()
    {
@@ -41,35 +45,48 @@ class SendExpirationAlerts extends Command
     */
    public function handle()
    {
-        $settings  = Setting::getSettings();
+
+        $settings = Setting::getSettings();
        $threshold = $settings->alert_interval;

+
        if (($settings->alert_email != '') && ($settings->alerts_enabled == 1)) {

            // Send a rollup to the admin, if settings dictate
            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
-                return new AlertRecipient($item);
+                return new \App\Models\Recipients\AlertRecipient($item);
            });

            // Expiring Assets
-            $assets = Asset::getExpiringWarrantee($threshold);
+            $assets = Asset::getExpiringWarrantee(Setting::getSettings()->alert_interval);
            if ($assets->count() > 0) {
-                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]));
+                $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(),
+                    ['count' => $assets->count(), 'threshold' => $threshold]));
                \Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold));
            }

            // Expiring licenses
            $licenses = License::getExpiringLicenses($threshold);
+
+
            if ($licenses->count() > 0) {
                $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $threshold]));
                \Notification::send($recipients, new ExpiringLicenseNotification($licenses, $threshold));
            }
+
+
        } else {
-            if ($settings->alert_email == '') {
+
+            if ($settings->alert_email=='') {
                $this->error('Could not send email. No alert email configured in settings');
-            } elseif (1 != $settings->alerts_enabled) {
+            } elseif ($settings->alerts_enabled!=1) {
                $this->info('Alerts are disabled in the settings. No mail will be sent');
            }
+
        }
+
+
+
+
    }
 }
--- a/app/Console/Commands/SendInventoryAlerts.php
+++ b/app/Console/Commands/SendInventoryAlerts.php
@@ -2,12 +2,13 @@

 namespace App\Console\Commands;

-use App\Helpers\Helper;
-use App\Models\Recipients\AlertRecipient;
 use App\Models\Setting;
+use DB;
+use Mail;
+use App\Helpers\Helper;
 use App\Notifications\InventoryAlert;
+
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Notification;

 class SendInventoryAlerts extends Command
 {
@@ -27,6 +28,8 @@ class SendInventoryAlerts extends Command

    /**
     * Create a new command instance.
+     *
+     * @return void
     */
    public function __construct()
    {
@@ -42,24 +45,29 @@ class SendInventoryAlerts extends Command
    {
        $settings = Setting::getSettings();

-        if (($settings->alert_email != '') && ($settings->alerts_enabled == 1)) {
+        if (($settings->alert_email!='')  && ($settings->alerts_enabled==1)) {
+
            $items = Helper::checkLowInventory();

+            // Send a rollup to the admin, if settings dictate
+
            if (($items) && (count($items) > 0)) {
                $this->info(trans_choice('mail.low_inventory_alert', count($items)));
                // Send a rollup to the admin, if settings dictate
                $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
-                    return new AlertRecipient($item);
+                    return new \App\Models\Recipients\AlertRecipient($item);
                });
-
                \Notification::send($recipients, new InventoryAlert($items, $settings->alert_threshold));
            }
+
        } else {
-            if ($settings->alert_email == '') {
+            if (Setting::getSettings()->alert_email=='') {
                $this->error('Could not send email. No alert email configured in settings');
-            } elseif (1 != $settings->alerts_enabled) {
+            } elseif (Setting::getSettings()->alerts_enabled!=1) {
                $this->info('Alerts are disabled in the settings. No mail will be sent');
            }
        }
+
+
    }
 }
--- a/app/Console/Commands/SyncAssetCounters.php
+++ b/app/Console/Commands/SyncAssetCounters.php
@@ -2,8 +2,8 @@

 namespace App\Console\Commands;

-use App\Models\Asset;
 use Illuminate\Console\Command;
+use App\Models\Asset;

 class SyncAssetCounters extends Command
 {
--- a/app/Console/Commands/SyncAssetLocations.php
+++ b/app/Console/Commands/SyncAssetLocations.php
@@ -2,8 +2,10 @@

 namespace App\Console\Commands;

-use App\Models\Asset;
+use App\Models\CustomField;
 use Illuminate\Console\Command;
+use App\Models\Asset;
+use Illuminate\Support\Facades\Storage;

 class SyncAssetLocations extends Command
 {
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -3,13 +3,40 @@
 namespace App\Console;

 use App\Console\Commands\ImportLocations;
-use App\Console\Commands\ReEncodeCustomFieldNames;
 use App\Console\Commands\RestoreDeletedUsers;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

 class Kernel extends ConsoleKernel
 {
+    /**
+     * The Artisan commands provided by your application.
+     *
+     * @var array
+     */
+    protected $commands = [
+        Commands\PaveIt::class,
+        Commands\CreateAdmin::class,
+        Commands\SendExpirationAlerts::class,
+        Commands\SendInventoryAlerts::class,
+        Commands\SendExpectedCheckinAlerts::class,
+        Commands\ObjectImportCommand::class,
+        Commands\Version::class,
+        Commands\SystemBackup::class,
+        Commands\DisableLDAP::class,
+        Commands\Purge::class,
+        Commands\LdapSync::class,
+        Commands\FixDoubleEscape::class,
+        Commands\RecryptFromMcrypt::class,
+        Commands\ResetDemoSettings::class,
+        Commands\SyncAssetLocations::class,
+        Commands\RegenerateAssetTags::class,
+        Commands\SyncAssetCounters::class,
+        Commands\RestoreDeletedUsers::class,
+        Commands\SendUpcomingAuditReport::class,
+        Commands\ImportLocations::class,
+        Commands\ReEncodeCustomFieldNames::class,
+    ];

    /**
     * Define the application's command schedule.
@@ -19,6 +46,7 @@ class Kernel extends ConsoleKernel
     */
    protected function schedule(Schedule $schedule)
    {
+
        $schedule->command('snipeit:inventory-alerts')->daily();
        $schedule->command('snipeit:expiring-alerts')->daily();
        $schedule->command('snipeit:expected-checkin')->daily();
@@ -27,10 +55,6 @@ class Kernel extends ConsoleKernel
        $schedule->command('snipeit:upcoming-audits')->daily();
    }

-    /**
-     * This method is required by Laravel to handle any console routes
-     * that are defined in routes/console.php.
-     */
    protected function commands()
    {
        require base_path('routes/console.php');
--- a/app/Events/CheckoutAccepted.php
+++ b/app/Events/CheckoutAccepted.php
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\CheckoutAcceptance;
-use App\Models\Contracts\Acceptable;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutAccepted
-{
-    use Dispatchable, SerializesModels;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(CheckoutAcceptance $acceptance)
-    {
-        $this->acceptance       = $acceptance;
-    }
-}
--- a/app/Events/CheckoutDeclined.php
+++ b/app/Events/CheckoutDeclined.php
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\CheckoutAcceptance;
-use App\Models\Contracts\Acceptable;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutDeclined
-{
-    use Dispatchable, SerializesModels;
-    
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct(CheckoutAcceptance $acceptance)
-    {
-        $this->acceptance       = $acceptance;
-    }
-}
--- a/app/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutableCheckedIn
-{
-    use Dispatchable, SerializesModels;
-
-    public $checkoutable;
-    public $checkedOutTo;
-    public $checkedInBy;
-    public $note;
-    public $action_date; // Date setted in the hardware.checkin view at the checkin_at input, for the action log
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $note, $action_date = null)
-    {
-        $this->checkoutable = $checkoutable;
-        $this->checkedOutTo = $checkedOutTo;
-        $this->checkedInBy  = $checkedInBy;
-        $this->note         = $note;
-        $this->action_date  = $action_date ?? date('Y-m-d');
-    }
-}
--- a/app/Events/CheckoutableCheckedOut.php
+++ b/app/Events/CheckoutableCheckedOut.php
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class CheckoutableCheckedOut
-{
-    use Dispatchable, SerializesModels;
-
-    public $checkoutable;
-    public $checkedOutTo;
-    public $checkedOutBy;
-    public $note;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note)
-    {
-        $this->checkoutable = $checkoutable;
-        $this->checkedOutTo = $checkedOutTo;
-        $this->checkedOutBy = $checkedOutBy;
-        $this->note         = $note;
-    }
-}
--- a/app/Exceptions/CheckoutNotAllowed.php
+++ b/app/Exceptions/CheckoutNotAllowed.php
@@ -3,7 +3,6 @@
 namespace App\Exceptions;

 use Exception;
-
 class CheckoutNotAllowed extends Exception
 {

--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -8,8 +8,6 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
 use Illuminate\Validation\ValidationException;
 use Log;
-use JsonException;
-

 class Handler extends ExceptionHandler
 {
@@ -26,8 +24,6 @@ class Handler extends ExceptionHandler
        \Illuminate\Session\TokenMismatchException::class,
        \Illuminate\Validation\ValidationException::class,
        \Intervention\Image\Exception\NotSupportedException::class,
-        \League\OAuth2\Server\Exception\OAuthServerException::class,
-        JsonException::class
    ];

    /**
@@ -41,7 +37,7 @@ class Handler extends ExceptionHandler
    public function report(Exception $exception)
    {
        if ($this->shouldReport($exception)) {
-            \Log::error($exception);
+            Log::error($exception);
            return parent::report($exception);
        }
    }
@@ -62,12 +58,6 @@ class Handler extends ExceptionHandler
            return redirect()->back()->with('error', trans('general.token_expired'));
        }

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

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

                }
            }
@@ -116,7 +104,7 @@ class Handler extends ExceptionHandler
    protected function unauthenticated($request, AuthenticationException $exception)
    {
        if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthorized or unauthenticated.'], 401);
+            return response()->json(['error' => 'Unauthorized.'], 401);
        }

        return redirect()->guest('login');
@@ -131,6 +119,6 @@ class Handler extends ExceptionHandler
     */
    protected function invalidJson($request, ValidationException $exception)
    {
-        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 422));
+        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors(), 400));
    }
 }
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1,16 +1,25 @@
 <?php
 namespace App\Helpers;

-use App\Models\Accessory;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\CustomField;
-use App\Models\CustomFieldset;
-use App\Models\Depreciation;
-use App\Models\Setting;
+use DB;
 use App\Models\Statuslabel;
+use App\Models\Location;
+use App\Models\Department;
+use App\Models\AssetModel;
+use App\Models\Company;
+use App\Models\User;
+use App\Models\Manufacturer;
+use App\Models\Supplier;
+use App\Models\Category;
+use App\Models\Depreciation;
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+use App\Models\Component;
+use App\Models\Accessory;
+use App\Models\Consumable;
+use App\Models\Asset;
+use App\Models\Setting;
 use Crypt;
-use Image;
 use Illuminate\Contracts\Encryption\DecryptException;

 class Helper
@@ -46,10 +55,7 @@ class Helper
    public static function formatCurrencyOutput($cost)
    {
        if (is_numeric($cost)) {
-            if (Setting::getSettings()->digit_separator=='1.234,56') {
-                return number_format($cost, 2, ',', '.');
-            }
-            return number_format($cost, 2, '.', ',');
+            return number_format($cost, 2, '.', '');
        }
        // It's already been parsed.
        return $cost;
@@ -58,313 +64,27 @@ class Helper

    /**
     * Static colors for pie charts.
+     * This is inelegant, and could be refactored later.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.3]
     * @return Array
     */
-    public static function defaultChartColors($index = 0)
+    public static function chartColors()
    {
        $colors = [
-            "#008941",
-            "#FF851B",
-            "#006FA6",
-            "#A30059",
-            "#1CE6FF",
-            "#FFDBE5",
-            "#7A4900",
-            "#0000A6",
-            "#63FFAC",
-            "#B79762",
-            "#004D43",
-            "#8FB0FF",
-            "#997D87",
-            "#5A0007",
-            "#809693",
-            "#FEFFE6",
-            "#1B4400",
-            "#4FC601",
-            "#3B5DFF",
-            "#4A3B53",
-            "#FF2F80",
-            "#61615A",
-            "#BA0900",
-            "#6B7900",
-            "#00C2A0",
-            "#FFAA92",
-            "#FF90C9",
-            "#B903AA",
-            "#D16100",
-            "#DDEFFF",
-            "#000035",
-            "#7B4F4B",
-            "#A1C299",
-            "#300018",
-            "#0AA6D8",
-            "#013349",
-            "#00846F",
-            "#372101",
-            "#FFB500",
-            "#C2FFED",
-            "#A079BF",
-            "#CC0744",
-            "#C0B9B2",
-            "#C2FF99",
-            "#001E09",
-            "#00489C",
-            "#6F0062",
-            "#0CBD66",
-            "#EEC3FF",
-            "#456D75",
-            "#B77B68",
-            "#7A87A1",
-            "#788D66",
-            "#885578",
-            "#FAD09F",
-            "#FF8A9A",
-            "#D157A0",
-            "#BEC459",
-            "#456648",
-            "#0086ED",
-            "#886F4C",
-            "#34362D",
-            "#B4A8BD",
-            "#00A6AA",
-            "#452C2C",
-            "#636375",
-            "#A3C8C9",
-            "#FF913F",
-            "#938A81",
-            "#575329",
-            "#00FECF",
-            "#B05B6F",
-            "#8CD0FF",
-            "#3B9700",
-            "#04F757",
-            "#C8A1A1",
-            "#1E6E00",
-            "#7900D7",
-            "#A77500",
-            "#6367A9",
-            "#A05837",
-            "#6B002C",
-            "#772600",
-            "#D790FF",
-            "#9B9700",
-            "#549E79",
-            "#FFF69F",
-            "#201625",
-            "#72418F",
-            "#BC23FF",
-            "#99ADC0",
-            "#3A2465",
-            "#922329",
-            "#5B4534",
-            "#FDE8DC",
-            "#404E55",
-            "#0089A3",
-            "#CB7E98",
-            "#A4E804",
-            "#324E72",
-            "#6A3A4C",
-            "#83AB58",
-            "#001C1E",
-            "#D1F7CE",
-            "#004B28",
-            "#C8D0F6",
-            "#A3A489",
-            "#806C66",
-            "#222800",
-            "#BF5650",
-            "#E83000",
-            "#66796D",
-            "#DA007C",
-            "#FF1A59",
-            "#8ADBB4",
-            "#1E0200",
-            "#5B4E51",
-            "#C895C5",
-            "#320033",
-            "#FF6832",
-            "#66E1D3",
-            "#CFCDAC",
-            "#D0AC94",
-            "#7ED379",
-            "#012C58",
-            "#7A7BFF",
-            "#D68E01",
-            "#353339",
-            "#78AFA1",
-            "#FEB2C6",
-            "#75797C",
-            "#837393",
-            "#943A4D",
-            "#B5F4FF",
-            "#D2DCD5",
-            "#9556BD",
-            "#6A714A",
-            "#001325",
-            "#02525F",
-            "#0AA3F7",
-            "#E98176",
-            "#DBD5DD",
-            "#5EBCD1",
-            "#3D4F44",
-            "#7E6405",
-            "#02684E",
-            "#962B75",
-            "#8D8546",
-            "#9695C5",
-            "#E773CE",
-            "#D86A78",
-            "#3E89BE",
-            "#CA834E",
-            "#518A87",
-            "#5B113C",
-            "#55813B",
-            "#E704C4",
-            "#00005F",
-            "#A97399",
-            "#4B8160",
-            "#59738A",
-            "#FF5DA7",
-            "#F7C9BF",
-            "#643127",
-            "#513A01",
-            "#6B94AA",
-            "#51A058",
-            "#A45B02",
-            "#1D1702",
-            "#E20027",
-            "#E7AB63",
-            "#4C6001",
-            "#9C6966",
-            "#64547B",
-            "#97979E",
-            "#006A66",
-            "#391406",
-            "#F4D749",
-            "#0045D2",
-            "#006C31",
-            "#DDB6D0",
-            "#7C6571",
-            "#9FB2A4",
-            "#00D891",
-            "#15A08A",
-            "#BC65E9",
-            "#FFFFFE",
-            "#C6DC99",
-            "#203B3C",
-            "#671190",
-            "#6B3A64",
-            "#F5E1FF",
-            "#FFA0F2",
-            "#CCAA35",
-            "#374527",
-            "#8BB400",
-            "#797868",
-            "#C6005A",
-            "#3B000A",
-            "#C86240",
-            "#29607C",
-            "#402334",
-            "#7D5A44",
-            "#CCB87C",
-            "#B88183",
-            "#AA5199",
-            "#B5D6C3",
-            "#A38469",
-            "#9F94F0",
-            "#A74571",
-            "#B894A6",
-            "#71BB8C",
-            "#00B433",
-            "#789EC9",
-            "#6D80BA",
-            "#953F00",
-            "#5EFF03",
-            "#E4FFFC",
-            "#1BE177",
-            "#BCB1E5",
-            "#76912F",
-            "#003109",
-            "#0060CD",
-            "#D20096",
-            "#895563",
-            "#29201D",
-            "#5B3213",
-            "#A76F42",
-            "#89412E",
-            "#1A3A2A",
-            "#494B5A",
-            "#A88C85",
-            "#F4ABAA",
-            "#A3F3AB",
-            "#00C6C8",
-            "#EA8B66",
-            "#958A9F",
-            "#BDC9D2",
-            "#9FA064",
-            "#BE4700",
-            "#658188",
-            "#83A485",
-            "#453C23",
-            "#47675D",
-            "#3A3F00",
-            "#061203",
-            "#DFFB71",
-            "#868E7E",
-            "#98D058",
-            "#6C8F7D",
-            "#D7BFC2",
-            "#3C3E6E",
-            "#D83D66",
-            "#2F5D9B",
-            "#6C5E46",
-            "#D25B88",
-            "#5B656C",
-            "#00B57F",
-            "#545C46",
-            "#866097",
-            "#365D25",
-            "#252F99",
-            "#00CCFF",
-            "#674E60",
-            "#FC009C",
-            "#92896B",
+            '#f56954',
+            '#00a65a',
+            '#f39c12',
+            '#00c0ef',
+            '#3c8dbc',
+            '#d2d6de',
+            '#3c8dbc',
+            '#3c8dbc',
+            '#3c8dbc',
+
        ];
-
-
-
-        return $colors[$index];
-
-    }
-
-    /**
-     * Increases or decreases the brightness of a color by a percentage of the current brightness.
-     *
-     * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-     * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-     *
-     * @return  string
-     */
-    public static function adjustBrightness($hexCode, $adjustPercent) {
-        $hexCode = ltrim($hexCode, '#');
-
-        if (strlen($hexCode) == 3) {
-            $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-        }
-
-        $hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-        foreach ($hexCode as & $color) {
-            $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-            $adjustAmount = ceil($adjustableLimit * $adjustPercent);
-
-            $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-        }
-
-        return '#' . implode($hexCode);
+        return $colors;
    }


@@ -403,19 +123,6 @@ class Helper
     */
    public static function ParseFloat($floatString)
    {
-        /*******
-         * 
-         * WARNING: This does conversions based on *locale* - a Unix-ey-like thing.
-         * 
-         * Everything else in the system tends to convert based on the Snipe-IT settings
-         * 
-         * So it's very likely this is *not* what you want - instead look for the new
-         * 
-         * ParseCurrency($currencyString)
-         * 
-         * Which should be directly below here
-         * 
-         */
        $LocaleInfo = localeconv();
        $floatString = str_replace(",", "", $floatString);
        $floatString = str_replace($LocaleInfo["decimal_point"], ".", $floatString);
@@ -429,26 +136,6 @@ class Helper
        $floatString = str_replace($currencySymbol, '', $floatString);
        return floatval($floatString);
    }
-    
-    /**
-     * Format currency using comma or period for thousands, and period or comma for decimal, based on settings.
-     * 
-     * @author [B. Wetherington] [<bwetherington@grokability.com>]
-     * @since [v5.2]
-     * @return Float
-     */
-    public static function ParseCurrency($currencyString) {
-        $without_currency = str_replace(Setting::getSettings()->default_currency, '', $currencyString); //generally shouldn't come up, since we don't do this in fields, but just in case it does...
-        if(Setting::getSettings()->digit_separator=='1.234,56') {
-            //EU format
-            $without_thousands = str_replace('.', '', $without_currency);
-            $corrected_decimal = str_replace(',', '.', $without_thousands);
-        } else {
-            $without_thousands = str_replace(',', '', $without_currency);
-            $corrected_decimal = $without_thousands;  // decimal is already OK
-        }
-        return floatval($corrected_decimal);
-    }

    /**
     * Get the list of status labels in an array to make a dropdown menu
@@ -464,26 +151,6 @@ class Helper
        return $statuslabel_list;
    }

-    /**
-     * Get the list of deployable status labels in an array to make a dropdown menu
-     *
-     * @todo This should probably be a selectlist, same as the other endpoints
-     * and we should probably add to the API controllers to make sure that
-     * the status_id submitted is actually really deployable.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.1.0]
-     * @return Array
-     */
-    public static function deployableStatusLabelList()
-    {
-        $statuslabel_list =  Statuslabel::where('deployable', '=', '1')->orderBy('default_label', 'desc')
-                ->orderBy('name','asc')
-                ->orderBy('deployable','desc')
-                ->pluck('name', 'id')->toArray();
-        return $statuslabel_list;
-    }
-
    /**
     * Get the list of status label types in an array to make a dropdown menu
     *
@@ -558,9 +225,8 @@ class Helper
     */
    public static function predefined_formats()
    {
-        $keys = array_keys(CustomField::PREDEFINED_FORMATS);
+        $keys = array_keys(CustomField::$PredefinedFormats);
        $stuff = array_combine($keys, $keys);
-
        return $stuff;
    }

@@ -810,9 +476,10 @@ class Helper


    /**
-     * Gracefully handle decrypting encrypted fields (custom fields, etc).
+     * Gracefully handle decrypting the legacy data (encrypted via mcrypt) and use the new
+     * decryption method instead.
     *
-     * @todo allow this to handle more than just strings (arrays, etc)
+     * This is not currently used, but will be.
     *
     * @author A. Gianotto
     * @since 3.6
@@ -923,8 +590,7 @@ class Helper
            // If upload_max_size is less, then reduce. Except if upload_max_size is
            // zero, which indicates no limit.
            $upload_max = Helper::parse_size(ini_get('upload_max_filesize'));
-
-            if ($upload_max > 0 && $upload_max < $post_max_size) {
+            if ($upload_max > 0 && $upload_max < $max_size) {
                $max_size = ini_get('upload_max_filesize');
            }
        }
@@ -948,32 +614,38 @@ class Helper

        $extension = substr(strrchr($filename,'.'),1);

-        $allowedExtensionMap = [
-            // Images
-            'jpg'   => 'fa fa-file-image-o',
-            'jpeg'   => 'fa fa-file-image-o',
-            'gif'   => 'fa fa-file-image-o',
-            'png'   => 'fa fa-file-image-o',
-            // word
-            'doc'   => 'fa fa-file-word-o',
-            'docx'   => 'fa fa-file-word-o',
-            // Excel
-            'xls'   => 'fa fa-file-excel-o',
-            'xlsx'   => 'fa fa-file-excel-o',
-            // archive
-            'zip'   => 'fa fa-file-archive-o',
-            'rar'   => 'fa fa-file-archive-o',
-            //Text
-            'txt'   => 'fa fa-file-text-o',
-            'rtf'   => 'fa fa-file-text-o',
-            'xml'   => 'fa fa-file-text-o',
-            // Misc
-            'pdf'   => 'fa fa-file-pdf-o',
-            'lic'   => 'fa fa-file-floppy-o',
-        ];
-
-        if ($extension && array_key_exists($extension, $allowedExtensionMap)) {
-            return $allowedExtensionMap[$extension];
+        if ($extension) {
+            switch ($extension) {
+                case 'jpg':
+                case 'jpeg':
+                case 'gif':
+                case 'png':
+                    return "fa fa-file-image-o";
+                    break;
+                case 'doc':
+                case 'docx':
+                    return "fa fa-file-word-o";
+                    break;
+                case 'xls':
+                case 'xlsx':
+                    return "fa fa-file-excel-o";
+                    break;
+                case 'zip':
+                case 'rar':
+                    return "fa fa-file-archive-o";
+                    break;
+                case 'pdf':
+                    return "fa fa-file-pdf-o";
+                    break;
+                case 'txt':
+                    return "fa fa-file-text-o";
+                    break;
+                case 'lic':
+                    return "fa fa-floppy-o";
+                    break;
+                default:
+                    return "fa fa-file-o";
+            }
        }
        return "fa fa-file-o";
    }
@@ -997,80 +669,7 @@ class Helper
        return false;
    }

-    /**
-     * Generate a random encrypted password.
-     *
-     * @author Wes Hulette <jwhulette@gmail.com>
-     *
-     * @since 5.0.0
-     *
-     * @return string
-     */
-    public static function generateEncyrptedPassword(): string
-    {
-        return bcrypt(Helper::generateUnencryptedPassword());
-    }

-    /**
-     * Get a random unencrypted password.
-     *
-     * @author Steffen Buehl <sb@sbuehl.com>
-     *
-     * @since 5.0.0
-     *
-     * @return string
-     */
-    public static function generateUnencryptedPassword(): string
-    {
-        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';

-        $password = '';
-        for ( $i = 0; $i < 20; $i++ ) {
-            $password .= substr( $chars, random_int( 0, strlen( $chars ) - 1 ), 1 );
-        }
-        return $password;
-    }
-
-    /**
-     * Process base64 encoded image data and save it on supplied path
-     *
-     * @param string $image_data base64 encoded image data with mime type
-     * @param string $save_path path to a folder where the image should be saved
-     * @return string path to uploaded image or false if something went wrong
-     */
-    public static function processUploadedImage(String $image_data, String $save_path) {
-        if ($image_data == null || $save_path == null) {
-            return false;
-        }
-
-        // After modification, the image is prefixed by mime info like the following:
-        // data:image/jpeg;base64,; This causes the image library to be unhappy, so we need to remove it.
-        $header = explode(';', $image_data, 2)[0];
-        // Grab the image type from the header while we're at it.
-        $extension = substr($header, strpos($header, '/')+1);
-        // Start reading the image after the first comma, postceding the base64.
-        $image = substr($image_data, strpos($image_data, ',')+1);
-
-        $file_name = str_random(25).".".$extension;
-
-        $directory= public_path($save_path);
-        // Check if the uploads directory exists.  If not, try to create it.
-        if (!file_exists($directory)) {
-            mkdir($directory, 0755, true);
-        }
-
-        $path = public_path($save_path.$file_name);
-
-        try {
-            Image::make($image)->resize(500, 500, function ($constraint) {
-                $constraint->aspectRatio();
-                $constraint->upsize();
-            })->save($path);
-        } catch (\Exception $e) {
-            return false;
-        }
-
-        return $file_name;
-    }

 }
--- a/app/Helpers/StorageHelper.php
+++ b/app/Helpers/StorageHelper.php
@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Helpers;
-use Illuminate\Support\Facades\Storage;
-
-class StorageHelper
-{
-    static function downloader($filename, $disk = 'default') {
-        if($disk == 'default') {
-            $disk = config('filesystems.default');
-        }
-        switch(config("filesystems.disks.$disk.driver")) {
-            case 'local':
-                return response()->download(Storage::disk($disk)->path($filename)); //works for PRIVATE or public?!
-
-            case 's3':
-                return redirect()->away(Storage::disk($disk)->temporaryUrl($filename, now()->addMinutes(5))); //works for private or public, I guess?
-
-            default:
-                return Storage::disk($disk)->download($filename);
-        }
-    }
-}
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -1,210 +0,0 @@
-<?php
-namespace App\Http\Controllers\Accessories;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\ImageUploadRequest;
-use App\Models\Accessory;
-use App\Models\Company;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Redirect;
-
-/** This controller handles all actions related to Accessories for
- * the Snipe-IT Asset Management application.
- *
- * @version    v1.0
- */
-class AccessoriesController extends Controller
-{
-    /**
-     * Returns a view that invokes the ajax tables which actually contains
-     * the content for the accessories listing, which is generated in getDatatable.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @see AccessoriesController::getDatatable() method that generates the JSON response
-     * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function index()
-    {
-        $this->authorize('index', Accessory::class);
-        return view('accessories/index');
-    }
-
-
-    /**
-     * Returns a view with a form to create a new Accessory.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function create()
-    {
-        $this->authorize('create', Accessory::class);
-        $category_type = 'accessory';
-        return view('accessories/edit')->with('category_type', $category_type)
-          ->with('item', new Accessory);
-    }
-
-
-    /**
-     * Validate and save new Accessory from form post
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param ImageUploadRequest $request
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(ImageUploadRequest $request)
-    {
-        $this->authorize(Accessory::class);
-        // create a new model instance
-        $accessory = new Accessory();
-
-        // Update the accessory data
-        $accessory->name                    = request('name');
-        $accessory->category_id             = request('category_id');
-        $accessory->location_id             = request('location_id');
-        $accessory->min_amt                 = request('min_amt');
-        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
-        $accessory->order_number            = request('order_number');
-        $accessory->manufacturer_id         = request('manufacturer_id');
-        $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->user_id                 = Auth::user()->id;
-        $accessory->supplier_id             = request('supplier_id');
-        $accessory->notes                   = request('notes');
-
-
-        $accessory = $request->handleImages($accessory);
-        
-        // Was the accessory created?
-        if ($accessory->save()) {
-            // Redirect to the new accessory  page
-            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
-        }
-        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
-    }
-
-    /**
-     * Return view for the Accessory update form, prepopulated with existing data
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $accessoryId
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function edit($accessoryId = null)
-    {
-
-        if ($item = Accessory::find($accessoryId)) {
-            $this->authorize($item);
-            return view('accessories/edit', compact('item'))->with('category_type', 'accessory');
-        }
-
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-
-    }
-
-
-    /**
-     * Save edited Accessory from form post
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param ImageUploadRequest $request
-     * @param  int $accessoryId
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function update(ImageUploadRequest $request, $accessoryId = null)
-    {
-        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());
-    }
-
-    /**
-     * Delete the given accessory.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $accessoryId
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function destroy($accessoryId)
-    {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
-        }
-
-        $this->authorize($accessory);
-
-
-        if ($accessory->hasUsers() > 0) {
-             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
-        }
-
-        if ($accessory->image) {
-            try  {
-                Storage::disk('public')->delete('accessories'.'/'.$accessory->image);
-            } catch (\Exception $e) {
-                \Log::debug($e);
-            }
-        }
-
-        $accessory->delete();
-        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.delete.success'));
-    }
-
-
-    /**
-     * Returns a view that invokes the ajax table which  contains
-     * the content for the accessory detail view, which is generated in getDataView.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $accessoryID
-     * @see AccessoriesController::getDataView() method that generates the JSON response
-     * @since [v1.0]
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function show($accessoryID = null)
-    {
-        $accessory = Accessory::find($accessoryID);
-        $this->authorize('view', $accessory);
-        if (isset($accessory->id)) {
-            return view('accessories/view', compact('accessory'));
-        }
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', ['id' => $accessoryID]));
-    }
-}
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Accessories;
-
-use App\Events\CheckoutableCheckedIn;
-use App\Http\Controllers\Controller;
-use App\Models\Accessory;
-use App\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-
-class AccessoryCheckinController extends Controller
-{
-    /**
-     * Check the accessory back into inventory
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param Request $request
-     * @param integer $accessoryUserId
-     * @param string $backto
-     * @return View
-     * @internal param int $accessoryId
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function create($accessoryUserId = null, $backto = null)
-    {
-        // Check if the accessory exists
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
-            // Redirect to the accessory management page with error
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
-        }
-
-        $accessory = Accessory::find($accessory_user->accessory_id);
-        $this->authorize('checkin', $accessory);
-        return view('accessories/checkin', compact('accessory'))->with('backto', $backto);
-    }
-
-    /**
-     * Check in the item so that it can be checked out again to someone else
-     *
-     * @uses Accessory::checkin_email() to determine if an email can and should be sent
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param null $accessoryUserId
-     * @param string $backto
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     * @internal param int $accessoryId
-     */
-    public function store(Request $request, $accessoryUserId = null, $backto = null)
-    {
-      // Check if the accessory exists
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
-            // Redirect to the accessory management page with error
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-        }
-
-        $accessory = Accessory::find($accessory_user->accessory_id);
-
-        $this->authorize('checkin', $accessory);
-
-        $checkin_at = date('Y-m-d');
-        if($request->filled('checkin_at')){
-            $checkin_at = $request->input('checkin_at');
-        }
-
-        // Was the accessory updated?
-        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
-            $return_to = e($accessory_user->assigned_to);
-
-            event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note'), $checkin_at));
-
-            return redirect()->route("accessories.show", $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
-        }
-        // Redirect to the accessory management page with error
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
-    }
-}
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Accessories;
-
-use App\Events\CheckoutableCheckedOut;
-use App\Http\Controllers\Controller;
-use App\Models\Accessory;
-use App\Models\User;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
-
-class AccessoryCheckoutController extends Controller
-{
-
-    /**
-     * Return the form to checkout an Accessory to a user.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $accessoryId
-     * @return View
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function create($accessoryId)
-    {
-        // Check if the accessory exists
-        if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the accessory management page with error
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
-        }
-
-        if ($accessory->category) {
-
-            $this->authorize('checkout', $accessory);
-
-            // Get the dropdown of users and then pass it to the checkout view
-            return view('accessories/checkout', compact('accessory'));
-        }
-
-        return redirect()->back()->with('error', 'The category type for this accessory is not valid. Edit the accessory and select a valid accessory category.');
-    }
-
-    /**
-     * Save the Accessory checkout information.
-     *
-     * If Slack is enabled and/or asset acceptance is enabled, it will also
-     * trigger a Slack message and send an email.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param Request $request
-     * @param  int $accessoryId
-     * @return Redirect
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function store(Request $request, $accessoryId)
-    {
-      // Check if the accessory exists
-        if (is_null($accessory = Accessory::find($accessoryId))) {
-            // Redirect to the accessory management page with error
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found'));
-        }
-
-        $this->authorize('checkout', $accessory);
-
-        if (!$user = User::find($request->input('assigned_to'))) {
-            return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
-        }
-
-      // Update the accessory data
-        $accessory->assigned_to = e($request->input('assigned_to'));
-
-        $accessory->users()->attach($accessory->id, [
-            'accessory_id' => $accessory->id,
-            'created_at' => Carbon::now(),
-            'user_id' => Auth::id(),
-            'assigned_to' => $request->get('assigned_to'),
-            'note' => $request->input('note')
-        ]);
-
-        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
-
-        event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
-
-      // Redirect to the new accessory page
-        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));
-    }
-}
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -0,0 +1,400 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Models\Company;
+use App\Models\User;
+use Auth;
+use Carbon\Carbon;
+use Config;
+use DB;
+use Gate;
+use Input;
+use Lang;
+use Redirect;
+use Illuminate\Http\Request;
+use Slack;
+use Str;
+use View;
+use Image;
+use App\Http\Requests\ImageUploadRequest;
+
+/** This controller handles all actions related to Accessories for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class AccessoriesController extends Controller
+{
+
+    /**
+    * Returns a view that invokes the ajax tables which actually contains
+    * the content for the accessories listing, which is generated in getDatatable.
+    *
+    * @author [A. Gianotto] [<snipe@snipe.net>]
+    * @see AccessoriesController::getDatatable() method that generates the JSON response
+    * @since [v1.0]
+    * @return View
+    */
+    public function index(Request $request)
+    {
+        $this->authorize('index', Accessory::class);
+        return view('accessories/index');
+    }
+
+
+  /**
+   * Returns a view with a form to create a new Accessory.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @return View
+   */
+    public function create(Request $request)
+    {
+        $this->authorize('create', Accessory::class);
+        $category_type = 'accessory';
+        return view('accessories/edit')->with('category_type', $category_type)
+          ->with('item', new Accessory);
+    }
+
+
+  /**
+   * Validate and save new Accessory from form post
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @return Redirect
+   */
+    public function store(ImageUploadRequest $request)
+    {
+        $this->authorize(Accessory::class);
+        // create a new model instance
+        $accessory = new Accessory();
+
+        // Update the accessory data
+        $accessory->name                    = request('name');
+        $accessory->category_id             = request('category_id');
+        $accessory->location_id             = request('location_id');
+        $accessory->min_amt                 = request('min_amt');
+        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
+        $accessory->order_number            = request('order_number');
+        $accessory->manufacturer_id         = request('manufacturer_id');
+        $accessory->model_number            = request('model_number');
+        $accessory->purchase_date           = request('purchase_date');
+        $accessory->purchase_cost           = Helper::ParseFloat(request('purchase_cost'));
+        $accessory->qty                     = request('qty');
+        $accessory->user_id                 = Auth::user()->id;
+        $accessory->supplier_id             = request('supplier_id');
+
+        if ($request->hasFile('image')) {
+
+            if (!config('app.lock_passwords')) {
+                $image = $request->file('image');
+                $ext = $image->getClientOriginalExtension();
+                $file_name = "accessory-".str_random(18).'.'.$ext;
+                $path = public_path('/uploads/accessories');
+                if ($image->getClientOriginalExtension()!='svg') {
+                    Image::make($image->getRealPath())->resize(null, 800, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    $image->move($path, $file_name);
+                }
+                $accessory->image = $file_name;
+            }
+        }
+
+
+
+        // Was the accessory created?
+        if ($accessory->save()) {
+            // Redirect to the new accessory  page
+            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.create.success'));
+        }
+        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
+    }
+
+  /**
+   * Return view for the Accessory update form, prepopulated with existing data
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return View
+   */
+    public function edit(Request $request, $accessoryId = null)
+    {
+
+        if ($item = Accessory::find($accessoryId)) {
+            $this->authorize($item);
+            $category_type = 'accessory';
+            return view('accessories/edit', compact('item'))->with('category_type', $category_type);
+        }
+
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
+    }
+
+
+  /**
+   * Save edited Accessory from form post
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function update(ImageUploadRequest $request, $accessoryId = null)
+    {
+        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           = request('purchase_cost');
+        $accessory->qty                     = request('qty');
+        $accessory->supplier_id             = request('supplier_id');
+
+        if ($request->hasFile('image')) {
+
+            if (!config('app.lock_passwords')) {
+                $image = $request->file('image');
+                $ext = $image->getClientOriginalExtension();
+                $file_name = "accessory-".str_random(18).'.'.$ext;
+                $path = public_path('/uploads/accessories');
+                if ($image->getClientOriginalExtension()!='svg') {
+                    Image::make($image->getRealPath())->resize(null, 800, function ($constraint) {
+                        $constraint->aspectRatio();
+                        $constraint->upsize();
+                    })->save($path.'/'.$file_name);
+                } else {
+                    $image->move($path, $file_name);
+                }
+                if (($accessory->image) && (file_exists($path.'/'.$accessory->image))) {
+                    unlink($path.'/'.$accessory->image);
+                }
+
+                $accessory->image = $file_name;
+            }
+        }
+
+
+        // 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());
+    }
+
+  /**
+   * Delete the given accessory.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function destroy(Request $request, $accessoryId)
+    {
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $this->authorize($accessory);
+
+
+        if ($accessory->hasUsers() > 0) {
+             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
+        }
+        $accessory->delete();
+        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.delete.success'));
+    }
+
+
+
+  /**
+  * Returns a view that invokes the ajax table which  contains
+  * the content for the accessory detail view, which is generated in getDataView.
+  *
+  * @author [A. Gianotto] [<snipe@snipe.net>]
+  * @param  int  $accessoryID
+  * @see AccessoriesController::getDataView() method that generates the JSON response
+  * @since [v1.0]
+  * @return View
+  */
+    public function show(Request $request, $accessoryID = null)
+    {
+        $accessory = Accessory::find($accessoryID);
+        $this->authorize('view', $accessory);
+        if (isset($accessory->id)) {
+            return view('accessories/view', compact('accessory'));
+        }
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist', compact('id')));
+    }
+
+  /**
+   * Return the form to checkout an Accessory to a user.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return View
+   */
+    public function getCheckout(Request $request, $accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        if ($accessory->category) {
+
+            $this->authorize('checkout', $accessory);
+
+            // Get the dropdown of users and then pass it to the checkout view
+            return view('accessories/checkout', compact('accessory'));
+        }
+
+        return redirect()->back()->with('error', 'The category type for this accessory is not valid. Edit the accessory and select a valid accessory category.');
+
+
+
+    }
+
+  /**
+   * Save the Accessory checkout information.
+   *
+   * If Slack is enabled and/or asset acceptance is enabled, it will also
+   * trigger a Slack message and send an email.
+   *
+   * @author [A. Gianotto] [<snipe@snipe.net>]
+   * @param  int  $accessoryId
+   * @return Redirect
+   */
+    public function postCheckout(Request $request, $accessoryId)
+    {
+      // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.user_not_found'));
+        }
+
+        $this->authorize('checkout', $accessory);
+
+        if (!$user = User::find(Input::get('assigned_to'))) {
+            return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
+        }
+
+      // Update the accessory data
+        $accessory->assigned_to = e(Input::get('assigned_to'));
+
+        $accessory->users()->attach($accessory->id, [
+            'accessory_id' => $accessory->id,
+            'created_at' => Carbon::now(),
+            'user_id' => Auth::id(),
+            'assigned_to' => $request->get('assigned_to')
+        ]);
+
+        $logaction = $accessory->logCheckout(e(Input::get('note')), $user);
+
+        DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
+
+        $data['log_id'] = $logaction->id;
+        $data['eula'] = $accessory->getEula();
+        $data['first_name'] = $user->first_name;
+        $data['item_name'] = $accessory->name;
+        $data['checkout_date'] = $logaction->created_at;
+        $data['item_tag'] = '';
+        $data['expected_checkin'] = '';
+        $data['note'] = $logaction->note;
+        $data['require_acceptance'] = $accessory->requireAcceptance();
+
+      // Redirect to the new accessory page
+        return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));
+    }
+
+
+    /**
+     * Check the accessory back into inventory
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @param integer $accessoryUserId
+     * @param string $backto
+     * @return View
+     * @internal param int $accessoryId
+     */
+    public function getCheckin(Request $request, $accessoryUserId = null, $backto = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        }
+
+        $accessory = Accessory::find($accessory_user->accessory_id);
+        $this->authorize('checkin', $accessory);
+        return view('accessories/checkin', compact('accessory'))->with('backto', $backto);
+    }
+
+
+    /**
+     * Check in the item so that it can be checked out again to someone else
+     *
+     * @uses Accessory::checkin_email() to determine if an email can and should be sent
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param Request $request
+     * @param integer $accessoryUserId
+     * @param string $backto
+     * @return Redirect
+     * @internal param int $accessoryId
+     */
+    public function postCheckin(Request $request, $accessoryUserId = null, $backto = null)
+    {
+      // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+        }
+
+        $accessory = Accessory::find($accessory_user->accessory_id);
+
+        $this->authorize('checkin', $accessory);
+
+        $return_to = e($accessory_user->assigned_to);
+        $logaction = $accessory->logCheckin(User::find($return_to), e(Input::get('note')));
+
+        // Was the accessory updated?
+        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
+            if (!is_null($accessory_user->assigned_to)) {
+                $user = User::find($accessory_user->assigned_to);
+            }
+
+            $data['log_id'] = $logaction->id;
+            $data['first_name'] = e($user->first_name);
+            $data['last_name'] = e($user->last_name);
+            $data['item_name'] = e($accessory->name);
+            $data['checkin_date'] = e($logaction->created_at);
+            $data['item_tag'] = '';
+            $data['note'] = e($logaction->note);
+
+            if ($backto=='user') {
+                return redirect()->route("users.show", $return_to)->with('success', trans('admin/accessories/message.checkin.success'));
+            }
+            return redirect()->route("accessories.show", $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
+        }
+        // Redirect to the accessory management page with error
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
+    }
+
+
+}
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -1,127 +0,0 @@
-<?php 
-namespace App\Http\Controllers\Account;
-
-use App\Events\CheckoutAccepted;
-use App\Events\CheckoutDeclined;
-use App\Events\ItemAccepted;
-use App\Events\ItemDeclined;
-use App\Http\Controllers\Controller;
-use App\Models\CheckoutAcceptance;
-use App\Models\Company;
-use App\Models\Contracts\Acceptable;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
-
-class AcceptanceController extends Controller {
-	
-    /**
-     * Show a listing of pending checkout acceptances for the current user
-     * 
-     * @return View
-     */
-    public function index() {
-        $acceptances = CheckoutAcceptance::forUser(Auth::user())->pending()->get();
-
-        return view('account/accept.index', compact('acceptances'));
-    }
-
-    /**
-     * Shows a form to either accept or decline the checkout acceptance
-     * 
-     * @param  int  $id
-     * @return mixed
-     */
-	public function create($id) {
-
-        $acceptance = CheckoutAcceptance::find($id);
-
-        if (is_null($acceptance)) {
-            return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-
-        if (! $acceptance->isPending()) {
-            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
-        }        
-
-        if (! $acceptance->isCheckedOutTo(Auth::user())) {
-            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
-        }
-
-        if (!Company::isCurrentUserHasAccess($acceptance->checkoutable)) {
-            return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions'));
-        }        
-
-        return view('account/accept.create', compact('acceptance'));
-	}
-
-    /**
-     * Stores the accept/decline of the checkout acceptance
-     * 
-     * @param  Request $request
-     * @param  int  $id
-     * @return Redirect
-     */
-    public function store(Request $request, $id) {
-        
-        $acceptance = CheckoutAcceptance::find($id);
-
-        if (is_null($acceptance)) {
-            return redirect()->route('account.accept')->with('error', trans('admin/hardware/message.does_not_exist'));
-        }
-
-        if (! $acceptance->isPending()) {
-            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.asset_already_accepted'));
-        }        
-
-        if (! $acceptance->isCheckedOutTo(Auth::user())) {
-            return redirect()->route('account.accept')->with('error', trans('admin/users/message.error.incorrect_user_accepted'));
-        }
-
-        if (!Company::isCurrentUserHasAccess($acceptance->checkoutable)) {
-            return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions'));
-        }   
-
-        if (!$request->filled('asset_acceptance')) {
-            return redirect()->back()->with('error', trans('admin/users/message.error.accept_or_decline'));
-        }
-
-        /**
-         * Get the signature and save it
-         */
-
-        if (!Storage::exists('private_uploads/signatures'))  Storage::makeDirectory('private_uploads/signatures', 775);
-
-
-        $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);
-
-            event(new CheckoutAccepted($acceptance));
-
-            $return_msg = trans('admin/users/message.accepted');
-
-        } else {
-
-            $acceptance->decline($sig_filename);         
-
-            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
@@ -9,21 +9,10 @@ class ActionlogController extends Controller
 {
    public function displaySig($filename)
    {
-        // PHP doesn't let you handle file not found errors well with 
-        // file_get_contents, so we set the error reporting for just this class
-        error_reporting(0);
-
        $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/signatures/'.$filename;
+        $file = config('app.private_uploads') . '/signatures/' . $filename;
        $filetype = Helper::checkUploadIsImage($file);
-
-        $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
-        if ($contents === false) {
-            \Log::warn('File '.$file.' not found');
-            return false;
-        } else {
-            return Response::make($contents)->header('Content-Type', $filetype);
-        }
-       
+        $contents = file_get_contents($file);
+        return Response::make($contents)->header('Content-Type', $filetype);
    }
 }
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -2,18 +2,13 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\AccessoriesTransformer;
-use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Accessory;
-use App\Models\Company;
-use App\Models\User;
-use Carbon\Carbon;
-use Auth;
-use DB;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Accessory;
+use App\Http\Transformers\AccessoriesTransformer;
+use App\Models\Company;
+

 class AccessoriesController extends Controller
 {
@@ -27,24 +22,9 @@ class AccessoriesController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Accessory::class);
-        
-        // 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 = 
-            [
-                'id',
-                'name',
-                'model_number',
-                'eol',
-                'notes',
-                'created_at',
-                'min_amt',
-                'company_id',
-                'notes',
-            ];
+        $allowed_columns = ['id','name','model_number','eol','notes','created_at','min_amt','company_id'];

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

        if ($request->filled('search')) {
            $accessories = $accessories->TextSearch($request->input('search'));
@@ -66,47 +46,25 @@ class AccessoriesController extends Controller
            $accessories->where('supplier_id','=',$request->input('supplier_id'));
        }

-        if ($request->filled('location_id')) {
-            $accessories->where('location_id','=',$request->input('location_id'));
-        }
-
-        if ($request->filled('notes')) {
-            $accessories->where('notes','=',$request->input('notes'));
-        }
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort_override =  $request->input('sort');
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

-        switch ($sort_override) {
+        switch ($sort) {
            case 'category':
                $accessories = $accessories->OrderCategory($order);
                break;
            case 'company':
                $accessories = $accessories->OrderCompany($order);
                break;
-            case 'location':
-                $accessories = $accessories->OrderLocation($order);
-                break;
-            case 'manufacturer':
-                $accessories = $accessories->OrderManufacturer($order);
-                break;    
-            case 'supplier':
-                $accessories = $accessories->OrderSupplier($order);
-                break;       
            default:
-                $accessories = $accessories->orderBy($column_sort, $order);
+                $accessories = $accessories->orderBy($sort, $order);
                break;
        }

-    
+        $accessories->orderBy($sort, $order);
+
        $total = $accessories->count();
        $accessories = $accessories->skip($offset)->take($limit)->get();
        return (new AccessoriesTransformer)->transformAccessories($accessories, $total);
@@ -118,15 +76,14 @@ class AccessoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Accessory::class);
        $accessory = new Accessory;
        $accessory->fill($request->all());
-        $accessory = $request->handleImages($accessory);

        if ($accessory->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.create.success')));
@@ -175,40 +132,18 @@ class AccessoriesController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function checkedout($id, Request $request)
+    public function checkedout($id)
    {
        $this->authorize('view', Accessory::class);

-        $accessory = Accessory::with('lastCheckout')->findOrFail($id);
+        $accessory = Accessory::findOrFail($id);
        if (!Company::isCurrentUserHasAccess($accessory)) {
            return ['total' => 0, 'rows' => []];
        }
-
-        $offset = request('offset', 0);
-        $limit = request('limit', 50);
-
        $accessory_users = $accessory->users;
        $total = $accessory_users->count();

-        if($total < $offset){
-            $offset = 0;
-        }
-
-        $accessory_users = $accessory->users()->skip($offset)->take($limit)->get();
-
-        if ($request->filled('search')) {
-            $accessory_users = $accessory->users()
-                                         ->where(function ($query) use ($request) {
-                                             $search_str = '%' . $request->input('search') . '%';
-                                             $query->where('first_name', 'like', $search_str)
-                                                   ->orWhere('last_name', 'like', $search_str)
-                                                   ->orWhere('note', 'like', $search_str);
-                                         })
-                                         ->get();
-            $total = $accessory_users->count();
-        }
-
-        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $accessory_users, $total);
+        return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_users, $total);
    }


@@ -217,16 +152,15 @@ class AccessoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
-        $this->authorize('update', Accessory::class);
+        $this->authorize('edit', Accessory::class);
        $accessory = Accessory::findOrFail($id);
        $accessory->fill($request->all());
-        $accessory = $request->handleImages($accessory);

        if ($accessory->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.update.success')));
@@ -257,122 +191,4 @@ class AccessoriesController extends Controller
        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.delete.success')));

    }
-
-
-    /**
-     * Save the Accessory checkout information.
-     *
-     * If Slack is enabled and/or asset acceptance is enabled, it will also
-     * trigger a Slack message and send an email.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int  $accessoryId
-     * @return Redirect
-     */
-    public function checkout(Request $request, $accessoryId)
-    {
-        // Check if the accessory exists
-        if (is_null($accessory = Accessory::find($accessoryId))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
-        }
-
-        $this->authorize('checkout', $accessory);
-
-
-        if ($accessory->numRemaining() > 0) {
-
-            if (!$user = User::find($request->input('assigned_to'))) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.checkout.user_does_not_exist')));
-            }
-
-            // Update the accessory data
-            $accessory->assigned_to = $request->input('assigned_to');
-
-            $accessory->users()->attach($accessory->id, [
-                'accessory_id' => $accessory->id,
-                'created_at' => Carbon::now(),
-                'user_id' => Auth::id(),
-                'assigned_to' => $request->get('assigned_to'),
-                'note' => $request->get('note')
-            ]);
-
-            $accessory->logCheckout($request->input('note'), $user);
-
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.checkout.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No accessories remaining'));
-
-    }
-
-    /**
-     * Check in the item so that it can be checked out again to someone else
-     *
-     * @uses Accessory::checkin_email() to determine if an email can and should be sent
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param Request $request
-     * @param integer $accessoryUserId
-     * @param string $backto
-     * @return Redirect
-     * @internal param int $accessoryId
-     */
-    public function checkin(Request $request, $accessoryUserId = null)
-    {
-        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.does_not_exist')));
-        }
-
-        $accessory = Accessory::find($accessory_user->accessory_id);
-        $this->authorize('checkin', $accessory);
-
-        $logaction = $accessory->logCheckin(User::find($accessory_user->user_id), $request->input('note'));
-
-        // Was the accessory updated?
-        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
-            if (!is_null($accessory_user->assigned_to)) {
-                $user = User::find($accessory_user->assigned_to);
-            }
-
-            $data['log_id'] = $logaction->id;
-            $data['first_name'] = $user->first_name;
-            $data['last_name'] = $user->last_name;
-            $data['item_name'] = $accessory->name;
-            $data['checkin_date'] = $logaction->created_at;
-            $data['item_tag'] = '';
-            $data['note'] = $logaction->note;
-
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/accessories/message.checkin.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/accessories/message.checkin.error')));
-
-    }
-
-
-    /**
-    * Gets a paginated collection for the select2 menus
-    *
-    * @see \App\Http\Transformers\SelectlistTransformer
-    *
-    */
-    public function selectlist(Request $request)
-    {
-
-        $accessories = Accessory::select([
-            'accessories.id',
-            'accessories.name'
-        ]);
-
-        if ($request->filled('search')) {
-            $accessories = $accessories->where('accessories.name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $accessories = $accessories->orderBy('name', 'ASC')->paginate(50);
-
-
-        return (new SelectlistTransformer)->transformSelectlist($accessories);
-    }
-
-
-
 }
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -9,6 +9,7 @@ use App\Models\AssetMaintenance;
 use App\Models\Company;
 use Auth;
 use Carbon\Carbon;
+use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Input;

@@ -33,24 +34,18 @@ class AssetMaintenancesController extends Controller
     */
    public function index(Request $request)
    {
-        $this->authorize('view', Asset::class);
-        $maintenances = AssetMaintenance::with('asset', 'asset.model','asset.location', 'supplier', 'asset.company', 'admin');
+        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company', 'admin');

-        if ($request->filled('search')) {
-            $maintenances = $maintenances->TextSearch($request->input('search'));
+        if (Input::has('search')) {
+            $maintenances = $maintenances->TextSearch(e($request->input('search')));
        }

        if ($request->filled('asset_id')) {
            $maintenances->where('asset_id', '=', $request->input('asset_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 = (($maintenances) && ($request->get('offset') > $maintenances->count())) ? $maintenances->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0);
+        $limit = request('limit', 50);

        $allowed_columns = [
                                'id',
@@ -65,8 +60,8 @@ class AssetMaintenancesController extends Controller
                                'asset_name',
                                'user_id'
                            ];
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

        switch ($sort) {
            case 'user_id':
@@ -102,12 +97,11 @@ class AssetMaintenancesController extends Controller
     */
    public function store(Request $request)
    {
-        $this->authorize('update', Asset::class);
        // create a new model instance
        $assetMaintenance = new AssetMaintenance();
        $assetMaintenance->supplier_id = $request->input('supplier_id');
        $assetMaintenance->is_warranty = $request->input('is_warranty');
-        $assetMaintenance->cost =  Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost =  e($request->input('cost'));
        $assetMaintenance->notes = e($request->input('notes'));
        $asset = Asset::find(e($request->input('asset_id')));

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

@@ -165,7 +158,7 @@ class AssetMaintenancesController extends Controller

        $assetMaintenance->supplier_id = e($request->input('supplier_id'));
        $assetMaintenance->is_warranty = e($request->input('is_warranty'));
-        $assetMaintenance->cost =  Helper::ParseCurrency($request->input('cost'));
+        $assetMaintenance->cost =  Helper::ParseFloat(e($request->input('cost')));
        $assetMaintenance->notes = e($request->input('notes'));

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

@@ -245,7 +237,6 @@ class AssetMaintenancesController extends Controller
     */
    public function show($assetMaintenanceId)
    {
-        $this->authorize('view', Asset::class);
        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -1,16 +1,15 @@
 <?php
 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
+use App\Models\AssetModel;
+use App\Models\Asset;
 use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use Illuminate\Http\Request;
 use App\Http\Transformers\AssetModelsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Asset;
-use App\Models\AssetModel;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;
+

 /**
 * This class controls all actions related to asset models for
@@ -31,20 +30,7 @@ class AssetModelsController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', AssetModel::class);
-        $allowed_columns =
-            [
-                'id',
-                'image',
-                'name',
-                'model_number',
-                'eol',
-                'notes',
-                'created_at',
-                'manufacturer',
-                'requestable',
-                'assets_count',
-                'category'
-            ];
+        $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer','assets_count'];

        $assetmodels = AssetModel::select([
            'models.id',
@@ -52,7 +38,6 @@ class AssetModelsController extends Controller
            'models.name',
            'model_number',
            'eol',
-            'requestable',
            'models.notes',
            'models.created_at',
            'category_id',
@@ -67,7 +52,7 @@ class AssetModelsController extends Controller



-        if ($request->input('status')=='deleted') {
+        if ($request->filled('status')) {
            $assetmodels->onlyTrashed();
        }

@@ -75,13 +60,8 @@ class AssetModelsController extends Controller
            $assetmodels->TextSearch($request->input('search'));
        }

-        // 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 = (($assetmodels) && ($request->get('offset') > $assetmodels->count())) ? $assetmodels->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';

@@ -89,14 +69,13 @@ class AssetModelsController extends Controller
            case 'manufacturer':
                $assetmodels->OrderManufacturer($order);
                break;
-            case 'category':
-                $assetmodels->OrderCategory($order);
-                break;
            default:
                $assetmodels->orderBy($sort, $order);
                break;
        }

+
+
        $total = $assetmodels->count();
        $assetmodels = $assetmodels->skip($offset)->take($limit)->get();
        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
@@ -108,15 +87,14 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', AssetModel::class);
        $assetmodel = new AssetModel;
        $assetmodel->fill($request->all());
-        $assetmodel = $request->handleImages($assetmodel);

        if ($assetmodel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
@@ -161,29 +139,16 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', AssetModel::class);
        $assetmodel = AssetModel::findOrFail($id);
        $assetmodel->fill($request->all());
-        $assetmodel = $request->handleImages($assetmodel);
-        
-        /**
-         * Allow custom_fieldset_id to override and populate fieldset_id.
-         * This is stupid, but required for legacy API support.
-         *
-         * I have no idea why we manually overrode that field name
-         * in previous versions. I assume there was a good reason for
-         * it, but I'll be damned if I can think of one. - snipe
-         */
-        if ($request->filled('custom_fieldset_id')) {
-            $assetmodel->fieldset_id = $request->get("custom_fieldset_id");
-        }
-
+        $assetmodel->fieldset_id = $request->get("custom_fieldset_id");

        if ($assetmodel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.update.success')));
@@ -212,7 +177,7 @@ class AssetModelsController extends Controller

        if ($assetmodel->image) {
            try  {
-                Storage::disk('public')->delete('assetmodels/'.$assetmodel->image);
+                unlink(public_path().'/uploads/models/'.$assetmodel->image);
            } catch (\Exception $e) {
                \Log::info($e);
            }
@@ -234,7 +199,6 @@ class AssetModelsController extends Controller
    public function selectlist(Request $request)
    {

-        $this->authorize('view.selectlists');
        $assetmodels = AssetModel::select([
            'models.id',
            'models.name',
@@ -257,20 +221,20 @@ class AssetModelsController extends Controller
            $assetmodel->use_text = '';

            if ($settings->modellistCheckedValue('category')) {
-                $assetmodel->use_text .= (($assetmodel->category) ? $assetmodel->category->name.' - ' : '');
+                $assetmodel->use_text .= (($assetmodel->category) ? e($assetmodel->category->name).' - ' : '');
            }

            if ($settings->modellistCheckedValue('manufacturer')) {
-                $assetmodel->use_text .= (($assetmodel->manufacturer) ? $assetmodel->manufacturer->name.' ' : '');
+                $assetmodel->use_text .= (($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name).' ' : '');
            }

-            $assetmodel->use_text .=  $assetmodel->name;
+            $assetmodel->use_text .=  e($assetmodel->name);

            if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number!='')) {
-                $assetmodel->use_text .=  ' (#'.$assetmodel->model_number.')';
+                $assetmodel->use_text .=  ' (#'.e($assetmodel->model_number).')';
            }

-            $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null;
+            $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? url('/').'/uploads/models/'.$assetmodel->image : null;
        }

        return (new SelectlistTransformer)->transformSelectlist($assetmodels);
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1,36 +1,37 @@
 <?php
 namespace App\Http\Controllers\Api;

-use App\Events\CheckoutableCheckedIn;
-use Illuminate\Support\Facades\Gate;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\AssetRequest;
 use App\Http\Requests\AssetCheckoutRequest;
 use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\DepreciationReportTransformer;
-use App\Http\Transformers\LicensesTransformer;
-use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Company;
 use App\Models\CustomField;
-use App\Models\License;
 use App\Models\Location;
 use App\Models\Setting;
 use App\Models\User;
+use Artisan;
 use Auth;
 use Carbon\Carbon;
+use Config;
 use DB;
+use Gate;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 use Input;
+use Lang;
+use Log;
+use Mail;
 use Paginator;
+use Response;
 use Slack;
 use Str;
 use TCPDF;
 use Validator;
-use Route;
+use View;
+use App\Http\Transformers\SelectlistTransformer;


 /**
@@ -51,33 +52,10 @@ class AssetsController extends Controller
     * @since [v4.0]
     * @return JsonResponse
     */
-    public function index(Request $request, $audit = null) 
+    public function index(Request $request, $audit = null)
    {

-        \Log::debug(Route::currentRouteName());
-        $filter_non_deprecable_assets = false;
-
-        /**
-         * This looks MAD janky (and it is), but the AssetsController@index does a LOT of heavy lifting throughout the 
-         * app. This bit here just makes sure that someone without permission to view assets doesn't 
-         * end up with priv escalations because they asked for a different endpoint. 
-         * 
-         * Since we never gave the specification for which transformer to use before, it should default 
-         * gracefully to just use the AssetTransformer by default, which shouldn't break anything. 
-         * 
-         * It was either this mess, or repeating ALL of the searching and sorting and filtering code, 
-         * which would have been far worse of a mess. *sad face*  - snipe (Sept 1, 2021)
-         */
-        if (Route::currentRouteName()=='api.depreciation-report.index') {
-            $filter_non_deprecable_assets = true;
-            $transformer = 'App\Http\Transformers\DepreciationReportTransformer';
-            $this->authorize('reports.view');
-        } else {
-            $transformer = 'App\Http\Transformers\AssetsTransformer';
-            $this->authorize('index', Asset::class);          
-        }
-        
-       
+        $this->authorize('index', Asset::class);
        $settings = Setting::getSettings();

        $allowed_columns = [
@@ -116,28 +94,13 @@ class AssetsController extends Controller
        }

        $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
-            ->with('location', 'assetstatus', 'company', 'defaultLoc','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset','supplier'); //it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.
+            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
+                'model.category', 'model.manufacturer', 'model.fieldset','supplier');
+

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

-        if ($request->filled('rtd_location_id')) {
-            $assets->where('assets.rtd_location_id', '=', $request->input('rtd_location_id'));
-        }
-
        if ($request->filled('supplier_id')) {
            $assets->where('assets.supplier_id', '=', $request->input('supplier_id'));
        }
@@ -185,14 +144,8 @@ class AssetsController extends Controller

        $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
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($assets) && ($request->get('offset') > $assets->count())) ? $assets->count() : $request->get('offset', 0);
-
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

        // This is used by the audit reporting routes
@@ -217,7 +170,7 @@ class AssetsController extends Controller
        // I am sad. :(
        switch ($request->input('status')) {
            case 'Deleted':
-                $assets->onlyTrashed();
+                $assets->withTrashed()->Deleted();
                break;
            case 'Pending':
                $assets->join('status_labels AS status_alias',function ($join) {
@@ -286,7 +239,7 @@ class AssetsController extends Controller
            $assets->TextSearch($request->input('search'));
        }

-        
+
        // This is kinda gross, but we need to do this because the Bootstrap Tables
        // API passes custom field ordering as custom_fields.fieldname, and we have to strip
        // that out to let the default sorter below order them correctly on the assets table.
@@ -335,25 +288,7 @@ class AssetsController extends Controller

        $total = $assets->count();
        $assets = $assets->skip($offset)->take($limit)->get();
-        
-    
-        /**
-         * Include additional associated relationships
-         */  
-        if ($request->input('components')) {
-            $assets->loadMissing(['components' => function ($query) {
-                $query->orderBy('created_at', 'desc');
-            }]);
-        }
-
-        
-
-
-        /**
-         * 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.
-         */
-        return (new $transformer)->transformAssets($assets, $total, $request);
+        return (new AssetsTransformer)->transformAssets($assets, $total);
    }


@@ -365,11 +300,11 @@ class AssetsController extends Controller
     * @since [v4.2.1]
     * @return JsonResponse
     */
-    public function showByTag(Request $request, $tag)
+    public function showByTag($tag)
    {
-        if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag',$tag)->first()) {
+        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()->where('asset_tag',$tag)->first()) {
            $this->authorize('view', $asset);
-            return (new AssetsTransformer)->transformAsset($asset, $request);
+            return (new AssetsTransformer)->transformAsset($asset);
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

@@ -383,24 +318,19 @@ class AssetsController extends Controller
     * @since [v4.2.1]
     * @return JsonResponse
     */
-    public function showBySerial(Request $request, $serial)
+    public function showBySerial($serial)
    {
        $this->authorize('index', Asset::class);
+        if ($assets = Asset::with('assetstatus')->with('assignedTo')
+            ->withTrashed()->where('serial',$serial)->get()) {

-        $assets = Asset::with('assetstatus')->with('assignedTo');
-
-        if ($request->input('deleted', 'false') === 'true') {
-            $assets = $assets->withTrashed();
-        }
-
-        $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);
        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
+
    }

+
    /**
     * Returns JSON with information about an asset for detail view.
     *
@@ -409,24 +339,15 @@ class AssetsController extends Controller
     * @since [v4.0]
     * @return JsonResponse
     */
-    public function show(Request $request, $id)
+    public function show($id)
    {
-        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()
-            ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->findOrFail($id)) {
+        if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed()->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as userRequests_count')->findOrFail($id)) {
            $this->authorize('view', $asset);
-            return (new AssetsTransformer)->transformAsset($asset, $request->input('components') );
+            return (new AssetsTransformer)->transformAsset($asset);
        }


    }
-    public function licenses(Request $request, $id)
-    {
-        $this->authorize('view', Asset::class);
-        $this->authorize('view', License::class);
-        $asset = Asset::where('id', $id)->withTrashed()->first();
-        $licenses = $asset->licenses()->get();
-        return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
-     }


    /**
@@ -448,7 +369,7 @@ class AssetsController extends Controller
            'assets.assigned_to',
            'assets.assigned_type',
            'assets.status_id'
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(), 'company_id', 'assets');
+        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(),'company_id', 'assets');

        if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
            $assets = $assets->RTD();
@@ -490,11 +411,11 @@ class AssetsController extends Controller
     * Accepts a POST request to create a new asset
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param \App\Http\Requests\ImageUploadRequest $request
+     * @param Request $request
     * @since [v4.0]
     * @return JsonResponse
     */
-    public function store(ImageUploadRequest $request)
+    public function store(AssetRequest $request)
    {

        $this->authorize('create', Asset::class);
@@ -515,59 +436,25 @@ class AssetsController extends Controller
        $asset->depreciate              = '0';
        $asset->status_id               = $request->get('status_id', 0);
        $asset->warranty_months         = $request->get('warranty_months', null);
-        $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_cost           = Helper::ParseFloat($request->get('purchase_cost'));
        $asset->purchase_date           = $request->get('purchase_date', null);
        $asset->assigned_to             = $request->get('assigned_to', null);
        $asset->supplier_id             = $request->get('supplier_id', 0);
        $asset->requestable             = $request->get('requestable', 0);
        $asset->rtd_location_id         = $request->get('rtd_location_id', null);
-        $asset->location_id             = $request->get('rtd_location_id', null);
-
-        /**
-        * this is here just legacy reasons. Api\AssetController
-        * used image_source  once to allow encoded image uploads.
-        */
-        if ($request->has('image_source')) {
-            $request->offsetSet('image', $request->offsetGet('image_source'));
-        }     
-
-        $asset = $request->handleImages($asset);

        // Update custom fields in the database.
        // Validation for these fields is handled through the AssetRequest form request
        $model = AssetModel::find($request->get('model_id'));
        if (($model) && ($model->fieldset)) {
            foreach ($model->fieldset->fields as $field) {
-
-                // Set the field value based on what was sent in the request
-                $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->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')));
-                }
-
-                // if the field is set to encrypted, make sure we encrypt the value
-                if ($field->field_encrypted == '1') {
-
-                    \Log::debug('This model field is encrypted in this fieldset.');
-
+                if ($field->field_encrypted=='1') {
                    if (Gate::allows('admin')) {
-
-                        // If input value is null, use custom field's default value
-                        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->convertUnicodeDbSlug()));
-                        }
+                        $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug()));
                    }
+                } else {
+                    $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug());
                }
-
-
-                $asset->{$field->convertUnicodeDbSlug()} = $field_val;
-
            }
        }

@@ -583,11 +470,6 @@ class AssetsController extends Controller
            if (isset($target)) {
                $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
            }
-
-            if ($asset->image) {
-                $asset->image = $asset->getImageUrl();
-            }
-
            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));
        }

@@ -599,37 +481,25 @@ class AssetsController extends Controller
     * Accepts a POST request to update an asset
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param \App\Http\Requests\ImageUploadRequest $request
+     * @param Request $request
     * @since [v4.0]
     * @return JsonResponse
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Asset::class);

        if ($asset = Asset::find($id)) {
+
            $asset->fill($request->all());

            ($request->filled('model_id')) ?
                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : null;
-            ($request->filled('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : '';
            ($request->filled('company_id')) ?
-                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
-
+                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : null;
            ($request->filled('rtd_location_id')) ?
                $asset->location_id = $request->get('rtd_location_id') : null;

-            /**
-            * this is here just legacy reasons. Api\AssetController
-            * used image_source  once to allow encoded image uploads.
-            */
-            if ($request->has('image_source')) {
-                $request->offsetSet('image', $request->offsetGet('image_source'));
-            }     
-
-            $asset = $request->handleImages($asset); 
-            
            // Update custom fields
            if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
                foreach ($model->fieldset->fields as $field) {
@@ -649,13 +519,9 @@ class AssetsController extends Controller
            if ($asset->save()) {

                if (($request->filled('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
-                        $location = $target->location_id;
+                    $location = $target->location_id;
                } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
                    $location = $target->location_id;
-
-                    Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $id)
-                        ->update(['location_id' => $target->location_id]);
-
                } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                    $location = $target->id;
                }
@@ -664,10 +530,6 @@ class AssetsController extends Controller
                    $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset update', e($request->get('name')), $location);
                }

-                if ($asset->image) {
-                    $asset->image = $asset->getImageUrl();
-                }
-
                return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
            }
            return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -704,39 +566,6 @@ class AssetsController extends Controller
        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
    }

-    
-
-    /**
-     * Restore a soft-deleted asset.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param int $assetId
-     * @since [v5.1.18]
-     * @return JsonResponse
-     */
-    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();
-
-            $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', null, trans('admin/hardware/message.restore.success')));
-        
-
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-    }
-


    /**
@@ -776,21 +605,20 @@ class AssetsController extends Controller
            $target = Asset::where('id','!=',$asset_id)->find(request('assigned_asset'));
            $asset->location_id = $target->rtd_location_id;
            // Override with the asset's location_id if it has one
-            $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : '';
+            if ($target->location_id!='') {
+                $asset->location_id = ($target) ? $target->location_id : '';
+            }
            $error_payload['target_id'] = $request->input('assigned_asset');
            $error_payload['target_type'] = 'asset';

        } elseif (request('checkout_to_type')=='user') {
            // Fetch the target and set the asset's new location_id
            $target = User::find(request('assigned_user'));
-            $asset->location_id = (($target) && (isset($target->location_id))) ? $target->location_id : '';
+            $asset->location_id = ($target) ? $target->location_id : '';
            $error_payload['target_id'] = $request->input('assigned_user');
            $error_payload['target_type'] = 'user';
        }

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


        if (!isset($target)) {
@@ -805,13 +633,11 @@ class AssetsController extends Controller
        $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.
-        // TODO: Follow up here. WTF. Commented out for now. 
+        if ($asset->rtd_location_id!='') {
+            $asset->location_id = $target->rtd_location_id;
+        }


-//        if ((isset($target->rtd_location_id)) && ($asset->rtd_location_id!='')) {
-//            $asset->location_id = $target->rtd_location_id;
-//        }



@@ -819,7 +645,7 @@ class AssetsController extends Controller
            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
        }

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


@@ -848,33 +674,23 @@ class AssetsController extends Controller
        $asset->assigned_to = null;
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;
-
-        if ($request->filled('name')) {
-            $asset->name = $request->input('name');
-        }
-        
+        $asset->name = Input::get('name');
        $asset->location_id =  $asset->rtd_location_id;

        if ($request->filled('location_id')) {
            $asset->location_id =  $request->input('location_id');
        }

-        if ($request->has('status_id')) {
-            $asset->status_id =  $request->input('status_id');
-        }
-
-        $checkin_at = null;
-        if ($request->filled('checkin_at')) {
-            $checkin_at = $request->input('checkin_at');
+        if (Input::has('status_id')) {
+            $asset->status_id =  Input::get('status_id');
        }

        if ($asset->save()) {
-            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at));
-
+            $asset->logCheckin($target, e(request('note')));
            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
        }

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


@@ -901,40 +717,26 @@ class AssetsController extends Controller
            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
        }

-        $settings = Setting::getSettings();
-        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
-
        $asset = Asset::where('asset_tag','=', $request->input('asset_tag'))->first();


        if ($asset) {
            // We don't want to log this as a normal update, so let's bypass that
            $asset->unsetEventDispatcher();
-            $asset->next_audit_date = $dt;
-
-            if ($request->filled('next_audit_date')) {
-                $asset->next_audit_date = $request->input('next_audit_date');
-            }
-
-            // Check to see if they checked the box to update the physical location,
-            // not just note it in the audit notes
-            if ($request->input('update_location')=='1') {
-                $asset->location_id = $request->input('location_id');
-            }
-
-            $asset->last_audit_date = date('Y-m-d H:i:s');
+            $asset->next_audit_date = $request->input('next_audit_date');
+            $asset->last_audit_date = date('Y-m-d h:i:s');

            if ($asset->save()) {
                $log = $asset->logAudit(request('note'),request('location_id'));
                return response()->json(Helper::formatStandardApiResponse('success', [
                    'asset_tag'=> e($asset->asset_tag),
                    'note'=> e($request->input('note')),
-                    'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date)
+                    'next_audit_date' => Helper::getFormattedDateObject($log->calcNextAuditDate())
                ], trans('admin/hardware/message.audit.success')));
            }
        }

-        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.$request->input('asset_tag').' not found'));



--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -2,14 +2,12 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Category;
 use App\Http\Transformers\CategoriesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Category;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;

 class CategoriesController extends Controller
 {
@@ -32,13 +30,8 @@ class CategoriesController extends Controller
            $categories = $categories->TextSearch($request->input('search'));
        }

-        // 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);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
        $categories->orderBy($sort, $order);
@@ -55,16 +48,14 @@ class CategoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Category::class);
        $category = new Category;
        $category->fill($request->all());
-        $category->category_type = strtolower($request->input('category_type'));
-        $category = $request->handleImages($category);

        if ($category->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.create.success')));
@@ -95,17 +86,15 @@ class CategoriesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Category::class);
        $category = Category::findOrFail($id);
        $category->fill($request->all());
-        $category->category_type = strtolower($request->input('category_type'));
-        $category = $request->handleImages($category);

        if ($category->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $category, trans('admin/categories/message.update.success')));
@@ -127,10 +116,14 @@ class CategoriesController extends Controller
        $this->authorize('delete', Category::class);
        $category = Category::findOrFail($id);

-        if (!$category->isDeletable()) {
-            return response()->json(
-                Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>$category->category_type]))
-            );
+        if ($category->has_models() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'model'])));
+        } elseif ($category->accessories()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'accessory'])));
+        } elseif ($category->consumables()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'consumable'])));
+        } elseif ($category->components()->count() > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/categories/message.assoc_items', ['asset_type'=>'component'])));
        }
        $category->delete();
        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/categories/message.delete.success')));
@@ -148,7 +141,7 @@ class CategoriesController extends Controller
     */
    public function selectlist(Request $request, $category_type = 'asset')
    {
-        $this->authorize('view.selectlists');
+
        $categories = Category::select([
            'id',
            'name',
@@ -165,7 +158,7 @@ class CategoriesController extends Controller
        // This lets us have more flexibility in special cases like assets, where
        // they may not have a ->name value but we want to display something anyway
        foreach ($categories as $category) {
-            $category->use_image = ($category->image) ? Storage::disk('public')->url('categories/'.$category->image, $category->image) : null;
+            $category->use_image = ($category->image) ? url('/').'/uploads/categories/'.$category->image : null;
        }

        return (new SelectlistTransformer)->transformSelectlist($categories);
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -2,14 +2,12 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
 use App\Http\Transformers\CompaniesTransformer;
-use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Company;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Company;
+use App\Http\Transformers\SelectlistTransformer;

 class CompaniesController extends Controller
 {
@@ -43,13 +41,8 @@ class CompaniesController extends Controller
            $companies->TextSearch($request->input('search'));
        }

-        // 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);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
        $companies->orderBy($sort, $order);
@@ -66,16 +59,15 @@ class CompaniesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Company::class);
        $company = new Company;
        $company->fill($request->all());
-        $company = $request->handleImages($company);
-        
+
        if ($company->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', (new CompaniesTransformer)->transformCompany($company), trans('admin/companies/message.create.success')));
        }
@@ -106,16 +98,15 @@ class CompaniesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Company::class);
        $company = Company::findOrFail($id);
        $company->fill($request->all());
-        $company = $request->handleImages($company);

        if ($company->save()) {
            return response()
@@ -136,17 +127,28 @@ class CompaniesController extends Controller
     */
    public function destroy($id)
    {
-        $this->authorize('delete', Company::class);
-        $company = Company::findOrFail($id);
-        $this->authorize('delete', $company);
+       $this->authorize('delete', Company::class);
+       $company = Company::findOrFail($id);
+            $this->authorize('delete', $company);

-        if ( !$company->isDeletable() ) {
+        try {
+            $company->delete();
            return response()
+                ->json(Helper::formatStandardApiResponse('success', null,  trans('admin/companies/message.delete.success')));
+        } catch (\Illuminate\Database\QueryException $exception) {
+            /*
+                 * NOTE: This happens when there's a foreign key constraint violation
+                 * For example when rows in other tables are referencing this company
+                 */
+            if ($exception->getCode() == 23000) {
+                return response()
                    ->json(Helper::formatStandardApiResponse('error', null,  trans('admin/companies/message.assoc_users')));
+
+            } else {
+                throw $exception;
+            }
        }
-        $company->delete();
-        return response()
-            ->json(Helper::formatStandardApiResponse('success', null,  trans('admin/companies/message.delete.success')));
+
    }

    /**
@@ -159,7 +161,7 @@ class CompaniesController extends Controller
     */
    public function selectlist(Request $request)
    {
-        $this->authorize('view.selectlists');
+
        $companies = Company::select([
            'companies.id',
            'companies.name',
@@ -176,7 +178,7 @@ class CompaniesController extends Controller
        // This lets us have more flexibility in special cases like assets, where
        // they may not have a ->name value but we want to display something anyway
        foreach ($companies as $company) {
-            $company->use_image = ($company->image) ? Storage::disk('public')->url('companies/'.$company->image, $company->image) : null;
+            $company->use_image = ($company->image) ? url('/').'/uploads/companies/'.$company->image : null;
        }

        return (new SelectlistTransformer)->transformSelectlist($companies);
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -2,16 +2,14 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\ComponentsTransformer;
-use App\Models\Company;
-use App\Models\Component;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use App\Events\CheckoutableCheckedIn;
-use App\Events\ComponentCheckedIn;
-use App\Models\Asset;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\AssetsTransformer;
+use App\Http\Transformers\ComponentsTransformer;
+use App\Http\Transformers\ComponentsAssetsTransformer;
+use App\Models\Component;
+use App\Models\Company;
+use App\Helpers\Helper;

 class ComponentsController extends Controller
 {
@@ -26,26 +24,8 @@ class ComponentsController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Component::class);
-
-        // 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 = 
-            [
-                'id',
-                'name',
-                'min_amt',
-                'order_number',
-                'serial',
-                'purchase_date',
-                'purchase_cost',
-                'qty',
-                'image',
-                'notes',
-            ];
-
-
        $components = Company::scopeCompanyables(Component::select('components.*')
-            ->with('company', 'location', 'category', 'assets'));
+            ->with('company', 'location', 'category'));

        if ($request->filled('search')) {
            $components = $components->TextSearch($request->input('search'));
@@ -63,23 +43,14 @@ class ComponentsController extends Controller
            $components->where('location_id','=',$request->input('location_id'));
        }

-        if ($request->filled('notes')) {
-            $components->where('notes','=',$request->input('notes'));
-        }
+        $offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0);
+        $limit = request('limit', 50);

-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
-        
+        $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image'];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort_override =  $request->input('sort');
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

-        switch ($sort_override) {
+        switch ($sort) {
            case 'category':
                $components = $components->OrderCategory($order);
                break;
@@ -90,7 +61,7 @@ class ComponentsController extends Controller
                $components = $components->OrderCompany($order);
                break;
            default:
-                $components = $components->orderBy($column_sort, $order);
+                $components = $components->orderBy($sort, $order);
                break;
        }

@@ -105,15 +76,14 @@ class ComponentsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Component::class);
        $component = new Component;
        $component->fill($request->all());
-        $component = $request->handleImages($component);

        if ($component->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.create.success')));
@@ -144,17 +114,15 @@ class ComponentsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param   \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Component::class);
        $component = Component::findOrFail($id);
        $component->fill($request->all());
-        $component = $request->handleImages($component);
-        

        if ($component->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $component, trans('admin/components/message.update.success')));
@@ -202,119 +170,4 @@ class ComponentsController extends Controller
        $assets = $assets->skip($offset)->take($limit)->get();
        return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
    }
-
-
-    /**
-     * Validate and checkout the component.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * t
-     * @since [v5.1.8]
-     * @param Request $request
-     * @param int $componentId
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function checkout(Request $request, $componentId)
-    {
-        // Check if the component exists
-        if (is_null($component = Component::find($componentId))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.does_not_exist')));
-        }
-
-        $this->authorize('checkout', $component);
-
-
-        if ($component->numRemaining() >= $request->get('assigned_qty')) {
-
-            if (!$asset = Asset::find($request->input('assigned_to'))) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')));
-            }
-
-            // Update the accessory data
-            $component->assigned_to = $request->input('assigned_to');
-
-            $component->assets()->attach($component->id, [
-                'component_id' => $component->id,
-                'created_at' => \Carbon::now(),
-                'assigned_qty' => $request->get('assigned_qty', 1),
-                'user_id' => \Auth::id(),
-                'asset_id' => $request->get('assigned_to')
-            ]);
-
-            $component->logCheckout($request->input('note'), $asset);
-
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/components/message.checkout.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Not enough components remaining: '.$component->numRemaining().' remaining, '.$request->get('assigned_qty').' requested.'));
-    }
-
-    /**
-     * Validate and store checkin data.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.1.8]
-     * @param Request $request
-     * @param $component_asset_id
-     * @return \Illuminate\Http\RedirectResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function checkin(Request $request, $component_asset_id)
-    {
-        if ($component_assets = \DB::table('components_assets')->find($component_asset_id)) {
-
-            if (is_null($component = Component::find($component_assets->component_id))) {
-
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/components/message.not_found')));
-            }
-
-            $this->authorize('checkin', $component);
-
-            $max_to_checkin = $component_assets->assigned_qty;
-
-            if ($max_to_checkin > 1) {
-                
-                $validator = \Validator::make($request->all(), [
-                    "checkin_qty" => "required|numeric|between:1,$max_to_checkin"
-                ]);
-    
-                if ($validator->fails()) {
-                    return response()->json(Helper::formatStandardApiResponse('error', null, 'Checkin quantity must be between 1 and '.$max_to_checkin));
-                }
-            }
-            
-
-            // Validation passed, so let's figure out what we have to do here.
-            $qty_remaining_in_checkout = ($component_assets->assigned_qty - (int)$request->input('checkin_qty', 1));
-
-            // We have to modify the record to reflect the new qty that's
-            // actually checked out.
-            $component_assets->assigned_qty = $qty_remaining_in_checkout;
-
-            \Log::debug($component_asset_id.' - '.$qty_remaining_in_checkout.' remaining in record '.$component_assets->id);
-            
-            \DB::table('components_assets')->where('id',
-                $component_asset_id)->update(['assigned_qty' => $qty_remaining_in_checkout]);
-
-            // If the checked-in qty is exactly the same as the assigned_qty,
-            // we can simply delete the associated components_assets record
-            if ($qty_remaining_in_checkout == 0) {
-                \DB::table('components_assets')->where('id', '=', $component_asset_id)->delete();
-            }
-            
-
-            $asset = Asset::find($component_assets->asset_id);
-
-            event(new CheckoutableCheckedIn($component, $asset, \Auth::user(), $request->input('note'), \Carbon::now()));
-
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/components/message.checkin.success')));
-
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No matching checkouts for that component join record'));
-
-    
-    }
-
 }
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -2,15 +2,12 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\ConsumablesTransformer;
-use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
 use App\Models\Consumable;
-use App\Models\User;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\ConsumablesTransformer;
+use App\Helpers\Helper;

 class ConsumablesController extends Controller
 {
@@ -25,27 +22,6 @@ class ConsumablesController extends Controller
    public function index(Request $request)
    {
        $this->authorize('index', Consumable::class);
-
-        // 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 = 
-            [
-                'id',
-                'name',
-                'order_number',
-                'min_amt',
-                'purchase_date',
-                'purchase_cost',
-                'company',
-                'category',
-                'model_number', 
-                'item_no', 
-                'qty',
-                'image',
-                'notes',
-                ];
-
-
        $consumables = Company::scopeCompanyables(
            Consumable::select('consumables.*')
                ->with('company', 'location', 'category', 'users', 'manufacturer')
@@ -63,38 +39,19 @@ class ConsumablesController extends Controller
            $consumables->where('category_id','=',$request->input('category_id'));
        }

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

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

-        if ($request->filled('notes')) {
-            $consumables->where('notes','=',$request->input('notes'));
-        }
-
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($consumables) && ($request->get('offset') > $consumables->count())) ? $consumables->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
-        
+        $offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0);
+        $limit = request('limit', 50);
+        $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image'];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-        $sort_override =  $request->input('sort');
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'created_at';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';


-        switch ($sort_override) {
+        switch ($sort) {
            case 'category':
                $consumables = $consumables->OrderCategory($order);
                break;
@@ -108,7 +65,7 @@ class ConsumablesController extends Controller
                $consumables = $consumables->OrderCompany($order);
                break;
            default:
-                $consumables = $consumables->orderBy($column_sort, $order);
+                $consumables = $consumables->orderBy($sort, $order);
                break;
        }

@@ -126,15 +83,14 @@ class ConsumablesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Consumable::class);
        $consumable = new Consumable;
        $consumable->fill($request->all());
-        $consumable = $request->handleImages($consumable);

        if ($consumable->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.create.success')));
@@ -162,17 +118,16 @@ class ConsumablesController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request $request
     * @param  int $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Consumable::class);
        $consumable = Consumable::findOrFail($id);
        $consumable->fill($request->all());
-        $consumable = $request->handleImages($consumable);
-        
+
        if ($consumable->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $consumable, trans('admin/consumables/message.update.success')));
        }
@@ -197,11 +152,11 @@ class ConsumablesController extends Controller
        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/consumables/message.delete.success')));
    }

-    /**
+        /**
    * Returns a JSON response containing details on the users associated with this consumable.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see \App\Http\Controllers\Consumables\ConsumablesController::getView() method that returns the form.
+    * @see ConsumablesController::getView() method that returns the form.
    * @since [v1.0]
    * @param int $consumableId
    * @return array
@@ -236,79 +191,4 @@ class ConsumablesController extends Controller
        $data = array('total' => $consumableCount, 'rows' => $rows);
        return $data;
    }
-
-    /**
-     * Checkout a consumable
-     *
-     * @author [A. Gutierrez] [<andres@baller.tv>]
-     * @param int $id
-     * @since [v4.9.5]
-     * @return JsonResponse
-     */
-    public function checkout(Request $request, $id)
-    {
-        // Check if the consumable exists
-        if (is_null($consumable = Consumable::find($id))) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.does_not_exist')));
-        }
-
-        $this->authorize('checkout', $consumable);
-
-        if ($consumable->qty > 0) {
-
-            // Check if the user exists
-            $assigned_to = $request->input('assigned_to');
-            if (is_null($user = User::find($assigned_to))) {
-                // Return error message
-                return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
-            }
-
-            // Update the consumable data
-            $consumable->assigned_to = e($assigned_to);
-
-            $consumable->users()->attach($consumable->id, [
-                'consumable_id' => $consumable->id,
-                'user_id' => $user->id,
-                'assigned_to' => $assigned_to
-            ]);
-
-            // Log checkout event
-            $logaction = $consumable->logCheckout(e($request->input('note')), $user);
-            $data['log_id'] = $logaction->id;
-            $data['eula'] = $consumable->getEula();
-            $data['first_name'] = $user->first_name;
-            $data['item_name'] = $consumable->name;
-            $data['checkout_date'] = $logaction->created_at;
-            $data['note'] = $logaction->note;
-            $data['require_acceptance'] = $consumable->requireAcceptance();
-
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/consumables/message.checkout.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No consumables remaining'));
-    }
-
-    /**
-    * Gets a paginated collection for the select2 menus
-    *
-    * @see \App\Http\Transformers\SelectlistTransformer
-    *
-    */
-    public function selectlist(Request $request)
-    {
-
-        $consumables = Consumable::select([
-            'consumables.id',
-            'consumables.name'
-        ]);
-
-        if ($request->filled('search')) {
-            $consumables = $consumables->where('consumables.name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $consumables = $consumables->orderBy('name', 'ASC')->paginate(50);
-
-
-        return (new SelectlistTransformer)->transformSelectlist($consumables);
-    }
 }
--- a/app/Http/Controllers/Api/CustomFieldsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsController.php
@@ -9,6 +9,7 @@ use App\Models\CustomField;
 use App\Models\CustomFieldset;
 use Illuminate\Http\Request;
 use Validator;
+use Illuminate\Validation\Rule;

 class CustomFieldsController extends Controller
 {
@@ -23,7 +24,7 @@ class CustomFieldsController extends Controller

    public function index()
    {
-        $this->authorize('index', CustomField::class);
+        $this->authorize('index', CustomFields::class);
        $fields = CustomField::get();
        return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count());
    }
@@ -37,7 +38,7 @@ class CustomFieldsController extends Controller
    */
    public function show($id)
    {
-      $this->authorize('view', CustomField::class);
+      $this->authorize('show', CustomField::class);
        if ($field = CustomField::find($id)) {
            return (new CustomFieldsTransformer)->transformCustomField($field);
        }
@@ -58,9 +59,9 @@ class CustomFieldsController extends Controller
    {
        $this->authorize('update', CustomField::class);
        $field = CustomField::findOrFail($id);
-
+        
        /**
-         * Updated values for the field,
+         * Updated values for the field, 
         * without the "field_encrypted" flag, preventing the change of encryption status
         * @var array
         */
@@ -95,14 +96,7 @@ class CustomFieldsController extends Controller
        $field = new CustomField;

        $data = $request->all();
-        $regex_format = null;
-        
-        if (str_contains($data["format"], "regex:")){
-            $regex_format = $data["format"];
-        }
-
-        $validator = Validator::make($data, $field->validationRules($regex_format));
-
+        $validator = Validator::make($data, $field->validationRules());
        if ($validator->fails()) {
            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()));
        }
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -1,14 +1,22 @@
 <?php
 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\CustomFieldsetsTransformer;
-use App\Http\Transformers\CustomFieldsTransformer;
-use App\Models\CustomFieldset;
-use Illuminate\Http\Request;
-use Redirect;
 use View;
+use App\Models\CustomFieldset;
+use App\Models\CustomField;
+use Input;
+use Validator;
+use Redirect;
+use App\Models\AssetModel;
+use Lang;
+use Auth;
+use Illuminate\Http\Request;
+use Log;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Http\Transformers\CustomFieldsTransformer;
+use App\Http\Transformers\CustomFieldsetsTransformer;
+use App\Http\Requests\AssetRequest;

 /**
 * This controller handles all actions related to Custom Asset Fieldsets for
@@ -50,7 +58,7 @@ class CustomFieldsetsController extends Controller
    */
    public function show($id)
    {
-      $this->authorize('view', CustomFieldset::class);
+      $this->authorize('show', CustomFieldset::class);
        if ($fieldset = CustomFieldset::find($id)) {
            return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset);
        }
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -2,22 +2,20 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\DepartmentsTransformer;
-use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Department;
-use Auth;
 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;
+use App\Http\Controllers\Controller;
+use App\Models\Department;
+use App\Http\Transformers\DepartmentsTransformer;
+use App\Helpers\Helper;
+use Auth;
+use App\Http\Transformers\SelectlistTransformer;

 class DepartmentsController extends Controller
 {
    /**
     * Display a listing of the resource.
     *
-     * @author [Godfrey Martinez] [<snipe@snipe.net>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
     * @return \Illuminate\Http\Response
     */
@@ -41,13 +39,8 @@ class DepartmentsController extends Controller
            $departments = $departments->TextSearch($request->input('search'));
        }

-        // 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);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

@@ -74,16 +67,14 @@ class DepartmentsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Department::class);
        $department = new Department;
        $department->fill($request->all());
-        $department = $request->handleImages($department);
-
        $department->user_id = Auth::user()->id;
        $department->manager_id = ($request->filled('manager_id' ) ? $request->input('manager_id') : null);

@@ -109,37 +100,14 @@ class DepartmentsController extends Controller
        return (new DepartmentsTransformer)->transformDepartment($department);
    }

-    /**
-     * Update the specified resource in storage.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(ImageUploadRequest $request, $id)
-    {
-        $this->authorize('update', Department::class);
-        $department = Department::findOrFail($id);
-        $department->fill($request->all());
-        $department = $request->handleImages($department);
-
-        if ($department->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $department, trans('admin/departments/message.update.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, $department->getErrors()));
-    }
-


    /**
-     * Validates and deletes selected department.
+     * Validates and deletes selected location.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $locationId
-     * @since [v4.0]
+     * @since [v1.0]
     * @return \Illuminate\Http\RedirectResponse
     */
    public function destroy($id)
@@ -168,7 +136,6 @@ class DepartmentsController extends Controller
    public function selectlist(Request $request)
    {

-        $this->authorize('view.selectlists');
        $departments = Department::select([
            'id',
            'name',
@@ -185,7 +152,7 @@ class DepartmentsController extends Controller
        // This lets us have more flexibility in special cases like assets, where
        // they may not have a ->name value but we want to display something anyway
        foreach ($departments as $department) {
-            $department->use_image = ($department->image) ? Storage::disk('public')->url('departments/'.$department->image, $department->image) : null;
+            $department->use_image = ($department->image) ? url('/').'/uploads/departments/'.$department->image : null;
        }

        return (new SelectlistTransformer)->transformSelectlist($departments);
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -2,11 +2,11 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\DepreciationsTransformer;
-use App\Models\Depreciation;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Depreciation;
+use App\Http\Transformers\DepreciationsTransformer;

 class DepreciationsController extends Controller
 {
@@ -20,21 +20,16 @@ class DepreciationsController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Depreciation::class);
-        $allowed_columns = ['id','name','months','depreciation_min','created_at'];
+        $allowed_columns = ['id','name','created_at'];

-        $depreciations = Depreciation::select('id','name','months','depreciation_min','user_id','created_at','updated_at');
+        $depreciations = Depreciation::select('id','name','months','user_id','created_at','updated_at');

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

-        // 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 = (($depreciations) && ($request->get('offset') > $depreciations->count())) ? $depreciations->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
        $depreciations->orderBy($sort, $order);
@@ -115,10 +110,10 @@ class DepreciationsController extends Controller
    public function destroy($id)
    {
        $this->authorize('delete', Depreciation::class);
-        $depreciation = Depreciation::withCount('models as models_count')->findOrFail($id);
+        $depreciation = Depreciation::findOrFail($id);
        $this->authorize('delete', $depreciation);

-        if ($depreciation->models_count > 0) {
+        if ($depreciation->has_models() > 0) {
            return response()->json(Helper::formatStandardApiResponse('error', trans('admin/depreciations/message.assoc_users')));
        }

--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -2,11 +2,11 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\GroupsTransformer;
-use App\Models\Group;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Group;
+use App\Http\Transformers\GroupsTransformer;

 class GroupsController extends Controller
 {
@@ -28,13 +28,8 @@ class GroupsController extends Controller
            $groups = $groups->TextSearch($request->input('search'));
        }

-        // 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);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
        $groups->orderBy($sort, $order);
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -6,15 +6,15 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ItemImportRequest;
 use App\Http\Transformers\ImportsTransformer;
-use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
-use Artisan;
-use Illuminate\Support\Facades\Request;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Session;
-use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Artisan;
+use App\Models\Asset;

 class ImportController extends Controller
 {
@@ -41,7 +41,7 @@ class ImportController extends Controller
    {
        $this->authorize('import');
        if (!config('app.lock_passwords')) {
-            $files = Request::file('files');
+            $files = Input::file('files');
            $path = config('app.private_uploads').'/imports';
            $results = [];
            $import = new Import;
@@ -49,12 +49,10 @@ class ImportController extends Controller
                if (!in_array($file->getMimeType(), array(
                    'application/vnd.ms-excel',
                    'text/csv',
-                    'application/csv',
-                    'text/x-Algol68', // because wtf CSV files?
                    'text/plain',
                    'text/comma-separated-values',
                    'text/tsv'))) {
-                    $results['error']='File type must be CSV. Uploaded file is '.$file->getMimeType();
+                    $results['error']='File type must be CSV';
                    return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
                }

@@ -114,21 +112,14 @@ class ImportController extends Controller
    /**
     * Processes the specified Import.
     *
-     * @param  int  $import_id
+     * @param  \App\Import  $import
     * @return \Illuminate\Http\Response
     */
    public function process(ItemImportRequest $request, $import_id)
    {
        $this->authorize('import');
-
        // Run a backup immediately before processing
-        if ($request->has('run-backup')) {
-            \Log::debug('Backup manually requested via importer');
-            Artisan::call('backup:run');
-        } else {
-            \Log::debug('NO BACKUP requested via importer');
-        }
-
+        Artisan::call('backup:run');
        $errors = $request->import(Import::find($import_id));
        $redirectTo = "hardware.index";
        switch ($request->get('import-type')) {
@@ -164,26 +155,19 @@ class ImportController extends Controller
    /**
     * Remove the specified resource from storage.
     *
-     * @param  int  $import_id
+     * @param  \App\Import  $import
     * @return \Illuminate\Http\Response
     */
    public function destroy($import_id)
    {
-        $this->authorize('create', Asset::class);
-        
-        if ($import = Import::find($import_id)) {
-            try {
-                // Try to delete the file
-                Storage::delete('imports/'.$import->file_path);
-                $import->delete();
-                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.import.file_delete_success')));
-
-            } catch (\Exception $e) {
-                // If the file delete didn't work, remove it from the database anyway and return a warning
-                $import->delete();
-                return response()->json(Helper::formatStandardApiResponse('warning', null, trans('admin/hardware/message.import.file_not_deleted_warning')));
-            }
+        $this->authorize('import');
+        $import = Import::find($import_id);
+        try {
+            unlink(config('app.private_uploads').'/imports/'.$import->file_path);
+            $import->delete();
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.import.file_delete_success')));
+        } catch (\Exception $e) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.import.file_delete_error')), 500);
        }
-
    }
 }
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -1,141 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\LicenseSeatsTransformer;
-use App\Models\Asset;
-use App\Models\License;
-use App\Models\LicenseSeat;
-use App\Models\User;
-use Auth;
-use Illuminate\Http\Request;
-
-class LicenseSeatsController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $licenseId
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request, $licenseId)
-    {
-        //
-        if ($license = License::find($licenseId)) {
-            $this->authorize('view', $license);
-
-            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department')
-                ->where('license_seats.license_id', $licenseId);
-
-            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-
-            if ($request->input('sort')=='department') {
-                $seats->OrderDepartments($order);
-            } else {
-                $seats->orderBy('id', $order);
-            }
-
-            $total = $seats->count();
-            $offset = (($seats) && (request('offset') > $total)) ? 0 : request('offset', 0);
-            $limit = request('limit', 50);
-            
-            $seats = $seats->skip($offset)->take($limit)->get();
-
-            if ($seats) {
-                return (new LicenseSeatsTransformer)->transformLicenseSeats($seats, $total);
-            }
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.does_not_exist')), 200);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $licenseId
-     * @param  int  $seatId
-     * @return \Illuminate\Http\Response
-     */
-    public function show($licenseId, $seatId)
-    {
-        //
-        $this->authorize('view', License::class);
-        // sanity checks:
-        // 1. does the license seat exist?
-        if (!$licenseSeat = LicenseSeat::find($seatId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
-        }
-        // 2. does the seat belong to the specified license?
-        if (!$license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
-        }
-        return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $licenseId
-     * @param  int  $seatId
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $licenseId, $seatId)
-    {
-        $this->authorize('checkout', License::class);
-
-        // sanity checks:
-        // 1. does the license seat exist?
-        if (!$licenseSeat = LicenseSeat::find($seatId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
-        }
-        // 2. does the seat belong to the specified license?
-        if (!$license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
-        }
-
-        $oldUser = $licenseSeat->user()->first();
-        $oldAsset = $licenseSeat->asset()->first();
-
-        // attempt to update the license seat
-        $licenseSeat->fill($request->all());
-        $licenseSeat->user_id = Auth::user()->id;
-        
-        // check if this update is a checkin operation
-        // 1. are relevant fields touched at all?
-        $touched = $licenseSeat->isDirty('assigned_to') || $licenseSeat->isDirty('asset_id');
-        // 2. are they cleared? if yes then this is a checkin operation
-        $is_checkin = ($touched && $licenseSeat->assigned_to === null && $licenseSeat->asset_id === null);
-
-        if (!$touched) {
-            // nothing to update
-            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
-        }
-
-        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'));
-                return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
-            }
-
-            // in this case, relevant fields are touched but it's not a checkin operation. so it must be a checkout operation.
-            $licenseSeat->logCheckout($request->input('note'), $target);
-            return response()->json(Helper::formatStandardApiResponse('success', $licenseSeat, trans('admin/licenses/message.update.success')));
-        }
-
-        return Helper::formatStandardApiResponse('error', null, $licenseSeat->getErrors());
-    }
-}
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\LicenseSeatsTransformer;
 use App\Http\Transformers\LicensesTransformer;
-use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -26,7 +25,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', 'freeSeats', 'supplier','category')->withCount('freeSeats as free_seats_count'));


        if ($request->filled('company_id')) {
@@ -82,18 +81,9 @@ class LicensesController extends Controller
            $licenses = $licenses->TextSearch($request->input('search'));
        }

-        if ($request->input('deleted')=='true') {
-            $licenses->onlyTrashed();
-        }
-
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($licenses) && ($request->get('offset') > $licenses->count())) ? $licenses->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

+        $offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0);
+        $limit = request('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';


@@ -107,33 +97,11 @@ class LicensesController extends Controller
            case 'category':
                $licenses = $licenses->leftJoin('categories', 'licenses.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
                break;
-            case 'depreciation':
-                $licenses = $licenses->leftJoin('depreciations', 'licenses.depreciation_id', '=', 'depreciations.id')->orderBy('depreciations.name', $order);
-                break;
            case 'company':
                $licenses = $licenses->leftJoin('companies', 'licenses.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
                break;
            default:
-                $allowed_columns =
-                    [
-                        'id',
-                        'name',
-                        'purchase_cost',
-                        'expiration_date',
-                        'purchase_order',
-                        'order_number',
-                        'notes',
-                        'purchase_date',
-                        'serial',
-                        'company',
-                        'category',
-                        'license_name',
-                        'license_email',
-                        'free_seats_count',
-                        'seats',
-                        'termination_date',
-                        'depreciation_id'
-                    ];
+                $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','category','license_name','license_email','free_seats_count','seats'];
                $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
                $licenses = $licenses->orderBy($sort, $order);
                break;
@@ -182,7 +150,7 @@ class LicensesController extends Controller
    public function show($id)
    {
        $this->authorize('view', License::class);
-        $license = License::withCount('freeSeats')->findOrFail($id);
+        $license = License::findOrFail($id);
        $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset');
        return (new LicensesTransformer)->transformLicense($license);
    }
@@ -241,28 +209,40 @@ class LicensesController extends Controller
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.assoc_users')));
    }
-    
+
    /**
-     * Gets a paginated collection for the select2 menus
+     * Get license seat listing
     *
-     * @see \App\Http\Transformers\SelectlistTransformer
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $licenseId
+     * @return \Illuminate\Contracts\View\View
     */
-    public function selectlist(Request $request)
+    public function seats(Request $request, $licenseId)
    {

-        $licenses = License::select([
-            'licenses.id',
-            'licenses.name'
-        ]);
+        if ($license = License::find($licenseId)) {
+
+            $this->authorize('view', $license);
+
+            $seats = LicenseSeat::where('license_id', $licenseId)->with('license', 'user', 'asset');
+
+            $offset = (($seats) && (request('offset') > $seats->count())) ? 0 : request('offset', 0);
+
+            $limit = request('limit', 50);
+            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+
+            $total = $seats->count();
+            $seats = $seats->skip($offset)->take($limit)->get();
+
+            if ($seats) {
+                return (new LicenseSeatsTransformer)->transformLicenseSeats($seats, $total);
+            }

-        if ($request->filled('search')) {
-            $licenses = $licenses->where('licenses.name', 'LIKE', '%'.$request->get('search').'%');
        }

-        $licenses = $licenses->orderBy('name', 'ASC')->paginate(50);
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/licenses/message.does_not_exist')), 200);

-
-        return (new SelectlistTransformer)->transformSelectlist($licenses);
    }


--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -3,14 +3,11 @@
 namespace App\Http\Controllers\Api;

 use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
 use App\Http\Controllers\Controller;
 use App\Helpers\Helper;
 use App\Models\Location;
 use App\Http\Transformers\LocationsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;

 class LocationsController extends Controller
 {
@@ -25,11 +22,11 @@ class LocationsController extends Controller
    {
        $this->authorize('view', Location::class);
        $allowed_columns = [
-            'id','name','address','address2','city','state','country','zip','created_at',
-            'updated_at','manager_id','image',
-            'assigned_assets_count','users_count','assets_count','currency','ldap_ou'];
+                'id','name','address','address2','city','state','country','zip','created_at',
+                'updated_at','manager_id','image',
+                'assigned_assets_count','users_count','assets_count','currency'];

-        $locations = Location::with('parent', 'manager', 'children')->select([
+        $locations = Location::with('parent', 'manager', 'childLocations')->select([
            'locations.id',
            'locations.name',
            'locations.address',
@@ -43,11 +40,10 @@ class LocationsController extends Controller
            'locations.created_at',
            'locations.updated_at',
            'locations.image',
-            'locations.ldap_ou',
            'locations.currency'
        ])->withCount('assignedAssets as assigned_assets_count')
-            ->withCount('assets as assets_count')
-            ->withCount('users as users_count');
+        ->withCount('assets as assets_count')
+        ->withCount('users as users_count');

        if ($request->filled('search')) {
            $locations = $locations->TextSearch($request->input('search'));
@@ -55,11 +51,8 @@ class LocationsController extends Controller



-        $offset = (($locations) && (request('offset') > $locations->count())) ? $locations->count() : request('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

@@ -87,15 +80,14 @@ class LocationsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Location::class);
        $location = new Location;
        $location->fill($request->all());
-        $location = $request->handleImages($location);

        if ($location->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', (new LocationsTransformer)->transformLocation($location), trans('admin/locations/message.create.success')));
@@ -114,7 +106,7 @@ class LocationsController extends Controller
    public function show($id)
    {
        $this->authorize('view', Location::class);
-        $location = Location::with('parent', 'manager', 'children')
+        $location = Location::with('parent', 'manager', 'childLocations')
            ->select([
                'locations.id',
                'locations.name',
@@ -143,21 +135,17 @@ class LocationsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Location::class);
        $location = Location::findOrFail($id);
-
        $location->fill($request->all());
-        $location = $request->handleImages($location);

-        if ($location->isValid()) {
-
-            $location->save();
+        if ($location->save()) {
            return response()->json(
                Helper::formatStandardApiResponse(
                    'success',
@@ -182,10 +170,6 @@ class LocationsController extends Controller
    {
        $this->authorize('delete', Location::class);
        $location = Location::findOrFail($id);
-        if(!$location->isDeletable()) {
-            return response()
-                    ->json(Helper::formatStandardApiResponse('error', null,  trans('admin/companies/message.assoc_users')));
-        }
        $this->authorize('delete', $location);
        $location->delete();
        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/locations/message.delete.success')));
@@ -194,27 +178,6 @@ class LocationsController extends Controller
    /**
     * Gets a paginated collection for the select2 menus
     *
-     * This is handled slightly differently as of ~4.7.8-pre, as
-     * we have to do some recursive magic to get the hierarchy to display
-     * properly when looking at the parent/child relationship in the
-     * rich menus.
-     *
-     * This means we can't use the normal pagination that we use elsewhere
-     * in our selectlists, since we have to get the full set before we can
-     * determine which location is parent/child/grandchild, etc.
-     *
-     * This also means that hierarchy display gets a little funky when people
-     * use the Select2 search functionality, but there's not much we can do about
-     * that right now.
-     *
-     * As a result, instead of paginating as part of the query, we have to grab
-     * the entire data set, and then invoke a paginator manually and pass that
-     * through to the SelectListTransformer.
-     *
-     * Many thanks to @uberbrady for the help getting this working better.
-     * Recursion still sucks, but I guess he doesn't have to get in the
-     * sea... this time.
-     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
@@ -223,49 +186,28 @@ class LocationsController extends Controller
    public function selectlist(Request $request)
    {

-        $this->authorize('view.selectlists');
-
        $locations = Location::select([
            'locations.id',
            'locations.name',
-            'locations.parent_id',
            'locations.image',
        ]);

-        $page = 1;
-        if ($request->filled('page')) {
-            $page = $request->input('page');
-        }
-
        if ($request->filled('search')) {
-            $locations = $locations->where('locations.name', 'LIKE', '%'.$request->input('search').'%');
+            $locations = $locations->where('locations.name', 'LIKE', '%'.$request->get('search').'%');
        }

-        $locations = $locations->orderBy('name', 'ASC')->get();
-
-        $locations_with_children = [];
+        $locations = $locations->orderBy('name', 'ASC')->paginate(50);

+        // Loop through and set some custom properties for the transformer to use.
+        // This lets us have more flexibility in special cases like assets, where
+        // they may not have a ->name value but we want to display something anyway
        foreach ($locations as $location) {
-            if (!array_key_exists($location->parent_id, $locations_with_children)) {
-                $locations_with_children[$location->parent_id] = [];
-            }
-            $locations_with_children[$location->parent_id][] = $location;
+            $location->use_text = $location->name;
+            $location->use_image = ($location->image) ? url('/').'/uploads/locations/'.$location->image : null;
        }

-        if ($request->filled('search')) {
-            $locations_formatted =  $locations;
-        } else {
-            $location_options = Location::indenter($locations_with_children);
-            $locations_formatted = new Collection($location_options);
-
-        }
-
-        $paginated_results =  new LengthAwarePaginator($locations_formatted->forPage($page, 500), $locations_formatted->count(), 500, $page, []);
-
-        //return [];
-        return (new SelectlistTransformer)->transformSelectlist($paginated_results);
+        return (new SelectlistTransformer)->transformSelectlist($locations);

    }

-
 }
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -2,14 +2,13 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Manufacturer;
+use App\Http\Transformers\DatatablesTransformer;
 use App\Http\Transformers\ManufacturersTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Manufacturer;
-use Illuminate\Http\Request;
-use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Storage;

 class ManufacturersController extends Controller
 {
@@ -38,13 +37,10 @@ class ManufacturersController extends Controller
        }


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

-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');

+        $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
        $manufacturers->orderBy($sort, $order);
@@ -60,15 +56,14 @@ class ManufacturersController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest $request
+     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(ImageUploadRequest $request)
+    public function store(Request $request)
    {
        $this->authorize('create', Manufacturer::class);
        $manufacturer = new Manufacturer;
        $manufacturer->fill($request->all());
-        $manufacturer = $request->handleImages($manufacturer);

        if ($manufacturer->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.create.success')));
@@ -98,16 +93,15 @@ class ManufacturersController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
-     * @param  \App\Http\Requests\ImageUploadRequest  $request
+     * @param  \Illuminate\Http\Request  $request
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(ImageUploadRequest $request, $id)
+    public function update(Request $request, $id)
    {
        $this->authorize('update', Manufacturer::class);
        $manufacturer = Manufacturer::findOrFail($id);
        $manufacturer->fill($request->all());
-        $manufacturer = $request->handleImages($manufacturer);

        if ($manufacturer->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $manufacturer, trans('admin/manufacturers/message.update.success')));
@@ -126,21 +120,11 @@ class ManufacturersController extends Controller
     */
    public function destroy($id)
    {
-
        $this->authorize('delete', Manufacturer::class);
        $manufacturer = Manufacturer::findOrFail($id);
        $this->authorize('delete', $manufacturer);
-
-        if ($manufacturer->isDeletable()) {
-            $manufacturer->delete();
-            return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.assoc_users')));
-
-
-
-
+        $manufacturer->delete();
+        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/manufacturers/message.delete.success')));

    }

@@ -155,7 +139,6 @@ class ManufacturersController extends Controller
    public function selectlist(Request $request)
    {

-        $this->authorize('view.selectlists');
        $manufacturers = Manufacturer::select([
            'id',
            'name',
@@ -173,7 +156,7 @@ class ManufacturersController extends Controller
        // they may not have a ->name value but we want to display something anyway
        foreach ($manufacturers as $manufacturer) {
            $manufacturer->use_text = $manufacturer->name;
-            $manufacturer->use_image = ($manufacturer->image) ? Storage::disk('public')->url('manufacturers/'.$manufacturer->image, $manufacturer->image) : null;
+            $manufacturer->use_image = ($manufacturer->image) ? url('/').'/uploads/manufacturers/'.$manufacturer->image : null;
        }

        return (new SelectlistTransformer)->transformSelectlist($manufacturers);
--- a/app/Http/Controllers/Api/PredefinedKitsController.php
+++ b/app/Http/Controllers/Api/PredefinedKitsController.php
@@ -1,449 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\PredefinedKitsTransformer;
-use App\Models\PredefinedKit;
-use Illuminate\Http\Request;
-
-/**
- *  @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
- */
-class PredefinedKitsController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('view', PredefinedKit::class);
-        $allowed_columns = ['id', 'name'];
-
-        $kits = PredefinedKit::query();
-
-        if ($request->filled('search')) {
-            $kits = $kits->TextSearch($request->input('search'));
-        }
-
-        $offset = $request->input('offset', 0);
-        $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'name';
-        $kits->orderBy($sort, $order);
-
-        $total = $kits->count();
-        $kits = $kits->skip($offset)->take($limit)->get();
-        return (new PredefinedKitsTransformer)->transformPredefinedKits($kits, $total);
-
-    }
-
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        $this->authorize('create', PredefinedKit::class);
-        $kit = new PredefinedKit;
-        $kit->fill($request->all());
-
-        if ($kit->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.create_success')));
-        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, $kit->getErrors()));
-
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        $this->authorize('view', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($id);
-        return (new PredefinedKitsTransformer)->transformPredefinedKit($kit);
-    }
-
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id kit id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        $this->authorize('update', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($id);
-        $kit->fill($request->all());
-
-        if ($kit->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $kit, trans('admin/kits/general.update_success')));      // TODO: trans
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, $kit->getErrors()));
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        $this->authorize('delete', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($id);
-
-        // Delete childs
-        $kit->models()->detach();
-        $kit->licenses()->detach();
-        $kit->consumables()->detach();
-        $kit->accessories()->detach();
-
-        $kit->delete();
-        return response()->json(Helper::formatStandardApiResponse('success', null,  trans('admin/kits/general.delete_success')));     // TODO: trans
-
-    }
-
-
-    /**
-     * Gets a paginated collection for the select2 menus
-     *
-     * @see \App\Http\Transformers\SelectlistTransformer
-     *
-     */
-    public function selectlist(Request $request)
-    {
-
-        $kits = PredefinedKit::select([
-            'id',
-            'name'
-        ]);
-
-        if ($request->filled('search')) {
-            $kits = $kits->where('name', 'LIKE', '%'.$request->get('search').'%');
-        }
-
-        $kits = $kits->orderBy('name', 'ASC')->paginate(50);
-
-        return (new SelectlistTransformer)->transformSelectlist($kits);
-
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function indexLicenses($kit_id) {
-        $this->authorize('view', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-        $licenses = $kit->licenses;
-        return (new PredefinedKitsTransformer)->transformElements($licenses, $licenses->count());
-    }
-
-    
-    /**
-     * Store the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-     public function storeLicense(Request $request, $kit_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         
-         $kit = PredefinedKit::findOrFail($kit_id);        
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-
-         $license_id = $request->get('license');
-         $relation = $kit->licenses();
-         if( $relation->find($license_id) ) {
-             return response()->json(Helper::formatStandardApiResponse('error', null, ['license' => 'License already attached to kit']));
-         }
-
-         $relation->attach( $license_id, ['quantity' => $quantity]);
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License added successfull'));     // TODO: trans
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function updateLicense(Request $request, $kit_id, $license_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         $kit = PredefinedKit::findOrFail($kit_id);
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-         $kit->licenses()->syncWithoutDetaching([$license_id => ['quantity' =>  $quantity]]);
- 
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated'));  // TODO: trans
-     }
-
-     /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function detachLicense($kit_id, $license_id)
-    {
-        $this->authorize('update', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-
-        $kit->licenses()->detach($license_id);
-        return response()->json(Helper::formatStandardApiResponse('success', $kit,  trans('admin/kits/general.delete_success')));
-    }
-    
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function indexModels($kit_id) {
-        $this->authorize('view', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-        $models = $kit->models;
-        return (new PredefinedKitsTransformer)->transformElements($models, $models->count());
-    }
-    
-    /**
-     * Store the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-     public function storeModel(Request $request, $kit_id)
-     {
-
-
-        $this->authorize('update', PredefinedKit::class);
-        
-        $kit = PredefinedKit::findOrFail($kit_id);        
-        
-        $model_id = $request->get('model');
-        $quantity = $request->input('quantity', 1);
-        if( $quantity < 1) {
-            $quantity = 1;
-        }
-        
-        $relation = $kit->models();
-        if( $relation->find($model_id) ) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, ['model' => 'Model already attached to kit']));
-        }
-        $relation->attach($model_id, ['quantity' => $quantity]);
-        
-        return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Model added successfull'));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function updateModel(Request $request, $kit_id, $model_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         $kit = PredefinedKit::findOrFail($kit_id);
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-         $kit->models()->syncWithoutDetaching([$model_id => ['quantity' =>  $quantity]]);
- 
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'License updated'));  // TODO: trans
-     }
-
-     /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function detachModel($kit_id, $model_id)
-    {
-        $this->authorize('update', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-
-        $kit->models()->detach($model_id);
-        return response()->json(Helper::formatStandardApiResponse('success', $kit,  trans('admin/kits/general.model_removed_success')));
-    }
-
-
-    
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function indexConsumables($kit_id) {
-        $this->authorize('view', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-        $consumables = $kit->consumables;
-        return (new PredefinedKitsTransformer)->transformElements($consumables, $consumables->count());
-    }
-
-    
-    /**
-     * Store the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-     public function storeConsumable(Request $request, $kit_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         
-         $kit = PredefinedKit::findOrFail($kit_id);        
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-
-         $consumable_id = $request->get('consumable');
-         $relation = $kit->consumables();
-         if( $relation->find($consumable_id) ) {
-             return response()->json(Helper::formatStandardApiResponse('error', null, ['consumable' => 'Consumable already attached to kit']));
-         }
-
-         $relation->attach( $consumable_id, ['quantity' => $quantity]);
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable added successfull'));     // TODO: trans
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function updateConsumable(Request $request, $kit_id, $consumable_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         $kit = PredefinedKit::findOrFail($kit_id);
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-         $kit->consumables()->syncWithoutDetaching([$consumable_id => ['quantity' =>  $quantity]]);
- 
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Consumable updated'));  // TODO: trans
-     }
-
-     /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function detachConsumable($kit_id, $consumable_id)
-    {
-        $this->authorize('update', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-
-        $kit->consumables()->detach($consumable_id);
-        return response()->json(Helper::formatStandardApiResponse('success', $kit,  'Delete was successfull'));     // TODO: trans
-    }
-
-    
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function indexAccessories($kit_id) {
-        $this->authorize('view', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-        $accessories = $kit->accessories;
-        return (new PredefinedKitsTransformer)->transformElements($accessories, $accessories->count());
-    }
-
-    
-    /**
-     * Store the specified resource.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function storeAccessory(Request $request, $kit_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         
-         $kit = PredefinedKit::findOrFail($kit_id);        
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-
-         $accessory_id = $request->get('accessory');
-         $relation = $kit->accessories();
-         if( $relation->find($accessory_id) ) {
-             return response()->json(Helper::formatStandardApiResponse('error', null, ['accessory' => 'Accessory already attached to kit']));
-         }
-
-         $relation->attach( $accessory_id, ['quantity' => $quantity]);
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory added successfull'));     // TODO: trans
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-     public function updateAccessory(Request $request, $kit_id, $accessory_id)
-     {
-         $this->authorize('update', PredefinedKit::class);
-         $kit = PredefinedKit::findOrFail($kit_id);
-         $quantity = $request->input('quantity', 1);
-         if( $quantity < 1) {
-             $quantity = 1;
-         }
-         $kit->accessories()->syncWithoutDetaching([$accessory_id => ['quantity' =>  $quantity]]);
- 
-         return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Accessory updated'));  // TODO: trans
-     }
-
-     /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $kit_id
-     * @return \Illuminate\Http\Response
-     */
-    public function detachAccessory($kit_id, $accessory_id)
-    {
-        $this->authorize('update', PredefinedKit::class);
-        $kit = PredefinedKit::findOrFail($kit_id);
-
-        $kit->accessories()->detach($accessory_id);
-        return response()->json(Helper::formatStandardApiResponse('success', $kit,  'Delete was successfull'));     // TODO: trans
-    }
-}
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -2,10 +2,11 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
 use App\Models\CheckoutRequest;
+use App\Http\Controllers\Controller;
 use Auth;
+use App\Helpers\Helper;
+

 class ProfileController extends Controller
 {
@@ -30,11 +31,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'),
                ];
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -2,10 +2,10 @@

 namespace App\Http\Controllers\Api;

-use App\Http\Controllers\Controller;
-use App\Http\Transformers\ActionlogsTransformer;
-use App\Models\Actionlog;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Actionlog;
+use App\Http\Transformers\ActionlogsTransformer;

 class ReportsController extends Controller
 {
@@ -49,7 +49,6 @@ class ReportsController extends Controller
            'created_at',
            'target_id',
            'user_id',
-            'accept_signature',
            'action_type',
            'note'
        ];
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -2,123 +2,50 @@

 namespace App\Http\Controllers\Api;

-use App\Http\Controllers\Controller;
-use App\Http\Transformers\LoginAttemptsTransformer;
-use App\Models\Setting;
-use App\Notifications\MailTest;
-use App\Services\LdapAd;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Notification;
-use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
-use App\Models\Ldap; // forward-port of v4 LDAP model for Sync
-use App\Http\Requests\SlackSettingsRequest;
-
+use App\Http\Controllers\Controller;
+use App\Models\Ldap;
+use Validator;
+use App\Models\Setting;
+use Mail;
+use App\Notifications\SlackTest;
+use Notification;
+use App\Notifications\MailTest;

 class SettingsController extends Controller
 {

-    /**
-     * Test the ldap settings
-     * 
-     * @author Wes Hulette <jwhulette@gmail.com>
-     * 
-     * @since 5.0.0
-     * 
-     * @param App\Models\LdapAd $ldap
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function ldapAdSettingsTest(LdapAd $ldap): JsonResponse
+
+    public function ldaptest()
    {
-        if(!$ldap->init()) {
-            Log::info('LDAP is not enabled so we cannot test.');
+
+        if (Setting::getSettings()->ldap_enabled!='1') {
+            \Log::debug('LDAP is not enabled cannot test.');
            return response()->json(['message' => 'LDAP is not enabled, cannot test.'], 400);
        }

-        // The connect, bind and resulting users message
-        $message = [];
+        \Log::debug('Preparing to test LDAP connection');

-        
-        // This is all kinda fucked right now. The connection test doesn't actually do what you think,
-        // // and the way we parse the errors
-        // on the JS side is horrible. 
-        Log::info('Preparing to test LDAP user login');
-        // Test user can connect to the LDAP server
        try {
-            $ldap->testLdapAdUserConnection();
-            $message['login'] = [
-                'message' => 'Successfully connected to LDAP server.'
-            ];
-        } catch (\Exception $ex) {
-                \Log::debug('Connection to LDAP server '.Setting::getSettings()->ldap_server.' failed. Please check your LDAP settings and try again. Server Responded with error: ' . $ex->getMessage());
-            return response()->json(
-                ['message' => 'Connection to LDAP server '.Setting::getSettings()->ldap_server." failed. Verify that the LDAP hostname is entered correctly and that it can be reached from this web server. \n\nServer Responded with error: " . $ex->getMessage()
-
-                ], 400);
-        }
-
-        Log::info('Preparing to test LDAP bind connection');
-        // Test user can bind to the LDAP server
-        try {
-            Log::info('Testing Bind');
-            $ldap->testLdapAdBindConnection();
-            $message['bind'] = [
-                'message' => 'Successfully bound to LDAP server.'
-            ];
-        } catch (\Exception $ex) {
-            Log::info('LDAP Bind failed');
-            return response()->json(['message' => 'Connection to LDAP successful, but we were unable to Bind the LDAP user '.Setting::getSettings()->ldap_uname.". Verify your that your LDAP Bind username and password are correct. \n\nServer Responded with error: " . $ex->getMessage()
-            ], 400);
-        }
-
-
-        Log::info('Preparing to get sample user set from LDAP directory');
-        // Get a sample of 10 users so user can verify the data is correct
-        $settings = Setting::getSettings();
-        try {
-            Log::info('Testing LDAP sync');
-            error_reporting(E_ALL & ~E_DEPRECATED); // workaround for php7.4, which deprecates ldap_control_paged_result
-            // $users = $ldap->testUserImportSync(); // from AdLdap2 from v5, disabling and falling back to v4's sync code
-            $users = collect(Ldap::findLdapUsers())->slice(0, 11)->filter(function ($value, $key) { //choosing ELEVEN because one is going to be the count, which we're about to filter out in the next line
-                return is_int($key);
-            })->map(function ($item) use ($settings) {
-                return (object) [
-                    'username'        => $item[$settings['ldap_username_field']][0] ?? null,
-                    'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
-                    'lastname'        => $item[$settings['ldap_lname_field']][0] ?? null,
-                    'firstname'       => $item[$settings['ldap_fname_field']][0] ?? null,
-                    'email'           => $item[$settings['ldap_email']][0] ?? null,
-                ];
-            });
-            if ($users->count() > 0) {
-                $message['user_sync']  = [
-                    'users' => $users
-                ];
-            } else {
-                $message['user_sync']  = [
-                    'message' => 'Connection to LDAP was successful, however there were no users returned from your query. You should confirm the Base Bind DN above.'
-                ];
-                return response()->json($message, 400);
+            $connection = Ldap::connectToLdap();
+            try {
+                \Log::debug('attempting to bind to LDAP for LDAP test');
+                Ldap::bindAdminToLdap($connection);
+                return response()->json(['message' => 'It worked!'], 200);
+            } catch (\Exception $e) {
+                \Log::debug('Bind failed');
+                return response()->json(['message' => $e->getMessage()], 400);
+                //return response()->json(['message' => $e->getMessage()], 500);
            }
-            
-        } catch (\Exception $ex) {
-            Log::info('LDAP sync failed');
-            $message['user_sync']  = [
-                'message' => 'Error getting users from LDAP directory, error: ' . $ex->getMessage()
-            ];
-            return response()->json($message, 400);
+        } catch (\Exception $e) {
+            \Log::debug('Connection failed but we cannot debug it any further on our end.');
+            return response()->json(['message' => $e->getMessage()], 600);
        }

-        return response()->json($message, 200);
+
    }

-    public function ldaptestlogin(Request $request, LdapAd $ldap)
+    public function ldaptestlogin(Request $request)
    {

        if (Setting::getSettings()->ldap_enabled!='1') {
@@ -142,65 +69,56 @@ class SettingsController extends Controller

        \Log::debug('Preparing to test LDAP login');
        try {
-            DB::beginTransaction(); //this was the easiest way to invoke a full test of an LDAP login without adding new users to the DB (which may not be desired)
+            $connection = Ldap::connectToLdap();
+            try {
+                Ldap::bindAdminToLdap($connection);
+                \Log::debug('Attempting to bind to LDAP for LDAP test');
+                try {
+                    $ldap_user = Ldap::findAndBindUserLdap($request->input('ldaptest_user'), $request->input('ldaptest_password'));
+                    if ($ldap_user) {
+                        \Log::debug('It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.');
+                        return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);
+                    }
+                    return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);

-            // $results = $ldap->ldap->auth()->attempt($request->input('ldaptest_username'), $request->input('ldaptest_password'), true);
-            // can't do this because that's a protected property.
+                } catch (\Exception $e) {
+                    \Log::debug('LDAP login failed');
+                    return response()->json(['message' => $e->getMessage()], 400);
+                }

-            $results = $ldap->ldapLogin($request->input('ldaptest_user'), $request->input('ldaptest_password')); // this would normally create a user on success (if they didn't already exist), but for the transaction
-            if($results) {
-                return response()->json(['message' => 'It worked! '. $request->input('ldaptest_user').' successfully binded to LDAP.'], 200);
-            } else {
-                return response()->json(['message' => 'Login Failed. '. $request->input('ldaptest_user').' did not successfully bind to LDAP.'], 400);
+            } catch (\Exception $e) {
+                \Log::debug('Bind failed');
+                return response()->json(['message' => $e->getMessage()], 400);
+                //return response()->json(['message' => $e->getMessage()], 500);
            }
        } catch (\Exception $e) {
            \Log::debug('Connection failed');
-            return response()->json(['message' => $e->getMessage()], 400);
-        } finally {
-            DB::rollBack(); // ALWAYS rollback, whether success or failure
+            return response()->json(['message' => $e->getMessage()], 500);
        }


    }

-    public function slacktest(Request $request)
+
+    public function slacktest()
    {

-        $validator = Validator::make($request->all(), [
-            'slack_endpoint'                      => 'url|required_with:slack_channel|starts_with:https://hooks.slack.com/|nullable',
-            'slack_channel'                       => 'required_with:slack_endpoint|starts_with:#|nullable',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json(['message' => 'Validation failed', 'errors' => $validator->errors()], 422);
+        if ($settings = Setting::getSettings()->slack_channel=='') {
+            \Log::debug('Slack is not enabled. Cannot test.');
+            return response()->json(['message' => 'Slack is not enabled, cannot test.'], 400);
        }

-        // If validation passes, continue to the curl request
-            $slack = new Client([
-                'base_url' => e($request->input('slack_endpoint')),
-                'defaults' => [
-                    'exceptions' => false,
-                ],
-            ]);
+        \Log::debug('Preparing to test slack connection');

-            $payload = json_encode(
-                [
-                    'channel'    => e($request->input('slack_channel')),
-                    'text'       => trans('general.slack_test_msg'),
-                    'username'    => e($request->input('slack_botname')),
-                    'icon_emoji' => ':heart:',
-                ]);
+        try {
+            Notification::send($settings = Setting::getSettings(), new SlackTest());
+            return response()->json(['message' => 'Success'], 200);
+        } catch (\Exception $e) {
+            \Log::debug('Slack connection failed');
+            return response()->json(['message' => $e->getMessage()], 400);
+        }

-            try {
-                $slack->post($request->input('slack_endpoint'), ['body' => $payload]);
-                return response()->json(['message' => 'Success'], 200);

-            } catch (\Exception $e) {
-                return response()->json(['message' => 'Please check the channel name and webhook endpoint URL ('.$request->input('slack_endpoint').'). Slack responded with: '.$e->getMessage()], 400);
-            }
-        
-        //} 
-        return response()->json(['message' => 'Something went wrong :( '], 400);
    }


@@ -217,7 +135,7 @@ class SettingsController extends Controller
            try {
                Notification::send(Setting::first(), new MailTest());
                return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                return response()->json(['message' => $e->getMessage()], 500);
            }
        }
@@ -226,74 +144,5 @@ class SettingsController extends Controller
    }


-    /**
-     * Delete server-cached barcodes
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.0.0]
-     * @return Response
-     */
-    public function purgeBarcodes()
-    {
-
-        $file_count = 0;
-        $files = Storage::disk('public')->files('barcodes');
-
-        foreach ($files as $file) { // iterate files
-
-            $file_parts = explode(".", $file);
-            $extension = end($file_parts);
-            \Log::debug($extension);
-
-            // Only generated barcodes would have a .png file extension
-            if ($extension =='png') {
-
-                \Log::debug('Deleting: '.$file);
-
-
-                try  {
-                    Storage::disk('public')->delete($file);
-                    \Log::debug('Deleting: '.$file);
-                    $file_count++;
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
-            }
-
-        }
-
-        return response()->json(['message' => 'Deleted '.$file_count.' barcodes'], 200);
-
-    }
-
-
-
-
-
-    /**
-     * Get a list of login attempts
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.0.0]
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function showLoginAttempts(Request $request)
-    {
-        $allowed_columns = ['id', 'username', 'remote_ip', 'user_agent','successful','created_at'];
-
-        $login_attempts =  DB::table('login_attempts');
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'created_at';
-
-        $total = $login_attempts->count();
-        $login_attempts->orderBy($sort, $order);
-        $login_attempt_results = $login_attempts->skip(request('offset', 0))->take(request('limit',  20))->get();
-
-        return (new LoginAttemptsTransformer)->transformLoginAttempts($login_attempt_results, $total);
-
-    }
-
-

 }
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -2,13 +2,13 @@

 namespace App\Http\Controllers\Api;

-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\AssetsTransformer;
-use App\Http\Transformers\StatuslabelsTransformer;
-use App\Models\Asset;
-use App\Models\Statuslabel;
 use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Helpers\Helper;
+use App\Models\Statuslabel;
+use App\Models\Asset;
+use App\Http\Transformers\StatuslabelsTransformer;
+use App\Http\Transformers\AssetsTransformer;

 class StatuslabelsController extends Controller
 {
@@ -22,7 +22,7 @@ class StatuslabelsController extends Controller
    public function index(Request $request)
    {
        $this->authorize('view', Statuslabel::class);
-        $allowed_columns = ['id','name','created_at', 'assets_count','color', 'notes','default_label'];
+        $allowed_columns = ['id','name','created_at', 'assets_count','color','default_label'];

        $statuslabels = Statuslabel::withCount('assets as assets_count');

@@ -30,26 +30,8 @@ class StatuslabelsController extends Controller
            $statuslabels = $statuslabels->TextSearch($request->input('search'));
        }

-        // if a status_type is passed, filter by that
-        if ($request->filled('status_type')) {
-            if (strtolower($request->input('status_type')) == 'pending') {
-                $statuslabels = $statuslabels->Pending();
-            } elseif (strtolower($request->input('status_type')) == 'archived') {
-                $statuslabels = $statuslabels->Archived();
-            } elseif (strtolower($request->input('status_type')) == 'deployable') {
-                $statuslabels = $statuslabels->Deployable();
-            } elseif (strtolower($request->input('status_type')) == 'undeployable') {
-                $statuslabels = $statuslabels->Undeployable();
-            }
-        }
-
-        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
-        // case we override with the actual count, so we should return 0 items.
-        $offset = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0);
-
-        // Check to make sure the limit is not higher than the max allowed
-        ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
-
+        $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0);
+        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
        $statuslabels->orderBy($sort, $order);
@@ -84,10 +66,6 @@ class StatuslabelsController extends Controller
        $statuslabel->deployable        =  $statusType['deployable'];
        $statuslabel->pending           =  $statusType['pending'];
        $statuslabel->archived          =  $statusType['archived'];
-        $statuslabel->color             =  $request->input('color');
-        $statuslabel->show_in_nav       =  $request->input('show_in_nav', 0);
-        $statuslabel->default_label     =  $request->input('default_label', 0);
-

        if ($statuslabel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success')));
@@ -128,7 +106,9 @@ 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.'));
+        }

        $statuslabel->fill($request->all());

@@ -136,9 +116,6 @@ class StatuslabelsController extends Controller
        $statuslabel->deployable        =  $statusType['deployable'];
        $statuslabel->pending           =  $statusType['pending'];
        $statuslabel->archived          =  $statusType['archived'];
-        $statuslabel->color             =  $request->input('color');
-        $statuslabel->show_in_nav       =  $request->input('show_in_nav');
-        $statuslabel->default_label     =  $request->input('default_label');

        if ($statuslabel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.update.success')));
@@ -185,27 +162,25 @@ class StatuslabelsController extends Controller
    {
        $this->authorize('view', Statuslabel::class);

-        $statuslabels = Statuslabel::withCount('assets')->get();
+        $statuslabels = Statuslabel::with('assets')->groupBy('id')->withCount('assets as assets_count')->get();

        $labels=[];
        $points=[];
-        $default_color_count = 0;
-        $colors_array = array();
-
+        $colors=[];
        foreach ($statuslabels as $statuslabel) {
            if ($statuslabel->assets_count > 0) {
+
                $labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
                $points[]=$statuslabel->assets_count;
-
                if ($statuslabel->color!='') {
-                    $colors_array[] = $statuslabel->color;
-                } else {
-                    $colors_array[] = Helper::defaultChartColors($default_color_count);
+                    $colors[]=$statuslabel->color;
                }
-                $default_color_count++;
            }
        }

+        
+        $colors_array = array_merge($colors, Helper::chartColors());
+
        $result= [
            "labels" => $labels,
            "datasets" => [ [
@@ -229,11 +204,11 @@ class StatuslabelsController extends Controller
    {
        $this->authorize('view', Statuslabel::class);
        $this->authorize('index', Asset::class);
-        $assets = Asset::where('status_id','=',$id)->with('assignedTo');
+        $assets = Asset::where('status_id','=',$id);

        $allowed_columns = [
            'id',
-            'name',
+            'name'
        ];

        $offset = request('offset', 0);
@@ -263,6 +238,8 @@ class StatuslabelsController extends Controller
     */
    public function checkIfDeployable($id) {
        $statuslabel = Statuslabel::findOrFail($id);
+        $this->authorize('view', Asset::class);
+
        if ($statuslabel->getStatuslabelType()=='deployable') {
            return '1';
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	141b0b410b	Change variable name to be clearer	2019-07-23 18:23:51 -07:00
snipe	d40f06373e	DIsable CORS allowed origins by default to replicate existing behavior	2019-07-23 18:23:39 -07:00
snipe	56753fa4cd	More clarification	2019-07-23 18:07:45 -07:00
snipe	8a7bafb575	Clarified header comments	2019-07-23 18:05:07 -07:00
snipe	82f91cb944	Fixed typo	2019-07-23 18:03:53 -07:00
snipe	41b226e5fc	Added APP_CORS_ALLOWED_ORIGINS env option	2019-07-23 18:02:51 -07:00
snipe	ae6048a6ea	Changed order so CORS will still work if throttle hit	2019-07-23 18:02:27 -07:00
snipe	ef41e0060a	Added CORS support to API	2019-07-23 17:17:01 -07:00
				`@@ -1 +0,0 @@`
				`web: php heroku/startup.php && heroku-php-apache2 public/`