Use the same string for both radio buttons in bulk user edit

Signed-off-by: snipe <snipe@snipe.net>

.all-contributorsrc

@@ -2585,6 +2585,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "QveenSi",
+      "name": "Yevhenii Huzii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
+      "profile": "https://github.com/QveenSi",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.github/workflows/SA-codeql.yml

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

README.md

@@ -128,6 +128,10 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<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/1975640?v=4" width="110px;"/><br /><sub>Evan Taylor</sub>](https://github.com/Delta5)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Delta5 "Code") | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |

app/Console/Commands/LdapSync.php

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

app/Console/Commands/MoveUploadsToNewDisk.php

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

app/Console/Commands/RestoreFromBackup.php

@@ -13,8 +13,8 @@ class RestoreFromBackup extends Command
      * @var string
      */
     protected $signature = 'snipeit:restore 
-                                            {--force : Skip the danger prompt; assuming you hit "y"} 
-                                            {filename : The full path of the .zip file to be migrated}
+                                            {--force : Skip the danger prompt; assuming you enter "y"} 
+                                            {filename : The zip file to be migrated}
                                             {--no-progress : Don\'t show a progress bar}';
 
     /**

app/Http/Controllers/Account/AcceptanceController.php

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

app/Http/Controllers/ActionlogController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
+use App\Models\Actionlog;
 use Response;
 
 class ActionlogController extends Controller
@@ -26,4 +27,10 @@ class ActionlogController extends Controller
         }
        
     }
+    public function getStoredEula($filename){
+        $this->authorize('view', \App\Models\Asset::class);
+        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
+
+        return Response::download($file);
+    }
 }

app/Http/Controllers/Api/AssetsController.php

@@ -521,7 +521,7 @@ class AssetsController extends Controller
         $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost')); // this is the API's store method, so I don't know that I want to do this? Confusing. FIXME (or not?!)
         $asset->purchase_date           = $request->get('purchase_date', null);
         $asset->assigned_to             = $request->get('assigned_to', null);
-        $asset->supplier_id             = $request->get('supplier_id', 0);
+        $asset->supplier_id             = $request->get('supplier_id');
         $asset->requestable             = $request->get('requestable', 0);
         $asset->rtd_location_id         = $request->get('rtd_location_id', null);
         $asset->location_id             = $request->get('rtd_location_id', null);

app/Http/Controllers/Api/ReportsController.php

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

app/Http/Controllers/Api/StatuslabelsController.php

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

app/Http/Controllers/Assets/AssetCheckinController.php

@@ -111,6 +111,13 @@ class AssetCheckinController extends Controller
             $checkin_at = $request->input('checkin_at');
         }
 
+        if(!empty($asset->licenseseats->all())){
+            foreach ($asset->licenseseats as $seat){
+                $seat->assigned_to = null;
+                $seat->save();
+            }
+        }
+
         // Get all pending Acceptances for this asset and delete them
         $acceptances = CheckoutAcceptance::pending()->whereHasMorph('checkoutable',
             [Asset::class],

app/Http/Controllers/Assets/AssetCheckoutController.php

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

app/Http/Controllers/Assets/AssetsController.php

@@ -137,12 +137,12 @@ class AssetsController extends Controller
             $asset->archived                = '0';
             $asset->physical                = '1';
             $asset->depreciate              = '0';
-            $asset->status_id               = request('status_id', 0);
+            $asset->status_id               = request('status_id');
             $asset->warranty_months         = request('warranty_months', null);
             $asset->purchase_cost           = Helper::ParseCurrency($request->get('purchase_cost'));
             $asset->purchase_date           = request('purchase_date', null);
             $asset->assigned_to             = request('assigned_to', null);
-            $asset->supplier_id             = request('supplier_id', 0);
+            $asset->supplier_id             = request('supplier_id', null);
             $asset->requestable             = request('requestable', 0);
             $asset->rtd_location_id         = request('rtd_location_id', null);
 
@@ -861,7 +861,7 @@ class AssetsController extends Controller
 
 
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
-            return redirect()->to('hardware')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
         }
     }
 

app/Http/Controllers/ReportsController.php

@@ -933,12 +933,17 @@ class ReportsController extends Controller
         /**
          * Get all assets with pending checkout acceptances
          */
-
-        $acceptances = CheckoutAcceptance::pending()->with('assignedTo')->get();
+        if($showDeleted) {
+            $acceptances = CheckoutAcceptance::pending()->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        } else {
+            $acceptances = CheckoutAcceptance::pending()->with(['assignedTo' => function ($query) {
+                $query->withTrashed();
+            }, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+        }
 
         $assetsForReport = $acceptances
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && !is_null($acceptance->assignedTo);
+            ->filter(function ($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
             })
             ->map(function($acceptance) {
                 return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];

app/Http/Controllers/SettingsController.php

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

app/Http/Transformers/ActionlogsTransformer.php

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

app/Importer/LicenseImporter.php

@@ -35,7 +35,7 @@ class LicenseImporter extends ItemImporter
                     ->first();
         if ($license) {
             if (! $this->updating) {
-                $this->log('A matching License '.$this->item['name'].'with serial '.$this->item['serial'].' already exists');
+                $this->log('A matching License '.$this->item['name'].' with serial '.$this->item['serial'].' already exists');
 
                 return;
             }

app/Listeners/LogListener.php

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

app/Models/Actionlog.php

@@ -25,7 +25,7 @@ class Actionlog extends SnipeModel
 
     protected $table = 'action_logs';
     public $timestamps = true;
-    protected $fillable = ['created_at', 'item_type', 'user_id', 'item_id', 'action_type', 'note', 'target_id', 'target_type'];
+    protected $fillable = ['created_at', 'item_type', 'user_id', 'item_id', 'action_type', 'note', 'target_id', 'target_type', 'stored_eula', 'stored_eula_file'];
 
     use Searchable;
 

app/Models/Asset.php

@@ -195,10 +195,25 @@ class Asset extends Depreciable
             $model = AssetModel::find($this->model_id);
 
             if (($model) && ($model->fieldset)) {
+
+                foreach ($model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
+
                 $this->rules += $model->fieldset->validation_rules();
+
+                foreach ($this->model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
             }
         }
 
+
+
         return parent::save($params);
     }
 

app/Models/Ldap.php

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

app/Models/User.php

@@ -74,7 +74,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @var array
      */
 
-    // 'username' => 'required|string|min:1|unique:users,username,NULL,id,deleted_at,NULL',
     protected $rules = [
         'first_name'              => 'required|string|min:1',
         'username'                => 'required|string|min:1|unique_undeleted',

app/Observers/AssetObserver.php

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

composer.json

@@ -20,6 +20,7 @@
     "alek13/slack": "^2.0",
     "bacon/bacon-qr-code": "^2.0",
     "barryvdh/laravel-debugbar": "^3.6",
+    "barryvdh/laravel-dompdf": "^1.0",
     "doctrine/cache": "^1.10",
     "doctrine/common": "^2.12",
     "doctrine/dbal": "^3.1",

composer.lock

@@ -408,6 +408,82 @@
             ],
             "time": "2022-02-09T07:52:32+00:00"
         },
+        {
+            "name": "barryvdh/laravel-dompdf",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/laravel-dompdf.git",
+                "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/e3f429e97087b2ef19b83e5ed313f080f2477685",
+                "reference": "e3f429e97087b2ef19b83e5ed313f080f2477685",
+                "shasum": ""
+            },
+            "require": {
+                "dompdf/dompdf": "^1",
+                "illuminate/support": "^6|^7|^8|^9",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "nunomaduro/larastan": "^1|^2",
+                "orchestra/testbench": "^4|^5|^6|^7",
+                "phpro/grumphp": "^1",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\DomPDF\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "PDF": "Barryvdh\\DomPDF\\Facade\\Pdf"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Barryvdh\\DomPDF\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "A DOMPDF Wrapper for Laravel",
+            "keywords": [
+                "dompdf",
+                "laravel",
+                "pdf"
+            ],
+            "support": {
+                "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
+                "source": "https://github.com/barryvdh/laravel-dompdf/tree/v1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://fruitcake.nl",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-01-29T08:02:59+00:00"
+        },
         {
             "name": "brick/math",
             "version": "0.9.3",
@@ -1672,6 +1748,73 @@
             "abandoned": "roave/better-reflection",
             "time": "2020-10-27T21:46:55+00:00"
         },
+        {
+            "name": "dompdf/dompdf",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/dompdf.git",
+                "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/60b704331479a69e9bcdb3496da2315b5c4f94fd",
+                "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "phenx/php-font-lib": "^0.5.4",
+                "phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8 || ^9",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "suggest": {
+                "ext-gd": "Needed to process images",
+                "ext-gmagick": "Improves image processing performance",
+                "ext-imagick": "Improves image processing performance",
+                "ext-zlib": "Needed for pdf stream compression"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Dompdf\\": "src/"
+                },
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                },
+                {
+                    "name": "Brian Sweeney",
+                    "email": "eclecticgeek@gmail.com"
+                },
+                {
+                    "name": "Gabriel Bull",
+                    "email": "me@gabrielbull.com"
+                }
+            ],
+            "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
+            "homepage": "https://github.com/dompdf/dompdf",
+            "support": {
+                "issues": "https://github.com/dompdf/dompdf/issues",
+                "source": "https://github.com/dompdf/dompdf/tree/v1.2.0"
+            },
+            "time": "2022-02-07T13:02:10+00:00"
+        },
         {
             "name": "dragonmantank/cron-expression",
             "version": "v3.3.1",
@@ -5965,6 +6108,96 @@
             "abandoned": "symfony/polyfill-mbstring or symfony/string",
             "time": "2021-01-07T16:38:58+00:00"
         },
+        {
+            "name": "phenx/php-font-lib",
+            "version": "0.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-font-lib.git",
+                "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4",
+                "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^3 || ^4 || ^5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "FontLib\\": "src/FontLib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                }
+            ],
+            "description": "A library to read, parse, export and make subsets of different types of font files.",
+            "homepage": "https://github.com/PhenX/php-font-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-font-lib/issues",
+                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.4"
+            },
+            "time": "2021-12-17T19:44:54+00:00"
+        },
+        {
+            "name": "phenx/php-svg-lib",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dompdf/php-svg-lib.git",
+                "reference": "3ffbbb037f0871c3a819e90cff8b36dd7e656189"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/3ffbbb037f0871c3a819e90cff8b36dd7e656189",
+                "reference": "3ffbbb037f0871c3a819e90cff8b36dd7e656189",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.4 || ^8.0",
+                "sabberworm/php-css-parser": "^8.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Svg\\": "src/Svg"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                }
+            ],
+            "description": "A library to read, parse and export to PDF SVG files.",
+            "homepage": "https://github.com/PhenX/php-svg-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-svg-lib/issues",
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.0"
+            },
+            "time": "2021-12-17T14:08:35+00:00"
+        },
         {
             "name": "php-http/message-factory",
             "version": "v1.0.2",
@@ -7606,6 +7839,59 @@
             },
             "time": "2022-02-21T21:48:29+00:00"
         },
+        {
+            "name": "sabberworm/php-css-parser",
+            "version": "8.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
+                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=5.6.20"
+            },
+            "require-dev": {
+                "codacy/coverage": "^1.4",
+                "phpunit/phpunit": "^4.8.36"
+            },
+            "suggest": {
+                "ext-mbstring": "for parsing UTF-8 CSS"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabberworm\\CSS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Raphael Schweikert"
+                }
+            ],
+            "description": "Parser for CSS Files written in PHP",
+            "homepage": "https://www.sabberworm.com/blog/2010/6/10/php-css-parser",
+            "keywords": [
+                "css",
+                "parser",
+                "stylesheet"
+            ],
+            "support": {
+                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
+                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+            },
+            "time": "2021-12-11T13:40:54+00:00"
+        },
         {
             "name": "sebastian/comparator",
             "version": "4.0.6",

config/app.php

@@ -328,6 +328,7 @@ return [
         Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
+        Barryvdh\DomPDF\ServiceProvider::class,
 
         /*
          * Package Service Providers...
@@ -396,6 +397,7 @@ return [
         'Mail' => Illuminate\Support\Facades\Mail::class,
         'Notification' => Illuminate\Support\Facades\Notification::class,
         'Password' => Illuminate\Support\Facades\Password::class,
+        'PDF'   => Barryvdh\DomPDF\Facade::class,
         'Queue' => Illuminate\Support\Facades\Queue::class,
         'Redirect' => Illuminate\Support\Facades\Redirect::class,
         'Redis' => Illuminate\Support\Facades\Redis::class,

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.0-RC-5',
-  'full_app_version' => 'v6.0.0-RC-5 - build 6772-g7cbcd2d95',
-  'build_version' => '6772',
+  'app_version' => 'v6.0.0-RC-6',
+  'full_app_version' => 'v6.0.0-RC-6 - build 6785-gab18ceb2f',
+  'build_version' => '6785',
   'prerelease_version' => '',
-  'hash_version' => 'g7cbcd2d95',
-  'full_hash' => 'v6.0.0-RC-5-19-g7cbcd2d95',
-  'branch' => 'merges/master_down_to_develop_march_16',
+  'hash_version' => 'gab18ceb2f',
+  'full_hash' => 'v6.0.0-RC-6-gab18ceb2f',
+  'branch' => 'develop',
 );

database/migrations/2018_10_18_191228_add_kits_licenses_table.php

@@ -17,8 +17,8 @@ class AddKitsLicensesTable extends Migration
 		if (!Schema::hasTable('kits_licenses')) {
             Schema::create('kits_licenses', function ($table) {
                 $table->increments('id');
-                $table->integer('kit_id')->nullable()->default(null);
-                $table->integer('license_id')->nullable()->default(null);
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('license_id')->nullable()->default(NULL);    
                 $table->integer('quantity')->default(1);
                 $table->timestamps();
             });

database/migrations/2018_10_19_153910_add_kits_table.php

@@ -16,7 +16,7 @@ class AddKitsTable extends Migration
 		if (!Schema::hasTable('kits')) {
             Schema::create('kits', function ($table) {
                 $table->increments('id');
-                $table->string('name')->nullable()->default(null);
+				$table->string('name')->nullable()->default(NULL);
                 $table->timestamps();
                 $table->engine = 'InnoDB';
             });
@@ -34,6 +34,7 @@ class AddKitsTable extends Migration
 		if (Schema::hasTable('kits')) {
            Schema::drop('kits');
         }
+
 	}
 
 }

database/migrations/2018_10_19_154013_add_kits_models_table.php

@@ -17,8 +17,8 @@ class AddKitsModelsTable extends Migration
 		if (!Schema::hasTable('kits_models')) {
             Schema::create('kits_models', function ($table) {
                 $table->increments('id');
-                $table->integer('kit_id')->nullable()->default(null);
-                $table->integer('model_id')->nullable()->default(null);
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('model_id')->nullable()->default(NULL);    
                 $table->integer('quantity')->default(1);
                 $table->timestamps();
             });
@@ -36,4 +36,5 @@ class AddKitsModelsTable extends Migration
            Schema::drop('kits_models');
         }
     }
+
 }

database/migrations/2019_02_07_185953_add_kits_consumables_table.php

@@ -16,8 +16,8 @@ class AddKitsConsumablesTable extends Migration
         if (!Schema::hasTable('kits_consumables')) {
             Schema::create('kits_consumables', function ($table) {
                 $table->increments('id');
-                $table->integer('kit_id')->nullable()->default(null);
-                $table->integer('consumable_id')->nullable()->default(null);
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('consumable_id')->nullable()->default(NULL);    
                 $table->integer('quantity')->default(1);
                 $table->timestamps();
             });

database/migrations/2019_02_07_190030_add_kits_accessories_table.php

@@ -16,8 +16,8 @@ class AddKitsAccessoriesTable extends Migration
         if (!Schema::hasTable('kits_accessories')) {
             Schema::create('kits_accessories', function ($table) {
                 $table->increments('id');
-                $table->integer('kit_id')->nullable()->default(null);
-                $table->integer('accessory_id')->nullable()->default(null);
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('accessory_id')->nullable()->default(NULL);    
                 $table->integer('quantity')->default(1);
                 $table->timestamps();
             });

database/migrations/2022_03_09_001334_add_eula_to_checkout_acceptance.php

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

database/migrations/2022_03_10_175740_add_eula_to_action_logs.php

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

database/migrations/2022_03_21_162724_adds_ldap_manager.php

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

public/js/plugins/chartjs/Chart.bundle.js

@@ -2431,7 +2431,7 @@ module.exports = {
 
     // LOCALES
 
-    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/;
+    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
     var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
     function localeMonths (m, format) {
         return isArray(this._months) ? this._months[m.month()] :

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

@@ -84,6 +84,7 @@ return [
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
     'ldap_server_cert'			=> 'LDAP SSL certificate validation',

resources/lang/en/general.php

@@ -237,6 +237,7 @@
     'state'  				=> 'State',
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
+    'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'Supplier',
     'suppliers'  			=> 'Suppliers',
     'sure_to_delete'    => 'Are you sure you wish to delete',

resources/views/account/accept/accept-accessory-eula.blade.php

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+</head>
+<body>
+
+@if ($signature)
+    <center>
+        <img src="{{ $logo }}">
+        <p>{{$company_name}}</p>
+    </center>
+@endif
+<br>
+
+<p>Date: {{ date($date_settings) }} </p><br>
+<p>Asset Tag: {{ $item_tag }}</p>
+<p>Asset Model: {{ $item_model }}</p>
+@if ($eula)
+    {!!  $eula !!}
+@endif
+
+<br>
+
+<p>Assigned on: {{$check_out_date}}</p>
+<p>Accepted on: {{$accepted_date}}</p>
+<p>Assigned to: {{$assigned_to}}</p>
+@if ($signature)
+    <center>
+        <img src="{{ $signature }}" style="max-width: 50%">
+    </center>
+@endif
+</body>
+</html>

resources/views/account/accept/accept-asset-eula.blade.php

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+</head>
+<body>
+
+@if ($signature)
+    <center>
+        <img src="{{ $logo }}">
+        <p>{{$company_name}}</p>
+    </center>
+@endif
+<br>
+
+<p>Date: {{ date($date_settings) }} </p><br>
+<p>Asset Tag: {{ $item_tag }}</p>
+<p>Asset Model: {{ $item_model }}</p>
+<p>Asset Serial: {{ $item_serial }}</p><br>
+@if ($eula)
+    {!!  $eula !!}
+@endif
+
+<br>
+
+<p>Assigned on: {{$check_out_date}}</p>
+<p>Accepted on: {{$accepted_date}}</p>
+<p>Assigned to: {{$assigned_to}}</p>
+@if ($signature)
+    <center>
+        <img src="{{ $signature }}" style="max-width: 50%">
+    </center>
+@endif
+</body>
+</html>

resources/views/hardware/labels.blade.php

@@ -113,7 +113,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
 
         @if ($settings->qr_code=='1')
             <div class="qr_img">
-                <img src="./{{ $asset->id }}/qr_code" class="qr_img">
+                <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="qr_img">
             </div>
         @endif
 
@@ -159,7 +159,7 @@ $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='')
 
         @if ((($settings->alt_barcode_enabled=='1') && $settings->alt_barcode!=''))
             <div class="barcode_container">
-                <img src="./{{ $asset->id }}/barcode" class="barcode">
+                <img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/barcode" class="barcode">
             </div>
         @endif
 

resources/views/hardware/view.blade.php

@@ -452,7 +452,9 @@
                                                         @endcan
 
                                                     @else
-                                                        @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
+                                                        @if (($field->format=='BOOLEAN') && ($asset->{$field->db_column_name()}!=''))
+                                                            {!! ($asset->{$field->db_column_name()} == 1) ? "<span class='fas fa-check-circle' style='color:green' />" : "<span class='fas fa-times-circle' style='color:red' />" !!}
+                                                        @elseif (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
                                                             <a href="{{ $asset->{$field->db_column_name()} }}" target="_new">{{ $asset->{$field->db_column_name()} }}</a>
                                                         @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
                                                             {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }}
@@ -1098,15 +1100,12 @@
                   <th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                   <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
                   <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
-                  @if  ($snipeSettings->require_accept_signature=='1')
-                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  @endif
+                  <th class="col-sm-1" data-field="stored_eula_file" data-visible="true" data-formatter="downloadFormatter">{{ trans('general.accept_eula') }}</th>
                   <th class="col-md-3" data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
                   <th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
                 </tr>
                 </thead>
               </table>
-
             </div>
           </div> <!-- /.row -->
         </div> <!-- /.tab-pane history -->

resources/views/partials/bootstrap-table.blade.php

@@ -6,7 +6,6 @@
 @push('js')
 
 <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
-
 <script nonce="{{ csrf_token() }}">
     $(function () {
         var locale = '{{ config('app.locale') }}';
@@ -32,6 +31,11 @@
         }
 
         $('.snipe-table').bootstrapTable({
+            data_export_options = $(this).attr('data-export-options');
+            export_options = data_export_options? JSON.parse(data_export_options): {};
+            export_options['htmlContent'] = true; //always enforce this on the given data-export-options (to prevent XSS)
+            
+            $(this).bootstrapTable({
             classes: 'table table-responsive table-no-bordered',
             ajaxOptions: {
                 headers: {
@@ -77,17 +81,15 @@
                 export: 'fa-download',
                 clearSearch: 'fa-times'
             },
-            exportOptions: {
-                htmlContent: true,
-            },
+                exportOptions: export_options,
 
             exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'],
             onLoadSuccess: function () {
                 $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call
             }
 
+            });
         });
-
     });
 
 
@@ -442,6 +444,8 @@
                 if ((row.custom_fields[field_column_plain].field_format) && (row.custom_fields[field_column_plain].value)) {
                     if (row.custom_fields[field_column_plain].field_format=='URL') {
                         return '<a href="' + row.custom_fields[field_column_plain].value + '" target="_blank" rel="noopener">' + row.custom_fields[field_column_plain].value + '</a>';
+                    }else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') {
+                        return (row.custom_fields[field_column_plain].value == 1) ? "<span class='fas fa-check-circle' style='color:green' />" : "<span class='fas fa-times-circle' style='color:red' />";
                     } else if (row.custom_fields[field_column_plain].field_format=='EMAIL') {
                         return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '">' + row.custom_fields[field_column_plain].value + '</a>';
                     }
@@ -613,6 +617,11 @@
             return '<a href="' + value + '" data-toggle="lightbox" data-type="image"><img src="' + value + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="' + altName + '"></a>';
         }
     }
+    function downloadFormatter(value) {
+        if (value) {
+            return '<a href="' + value + '" target="_blank"><i class="fas fa-download"></i></a>';
+        }
+    }
 
     function fileUploadFormatter(value) {
         if ((value) && (value.url) && (value.inlineable)) {

resources/views/reports/unaccepted_assets.blade.php

@@ -71,7 +71,7 @@
                   @if ($item['assetItem'])
                   <tr @if($item['acceptance']->trashed()) style="text-decoration: line-through" @endif>
                     <td>{{ $item['acceptance']->created_at }}</td>
-                    <td>{{ ($item['assetItem']->company) ? $assetItem->company->name : '' }}</td>
+                    <td>{{ ($item['assetItem']->company) ? $item['assetItem']->company->name : '' }}</td>
                     <td>{!! $item['assetItem']->model->category->present()->nameUrl() !!}</td>
                     <td>{!! $item['assetItem']->present()->modelUrl() !!}</td>
                     <td>{!! $item['assetItem']->present()->nameUrl() !!}</td>

resources/views/settings/ldap.blade.php

@@ -383,6 +383,19 @@
                                 @endif
                             </div>
                         </div>
+                        <!-- LDAP Manager -->
+                        <div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
+                            </div>
+                            <div class="col-md-9">
+                                {{ Form::text('ldap_manager', Request::old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => 'manager', $setting->demoMode]) }}
+                                {!! $errors->first('ldap_manager', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @if (config('app.lock_passwords')===true)
+                                    <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
+                                @endif
+                            </div>
+                        </div>
 
                         <!-- LDAP email -->
                         <div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">

resources/views/users/bulk-edit.blade.php

@@ -88,7 +88,7 @@
                             <div class="col-sm-9">
                                 <div class="checkbox">
                                     <label for="activated">
-                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated']) }} {{  trans('admin/users/general.activation_status_warning') }} <br>
+                                        {{ Form::radio('remote', '', true, ['aria-label'=>'activated']) }} {{  trans('general.do_not_change') }} <br>
                                         {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('general.login_enabled')}} <br>
                                         {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('admin/users/general.user_deactivated')}}
 

routes/web.php

@@ -124,6 +124,10 @@ Route::group(['middleware' => 'auth'], function () {
         'display-sig/{filename}',
         [ActionlogController::class, 'displaySig']
     )->name('log.signature.view');
+    Route::get(
+        'stored-eula-file/{filename}/',
+        [ActionlogController::class, 'getStoredEula']
+    )->name('log.storedeula.download');
 });
 
 /*