Squashed commit of the following:

commit 01c18f6
Merge: 4d1d2fe c5e2aed
Author: snipe <[email protected]>
Date:   Thu Dec 12 17:40:40 2024 +0000

    Merge pull request #15962 from snipe/fixes_rb-18772

commit c5e2aed
Author: snipe <[email protected]>
Date:   Thu Dec 12 17:37:08 2024 +0000

    Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets

    Signed-off-by: snipe <[email protected]>

commit 4d1d2fe
Merge: ab6363a a0e7dcf
Author: snipe <[email protected]>
Date:   Thu Dec 12 17:05:10 2024 +0000

    Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8

commit ab6363a
Merge: f089d1f da33f18
Author: snipe <[email protected]>
Date:   Thu Dec 12 16:53:15 2024 +0000

    Merge pull request #15959 from snipe/remove_settings_api_endpoints

commit a0e7dcf
Author: Brady Wetherington <[email protected]>
Date:   Thu Dec 12 16:50:36 2024 +0000

    Fixes to 'clean' mode to better handle character sets and zero-values

commit da33f18
Author: snipe <[email protected]>
Date:   Thu Dec 12 16:46:19 2024 +0000

    Removed index and destroy settinga API endpoints

    Signed-off-by: snipe <[email protected]>

commit f089d1f
Merge: 4bd6c21 67494c1
Author: snipe <[email protected]>
Date:   Thu Dec 12 01:42:26 2024 +0000

    Merge pull request #15944 from marcusmoore/bug/required-display-for-selects

commit 4bd6c21
Merge: a7e6b8e 3264149
Author: snipe <[email protected]>
Date:   Thu Dec 12 00:38:21 2024 +0000

    Merge pull request #15957 from Godmartinz/fix-checkout-notif-parameters

commit 67494c1
Author: Marcus Moore <[email protected]>
Date:   Wed Dec 11 16:26:23 2024 -0800

    Fix validation messages for select2 inputs

commit 3264149
Author: Godfrey M <[email protected]>
Date:   Wed Dec 11 16:26:18 2024 -0800

    fix other mailables

commit 8417fcb
Author: Marcus Moore <[email protected]>
Date:   Wed Dec 11 16:25:45 2024 -0800

    Revert "Show frontend "required" validation for model and status selects"

    This reverts commit 10a7ae8.

commit 400833f
Author: Godfrey M <[email protected]>
Date:   Wed Dec 11 16:14:06 2024 -0800

    reversed order of the acceptance and note paramter

commit a7e6b8e
Merge: b9a6606 6e31d0f
Author: snipe <[email protected]>
Date:   Wed Dec 11 23:52:33 2024 +0000

    Merge pull request #15956 from marcusmoore/bug/sc-27731

commit 6e31d0f
Author: Marcus Moore <[email protected]>
Date:   Wed Dec 11 15:39:41 2024 -0800

    Use appropriate category for licenses when seeding

commit b9a6606
Merge: 06a0ac8 014350a
Author: snipe <[email protected]>
Date:   Wed Dec 11 20:42:13 2024 +0000

    Merge pull request #15955 from ubc-cpsc/bugfix/GHSA-c2pc-g5qf-rfrf

commit 014350a
Author: Joël Pittet <[email protected]>
Date:   Wed Dec 11 12:04:45 2024 -0800

    Fix league/commonmark's quadratic complexity bugs may lead to a denial of service

commit 06a0ac8
Author: snipe <[email protected]>
Date:   Wed Dec 11 18:34:18 2024 +0000

    Fixed #15928 - updated method name to setCreatedBy from SetUserId

    Signed-off-by: snipe <[email protected]>

commit 34a47e9
Author: snipe <[email protected]>
Date:   Wed Dec 11 18:09:53 2024 +0000

    Add @sgross-emlix as a contributor

commit f5a9e4b
Author: snipe <[email protected]>
Date:   Wed Dec 11 18:09:19 2024 +0000

    Fixes #15952 - fixed typo in content-type

    Signed-off-by: snipe <[email protected]>

commit 6633948
Merge: 5014a95 2e97b56
Author: snipe <[email protected]>
Date:   Wed Dec 11 17:38:59 2024 +0000

    Merge pull request #15954 from Godmartinz/null_fix-for-reminder-command

commit 2e97b56
Author: Godfrey M <[email protected]>
Date:   Wed Dec 11 09:27:27 2024 -0800

    add null safe operator to acceptance reminder

commit 5014a95
Author: snipe <[email protected]>
Date:   Tue Dec 10 13:27:59 2024 +0000

    Updated supported versions

    Signed-off-by: snipe <[email protected]>

commit 10a7ae8
Author: Marcus Moore <[email protected]>
Date:   Mon Dec 9 16:09:51 2024 -0800

    Show frontend "required" validation for model and status selects

commit 5f0efd8
Merge: cc8f72c 31155b5
Author: snipe <[email protected]>
Date:   Mon Dec 9 19:35:31 2024 +0000

    Merge pull request #15940 from snipe/reove_gh_templates

commit 31155b5
Author: snipe <[email protected]>
Date:   Mon Dec 9 19:28:51 2024 +0000

    Removed issue/PR templates

    Signed-off-by: snipe <[email protected]>

commit cc8f72c
Merge: a0bab70 f6b9ae6
Author: snipe <[email protected]>
Date:   Mon Dec 9 19:23:13 2024 +0000

    Merge pull request #15914 from Godmartinz/send_reminder_emails

commit a0bab70
Merge: 0149ed7 b5c8251
Author: snipe <[email protected]>
Date:   Mon Dec 9 17:56:23 2024 +0000

    Merge pull request #15939 from uberbrady/fix_ldap_asset_location_updater

commit b5c8251
Author: Brady Wetherington <[email protected]>
Date:   Mon Dec 9 17:40:10 2024 +0000

    Only update asset locations to assets checked out to users.

commit 0149ed7
Merge: f726359 4f9f035
Author: snipe <[email protected]>
Date:   Mon Dec 9 17:00:10 2024 +0000

    Merge pull request #15565 from spencerrlongg/bug/sc-25921

commit f726359
Merge: a137e31 5120cdd
Author: snipe <[email protected]>
Date:   Mon Dec 9 16:40:21 2024 +0000

    Merge pull request #15925 from Godmartinz/refactor-unaccepted-assets-reminder-notif

commit 5120cdd
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 16:02:55 2024 -0800

    delete notification version of reminder

commit 97398f1
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 12:41:33 2024 -0800

    adds testing to unaccepted reminder command

commit 281ff6a
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 11:52:34 2024 -0800

    wrap comment

commit 9d49b01
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 11:46:56 2024 -0800

    cleans up the Unaccepted Asset reminder variables

commit 3f8916e
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 11:37:03 2024 -0800

    fix duplicate emails being sent in unaccepted reminder command

commit f6b9ae6
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 10:18:35 2024 -0800

    missed a spot

commit de41def
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 10:15:57 2024 -0800

    fixed conditionals

commit 52b051e
Author: Godfrey M <[email protected]>
Date:   Thu Dec 5 10:08:39 2024 -0800

    add mail class for unaccepted assets reminders

commit a137e31
Merge: 43d66a8 ca0f8ac
Author: snipe <[email protected]>
Date:   Wed Dec 4 21:46:43 2024 +0000

    Merge pull request #15920 from akemidx/asset-category-in-emails

commit ca0f8ac
Author: akemidx <[email protected]>
Date:   Tue Dec 3 16:57:28 2024 -0500

    fixed

commit 6252f0a
Author: akemidx <[email protected]>
Date:   Tue Dec 3 16:10:42 2024 -0500

    layout / added category id

commit 43d66a8
Merge: 2ad1407 e5284c0
Author: snipe <[email protected]>
Date:   Tue Dec 3 17:17:26 2024 +0000

    Merge pull request #15918 from Godmartinz/mail_name_fix

    Adds `MAIL_FROM_NAME` to mail envelope

commit e5284c0
Author: Godfrey M <[email protected]>
Date:   Tue Dec 3 09:10:50 2024 -0800

    fix typo

commit 16283b8
Author: Godfrey M <[email protected]>
Date:   Tue Dec 3 09:08:39 2024 -0800

    adds mail from name to mail envelope

commit 983b78e
Author: Godfrey M <[email protected]>
Date:   Mon Dec 2 14:27:04 2024 -0800

    add property check

commit 2ad1407
Merge: 1473018 99464fc
Author: snipe <[email protected]>
Date:   Mon Dec 2 22:03:32 2024 +0000

    Merge pull request #15909 from Godmartinz/checkin-out-notifications

    Fixed general webhook option notifications not firing

commit ab67c48
Author: Godfrey M <[email protected]>
Date:   Mon Dec 2 13:03:09 2024 -0800

    fix unaccepted assets report resend acceptance

commit 99464fc
Author: Godfrey M <[email protected]>
Date:   Mon Dec 2 10:19:24 2024 -0800

    fixes general webhook not firing

commit 4f9f035
Author: spencerrlongg <[email protected]>
Date:   Mon Sep 30 20:09:00 2024 -0500

    added a way to manipulate validator attribute names

commit cd3059f
Author: spencerrlongg <[email protected]>
Date:   Mon Sep 30 13:38:52 2024 -0500

    rm numbers too. :(

commit b69596a
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 16:21:33 2024 -0500

    rm dump

commit d02b993
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 15:38:40 2024 -0500

    rm comment

commit 852a56f
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 15:30:41 2024 -0500

    should be all good now

commit 9df78a9
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 14:00:50 2024 -0500

    working! need formatting for error messages etc

commit f3ad899
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 13:00:35 2024 -0500

    hm ok this kind of works

commit 21906d8
Author: spencerrlongg <[email protected]>
Date:   Wed Sep 25 12:47:56 2024 -0500

    world set up and idea in place

Signed-off-by: snipe <[email protected]>

.all-contributorsrc

@@ -3235,6 +3235,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "sgross-emlix",
+      "name": "Sebastian Groß",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143394709?v=4",
+      "profile": "https://github.com/sgross-emlix",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

CONTRIBUTORS.md

@@ -52,7 +52,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") |
 | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

SECURITY.md

@@ -10,10 +10,12 @@ 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: |
+|---------| ------------------ |
+| 7.x     | :white_check_mark: |
+| 6.x     | :x:                |
+| 5.1.x   | :x:                |
 | 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
+| 4.0.x   | :x:                |
 | < 4.0   | :x:                |
 
 ## Reporting a Vulnerability

app/Console/Commands/LdapSync.php

@@ -427,7 +427,7 @@ public function handle()
                     $user->groups()->attach($ldap_default_group);
                 }
                 //updates assets location based on user's location
-                Asset::where('assigned_to', '=', $user->id)->update(['location_id' => $user->location_id]);
+                Asset::where('assigned_to', '=', $user->id)->where('assigned_type', '=', User::class)->update(['location_id' => $user->location_id]);
 
             } else {
                 foreach ($user->getErrors()->getMessages() as $key => $err) {

app/Console/Commands/ObjectImportCommand.php

@@ -59,7 +59,7 @@ public function handle()
         $classString = "App\\Importer\\{$class}Importer";
         $importer = new $classString($filename);
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
-                 ->setUserId($this->option('user_id'))
+                 ->setCreatedBy($this->option('user_id'))
                  ->setUpdating($this->option('update'))
                  ->setShouldNotify($this->option('send-welcome'))
                  ->setUsernameFormat($this->option('username_format'));

app/Console/Commands/RestoreFromBackup.php

@@ -51,6 +51,8 @@ public function parse_sql(string $line): string {
             /* we *could* have made the ^INSERT INTO blah VALUES$ turn on the capturing state, and closed it with
                a ^(blahblah);$ but it's cleaner to not have to manage the state machine. We're just going to
                assume that (blahblah), or (blahblah); are values for INSERT and are always acceptable. */
+            "<^/\*!40101 SET NAMES '?[a-zA-Z0-9_-]+'? \*/;$>"                                   => false, //using weird delimiters (<,>) for readability. allow quoted or unquoted charsets
+            "<^/\*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' \*/;$>" => false, //same, now handle zero-values
         ];
 
         foreach($allowed_statements as $statement => $statechange) {