Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )

* Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-05 22:32:52 -04:00 · 2019-05-02 15:20:52 -07:00 · 2019-05-02 15:20:47 -07:00 · 2019-04-18 17:56:08 -04:00 · 2019-04-18 15:49:59 -04:00 · 2019-04-18 14:13:50 -04:00
112 changed files with 10599 additions and 608 deletions
@@ -1650,6 +1650,15 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "timothyfarmer",
+      "name": "Tim Farmer",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7632599?v=4",
+      "profile": "https://github.com/timothyfarmer",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -0,0 +1,5 @@
+# You can add one username per supported platform and one custom link
+# patreon: # Replace with your Patreon username
+# open_collective: # Replace with your Open Collective username
+# ko_fi: # Replace with your Ko-fi username
+custom: https://snipeitapp.com/donate
@@ -16,8 +16,13 @@ services:
 php:
  - 5.6
  - 7.0
-  - 7.2 
-  - 7.1.4
+  - 7.1
+  - 7.2
+  - 7.3
+
+matrix:
+  allow_failures:
+    - php: 7.3

 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
@@ -18,9 +18,8 @@ patch \
 curl \
 vim \
 git \
-cron \
 mysql-client \
-cron \
+supervisor \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

@@ -69,7 +68,9 @@ RUN \
      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
      && mkdir "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
      && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
-      && chown docker "/var/lib/snipeit/keys/"
+      && chown docker "/var/lib/snipeit/keys/" \
+      && chmod +x /var/www/html/artisan \
+      && echo "Finished setting up application in /var/www/html"

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

@@ -96,16 +97,11 @@ VOLUME ["/var/lib/snipeit"]

 ##### START SERVER

-COPY docker/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+COPY docker/startup.sh docker/supervisord.conf /
+COPY docker/supervisor-exit-event-listener /usr/bin/supervisor-exit-event-listener
+RUN chmod +x /startup.sh /usr/bin/supervisor-exit-event-listener

-# Add Tini
-ENV TINI_VERSION v0.14.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
-ENTRYPOINT ["/tini", "--"]
-
-CMD ["/entrypoint.sh"]
+CMD ["/startup.sh"]

 EXPOSE 80
 EXPOSE 443
@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=master)](https://travis-ci.org/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-180-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)
+[![All Contributors](https://img.shields.io/badge/all_contributors-181-orange.svg?style=flat-square)](#contributors) [![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)


 ## Snipe-IT - Open Source Asset Management System
@@ -59,6 +59,7 @@ Since the release of the JSON REST API, several third-party developers have been
 - [InQRy](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
 - [SnipeitPS](https://github.com/snazy2000/SnipeitPS) by [@snazy2000](https://github.com/snazy2000) - Powershell API Wrapper for Snipe-it
 - [jamf2snipe](https://github.com/ParadoxGuitarist/jamf2snipe) by [@ParadoxGuitarist](https://github.com/ParadoxGuitarist) - Python script to sync assets between a JAMFPro instance and a Snipe-II instance
+- [Marksman](https://github.com/Scope-IT/marksman) - A Windows agent for Snipe-IT

 As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :) 

@@ -95,7 +96,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars2.githubusercontent.com/u/982885?v=4" width="110px;"/><br /><sub>Martin Stub</sub>](http://martinstub.dk)<br />[🌍](#translation-stubben "Translation") | [<img src="https://avatars2.githubusercontent.com/u/28959963?v=4" width="110px;"/><br /><sub>Meyer Flavio</sub>](https://github.com/meyerf99)<br />[🌍](#translation-meyerf99 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/796443?v=4" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[🌍](#translation-MicaelRodrigues "Translation") | [<img src="https://avatars0.githubusercontent.com/u/10481331?v=4" width="110px;"/><br /><sub>Mikael Rasmussen</sub>](http://rubixy.com/)<br />[🌍](#translation-mikaelssen "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1544552?v=4" width="110px;"/><br /><sub>IxFail</sub>](https://github.com/IxFail)<br />[🌍](#translation-IxFail "Translation") | [<img src="https://avatars3.githubusercontent.com/u/18483118?v=4" width="110px;"/><br /><sub>Mohammed Fota</sub>](http://www.mohammedfota.com)<br />[🌍](#translation-MohammedFota "Translation") | [<img src="https://avatars0.githubusercontent.com/u/227080?v=4" width="110px;"/><br /><sub>Moayad Alserihi</sub>](https://github.com/omego)<br />[🌍](#translation-omego "Translation") |
 | [<img src="https://avatars0.githubusercontent.com/u/1680266?v=4" width="110px;"/><br /><sub>saymd</sub>](https://github.com/saymd)<br />[🌍](#translation-saymd "Translation") | [<img src="https://avatars0.githubusercontent.com/u/1826808?v=4" width="110px;"/><br /><sub>Patrik Larsson</sub>](https://nordsken.se)<br />[🌍](#translation-pooot "Translation") | [<img src="https://avatars1.githubusercontent.com/u/20584746?v=4" width="110px;"/><br /><sub>drcryo</sub>](https://github.com/drcryo)<br />[🌍](#translation-drcryo "Translation") | [<img src="https://avatars1.githubusercontent.com/u/19408004?v=4" width="110px;"/><br /><sub>pawel1615</sub>](https://github.com/pawel1615)<br />[🌍](#translation-pawel1615 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/23340468?v=4" width="110px;"/><br /><sub>bodrovics</sub>](https://github.com/bodrovics)<br />[🌍](#translation-bodrovics "Translation") | [<img src="https://avatars0.githubusercontent.com/u/3257654?v=4" width="110px;"/><br /><sub>priatna</sub>](https://github.com/priatna)<br />[🌍](#translation-priatna "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5358374?v=4" width="110px;"/><br /><sub>Fan Jiang</sub>](https://amayume.net)<br />[🌍](#translation-ProfFan "Translation") |
 | [<img src="https://avatars1.githubusercontent.com/u/22555451?v=4" width="110px;"/><br /><sub>ragnarcx</sub>](https://github.com/ragnarcx)<br />[🌍](#translation-ragnarcx "Translation") | [<img src="https://avatars2.githubusercontent.com/u/18654582?v=4" width="110px;"/><br /><sub>Rein van Haaren</sub>](http://www.reinvanhaaren.nl/)<br />[🌍](#translation-reinvanhaaren "Translation") | [<img src="https://avatars1.githubusercontent.com/u/386672?v=4" width="110px;"/><br /><sub>Teguh Dwicaksana</sub>](http://dheche.songolimo.net)<br />[🌍](#translation-dheche "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2572552?v=4" width="110px;"/><br /><sub>fraccie</sub>](https://github.com/FRaccie)<br />[🌍](#translation-FRaccie "Translation") | [<img src="https://avatars0.githubusercontent.com/u/35182720?v=4" width="110px;"/><br /><sub>vinzruzell</sub>](https://github.com/vinzruzell)<br />[🌍](#translation-vinzruzell "Translation") | [<img src="https://avatars1.githubusercontent.com/u/7883603?v=4" width="110px;"/><br /><sub>Kevin Austin</sub>](http://kevinaustin.com)<br />[🌍](#translation-vipsystem "Translation") | [<img src="https://avatars3.githubusercontent.com/u/3861828?v=4" width="110px;"/><br /><sub>Wira Sandy</sub>](http://azuraweb.xyz)<br />[🌍](#translation-wira-sandy "Translation") |
-| [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -61,7 +61,7 @@ class LdapSync extends Command
                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
                $this->info(json_encode($json_summary));
            }
-            LOG::error($e);
+            LOG::info($e);
            return [];
        }

@@ -80,7 +80,7 @@ class LdapSync extends Command
                $json_summary = [ "error" => true, "error_message" => $e->getMessage(), "summary" => [] ];
                $this->info(json_encode($json_summary));
            }
-            LOG::error($e);
+            LOG::info($e);
            return [];
        }

@@ -208,8 +208,7 @@ class LdapSync extends Command
                    }

                }
-
-                $user->notes = 'Imported from LDAP';
+                
                $user->ldap_import = 1;

                $errors = '';
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Asset;
+use App\Models\License;
+use App\Models\Setting;
+use App\Notifications\ExpiringAssetsNotification;
+use App\Models\Recipients;
+use DB;
+use Illuminate\Console\Command;
+use App\Notifications\SendUpcomingAuditNotification;
+use Carbon\Carbon;
+
+class SendUpcomingAuditReport extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:upcoming-audits';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send email/slack notifications for upcoming asset audits.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $settings = Setting::getSettings();
+
+        if (($settings->alert_email != '') && ($settings->audit_warning_days) && ($settings->alerts_enabled == 1)) {
+
+            // Send a rollup to the admin, if settings dictate
+            $recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
+                return new \App\Models\Recipients\AlertRecipient($item);
+            });
+
+
+            // Assets due for auditing
+
+            $assets = Asset::whereNotNull('next_audit_date')
+                    ->DueOrOverdueForAudit($settings)
+                    ->orderBy('last_audit_date', 'asc')->get();
+
+            if ($assets->count() > 0) {
+
+                $this->info(trans_choice('mail.upcoming-audits', $assets->count(),
+                    ['count' => $assets->count(), 'threshold' => $settings->audit_warning_days]));
+                \Notification::send($recipients, new SendUpcomingAuditNotification($assets, $settings->audit_warning_days));
+                $this->info('Audit report sent to '.$settings->alert_email);
+            } else {
+                $this->info('No assets to be audited. No report sent.');
+            }
+
+
+
+        } elseif ($settings->alert_email=='') {
+            $this->error('Could not send email. No alert email configured in settings');
+        } elseif (!$settings->audit_warning_days) {
+            $this->error('No audit warning days set in Admin Notifications. No mail will be sent.');
+        } elseif ($settings->alerts_enabled!=1) {
+            $this->info('Alerts are disabled in the settings. No mail will be sent');
+        } else {
+            $this->error('Something went wrong. :( ');
+            $this->error('Admin Notifications Email Setting: '.$settings->alert_email);
+            $this->error('Admin Audit Warning Setting: '.$settings->audit_warning_days);
+            $this->error('Admin Alerts Emnabled: '.$settings->alerts_enabled);
+        }
+
+
+    }
+}
@@ -2,6 +2,7 @@

 namespace App\Console;

+use App\Console\Commands\RestoreDeletedUsers;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

@@ -31,6 +32,7 @@ class Kernel extends ConsoleKernel
        Commands\RegenerateAssetTags::class,
        Commands\SyncAssetCounters::class,
        Commands\RestoreDeletedUsers::class,
+        Commands\SendUpcomingAuditReport::class,
    ];

    /**
@@ -47,6 +49,7 @@ class Kernel extends ConsoleKernel
        $schedule->command('snipeit:expected-checkin')->daily();
        $schedule->command('snipeit:backup')->weekly();
        $schedule->command('backup:clean')->daily();
+        $schedule->command('snipeit:upcoming-audits')->daily();
    }

    protected function commands()
@@ -46,7 +46,7 @@ class AccessoriesController extends Controller
            $accessories->where('supplier_id','=',$request->input('supplier_id'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -44,7 +44,7 @@ class AssetMaintenancesController extends Controller
            $maintenances->where('asset_id', '=', $request->input('asset_id'));
        }

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

        $allowed_columns = [
@@ -60,7 +60,7 @@ class AssetModelsController extends Controller
            $assetmodels->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';
@@ -179,7 +179,7 @@ class AssetModelsController extends Controller
            try  {
                unlink(public_path().'/uploads/models/'.$assetmodel->image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

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

        $this->authorize('index', Asset::class);
@@ -95,7 +95,7 @@ class AssetsController extends Controller

        $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-            'model.category', 'model.manufacturer', 'model.fieldset','supplier');
+                'model.category', 'model.manufacturer', 'model.fieldset','supplier');


        // These are used by the API to query against specific ID numbers.
@@ -127,7 +127,7 @@ class AssetsController extends Controller

        if (($request->has('assigned_to')) && ($request->has('assigned_type'))) {
            $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
-                    ->where('assets.assigned_type', '=', $request->input('assigned_type'));
+                ->where('assets.assigned_type', '=', $request->input('assigned_type'));
        }

        if ($request->has('company_id')) {
@@ -144,10 +144,25 @@ class AssetsController extends Controller

        $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';

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

+        // This is used by the audit reporting routes
+        if (Gate::allows('audit', Asset::class)) {
+
+            switch ($audit) {
+                case 'due':
+                    $assets->DueOrOverdueForAudit($settings);
+                    break;
+                case 'overdue':
+                    $assets->overdueForAudit($settings);
+                    break;
+            }
+        }
+
+
+
        // This is used by the sidenav, mostly

        // We switched from using query scopes here because of a Laravel bug
@@ -167,12 +182,12 @@ class AssetsController extends Controller
                break;
            case 'RTD':
                $assets->whereNull('assets.assigned_to')
-                ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
+                    ->join('status_labels AS status_alias',function ($join) {
+                        $join->on('status_alias.id', "=", "assets.status_id")
+                            ->where('status_alias.deployable','=',1)
+                            ->where('status_alias.pending','=',0)
+                            ->where('status_alias.archived', '=', 0);
+                    });
                break;
            case 'Undeployable':
                $assets->Undeployable();
@@ -188,11 +203,11 @@ class AssetsController extends Controller
            case 'Requestable':
                $assets->where('assets.requestable', '=', 1)
                    ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
+                        $join->on('status_alias.id', "=", "assets.status_id")
+                            ->where('status_alias.deployable','=',1)
+                            ->where('status_alias.pending','=',0)
+                            ->where('status_alias.archived', '=', 0);
+                    });

                break;
            case 'Deployed':
@@ -207,8 +222,8 @@ class AssetsController extends Controller
                        $join->on('status_alias.id', "=", "assets.status_id")
                            ->where('status_alias.archived', '=', 0);
                    });
-                    
-                // If there is a status ID, don't take show_archived_in_list into consideration
+
+                    // If there is a status ID, don't take show_archived_in_list into consideration
                } else {
                    $assets->join('status_labels AS status_alias',function ($join) {
                        $join->on('status_alias.id', "=", "assets.status_id");
@@ -233,8 +248,8 @@ class AssetsController extends Controller
        // This handles all of the pivot sorting (versus the assets.* fields
        // in the allowed_columns array)
        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
-        
-        
+
+
        switch ($sort_override) {
            case 'model':
                $assets->OrderModels($order);
@@ -291,7 +306,7 @@ class AssetsController extends Controller
            $this->authorize('view', $asset);
            return (new AssetsTransformer)->transformAsset($asset);
        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

    }

@@ -305,17 +320,18 @@ class AssetsController extends Controller
     */
    public function showBySerial($serial)
    {
+        $this->authorize('index', Asset::class);
        if ($assets = Asset::with('assetstatus')->with('assignedTo')
            ->withTrashed()->where('serial',$serial)->get()) {
-                $this->authorize('view', $assets);
-                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+
+            return (new AssetsTransformer)->transformAssets($assets, $assets->count());
        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

    }


-     /**
+    /**
     * Returns JSON with information about an asset for detail view.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
@@ -353,7 +369,7 @@ class AssetsController extends Controller
            'assets.assigned_to',
            'assets.assigned_type',
            'assets.status_id'
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
+        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(),'company_id', 'assets');

        if ($request->has('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
            $assets = $assets->RTD();
@@ -378,7 +394,7 @@ class AssetsController extends Controller
                $asset->use_text .= ' → '.$asset->assigned->getFullNameAttribute();
            }

-            
+
            if ($asset->assetstatus->getStatuslabelType()=='pending') {
                $asset->use_text .=  '('.$asset->assetstatus->getStatuslabelType().')';
            }
@@ -468,43 +484,15 @@ class AssetsController extends Controller
        $this->authorize('update', Asset::class);

        if ($asset = Asset::find($id)) {
-            ($request->has('model_id')) ?
-                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : '';
-            ($request->has('name')) ?
-                $asset->name = $request->get('name') : '';
-            ($request->has('serial')) ?
-                $asset->serial = $request->get('serial') : '';
-            ($request->has('model_id')) ?
-                $asset->model_id = $request->get('model_id') : '';
-            ($request->has('order_number')) ?
-                $asset->order_number = $request->get('order_number') : '';
-            ($request->has('notes')) ?
-                $asset->notes = $request->get('notes') : '';
-            ($request->has('asset_tag')) ?
-                $asset->asset_tag = $request->get('asset_tag') : '';
-            ($request->has('archived')) ?
-                $asset->archived = $request->get('archived') : '';
-            ($request->has('status_id')) ?
-                $asset->status_id = $request->get('status_id') : '';
-            ($request->has('warranty_months')) ?
-                $asset->warranty_months = $request->get('warranty_months') : '';
-            ($request->has('purchase_cost')) ?
-                $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')) : '';
-            ($request->has('purchase_date')) ?
-                $asset->purchase_date = $request->get('purchase_date') : '';
-            ($request->has('assigned_to')) ?
-                $asset->assigned_to = $request->get('assigned_to') : '';
-            ($request->has('supplier_id')) ?
-                $asset->supplier_id = $request->get('supplier_id') : '';
-            ($request->has('requestable')) ?
-                $asset->requestable = $request->get('requestable') : '';
-            ($request->has('rtd_location_id')) ?
-                $asset->rtd_location_id = $request->get('rtd_location_id') : '';
-            ($request->has('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : '';
-            ($request->has('company_id')) ?
-                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';

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

            // Update custom fields
            if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
@@ -519,9 +507,9 @@ class AssetsController extends Controller
            if ($asset->save()) {

                if (($request->has('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
-                        $location = $target->location_id;
+                    $location = $target->location_id;
                } elseif (($request->has('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
-                            $location = $target->location_id;
+                    $location = $target->location_id;
                } elseif (($request->has('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                    $location = $target->id;
                }
@@ -631,7 +619,7 @@ class AssetsController extends Controller
        $expected_checkin = request('expected_checkin', null);
        $note = request('note', null);
        $asset_name = request('name', null);
-        
+
        // Set the location ID to the RTD location id if there is one
        if ($asset->rtd_location_id!='') {
            $asset->location_id = $target->rtd_location_id;
@@ -639,7 +627,7 @@ class AssetsController extends Controller



-        
+

        if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));
@@ -30,7 +30,7 @@ class CategoriesController extends Controller
            $categories = $categories->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
@@ -41,7 +41,7 @@ class CompaniesController extends Controller
            $companies->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -43,7 +43,7 @@ class ComponentsController extends Controller
            $components->where('location_id','=',$request->input('location_id'));
        }

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

        $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image'];
@@ -35,12 +35,16 @@ class ConsumablesController extends Controller
            $consumables->where('company_id','=',$request->input('company_id'));
        }

+        if ($request->has('category_id')) {
+            $consumables->where('category_id','=',$request->input('category_id'));
+        }
+
        if ($request->has('manufacturer_id')) {
            $consumables->where('manufacturer_id','=',$request->input('manufacturer_id'));
        }


-        $offset = request('offset', 0);
+        $offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0);
        $limit = request('limit', 50);
        $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image'];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -39,7 +39,7 @@ class DepartmentsController extends Controller
            $departments = $departments->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -28,7 +28,7 @@ class DepreciationsController extends Controller
            $depreciations = $depreciations->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -28,7 +28,7 @@ class GroupsController extends Controller
            $groups = $groups->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -25,7 +25,7 @@ class ImportController extends Controller
     */
    public function index()
    {
-        //
+        $this->authorize('import');
        $imports = Import::latest()->get();
        return (new ImportsTransformer)->transformImports($imports);

@@ -39,10 +39,8 @@ class ImportController extends Controller
     */
    public function store()
    {
-        //
-        if (!Company::isCurrentUserAuthorized()) {
-            return redirect()->route('hardware.index')->with('error', trans('general.insufficient_permissions'));
-        } elseif (!config('app.lock_passwords')) {
+        $this->authorize('import');
+        if (!config('app.lock_passwords')) {
            $files = Input::file('files');
            $path = config('app.private_uploads').'/imports';
            $results = [];
@@ -119,7 +117,7 @@ class ImportController extends Controller
     */
    public function process(ItemImportRequest $request, $import_id)
    {
-        $this->authorize('create', Asset::class);
+        $this->authorize('import');
        // Run a backup immediately before processing
        Artisan::call('backup:run');
        $errors = $request->import(Import::find($import_id));
@@ -162,7 +160,7 @@ class ImportController extends Controller
     */
    public function destroy($import_id)
    {
-        $this->authorize('create', Asset::class);
+        $this->authorize('import');
        $import = Import::find($import_id);
        try {
            unlink(config('app.private_uploads').'/imports/'.$import->file_path);
@@ -82,7 +82,7 @@ class LicensesController extends Controller
        }


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

@@ -227,7 +227,8 @@ class LicensesController extends Controller

            $seats = LicenseSeat::where('license_id', $licenseId)->with('license', 'user', 'asset');

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

@@ -51,7 +51,7 @@ class LocationsController extends Controller



-        $offset = $request->input('offset', 0);
+        $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -39,7 +39,7 @@ class ManufacturersController extends Controller



-        $offset = request('offset', 0);
+        $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -27,15 +27,20 @@ class ProfileController extends Controller


        foreach ($checkoutRequests as $checkoutRequest) {
-            $results['rows'][] = [
-                'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
-                'name' => $checkoutRequest->itemRequested()->present()->name(),
-                'type' => $checkoutRequest->itemType(),
-                'qty' => $checkoutRequest->quantity,
-                'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
-                'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
-                'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
-            ];
+
+            // Make sure the asset and request still exist
+            if ($checkoutRequest && $checkoutRequest->itemRequested()) {
+                $results['rows'][] = [
+                    'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
+                    'name' => $checkoutRequest->itemRequested()->present()->name(),
+                    'type' => $checkoutRequest->itemType(),
+                    'qty' => $checkoutRequest->quantity,
+                    'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
+                    'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
+                    'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
+                ];
+            }
+
        }
        return $results;
    }
@@ -30,7 +30,7 @@ class StatuslabelsController extends Controller
            $statuslabels = $statuslabels->TextSearch($request->input('search'));
        }

-        $offset = $request->input('offset', 0);
+        $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -33,7 +33,7 @@ class SuppliersController extends Controller
            $suppliers = $suppliers->TextSearch($request->input('search'));
        }

-        $offset = request('offset', 0);
+        $offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0);
        $limit = $request->input('limit', 50);
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -12,6 +12,7 @@ use App\Http\Requests\SaveUserRequest;
 use App\Models\Asset;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\SelectlistTransformer;
+use App\Http\Transformers\AccessoriesTransformer;

 class UsersController extends Controller
 {
@@ -51,6 +52,7 @@ class UsersController extends Controller
            'users.phone',
            'users.state',
            'users.two_factor_enrolled',
+            'users.two_factor_optin',
            'users.updated_at',
            'users.username',
            'users.zip',
@@ -85,7 +87,7 @@ class UsersController extends Controller
        }

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

        switch ($request->input('sort')) {
@@ -147,8 +149,7 @@ class UsersController extends Controller
        $users = Company::scopeCompanyables($users);

        if ($request->has('search')) {
-            $users = $users->where('first_name', 'LIKE', '%'.$request->get('search').'%')
-                ->orWhere('last_name', 'LIKE', '%'.$request->get('search').'%')
+            $users = $users->SimpleNameSearch($request->get('search'))
                ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
                ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
        }
@@ -302,6 +303,23 @@ class UsersController extends Controller
        return (new AssetsTransformer)->transformAssets($assets, $assets->count());
    }

+    /**
+     * Return JSON containing a list of accessories assigned to a user.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.6.14]
+     * @param $userId
+     * @return string JSON
+     */
+    public function accessories($id)
+    {
+        $this->authorize('view', User::class);
+        $user = User::findOrFail($id);
+        $this->authorize('view', Accessory::class);
+        $accessories = $user->accessories;
+        return (new AccessoriesTransformer)->transformAccessories($accessories, $accessories->count());
+    }
+
    /**
     * Reset the user's two-factor status
     *
@@ -162,6 +162,9 @@ class AssetMaintenancesController extends Controller
            // Redirect to the improvement management page
            return redirect()->route('maintenances.index')
                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (!$assetMaintenance->asset) {
+            return redirect()->route('maintenances.index')
+                ->with('error', 'The asset associated with this maintenance does not exist.');
        } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return static::getInsufficientPermissionsRedirect();
        }
@@ -209,7 +209,7 @@ class AssetModelsController extends Controller
            try  {
                unlink(app('models_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -246,7 +246,7 @@ class AssetModelsController extends Controller
            try  {
                unlink(public_path().'/uploads/models/'.$model->image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -326,7 +326,7 @@ class AssetsController extends Controller
                unlink(public_path().'/uploads/assets/'.$asset->image);
                $asset->image = '';
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }

        }
@@ -744,6 +744,18 @@ class AssetsController extends Controller
        return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
    }

+    public function dueForAudit()
+    {
+        $this->authorize('audit', Asset::class);
+        return view('hardware/audit-due');
+    }
+
+    public function overdueForAudit()
+    {
+        $this->authorize('audit', Asset::class);
+        return view('hardware/audit-overdue');
+    }
+

    public function auditStore(AssetFileRequest $request, $id)
    {
@@ -781,7 +793,7 @@ class AssetsController extends Controller
                    $filename = 'audit-'.$asset->id.'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
                    $file->move($destinationPath, $filename);
                } catch (\Exception $e) {
-                    \Log::error($e);
+                    \Log::info($e);
                }
            }

@@ -80,7 +80,7 @@ class LoginController extends Controller
                Log::debug("Remote user auth lookup complete");
                if(!is_null($user)) Auth::login($user, true);
            } catch(Exception $e) {
-                Log::error("There was an error authenticating the Remote user: " . $e->getMessage());
+                Log::debug("There was an error authenticating the Remote user: " . $e->getMessage());
            }
        }
    }
@@ -169,7 +169,7 @@ class LoginController extends Controller
            // If the user was unable to login via LDAP, log the error and let them fall through to
            // local authentication.
            } catch (\Exception $e) {
-                Log::error("There was an error authenticating the LDAP user: ".$e->getMessage());
+                Log::debug("There was an error authenticating the LDAP user: ".$e->getMessage());
            }
        }

@@ -209,26 +209,33 @@ class LoginController extends Controller
    public function getTwoFactorEnroll()
    {

+        // Make sure the user is logged in
        if (!Auth::check()) {
-            return redirect()->route('login')->with('error', 'You must be logged in.');
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
        }

+
+        $settings = Setting::getSettings();
        $user = Auth::user();
-        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');

-        if ($user->two_factor_secret=='') {
-            $user->two_factor_secret = $google2fa->generateSecretKey(32);
-            $user->save();
+        // We wouldn't normally see this page if 2FA isn't enforced via the
+        // \App\Http\Middleware\CheckForTwoFactor middleware AND if a device isn't enrolled,
+        // but let's check check anyway in case there's a browser history or back button thing.
+        // While you can access this page directly, enrolling a device when 2FA isn't enforced
+        // won't cause any harm.
+
+        if (($user->two_factor_secret!='') && ($user->two_factor_enrolled==1)) {
+            return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.already_enrolled'));
        }

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

-        $google2fa_url = $google2fa->getQRCodeGoogleUrl(
-            urlencode(Setting::getSettings()->site_name),
-            urlencode($user->username),
-            $user->two_factor_secret
-        );
-
-        return view('auth.two_factor_enroll')->with('google2fa_url', $google2fa_url);
+        $barcode = new \Com\Tecnick\Barcode\Barcode();
+        $barcode_obj =  $barcode->getBarcodeObj('QRCODE', 'otpauth://totp/'.urlencode($settings->site_name).':'.urlencode($user->username).'?secret='.urlencode($secret).'&issuer=Snipe-IT&period=30', 300, 300, 'black', array(-2, -2, -2, -2));
+        return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj);

    }

@@ -240,6 +247,20 @@ class LoginController extends Controller
     */
    public function getTwoFactorAuth()
    {
+        // Check that the user is logged in
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
+        }
+
+        $user = Auth::user();
+
+        // Check whether there is a device enrolled.
+        // This *should* be handled via the \App\Http\Middleware\CheckForTwoFactor middleware
+        // but we're just making sure (in case someone edited the database directly, etc)
+        if (($user->two_factor_secret=='') || ($user->two_factor_enrolled!=1)) {
+            return redirect()->route('two-factor-enroll');
+        }
+
        return view('auth.two_factor');
    }

@@ -252,22 +273,25 @@ class LoginController extends Controller
    {

        if (!Auth::check()) {
-            return redirect()->route('login')->with('error', 'You must be logged in.');
+            return redirect()->route('login')->with('error', trans('auth/general.login_prompt'));
+        }
+
+        if (!$request->has('two_factor_secret')) {
+            return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.code_required'));
        }

        $user = Auth::user();
-        $secret = $request->get('two_factor_secret');
-        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
-        $valid = $google2fa->verifyKey($user->two_factor_secret, $secret);
+        $google2fa = new Google2FA();
+        $secret = $request->input('two_factor_secret');

-        if ($valid) {
+        if ($google2fa->verifyKey($user->two_factor_secret, $secret)) {
            $user->two_factor_enrolled = 1;
            $user->save();
            $request->session()->put('2fa_authed', 'true');
            return redirect()->route('home')->with('success', 'You are logged in!');
        }

-        return redirect()->route('two-factor')->with('error', 'Invalid two-factor code');
+        return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code'));


    }
@@ -290,7 +314,7 @@ class LoginController extends Controller
            return redirect()->away($customLogoutUrl);
        }

-        return redirect()->route('login')->with('success', 'You have successfully logged out!');
+        return redirect()->route('login')->with('success',  trans('auth/general.logout.success'));
    }


@@ -315,11 +339,11 @@ class LoginController extends Controller
    }

    /**
-    * Redirect the user after determining they are locked out.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @return \Illuminate\Http\RedirectResponse
-    */
+     * Redirect the user after determining they are locked out.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
    protected function sendLockoutResponse(Request $request)
    {
        $seconds = $this->limiter()->availableIn(
@@ -330,18 +354,18 @@ class LoginController extends Controller

        $message = \Lang::get('auth/message.throttle', ['minutes' => $minutes]);

-            return redirect()->back()
+        return redirect()->back()
            ->withInput($request->only($this->username(), 'remember'))
            ->withErrors([$this->username() => $message]);
    }


    /**
-    * Override the lockout time and duration
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @return \Illuminate\Http\RedirectResponse
-    */
+     * Override the lockout time and duration
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
    protected function hasTooManyLoginAttempts(Request $request)
    {
        $lockoutTime = config('auth.throttle.lockout_duration');
@@ -179,7 +179,7 @@ class CategoriesController extends Controller
            try  {
                unlink(app('categories_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -148,7 +148,7 @@ final class CompaniesController extends Controller
            try  {
                unlink(app('companies_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -191,7 +191,7 @@ class DepartmentsController extends Controller
            try  {
                unlink(app('departments_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -72,7 +72,7 @@ class GroupsController extends Controller
        if ($group->save()) {
            return redirect()->route("groups.index")->with('success', trans('admin/groups/message.success.create'));
        }
-        return redirect(route('groups.create'))->withInput()->withErrors($group->getErrors());
+        return redirect()->back()->withInput()->withErrors($group->getErrors());
    }

    /**
@@ -111,7 +111,7 @@ class GroupsController extends Controller
    {
        $permissions = config('permissions');
        if (!$group = Group::find($id)) {
-            return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
        }
        $group->name = e(Input::get('name'));
        $group->permissions = json_encode(Input::get('permission'));
@@ -138,7 +138,7 @@ class GroupsController extends Controller
    {
        if (!config('app.lock_passwords')) {
            if (!$group = Group::find($id)) {
-                return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+                return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
            }
            $group->delete();
            // Redirect to the group management page
@@ -12,7 +12,7 @@ class ImportsController extends Controller
 {
    public function index()
    {
-        $this->authorize('create', Asset::class);
+        $this->authorize('import');
        $imports = Import::latest()->get();
        $imports = (new ImportsTransformer)->transformImports($imports);
        return view('importer/import')->with('imports', $imports);
@@ -413,20 +413,7 @@ class LicensesController extends Controller
            return redirect()->back()->withInput();
        }

-        // Declare the rules for the form validation
-        $rules = array(
-            'note'   => 'string',
-            'notes'   => 'string',
-        );

-        // Create a new validator instance from our validation rules
-        $validator = Validator::make(Input::all(), $rules);
-
-        // If validation fails, we'll exit the operation now.
-        if ($validator->fails()) {
-            // Ooops.. something went wrong
-            return redirect()->back()->withInput()->withErrors($validator);
-        }
        $return_to = User::find($licenseSeat->assigned_to);
        if (!$return_to) {
            $return_to = Asset::find($licenseSeat->asset_id);
@@ -438,7 +425,7 @@ class LicensesController extends Controller

        // Was the asset updated?
        if ($licenseSeat->save()) {
-            $licenseSeat->logCheckin($return_to, e(request('note')));
+            $licenseSeat->logCheckin($license, e(request('note')));
            if ($backTo=='user') {
                return redirect()->route("users.show", $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
            }
@@ -200,7 +200,7 @@ class LocationsController extends Controller
            try  {
                unlink(app('locations_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -170,7 +170,7 @@ class ManufacturersController extends Controller
            try  {
                unlink(app('manufacturers_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -207,7 +207,7 @@ class ManufacturersController extends Controller
            try  {
                unlink(public_path().'/uploads/manufacturers/'.$manufacturer->image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -49,6 +49,9 @@ class ProfileController extends Controller
        $user->last_name  = $request->input('last_name');
        $user->website    = $request->input('website');
        $user->gravatar   = $request->input('gravatar');
+        $user->phone   = $request->input('phone');
+
+

        if (!config('app.lock_passwords')) {
            $user->locale = $request->input('locale', 'en');
@@ -125,8 +128,7 @@ class ProfileController extends Controller

        $rules = array(
            'current_password'     => 'required',
-            'password'         => Setting::passwordComplexityRulesSaving('store'),
-            'password_confirm' => 'required|same:password',
+            'password'         => Setting::passwordComplexityRulesSaving('store').'|confirmed',
        );

        $validator = \Validator::make($request->all(), $rules);
@@ -482,13 +482,12 @@ class SettingsController extends Controller
                $setting->two_factor_enabled = null;
            } else {
                $setting->two_factor_enabled = $request->input('two_factor_enabled');
-
-                # remote user login
-                $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
-                $setting->login_common_disabled= (int)$request->input('login_common_disabled');
-                $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
            }

+            # remote user login
+            $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
+            $setting->login_common_disabled = (int)$request->input('login_common_disabled');
+            $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
        }

        $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon');
@@ -174,7 +174,7 @@ class SuppliersController extends Controller
            try  {
                unlink(app('suppliers_upload_path').$old_image);
            } catch (\Exception $e) {
-                \Log::error($e);
+                \Log::info($e);
            }
        }

@@ -259,9 +259,7 @@ class UsersController extends Controller

        // Only save groups if the user is a super user
        if (Auth::user()->isSuperUser()) {
-            if ($request->has('groups')) {
-                $user->groups()->sync($request->input('groups'));
-            }
+            $user->groups()->sync($request->input('groups'));
        }


@@ -25,7 +25,7 @@ class Kernel extends HttpKernel
        \Fideloper\Proxy\TrustProxies::class,
        \App\Http\Middleware\CheckForSetup::class,
        \App\Http\Middleware\CheckForDebug::class,
-       // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
    ];

    /**
@@ -43,6 +43,20 @@ class ItemImportRequest extends FormRequest
        $import->save();
        $fieldMappings=[];
        if ($import->field_map) {
+
+            // This checks to make sure the field header has been mapped.
+            // If it hasn't been, it will throw an array_flip error
+            foreach ($import->field_map as $field => $fieldValue) {
+                $errorMessage = null;
+
+                if(is_null($fieldValue)){
+                    $errorMessage = 'All import fields must be mapped.';
+                    $this->errorCallback($import, $field, $errorMessage);
+
+                    return $this->errors;
+                }
+            }
+
            // We submit as csv field: column, but the importer is happier if we flip it here.
            $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER);
                        // dd($fieldMappings);
@@ -37,7 +37,7 @@ class SaveUserRequest extends Request
                $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                if ($this->request->get('ldap_import') == false)
                {
-                    $rules['password'] = Setting::passwordComplexityRulesSaving('store');
+                    $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed';
                }
                break;
            }
@@ -46,7 +46,7 @@ class SaveUserRequest extends Request
            case 'PUT':
                $rules['first_name'] = 'required|string|min:1';
                $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
-                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update').'|confirmed';
                break;

            // Save only what's passed
@@ -58,9 +58,7 @@ class SaveUserRequest extends Request

            default:break;
        }
-
-        $rules['password_confirm'] = 'sometimes|required_with:password';
-
+        
        return $rules;

    }
@@ -29,8 +29,7 @@ class SetupUserRequest extends Request
          'last_name' => 'required|string|min:1',
          'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at',
          'email' => 'email|unique:users,email',
-          'password' => 'required|min:6',
-          'password_confirm' => 'required|min:6|same:password',
+          'password' => 'required|min:6|confirmed',
          'email_domain' => 'required|min:4',
        ];
    }
@@ -26,6 +26,18 @@ class ActionlogsTransformer
        if ($actionlog->filename!='') {
            $icon =  e(\App\Helpers\Helper::filetype_icon($actionlog->filename));
        }
+
+        // This is necessary since we can't escape special characters within a JSON object
+        if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
+            $meta_array = json_decode($actionlog->log_meta);
+            foreach ($meta_array as $key => $value) {
+                foreach ($value as $meta_key => $meta_value) {
+                    $clean_meta[$key][$meta_key] = e($meta_value);
+                }
+            }
+        }
+
+
        $array = [
            'id'          => (int) $actionlog->id,
            'icon'          => $icon,
@@ -64,7 +76,7 @@ class ActionlogsTransformer

            'note'          => ($actionlog->note) ? e($actionlog->note): null,
            'signature_file'   => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
-            'log_meta'          => ($actionlog->log_meta) ? json_decode($actionlog->log_meta): null,
+            'log_meta'          => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,


        ];
@@ -28,7 +28,7 @@ class AssetMaintenancesTransformer
                'asset_tag'=> e($assetmaintenance->asset->asset_tag)

            ]  : null,
-            'company' => (($assetmaintenance->asset->company) && ($assetmaintenance->asset)) ? [
+            'company' => (($assetmaintenance->asset) && ($assetmaintenance->asset->company)) ? [
                'id' => (int) $assetmaintenance->asset->company->id,
                'name'=> ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null,

@@ -24,7 +24,7 @@ class UsersTransformer
        $array = [
                'id' => (int) $user->id,
                'avatar' => e($user->present()->gravatar),
-                'name' => e($user->first_name).' '.($user->last_name),
+                'name' => e($user->first_name).' '.e($user->last_name),
                'first_name' => e($user->first_name),
                'last_name' => e($user->last_name),
                'username' => e($user->username),
@@ -53,6 +53,8 @@ class UsersTransformer
                'permissions' => $user->decodePermissions(),
                'activated' => ($user->activated =='1') ? true : false,
                'two_factor_activated' => ($user->two_factor_active()) ? true : false,
+                'two_factor_enrolled' => ($user->two_factor_active_and_enrolled()) ? true : false,
+
                'assets_count' => (int) $user->assets_count,
                'licenses_count' => (int) $user->licenses_count,
                'accessories_count' => (int) $user->accessories_count,
@@ -796,6 +796,83 @@ class Asset extends Depreciable
        });
    }

+    /**
+     * Query builder scope for Assets that are due for auditing, based on the assets.next_audit_date
+     * and settings.audit_warning_days.
+     *
+     * This is/will be used in the artisan command snipeit:upcoming-audits and also
+     * for an upcoming API call for retrieving a report on assets that will need to be audited.
+     *
+     * Due for audit soon:
+     * next_audit_date greater than or equal to now (must be in the future)
+     * and (next_audit_date - threshold days) <= now ()
+     *
+     * Example:
+     * next_audit_date = May 4, 2025
+     * threshold for alerts = 30 days
+     * now = May 4, 2019
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since v4.6.16
+     * @param Setting $settings
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeDueForAudit($query, $settings)
+    {
+        return $query->whereNotNull('assets.next_audit_date')
+            ->where('assets.next_audit_date', '>=', Carbon::now())
+            ->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $settings->audit_warning_days DAY) <= '".Carbon::now()."'")
+            ->where('assets.archived', '=', 0)
+            ->NotArchived();
+    }
+
+    /**
+     * Query builder scope for Assets that are OVERDUE for auditing, based on the assets.next_audit_date
+     * and settings.audit_warning_days. It checks to see if assets.next audit_date is before now
+     *
+     * This is/will be used in the artisan command snipeit:upcoming-audits and also
+     * for an upcoming API call for retrieving a report on overdue assets.
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since v4.6.16
+     * @param Setting $settings
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeOverdueForAudit($query)
+    {
+        return $query->whereNotNull('assets.next_audit_date')
+            ->where('assets.next_audit_date', '<', Carbon::now())
+            ->where('assets.archived', '=', 0)
+            ->NotArchived();
+    }
+
+    /**
+     * Query builder scope for Assets that are due for auditing OR overdue, based on the assets.next_audit_date
+     * and settings.audit_warning_days.
+     *
+     * This is/will be used in the artisan command snipeit:upcoming-audits and also
+     * for an upcoming API call for retrieving a report on assets that will need to be audited.
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since v4.6.16
+     * @param Setting $settings
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+
+    public function scopeDueOrOverdueForAudit($query, $settings)
+    {
+        return $query->whereNotNull('assets.next_audit_date')
+            ->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $settings->audit_warning_days DAY) <= '".Carbon::now()."'")
+            ->where('assets.archived', '=', 0)
+            ->NotArchived();
+    }
+
+
  /**
   * Query builder scope for Archived assets
   *
@@ -72,6 +72,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
            trans('admin/asset_maintenances/general.repair')      => trans('admin/asset_maintenances/general.repair'),
            trans('admin/asset_maintenances/general.upgrade')     => trans('admin/asset_maintenances/general.upgrade'),
            'PAT test'      => 'PAT test',
+            trans('admin/asset_maintenances/general.calibration')     => trans('admin/asset_maintenances/general.calibration'),
+            'PAT test'      => 'PAT test',
        ];
    }

@@ -76,7 +76,7 @@ class Consumable extends SnipeModel
     * 
     * @var array
     */
-    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date'];
+    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no'];

    /**
     * The relations and their attributes that should be included when searching the model.
@@ -96,8 +96,11 @@ class Ldap extends Model

        $filterQuery = $settings->ldap_auth_filter_query . $username;

+
        if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) {
-            return false;
+            if(!$ldapbind = Ldap::bindAdminToLdap($connection)){
+                    return false;
+            }
        }

        if (!$results = ldap_search($connection, $baseDn, $filterQuery)) {
@@ -41,7 +41,8 @@ trait Loggable
        $settings = Setting::getSettings();
        $log = new Actionlog;
        $log = $this->determineLogItemType($log);
-        $log->user_id = Auth::user()->id;
+        if(Auth::user())
+            $log->user_id = Auth::user()->id;

        if (!isset($target)) {
            throw new Exception('All checkout logs require a target');
@@ -47,6 +47,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
        'manager_id',
        'password',
        'phone',
+        'notes',
        'state',
        'username',
        'zip',
@@ -269,7 +270,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
     **/
    public function managedLocations()
    {
-        return $this->hasMany('\App\Models\Location', 'manager_id')->withTrashed();
+        return $this->hasMany('\App\Models\Location', 'manager_id');
    }

    /**
@@ -328,7 +329,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo

    public function scopeGetDeleted($query)
    {
-        return $query->withTrashed()->whereNotNull('deleted_at');
+        return $query->withTrashed()->whereNotNull('users.deleted_at');
    }

    public function scopeGetNotDeleted($query)
@@ -388,7 +389,11 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
    }

    /**
-     * Check whether two-factor authorization is required and the user has activated it
+     * Check whether two-factor authorization is requiredfor this user
+     *
+     * 0 = 2FA disabled
+     * 1 = 2FA optional
+     * 2 = 2FA universally required
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0]
@@ -397,10 +402,45 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
     */
    public function two_factor_active () {

-        if (Setting::getSettings()->two_factor_enabled !='0') {
-            if (($this->two_factor_optin =='1') && ($this->two_factor_enrolled)) {
-                return true;
-            }
+        // If the 2FA is optional and the user has opted in
+        if ((Setting::getSettings()->two_factor_enabled =='1') && ($this->two_factor_optin =='1'))
+        {
+            return true;
+        }
+        // If the 2FA is required for everyone so is implicitly active
+        elseif (Setting::getSettings()->two_factor_enabled =='2')
+        {
+            return true;
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Check whether two-factor authorization is required and the user has activated it
+     * and enrolled a device
+     *
+     * 0 = 2FA disabled
+     * 1 = 2FA optional
+     * 2 = 2FA universally required
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.6.14]
+     *
+     * @return bool
+     */
+    public function two_factor_active_and_enrolled () {
+
+        // If the 2FA is optional and the user has opted in and is enrolled
+        if ((Setting::getSettings()->two_factor_enabled =='1') && ($this->two_factor_optin =='1') && ($this->two_factor_enrolled =='1'))
+        {
+            return true;
+        }
+        // If the 2FA is required for everyone and the user has enrolled
+        elseif ((Setting::getSettings()->two_factor_enabled =='2') && ($this->two_factor_enrolled))
+        {
+            return true;
        }
        return false;

@@ -412,6 +452,25 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
        return json_decode($this->permissions, true);
    }

+    /**
+     * Query builder scope to search user by name with spaces in it.
+     * We don't use the advancedTextSearch() scope because that searches
+     * all of the relations as well, which is more than what we need.
+     *
+     * @param  \Illuminate\Database\Query\Builder $query Query builder instance
+     * @param  array  $terms The search terms
+     * @return \Illuminate\Database\Query\Builder
+     */
+    public function scopeSimpleNameSearch($query,  $search) {
+
+           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
+               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
+               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%$search%", "%$search%"]);
+        return $query;
+    }
+
+
+
    /**
     * Run additional, advanced searches.
     *
@@ -445,7 +504,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo

    public function scopeDeleted($query)
    {
-        return $query->whereNotNull('deleted_at');
+        return $query->whereNotNull('users.deleted_at');
    }


@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\Setting;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Notification;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class SendUpcomingAuditNotification extends Notification
+{
+    use Queueable;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct($params, $threshold)
+    {
+        $this->assets = $params;
+        $this->threshold = $threshold;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return $notifyBy = ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        $message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits',
+            [
+                'assets'  => $this->assets,
+                'threshold'  => $this->threshold,
+            ])
+            ->subject(trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]));
+
+        return $message;
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
@@ -53,7 +53,7 @@ abstract class SnipePermissionsPolicy
    /**
     * Determine whether the user can view the accessory.
     *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
     * @return mixed
     */
    public function view(User $user, $item = null)
@@ -64,7 +64,7 @@ abstract class SnipePermissionsPolicy
    /**
     * Determine whether the user can create accessories.
     *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
     * @return mixed
     */
    public function create(User $user)
@@ -75,7 +75,7 @@ abstract class SnipePermissionsPolicy
    /**
     * Determine whether the user can update the accessory.
     *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
     * @return mixed
     */
    public function update(User $user, $item = null)
@@ -86,7 +86,7 @@ abstract class SnipePermissionsPolicy
    /**
     * Determine whether the user can delete the accessory.
     *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
     * @return mixed
     */
    public function delete(User $user, $item = null)
@@ -97,11 +97,13 @@ abstract class SnipePermissionsPolicy
     /**
     * Determine whether the user can manage the accessory.
     *
-     * @param  \App\User  $user
+     * @param  \App\Models\User  $user
     * @return mixed
     */
    public function manage(User $user, $item = null)
    {
        return $user->hasAccess($this->columnName().'.edit');
    }
+
+
 }
@@ -0,0 +1,273 @@
+<?php
+namespace App\Presenters;
+
+use App\Models\CustomField;
+use DateTime;
+
+/**
+ * Class AssetPresenter
+ * @package App\Presenters
+ */
+class AssetAuditPresenter extends Presenter
+{
+
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+             [
+                "field" => "id",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.id'),
+                "visible" => false
+            ], [
+                "field" => "company",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.company'),
+                "visible" => false,
+                "formatter" => 'assetCompanyObjFilterFormatter'
+            ], [
+                "field" => "name",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.name'),
+                "visible" => true,
+                "formatter" => "hardwareLinkFormatter"
+            ], [
+                "field" => "image",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/hardware/table.image'),
+                "visible" => false,
+                "formatter" => "imageFormatter"
+            ], [
+                "field" => "asset_tag",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/table.asset_tag'),
+                "visible" => true,
+                "formatter" => "hardwareLinkFormatter"
+            ], [
+                "field" => "serial",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.serial'),
+                "visible" => true,
+                "formatter" => "hardwareLinkFormatter"
+            ],  [
+                "field" => "model",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.model'),
+                "visible" => true,
+                "formatter" => "modelsLinkObjFormatter"
+            ], [
+                "field" => "model_number",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/models/table.modelnumber'),
+                "visible" => false
+            ], [
+                "field" => "category",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('general.category'),
+                "visible" => false,
+                "formatter" => "categoriesLinkObjFormatter"
+            ], [
+                "field" => "status_label",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/table.status'),
+                "visible" => true,
+                "formatter" => "statuslabelsLinkObjFormatter"
+            ], [
+                "field" => "assigned_to",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.checkedout_to'),
+                "visible" => true,
+                "formatter" => "polymorphicItemFormatter"
+            ], [
+                "field" => "location",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/table.location'),
+                "visible" => true,
+                "formatter" => "deployedLocationFormatter"
+            ], [
+                "field" => "rtd_location",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.default_location'),
+                "visible" => false,
+                "formatter" => "deployedLocationFormatter"
+            ], [
+                "field" => "manufacturer",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('general.manufacturer'),
+                "visible" => false,
+                "formatter" => "manufacturersLinkObjFormatter"
+            ], [
+                "field" => "purchase_date",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.purchase_date'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "purchase_cost",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.purchase_cost'),
+                "footerFormatter" => 'sumFormatter',
+            ], [
+                "field" => "order_number",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.order_number'),
+                'formatter' => "orderNumberObjFilterFormatter"
+            ], [
+                "field" => "eol",
+                "searchable" => false,
+                "sortable" => false,
+                "visible" => false,
+                "title" => trans('general.eol'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "warranty_months",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/hardware/form.warranty')
+            ],[
+                "field" => "warranty_expires",
+                "searchable" => false,
+                "sortable" => false,
+                "visible" => false,
+                "title" => trans('admin/hardware/form.warranty_expires'),
+                "formatter" => "dateDisplayFormatter"
+            ],[
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+
+            ], [
+                "field" => "checkout_counter",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.checkouts_count')
+
+            ],[
+                "field" => "checkin_counter",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.checkins_count')
+
+            ], [
+                "field" => "requests_counter",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.user_requests_count')
+
+            ], [
+                "field" => "created_at",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.created_at'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "updated_at",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.updated_at'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "last_checkout",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/hardware/table.checkout_date'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "expected_checkin",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/hardware/form.expected_checkin'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "last_audit_date",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => true,
+                "title" => trans('general.last_audit'),
+                "formatter" => "dateDisplayFormatter"
+            ], [
+                "field" => "next_audit_date",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => true,
+                "title" => trans('general.next_audit_date'),
+                "formatter" => "dateDisplayFormatter"
+            ],
+        ];
+
+        // This looks complicated, but we have to confirm that the custom fields exist in custom fieldsets
+        // *and* those fieldsets are associated with models, otherwise we'll trigger
+        // javascript errors on the bootstrap tables side of things, since we're asking for properties
+        // on fields that will never be passed through the REST API since they're not associated with
+        // models. We only pass the fieldsets that pertain to each asset (via their model) so that we
+        // don't junk up the REST API with tons of custom fields that don't apply
+
+        $fields =  CustomField::whereHas('fieldset', function ($query) {
+            $query->whereHas('models');
+        })->get();
+
+        foreach ($fields as $field) {
+            $layout[] = [
+                "field" => 'custom_fields.'.$field->convertUnicodeDbSlug(),
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "switchable" => true,
+                "title" => ($field->field_encrypted=='1') ?'<i class="fa fa-lock"></i> '.e($field->name) : e($field->name),
+                "formatter" => "customFieldsFormatter"
+            ];
+
+        }
+
+
+        $layout[] = [
+            "field" => "actions",
+            "searchable" => false,
+            "sortable" => false,
+            "switchable" => false,
+            "title" => trans('table.actions'),
+            "formatter" => "hardwareAuditFormatter",
+        ];
+
+        return json_encode($layout);
+    }
+
+
+
+}
@@ -391,7 +391,7 @@ class AssetPresenter extends Presenter
    public function eol_date()
    {

-        if (( $this->purchase_date ) && ( $this->model )) {
+        if (( $this->purchase_date ) && ( $this->model ) && ($this->model->model->eol) ) {
            $date = date_create($this->purchase_date);
            date_add($date, date_interval_create_from_date_string($this->model->model->eol . ' months'));
            return date_format($date, 'Y-m-d');
@@ -226,14 +226,14 @@ class UserPresenter extends Presenter
            [
                "field" => "two_factor_enrolled",
                "searchable" => false,
-                "sortable" => false,
+                "sortable" => true,
                "switchable" => true,
                "title" => trans('admin/users/general.two_factor_enrolled'),
                "visible" => false,
                'formatter' => 'trueFalseFormatter'
            ],
            [
-                "field" => "two_factor_active",
+                "field" => "two_factor_activated",
                "searchable" => false,
                "sortable" => false,
                "switchable" => true,
@@ -246,7 +246,7 @@ class UserPresenter extends Presenter
                "searchable" => false,
                "sortable" => true,
                "switchable" => true,
-                "title" => trans('general.activated'),
+                "title" => trans('general.login_enabled'),
                "visible" => true,
                'formatter' => 'trueFalseFormatter'
            ],
@@ -113,6 +113,14 @@ class AuthServiceProvider extends ServiceProvider
        });


+        // Can the user import CSVs?
+        Gate::define('import', function ($user) {
+            if ($user->hasAccess('import') ) {
+                return true;
+            }
+        });
+
+
        # -----------------------------------------
        # Reports
        # -----------------------------------------
@@ -12,6 +12,7 @@
    "doctrine/dbal": "^2.5.13",
    "doctrine/inflector": "1.1.*",
    "doctrine/instantiator": "1.0.*",
+    "eduardokum/laravel-mail-auto-embed": "^1.0",
    "erusev/parsedown": "^1.6",
    "fideloper/proxy": "^3.3",
    "intervention/image": "^2.3",
@@ -26,7 +27,8 @@
    "patchwork/utf8": "~1.2",
    "phpdocumentor/reflection-docblock": "3.2.2",
    "phpspec/prophecy": "1.6.2",
-    "pragmarx/google2fa": "^1.0",
+    "pragmarx/google2fa": "^5.0",
+    "pragmarx/google2fa-laravel": "^0.3.0",
    "predis/predis": "^1.1",
    "rollbar/rollbar-laravel": "2.4.1",
    "schuppo/password-strength": "~1.5",
@@ -291,12 +291,13 @@ return [
        Collective\Html\HtmlServiceProvider::class,
        Spatie\Backup\BackupServiceProvider::class,
        Fideloper\Proxy\TrustedProxyServiceProvider::class,
-        PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
+        PragmaRX\Google2FALaravel\ServiceProvider::class,
        Laravel\Passport\PassportServiceProvider::class,
        Laravel\Tinker\TinkerServiceProvider::class,
        Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
        Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
        Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
+        Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,

        /*
        * Application Service Providers...
@@ -27,6 +27,15 @@ return array(
        )
    ),

+    'CSV Import' => array(
+        array(
+            'permission' => 'import',
+            'label'      => '',
+            'note'       => 'This will allow users to import even if access to users, assets, etc is denied elsewhere.',
+            'display'    => true,
+        )
+    ),
+
    'Reports' => array(
        array(
            'permission' => 'reports.view',
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.6.7',
-  'full_app_version' => 'v4.6.7 - build 3944-g8f6ea84fc',
-  'build_version' => '3944',
+  'app_version' => 'v4.6.16',
+  'full_app_version' => 'v4.6.16 - build 4018-gce16eae50',
+  'build_version' => '4018',
  'prerelease_version' => '',
-  'hash_version' => 'g8f6ea84fc',
-  'full_hash' => 'v4.6.7-15-g8f6ea84fc',
-  'branch' => 'master',
+  'hash_version' => 'gce16eae50',
+  'full_hash' => 'v4.6.16-6-gce16eae50',
+  'branch' => 'features/6204_email_audit-alerts',
 );
@@ -15,7 +15,7 @@ class AddPrefixToSettings extends Migration {
 		//
 		Schema::table('settings', function(Blueprint $table) {

-			$table->string('auto_increment_prefix')->default(0);
+			$table->string('auto_increment_prefix')->nullable()->default(NULL);

 		});
 	}
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeAutoIncrementPrefixToNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('auto_increment_prefix')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AutoIncrementBackToString extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('auto_increment_prefix')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeSerialNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
+        Schema::table('assets', function (Blueprint $table) {
+            $table->string('serial')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakeFieldsNullableForIntegrity extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+
+        Schema::table('locations', function (Blueprint $table) {
+            $table->string('city')->nullable()->default(null)->change();
+            $table->string('state')->nullable()->default(null)->change();
+            $table->string('country')->nullable()->default(null)->change();
+            $table->integer('user_id')->nullable()->default(null)->change();
+            $table->string('address')->nullable()->default(null)->change();
+            $table->string('address2')->nullable()->default(null)->change();
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('last_name')->nullable()->default(null)->change();
+        });
+
+        Schema::table('suppliers', function (Blueprint $table) {
+            $table->integer('user_id')->nullable()->default(null)->change();
+        });
+
+        Schema::table('status_labels', function (Blueprint $table) {
+            $table->integer('user_id')->nullable()->default(null)->change();
+        });
+
+        Schema::table('models', function (Blueprint $table) {
+            $table->integer('user_id')->nullable()->default(null)->change();
+            $table->integer('manufacturer_id')->nullable()->default(null)->change();
+            $table->integer('category_id')->nullable()->default(null)->change();
+        });
+
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->integer('user_id')->nullable()->default(null)->change();
+            $table->boolean('maintained')->nullable()->default(null)->change();
+        });
+
+        Schema::table('depreciations', function (Blueprint $table) {
+            $table->integer('user_id')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -43,5 +43,8 @@ class DatabaseSeeder extends Seeder
        \Log::info($output);

        Model::reguard();
+
+        DB::table('imports')->truncate();
+
    }
 }
@@ -5,7 +5,7 @@ if [ -z "$APP_KEY" ]
 then
  echo "Please re-run this container with an environment variable \$APP_KEY"
  echo "An example APP_KEY you could use is: "
-  php artisan key:generate --show
+  /var/www/html/artisan key:generate --show
  exit
 fi

@@ -47,5 +47,4 @@ then
  cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
 fi

-. /etc/apache2/envvars 
-exec apache2 -DNO_DETACH < /dev/null
+exec supervisord -c /supervisord.conf
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# A supervisor event listener which terminates supervisord if any of its child
+# processes enter the FATAL state.
+# https://stackoverflow.com/a/37527488/119527
+import os
+import signal
+
+from supervisor import childutils
+
+def main():
+    while True:
+        headers, payload = childutils.listener.wait()
+        childutils.listener.ok()
+        if headers['eventname'] != 'PROCESS_STATE_FATAL':
+            continue
+        os.kill(os.getppid(), signal.SIGTERM)
+
+if __name__ == "__main__":
+    main()
@@ -0,0 +1,27 @@
+[supervisord]
+nodaemon=true
+
+[program:apache]
+; https://advancedweb.hu/2018/07/03/supervisor_docker/
+command=apache2ctl -DFOREGROUND
+killasgroup=true
+stopasgroup=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:run_schedule]
+; Simply run the Laravel command scheduler every minute
+command=/bin/bash -c "while true; do /var/www/html/artisan schedule:run; sleep 1m; done"
+user=docker
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+
+; https://stackoverflow.com/a/37527488/119527
+[eventlistener:exit_on_any_fatal]
+command=supervisor-exit-event-listener
+events=PROCESS_STATE_FATAL
@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=af0a53aa1b89d0e19039",
+    "/js/build/vue.js": "/js/build/vue.js?id=96f90510b797ac27a94b",
    "/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
    "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
    "/css/overrides.css": "/css/overrides.css?id=2d81c3704393bac77011",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=79fce5e6515d8a4cc760",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=423f16f63b86abd6b196",
    "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=0be7790b84909dca6a0a",
    "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
    "/css/overrides.css.map": "/css/overrides.css.map?id=f7ce9ca49027594ac402",
    "/css/dist/all.css": "/css/dist/all.css?id=98db4e9b7650453c8b00",
-    "/js/dist/all.js": "/js/dist/all.js?id=a3a656ed6316d4c4efe7",
+    "/js/dist/all.js": "/js/dist/all.js?id=114f1025a1b3e8975476",
    "/css/build/all.css": "/css/build/all.css?id=98db4e9b7650453c8b00",
-    "/js/build/all.js": "/js/build/all.js?id=a3a656ed6316d4c4efe7"
-}
+    "/js/build/all.js": "/js/build/all.js?id=114f1025a1b3e8975476"
+}
@@ -40,9 +40,8 @@ tr {
                </div>
                </div>
            </div>
-            <div class="alert col-md-12"
+            <div class="alert col-md-12" style="text-align:left"
                 :class="alertClass"
-                 style="text-align:left"
                 v-if="statusText">
                {{ this.statusText }}
            </div>
@@ -84,7 +83,6 @@ tr {

                <div class="alert col-md-12" style="padding-top: 20px;"
                     :class="alertClass"
-                     style="text-align:left"
                     v-if="statusText">
                    {{ this.statusText }}
                </div>
@@ -260,7 +260,18 @@ $(document).ready(function () {
    }

    function formatDataSelection (datalist) {
-        return datalist.text;
+        // This a heinous workaround for a known bug in Select2.
+        // Without this, the rich selectlists are vulnerable to XSS.
+        // Many thanks to @uberbrady for this fix. It ain't pretty,
+        // but it resolves the issue until Select2 addresses it on their end.
+        //
+        // Bug was reported in 2016 :{
+        // https://github.com/select2/select2/issues/4587
+
+        return datalist.text.replace(/>/g, '&gt;')
+            .replace(/</g, '&lt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#039;');
    }

    // This handles the radio button selectors for the checkout-to-foo options
@@ -7,5 +7,6 @@
        'view'               => 'View Asset Maintenance Details',
        'repair'             => 'Repair',
        'maintenance'        => 'Maintenance',
-        'upgrade'            => 'Upgrade'
+        'upgrade'            => 'Upgrade',
+        'calibration'        => 'Calibration'
    ];
@@ -9,11 +9,23 @@ return array(
    'account_banned'         => 'This user account is banned.',
    'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',

+    'two_factor' => array(
+        'already_enrolled'      => 'Your device is already enrolled.',
+        'success'               => 'You have successfully logged in.',
+        'code_required'         => 'Two-factor code is required.',
+        'invalid_code'          => 'Two-factor code is invalid.',
+    ),
+
    'signin' => array(
        'error'   => 'There was a problem while trying to log you in, please try again.',
        'success' => 'You have successfully logged in.',
    ),

+    'logout' => array(
+        'error'   => 'There was a problem while trying to log you out, please try again.',
+        'success' => 'You have successfully logged out.',
+    ),
+
    'signup' => array(
        'error'   => 'There was a problem while trying to create your account, please try again.',
        'success' => 'Account sucessfully created.',
@@ -219,6 +219,9 @@
    'years'					=> 'years',
    'yes' 					=> 'Yes',
    'zip'  					=> 'Zip',
-    'noimage'					=> 'No image uploaded or image not found.',
-    'token_expired'             => 'Your form session has expired. Please try again.',
+    'noimage'				=> 'No image uploaded or image not found.',
+    'token_expired'         => 'Your form session has expired. Please try again.',
+    'login_enabled'         => 'Login Enabled',
+    'audit_due'             => 'Due for Audit',
+    'audit_overdue'         => 'Overdue for Audit',
    ];
@@ -64,9 +64,11 @@ return array(
    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
    'to_reset' => 'To reset your :web password, complete this form:',
    'type' => 'Type',
+    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
    'user' => 'User',
    'username' => 'Username',
    'welcome' => 'Welcome :name',
    'welcome_to' => 'Welcome to :web!',
    'your_credentials' => 'Your Snipe-IT credentials',
+
 );
@@ -42,6 +42,7 @@ return array(
    'exists'               => 'The selected :attribute is invalid.',
    'file'                 => 'The :attribute must be a file.',
    'filled'               => 'The :attribute field must have a value.',
+    'hashed_pass'          => 'Your password is incorrect.',
    'image'                => 'The :attribute must be an image.',
    'in'                   => 'The selected :attribute is invalid.',
    'in_array'             => 'The :attribute field does not exist in :other.',
@@ -371,6 +371,7 @@ Form::macro('date_display_format', function ($name = "date_display_format", $sel
        'd/m/Y',
        'm/j/Y',
        'd.m.Y',
+        'Y.m.d.',
    ];

    foreach ($formats as $format) {
@@ -37,11 +37,11 @@
    </div>


-    <div class="form-group {{ $errors->has('password_confirm') ? ' has-error' : '' }}">
+    <div class="form-group {{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
        <label for="password_confirm" class="col-md-3 control-label">New Password</label>
        <div class="col-md-5 required">
-            <input class="form-control" type="password" name="password_confirm" id="password_confirm"  {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
-            {!! $errors->first('password_confirm', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+            <input class="form-control" type="password" name="password_confirmation" id="password_confirmation"  {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
+            {!! $errors->first('password_confirmation', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
            @if (config('app.lock_passwords'))
            	<p class="help-block">{{ trans('admin/users/table.lock_passwords') }}</p>
            @endif
@@ -58,6 +58,15 @@
          </div>
        </div>

+        <!-- Phone -->
+        <div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
+          <label class="col-md-3 control-label" for="phone">{{ trans('admin/users/table.phone') }}</label>
+          <div class="col-md-4">
+            <input class="form-control" type="text" name="phone" id="phone" value="{{ Input::old('phone', $user->phone) }}" />
+            {!! $errors->first('phone', '<span class="alert-msg">:message</span>') !!}
+          </div>
+        </div>
+


        <!-- Website URL -->
@@ -28,7 +28,7 @@
                                </div>

                                <div class="col-md-12 text-center">
-                                    <img src="{{ $google2fa_url }}" style="padding: 15px 0px 15px 0px">
+                                    {!!  $barcode_obj->getHtmlDiv() !!}
                                </div>

                            </div>
@@ -0,0 +1,70 @@
+@extends('layouts/default')
+
+@section('title0')
+
+    @if ((Input::get('company_id')) && ($company))
+        {{ $company->name }}
+    @endif
+
+    {{ trans('general.audit_due') }}
+
+@stop
+
+{{-- Page title --}}
+@section('title')
+    @yield('title0')  @parent
+@stop
+
+
+{{-- Page content --}}
+@section('content')
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-body">
+                    {{ Form::open([
+                      'method' => 'POST',
+                      'route' => ['hardware/bulkedit'],
+                      'class' => 'form-inline',
+                       'id' => 'bulkForm']) }}
+                    <div class="row">
+                        <div class="col-md-12">
+
+                            <table
+                                    data-click-to-select="true"
+                                    data-columns="{{ \App\Presenters\AssetAuditPresenter::dataTableLayout() }}"
+                                    data-cookie-id-table="assetsAuditListingTable"
+                                    data-pagination="true"
+                                    data-id-table="assetsAuditListingTable"
+                                    data-search="true"
+                                    data-side-pagination="server"
+                                    data-show-columns="true"
+                                    data-show-export="true"
+                                    data-show-footer="true"
+                                    data-show-refresh="true"
+                                    data-sort-order="asc"
+                                    data-sort-name="name"
+                                    data-toolbar="#toolbar"
+                                    id="assetsAuditListingTable"
+                                    class="table table-striped snipe-table"
+                                    data-url="{{ route('api.asset.to-audit', ['audit' => 'due']) }}"
+                                    data-export-options='{
+                "fileName": "export-assets-due-audit-{{ date('Y-m-d') }}",
+                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                }'>
+                            </table>
+
+                        </div><!-- /.col -->
+                    </div><!-- /.row -->
+                    {{ Form::close() }}
+                </div><!-- ./box-body -->
+            </div><!-- /.box -->
+        </div>
+    </div>
+@stop
+
+@section('moar_scripts')
+    @include('partials.bootstrap-table')
+
+@stop
@@ -0,0 +1,70 @@
+@extends('layouts/default')
+
+@section('title0')
+
+    @if ((Input::get('company_id')) && ($company))
+        {{ $company->name }}
+    @endif
+
+    {{ trans('general.audit_overdue') }}
+
+@stop
+
+{{-- Page title --}}
+@section('title')
+    @yield('title0')  @parent
+@stop
+
+
+{{-- Page content --}}
+@section('content')
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="box">
+                <div class="box-body">
+                    {{ Form::open([
+                      'method' => 'POST',
+                      'route' => ['hardware/bulkedit'],
+                      'class' => 'form-inline',
+                       'id' => 'bulkForm']) }}
+                    <div class="row">
+                        <div class="col-md-12">
+
+                            <table
+                                    data-click-to-select="true"
+                                    data-columns="{{ \App\Presenters\AssetAuditPresenter::dataTableLayout() }}"
+                                    data-cookie-id-table="assetsOverdueAuditListingTable"
+                                    data-pagination="true"
+                                    data-id-table="assetsOverdueAuditListingTable"
+                                    data-search="true"
+                                    data-side-pagination="server"
+                                    data-show-columns="true"
+                                    data-show-export="true"
+                                    data-show-footer="true"
+                                    data-show-refresh="true"
+                                    data-sort-order="asc"
+                                    data-sort-name="name"
+                                    data-toolbar="#toolbar"
+                                    id="assetsAuditListingTable"
+                                    class="table table-striped snipe-table"
+                                    data-url="{{ route('api.asset.to-audit', ['audit' => 'overdue']) }}"
+                                    data-export-options='{
+                "fileName": "export-assets-due-audit-{{ date('Y-m-d') }}",
+                "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                }'>
+                            </table>
+
+                        </div><!-- /.col -->
+                    </div><!-- /.row -->
+                    {{ Form::close() }}
+                </div><!-- ./box-body -->
+            </div><!-- /.box -->
+        </div>
+    </div>
+@stop
+
+@section('moar_scripts')
+    @include('partials.bootstrap-table')
+
+@stop
@@ -440,14 +440,27 @@
                        </a>
                    </li>

+                    @can('audit', \App\Models\Asset::class)
+                        <li{!! (Request::is('hardware/audit/due') ? ' class="active"' : '') !!}>
+                            <a href="{{ route('assets.audit.due') }}">
+                                <i class="fa fa-clock-o text-yellow"></i> {{ trans('general.audit_due') }}
+                            </a>
+                        </li>
+                        <li{!! (Request::is('hardware/audit/overdue') ? ' class="active"' : '') !!}>
+                            <a href="{{ route('assets.audit.overdue') }}">
+                                <i class="fa fa-warning text-red"></i> {{ trans('general.audit_overdue') }}
+                            </a>
+                        </li>
+                    @endcan
+
                  <li class="divider">&nbsp;</li>
                    @can('checkout', \App\Models\Asset::class)
-                    <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active>"' : '') !!}>
+                    <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
                        <a href="{{ route('hardware/bulkcheckout') }}">
                            {{ trans('general.bulk_checkout') }}
                        </a>
                    </li>
-                    <li{!! (Request::is('hardware/requested') ? ' class="active>"' : '') !!}>
+                    <li{!! (Request::is('hardware/requested') ? ' class="active"' : '') !!}>
                        <a href="{{ route('assets.requested') }}">
                            {{ trans('general.requested') }}</a>
                    </li>
@@ -520,7 +533,7 @@
                  </a>
            </li>
            @endcan
-            @can('create', \App\Models\Asset::class)
+            @can('import')
                <li{!! (Request::is('import/*') ? ' class="active"' : '') !!}>
                    <a href="{{ route('imports.index') }}">
                        <i class="fa fa-cloud-download"></i>
@@ -44,9 +44,9 @@

                <table
                        data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayoutSeats() }}"
-                        data-cookie-id-table="seatsTable"
-                        data-id-table="seatsTable"
-                        id="seatsTable"
+                        data-cookie-id-table="seatsTable-{{ $license->id }}"
+                        data-id-table="seatsTable-{{ $license->id }}"
+                        id="seatsTable-{{$license->id}}"
                        data-pagination="true"
                        data-search="true"
                        data-side-pagination="server"
@@ -14,7 +14,7 @@
            'numbers': true,
            'specialChars': true,
            'onPasswordGenerated': function (generatedPassword) {
-                $('#modal-password_confirm').val($('#modal-password').val());
+                $('#modal-password_confirmation').val($('#modal-password').val());
            }
        });
    });
@@ -52,8 +52,8 @@
                    </div>

                    <div class="dynamic-form-row">
-                        <div class="col-md-4 col-xs-12"><label for="modal-password_confirm">{{ trans('admin/users/table.password_confirm') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirm" id='modal-password_confirm' class="form-control">
+                        <div class="col-md-4 col-xs-12"><label for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label></div>
+                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
                            <div id="generated-password"></div>
                        </div>
                    </div>
@@ -0,0 +1,20 @@
+@component('mail::message')
+
+### {{ trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count(), 'threshold' => $threshold]) }}
+
+@component('mail::table')
+| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}
+| |:------------- |:-------------|:---------|:---------|:---------|:---------|
+@foreach ($assets as $asset)
+@php
+$next_audit_date = \App\Helpers\Helper::getFormattedDateObject($asset->next_audit_date, 'date', false);
+$last_audit_date = \App\Helpers\Helper::getFormattedDateObject($asset->last_audit_date, 'date', false);
+$diff = Carbon::parse(Carbon::now())->diffInDays($next_audit_date, false);
+$icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' ');
+@endphp
+|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }}  | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}
+@endforeach
+@endcomponent
+
+
+@endcomponent
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	e5c2d77c7d	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 ) * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)	2019-05-05 22:32:52 -04:00
snipe	ce16eae508	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-05-02 15:20:52 -07:00
snipe	dc73dbfbfd	Fixed #6911 - note must be a string on license checkin	2019-05-02 15:20:47 -07:00
snipe	dae26e0378	Remove “Imported from LDAP” note override	2019-04-18 17:56:08 -04:00
snipe	1bb1f7342f	Fixed #6922 - date_add crashing if EOL is null	2019-04-18 15:49:59 -04:00
snipe	420e8bc85a	Allow phone number to be changed in Profile	2019-04-18 14:13:50 -04:00
snipe	a521523d45	Truncate imports table on seed	2019-04-18 14:13:33 -04:00
snipe	25884a893e	Bumped version	2019-03-20 02:41:33 -07:00
snipe	d1e9fbfa24	Updated compoer	2019-03-20 02:37:44 -07:00
snipe	da015ec4a8	Fixed #6834 and #6402 - use inline QR code generation for 2FA (#6840 ) * Fixed #6834 and #6402 - use inline QR code generation for * Update auth controllers to use translations * Updated composer lock * Added comments * Moar comments * Typo	2019-03-20 01:24:31 -07:00
snipe	1451b4f45d	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-03-18 20:51:11 -07:00
snipe	b6da68a69c	Bumped version	2019-03-18 20:50:47 -07:00
snipe	dee92cfc6c	Fixes XSS vulnerabilities (#6831 ) * Properly escape log_meta values * Vue syntax fix to allow npm run dev to work again * Janky fix for Select2 bug * Compiled production assets * Escape user’s last name in API * Removed duplicate alertClass * Compiled production assets	2019-03-18 20:49:32 -07:00
snipe	dec77890bd	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-03-18 11:59:48 -07:00
snipe	0e1289f12f	Fixes #6821 - fixed 2 fa active for users list (#6822 ) * Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced I also updated the language in the user’s listing table to clarify what “activated” means * Added login enabled info to user view * Clarified comments * Added info about 2FA on user profile Because why not * Added nowrap to table, and added 2FA reset for superadmins	2019-03-18 11:59:02 -07:00
snipe	7b33f95e83	Fixes/import permissions mask (#6826 ) * Check for empty headers in import * Added import permission * Fixed model path in docblock * Added import gate to default blade * Check if the user is an admin OR idf they have import permissions * Walked back that admin permission Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission	2019-03-18 11:58:08 -07:00
snipe	ab6744dfba	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-03-14 15:38:20 -07:00
snipe	0fd940ffa4	Check for empty headers in import	2019-03-14 15:38:07 -07:00
Tim Farmer	5893e25b43	Label bugs in alerts settings (#6808 ) * Label bugs in alerts settings Found another label bug where the alert_email label should be alerts_enabled. * Update alerts.blade.php	2019-03-14 10:53:05 -07:00
snipe	7c3bbe3097	Fixes #6776 hungary date format (#6823 ) * Add @timothyfarmer as a contributor * Fixed #6776 - added hungary time format	2019-03-13 19:39:38 -07:00
snipe	858d382e26	Changed logging to info level for LDAP	2019-03-13 15:14:03 -07:00
snipe	de16fee00a	Change image unlink error log to info from error	2019-03-13 12:22:12 -07:00
Tim Farmer	7deab0f53b	Label bugs in general settings (#6801 ) * checkbox label bug The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box. * Update general.blade.php * Update general.blade.php Another label that is wrong in general settings	2019-03-08 12:24:24 -08:00
Jonathon Reinhart	e59ec8b27f	Run Laravel schedule in docker image using supervisord (#6606 ) * docker: Rename /entrypoint.sh to /startup.sh This script is not configured as the docker image ENTRYPOINT, thus it is misleading to name it so. * docker: Terminate supervisord if a process enters the FATAL state By terminating PID 1, this will also terminate the Docker container. * docker: Use supervisord to start up apache and cron Note that this uses `apache2ctl -DFOREGROUND` rather than manually sourcing /etc/apache2/envvars and running apache2, as recommended at https://advancedweb.hu/2018/07/03/supervisor_docker/. * docker: Add artisan schedule:run to crontab This also switches to executing /var/www/html/artisan directly. * docker: Run artisan schedule:run directly from supervisor This has the following benefits over using cron: - Cron doesn't need to be installed - Docker-provided environment variables are preserved - It's easy and explicit to run as the docker user	2019-03-07 12:42:00 -08:00
snipe	6d98bd6846	Fixed error if item requested or request was deleted (#6786 ) ch628	2019-03-05 23:47:36 -08:00
snipe	58768e5aee	Added ability to search consumables by item number (#6785 ) Fixes ch1086	2019-03-05 23:21:22 -08:00
snipe	28a450ea25	Added ability to do full name search in user dropdown selectlist (#6784 )	2019-03-05 21:13:39 -08:00
snipe	1393f44070	Create FUNDING.yml	2019-03-04 23:57:17 -08:00
snipe	8016939f31	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-03-01 17:39:55 -08:00
snipe	c1ad2f9376	Added link to Marksman - A Windows agent for Snipe-IT Per https://github.com/Scope-IT/marksman/issues/9#issuecomment-468275142	2019-03-01 17:39:50 -08:00
snipe	9575cd2651	Add accessories endpoint to user API (#6775 )	2019-03-01 17:21:03 -08:00
snipe	cf086b711e	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-02-22 13:24:58 -08:00
snipe	53db96edad	Bumped minor version	2019-02-22 13:24:45 -08:00
snipe	3b62c4a83a	Fixes/integrity constraint (#6754 ) * Migration to fix nullables This should fix an issue introduced in `90cddb7aee` where we’re passing null instead of an empty string (necessary to nullify values via the API) * Removed asset migration - serial was already fixed	2019-02-22 13:20:42 -08:00
snipe	5f3147cf36	Added support for enum that was added :(	2019-02-20 21:04:03 -08:00
snipe	738896bdc2	Make serial nullable Guessing this is new due to later versions of mysql	2019-02-20 20:47:14 -08:00
snipe	e2834fab90	Bumped minor version	2019-02-16 11:48:20 -08:00
snipe	d687e1d762	Fixed #6725 - revert auro_increment_prefix to string This was mis-migrated as boolean. It’s essentially a duplicate migration, as it is fixed in-place on the existing migration, and then a new migratio was created to handle anyone who already upgraded.	2019-02-16 11:37:05 -08:00
snipe	6256abddf2	Bumped point release	2019-02-14 15:07:11 -08:00
snipe	b26fbf986f	Fixed issue where offset could be greater than total items, resulting in “No results” confusion	2019-02-14 14:49:08 -08:00
snipe	5c9b1ed43a	Fixed #6676 - consumables API not respecting category id	2019-02-14 14:48:43 -08:00
snipe	14eb6b387b	Possible fix for #6710 - explicitly make auto_increment_prefix nullable (#6716 ) * Possible fix for #6710 - explicitly make auto_increment_prefix nullable * Added migration to make auto_increment_prefix explicitly nullable	2019-02-14 12:46:09 -08:00
snipe	35ebe33e4e	Fixed #6703 - fixes password confirmation (#6711 ) * Fixed #6703 - fixes password confirmation * Removed debugging * Fixed tests * I guess we use 10 as the settings for password min in tests * One more try to fix tests - confirmation won’t validate until password validates	2019-02-13 23:01:19 -08:00
snipe	9035707bd6	Bumped point version	2019-02-13 07:40:52 -08:00
snipe	aa1e06f021	One more time…. Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets	2019-02-13 04:46:19 -08:00
snipe	30b1cfabf5	Fixed dumb formatting	2019-02-13 04:45:21 -08:00
snipe	e75d22ab73	Revert "Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets" This reverts commit `b1e17743b8`.	2019-02-13 04:44:19 -08:00
snipe	b1e17743b8	Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets	2019-02-13 04:35:55 -08:00
snipe	e2c0f01a10	Fixed #6367 - pass table name and column_id to scopeCompanyables Solves error: Integrity constraint violation: 1052 Column 'company_id' in where clause is ambiguous	2019-02-13 01:26:11 -08:00
snipe	f88fee0f21	Make user notes field editable via API	2019-02-12 23:58:30 -08:00
snipe	c0669150fb	Bumped point version	2019-02-12 23:48:31 -08:00
snipe	f3c12f38b6	Fixed #6061 - Assigned user group cannot be removed This bug was a result of attempting to check if the groups field had a value, and only THEN trying to sync the groups. This meant that uf you were removing ALL groups, the sync wouldn’t be triggered. This still needs to be updated in the API.	2019-02-12 23:43:38 -08:00
snipe	5e19178a30	Do not count deleted locations in managedLocation check on user delete	2019-02-12 23:32:10 -08:00
snipe	90cddb7aee	Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API (#6693 ) Need to confirm that re-enabling `\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,` won’t mangle anything. I know we ran into some issues when testing a long time ago, but not sure those issues apply anymore, and I can’t remember what they were.	2019-02-12 22:08:38 -08:00
snipe	6d828964be	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-02-04 18:58:32 -08:00
snipe	971fcf5800	Fixed #6633 - return 200 status code	2019-02-04 18:58:28 -08:00
Daniel Ruf	2ad270cf33	ci: fix indentation (#6669 )	2019-01-30 15:14:17 -08:00
Daniel Ruf	8ce78c6b31	tests: allow to fail on PHP 7.3 and use the latest PHP 7.1 release (#6666 )	2019-01-30 14:32:33 -08:00
Daniel Ruf	af3c8195af	tests: fix expected string (#6665 )	2019-01-30 14:12:20 -08:00
snipe	117b4c59cc	Bumped minor version	2019-01-25 21:06:08 -08:00
snipe	194d0733d4	Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report This report will likely be deprecated.	2019-01-25 20:57:14 -08:00
snipe	a371e8d53f	Added calibration as a maintenance type Should just make these custmizable options	2019-01-24 15:17:33 -08:00
snipe	8f09cca043	Fixed incorrect group route	2019-01-24 15:17:11 -08:00
snipe	39bca49e8f	Specify table name in deleted user display	2019-01-24 14:38:18 -08:00
snipe	b8269020ae	Specify table name in deleted user display	2019-01-24 14:37:39 -08:00
snipe	601c129bbf	Embed images in emails	2019-01-17 20:45:24 -08:00
snipe	b293d00699	Switch LDAP error to debug, to avoid crapping up the logs	2019-01-17 20:18:03 -08:00
snipe	75a0cf97e2	Return an error if asset maintenance is associated with a non-existant asset	2019-01-16 02:19:57 -08:00
snipe	c055e3af21	Only try to return the asset tag link if a valid asset id has been passed	2019-01-16 02:19:35 -08:00
snipe	a1f93e733c	Fixed undefined error when maintenance is associated with a deleted asset	2019-01-16 01:45:51 -08:00
fanta8897	49073742b5	Updating LDAP such that each user is not required to be bindable to LDAP (#6571 ) * Update Ldap.php * Update Ldap.php * Update Ldap.php * Update Ldap.php * Update Ldap.php Updating LDAP.php such that the admin bind will ONLY occur if the user attempting auth cannot bind. If that is the case, it will attempt to bind as admin and search for that user, prior to failing.	2019-01-15 14:04:21 -08:00
Sxderp	187206cb88	Fix saving of REMOTE_USER setting broken by `1a64879b6` (#6565 ) The previous commit made it such that remote user login could only be enabled if two factor authentication was also enabled. Unnest the configuration so that the setting can be applied without.	2019-01-15 13:59:36 -08:00
Hubert	8420cb7ec1	Fixed problem with import when using snipeit:import command (#6550 )	2019-01-15 13:58:23 -08:00
Andrey Bolonin	75252bce05	add php 7.3 (#6556 )	2019-01-10 13:21:04 -08:00