Version bump for beta 2

Removed some logging to make test debugging less verbose
Add Error DIV's to all modals (#3886 )
2017-08-24 23:32:33 -07:00 · 2017-08-24 23:20:51 -07:00 · 2017-08-24 22:43:05 -07:00 · 2017-08-24 22:40:07 -07:00 · 2017-08-24 22:24:02 -07:00 · 2017-08-24 17:21:50 -07:00
80 changed files with 2024 additions and 671 deletions
@@ -719,6 +719,15 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "zwerch",
+      "name": "Robin Temme",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2809241?v=4",
+      "profile": "https://github.com/zwerch",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -15,7 +15,7 @@ FILESYSTEM_DISK=local
 DB_CONNECTION=mysql
 DB_HOST=localhost
 DB_DATABASE=snipeit_unit
-DB_USERNAME=travis
+DB_USERNAME=root
 DB_PASSWORD=null

 # --------------------------------------------
@@ -6,6 +6,9 @@ sudo: false
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php

+services:
+  - mysql
+
 # list any PHP version you want to test against
 php:
  - 5.6
@@ -15,7 +18,10 @@ php:
 before_script:
  - phantomjs --webdriver=4444  &
  - sleep 4
-  - mysql -e "create database IF NOT EXISTS snipeit_unit;" -utravis
+  - mysql -e 'CREATE DATABASE snipeit_unit;'
+  - mysql -e 'CREATE USER "travis'@'localhost";'
+  - mysql -e 'GRANT ALL PRIVILEGES ON * . * TO "travis'@'localhost";'
+  - mysql -e 'FLUSH PRIVILEGES;'
  - composer self-update
  - composer install -n --prefer-source
  - chmod -R 777 storage
@@ -13,6 +13,7 @@ php7.0-gd \
 php7.0-xml \
 php7.0-mbstring \
 php7.0-zip \
+php7.0-bcmath \
 patch \
 curl \
 vim \
@@ -23,6 +24,7 @@ mysql-client \

 RUN phpenmod mcrypt
 RUN phpenmod gd
+RUN phpenmod bcmath

 RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini
 RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini
@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&amp;title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2016.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](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/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.io) [![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-77-orange.svg?style=flat-square)](#contributors)
+[![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&amp;title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](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/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.io) [![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-78-orange.svg?style=flat-square)](#contributors)


 ## Snipe-IT - Open Source Asset Management System
@@ -67,6 +67,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars0.githubusercontent.com/u/8341172?v=3" width="110px;"/><br /><sub>Jay Richards</sub>](http://www.cordeos.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [<img src="https://avatars2.githubusercontent.com/u/7295127?v=3" width="110px;"/><br /><sub>Alexander Innes</sub>](https://necurity.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [<img src="https://avatars2.githubusercontent.com/u/334485?v=3" width="110px;"/><br /><sub>Danny Garcia</sub>](https://buzzedword.codes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [<img src="https://avatars2.githubusercontent.com/u/366855?v=3" width="110px;"/><br /><sub>archpoint</sub>](https://github.com/archpoint)<br />[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [<img src="https://avatars1.githubusercontent.com/u/67991?v=3" width="110px;"/><br /><sub>Jake McGraw</sub>](http://www.jakemcgraw.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [<img src="https://avatars1.githubusercontent.com/u/1714374?v=3" width="110px;"/><br /><sub>FleischKarussel</sub>](https://github.com/FleischKarussel)<br />[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/319644?v=3" width="110px;"/><br /><sub>Dylan Yi</sub>](https://github.com/feeva)<br />[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") |
 | [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") |
 | [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\CustomField;
+use Illuminate\Console\Command;
+use App\LegacyEncrypter\McryptEncrypter;
+use App\Models\Setting;
+use App\Models\Asset;
+use Illuminate\Support\Facades\Storage;
+
+class RecryptFromMcrypt extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:legacy-recrypt';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command allows upgrading users to de-encrypt their deprecated mcrypt encrypted fields and re-encrypt them using the current OpenSSL encryption.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+
+        // Check and see if they have a legacy app key listed in their .env
+        // If not, we can try to use the current APP_KEY if looks like it's old
+        $legacy_key = env('LEGACY_APP_KEY');
+        $errors = array();
+
+        if (!$legacy_key) {
+            $this->error('ERROR: You do not have a LEGACY_APP_KEY set in your .env file. Please locate your old APP_KEY and ADD a line to your .env file like: LEGACY_APP_KEY=YOUR_OLD_APP_KEY');
+            return false;
+        }
+
+        // Check that the app key is 32 characters
+        if (strlen($legacy_key) == 32) {
+            $this->comment('INFO: Your LEGACY_APP_KEY is 32 characters. Okay to continue.');
+        } else {
+            $this->error('ERROR: Your LEGACY_APP_KEY is not the correct length (32 characters). Please locate your old APP_KEY and use that as your LEGACY_APP_KEY in your .env file to continue.');
+            return false;
+        }
+
+        $this->error('================================!!!! WARNING !!!!================================');
+        $this->error('================================!!!! WARNING !!!!================================');
+        $this->comment("This tool will attempt to decrypt your old Snipe-IT (mcrypt, now deprecated) encrypted data and re-encrypt it using OpenSSL. \n\nYou should only continue if you have backed up any and all old APP_KEYs and have backed up your data.");
+
+        if ($this->confirm("Are you SURE you wish to continue?")) {
+
+            $backup_file = 'backups/env-backups/'.'app_key-'.date('Y-m-d-gis');
+
+            try {
+                Storage::disk('local')->put($backup_file, 'APP_KEY: '.config('app.key'));
+                Storage::disk('local')->append($backup_file, 'LEGACY_APP_KEY: '.$legacy_key);
+            } catch (\Exception $e) {
+                $this->info('WARNING: Could not backup app keys');
+            }
+
+
+            $mcrypter = new McryptEncrypter($legacy_key);
+            $settings = Setting::getSettings();
+
+            if ($settings->ldap_password=='') {
+                $this->comment('INFO: No LDAP password found. Skipping... ');
+            }
+
+            $custom_fields = CustomField::where('field_encrypted','=', 1)->get();
+            $this->comment('INFO: Retrieving encrypted custom fields...');
+
+            $query = Asset::withTrashed();
+
+            foreach ($custom_fields as $custom_field) {
+                $this->comment('FIELD TO RECRYPT:  '.$custom_field->name .' ('.$custom_field->db_column.')');
+                $query->orWhereNotNull($custom_field->db_column);
+            }
+
+
+            // Get all assets with a value in any of the fields that were encrypted
+            $assets = $query->get();
+
+            $bar = $this->output->createProgressBar(count($assets));
+
+            foreach ($custom_fields as $encrypted_field) {
+
+                // Try to decrypt the payload using the legacy app key
+                try {
+                    $decrypted_field = $mcrypter->decrypt($encrypted_field);
+                    $this->comment($decrypted_field);
+                } catch (\Exception $e) {
+                    $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
+                }
+                $bar->advance();
+            }
+
+
+            foreach ($assets as $asset) {
+                foreach ($custom_fields as $encrypted_field) {
+
+                    // Make sure the value isn't null
+                    if ($asset->{$encrypted_field}!='') {
+                        // Try to decrypt the payload using the legacy app key
+                        try {
+                            $decrypted_field = $mcrypter->decrypt($asset->{$encrypted_field});
+                            $asset->{$encrypted_field} = \Crypt::encrypt($decrypted_field);
+                            $this->comment($decrypted_field);
+                        } catch (\Exception $e) {
+                            $errors[] = ' - ERROR: Could not decrypt field ['.$encrypted_field->name.']: '.$e->getMessage();
+                        }
+                    }
+
+                }
+                $asset->save();
+                $bar->advance();
+            }
+
+
+
+            $bar->finish();
+
+            if (count($errors) > 0) {
+                $this->comment("\n\n");
+                $this->error("The decrypter encountered some errors: \n");
+                foreach ($errors as $error) {
+                    $this->error($error);
+                }
+            }
+        }
+
+    }
+}
@@ -23,7 +23,8 @@ class Kernel extends ConsoleKernel
        Commands\DisableLDAP::class,
        Commands\Purge::class,
        Commands\LdapSync::class,
-        Commands\FixDoubleEscape::class
+        Commands\FixDoubleEscape::class,
+        Commands\RecryptFromMcrypt::class
    ];

    /**
@@ -0,0 +1,226 @@
+<?php
+namespace App\Http\Controllers\Api;
+
+use App\Models\AssetMaintenance;
+use Carbon\Carbon;
+use App\Models\Company;
+use App\Models\Asset;
+use App\Helpers\Helper;
+use Auth;
+use Gate;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Transformers\AssetMaintenancesTransformer;
+
+/**
+ * This controller handles all actions related to Asset Maintenance for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v2.0
+ */
+class AssetMaintenancesController extends Controller
+{
+
+
+    /**
+     *  Generates the JSON response for asset maintenances listing view.
+     *
+     * @see AssetMaintenancesController::getIndex() method that generates view
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return String JSON
+     */
+    public function index(Request $request)
+    {
+        $maintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company', 'admin');
+
+        if (Input::has('search')) {
+            $maintenances = $maintenances->TextSearch(e($request->input('search')));
+        }
+
+        $offset = request('offset', 0);
+        $limit = request('limit', 50);
+
+        $allowed_columns = ['id','title','asset_maintenance_time','asset_maintenance_type','cost','start_date','completion_date','notes','user_id'];
+        $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array(Input::get('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
+
+        switch ($sort) {
+            case 'user_id':
+                $maintenances = $maintenances->OrderAdmin($order);
+                break;
+            default:
+                $maintenances = $maintenances->orderBy($sort, $order);
+                break;
+        }
+
+
+        $maintenances = $maintenances->skip($offset)->take($limit)->get();
+
+
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $maintenances->count());
+
+
+    }
+
+
+    /**
+     *  Validates and stores the new asset maintenance
+     *
+     * @see AssetMaintenancesController::getCreate() method for the form
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return String JSON
+     */
+    public function store(Request $request)
+    {
+        // create a new model instance
+        $assetMaintenance = new AssetMaintenance();
+        $assetMaintenance->supplier_id = $request->input('supplier_id');
+        $assetMaintenance->is_warranty = $request->input('is_warranty');
+        $assetMaintenance->cost =  e($request->input('cost'));
+        $assetMaintenance->notes = e($request->input('notes'));
+        $asset = Asset::find(e($request->input('asset_id')));
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot add a maintenance for that asset'));
+        }
+
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');
+        $assetMaintenance->user_id                = Auth::id();
+
+        if (( $assetMaintenance->completion_date !== null )
+            && ( $assetMaintenance->start_date !== "" )
+            && ( $assetMaintenance->start_date !== "0000-00-00" )
+        ) {
+            $startDate                                = Carbon::parse($assetMaintenance->start_date);
+            $completionDate                           = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+            return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.create.success')));
+
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors()));
+
+    }
+
+
+    /**
+     *  Validates and stores an update to an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @param int $request
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function update(Request $request, $assetMaintenanceId = null)
+    {
+        // Check if the asset maintenance exists
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset'));
+        }
+
+        $assetMaintenance->supplier_id = e($request->input('supplier_id'));
+        $assetMaintenance->is_warranty = e($request->input('is_warranty'));
+        $assetMaintenance->cost =  Helper::ParseFloat(e($request->input('cost')));
+        $assetMaintenance->notes = e($request->input('notes'));
+
+        $asset = Asset::find(request('asset_id'));
+
+        if (!Company::isCurrentUserHasAccess($asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot edit a maintenance for that asset'));
+        }
+
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id               = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title                  = $request->input('title');
+        $assetMaintenance->start_date             = $request->input('start_date');
+        $assetMaintenance->completion_date        = $request->input('completion_date');
+
+        if (( $assetMaintenance->completion_date == null )
+        ) {
+            if (( $assetMaintenance->asset_maintenance_time !== 0 )
+                || ( !is_null($assetMaintenance->asset_maintenance_time) )
+            ) {
+                $assetMaintenance->asset_maintenance_time = null;
+            }
+        }
+
+        if (( $assetMaintenance->completion_date !== null )
+            && ( $assetMaintenance->start_date !== "" )
+            && ( $assetMaintenance->start_date !== "0000-00-00" )
+        ) {
+            $startDate                                = Carbon::parse($assetMaintenance->start_date);
+            $completionDate                           = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = $completionDate->diffInDays($startDate);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+
+            return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.edit.success')));
+
+        }
+        return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors()));
+    }
+
+    /**
+     *  Delete an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function destroy($assetMaintenanceId)
+    {
+        // Check if the asset maintenance exists
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot delete a maintenance for that asset'));
+        }
+
+        $assetMaintenance->delete();
+
+        return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success')));
+
+
+    }
+
+    /**
+     *  View an asset maintenance
+     *
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @param int $assetMaintenanceId
+     * @version v1.0
+     * @since [v4.0]
+     * @return String JSON
+     */
+    public function show($assetMaintenanceId)
+    {
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+        if (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
+        }
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance);
+
+    }
+}
@@ -76,7 +76,7 @@ class AssetModelsController extends Controller
        $assetmodel->fill($request->all());

        if ($assetmodel->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/assetmodels/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));

@@ -22,7 +22,7 @@ class CategoriesController extends Controller
        $this->authorize('view', Category::class);
        $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email'];

-        $categories = Category::select(['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email'])
+        $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email'])
            ->withCount('assets', 'accessories', 'consumables', 'components');

        if ($request->has('search')) {
@@ -75,7 +75,8 @@ class CategoriesController extends Controller
    {
        $this->authorize('view', Category::class);
        $category = Category::findOrFail($id);
-        return $category;
+        return (new CategoriesTransformer)->transformCategory($category);
+
    }


@@ -99,16 +99,14 @@ class DepartmentsController extends Controller
     */
    public function destroy($id)
    {
-        if (is_null($department = Department::find($id))) {
-            return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.not_found'));
-        }
+        $department = Department::findOrFail($id);

        if ($department->users->count() > 0) {
-            return redirect()->to(route('departments.index'))->with('error', trans('admin/departments/message.assoc_users'));
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/departments/message.assoc_users')));
        }

        $department->delete();
-        return redirect()->to(route('departments.index'))->with('success', trans('admin/departments/message.delete.success'));
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/departments/message.delete.success')));

    }

@@ -59,6 +59,10 @@ class LicensesController extends Controller
            $licenses->where('manufacturer_id','=',$request->input('manufacturer_id'));
        }

+        if ($request->has('supplier_id')) {
+            $licenses->where('supplier_id','=',$request->input('supplier_id'));
+        }
+
        if ($request->has('depreciation_id')) {
            $licenses->where('depreciation_id','=',$request->input('depreciation_id'));
        }
@@ -69,22 +73,26 @@ class LicensesController extends Controller

        $offset = request('offset', 0);
        $limit = request('limit', 50);
-
-        $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','manufacturer','company','license_name','license_email'];
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

-        switch ($sort) {
+
+        switch ($request->input('sort')) {
            case 'manufacturer':
                $licenses = $licenses->OrderManufacturer($order);
                break;
+            case 'supplier':
+                $licenses = $licenses->OrderSupplier($order);
+                break;
            case 'company':
                $licenses = $licenses->OrderCompany($order);
                break;
            default:
+                $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','license_name','license_email'];
+                $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
                $licenses = $licenses->orderBy($sort, $order);
                break;
        }
+        

        $total = $licenses->count();
        $licenses = $licenses->skip($offset)->take($limit)->get();
@@ -53,9 +53,20 @@ class StatuslabelsController extends Controller
    public function store(Request $request)
    {
        $this->authorize('create', Statuslabel::class);
+        $request->except('deployable', 'pending','archived');
+
+        if (!$request->has('type')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, ["type" => ["Status label type is required."]]));
+        }
+
        $statuslabel = new Statuslabel;
        $statuslabel->fill($request->all());

+        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
+        $statuslabel->deployable        =  $statusType['deployable'];
+        $statuslabel->pending           =  $statusType['pending'];
+        $statuslabel->archived          =  $statusType['archived'];
+
        if ($statuslabel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.create.success')));
        }
@@ -75,7 +86,7 @@ class StatuslabelsController extends Controller
    {
        $this->authorize('view', Statuslabel::class);
        $statuslabel = Statuslabel::findOrFail($id);
-        return $statuslabel;
+        return (new StatuslabelsTransformer)->transformStatuslabel($statuslabel);
    }


@@ -92,8 +103,20 @@ class StatuslabelsController extends Controller
    {
        $this->authorize('edit', Statuslabel::class);
        $statuslabel = Statuslabel::findOrFail($id);
+        
+        $request->except('deployable', 'pending','archived');
+
+        if (!$request->has('type')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Status label type is required.'));
+        }
+
        $statuslabel->fill($request->all());

+        $statusType = Statuslabel::getStatuslabelTypesForDB($request->input('type'));
+        $statuslabel->deployable        =  $statusType['deployable'];
+        $statuslabel->pending           =  $statusType['pending'];
+        $statuslabel->archived          =  $statusType['archived'];
+
        if ($statuslabel->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $statuslabel, trans('admin/statuslabels/message.update.success')));
        }
@@ -8,6 +8,7 @@ use App\Http\Transformers\UsersTransformer;
 use App\Models\Company;
 use App\Models\User;
 use App\Helpers\Helper;
+use App\Http\Requests\SaveUserRequest;

 class UsersController extends Controller
 {
@@ -102,7 +103,7 @@ class UsersController extends Controller
     * @param  \Illuminate\Http\Request  $request
     * @return \Illuminate\Http\Response
     */
-    public function store(Request $request)
+    public function store(SaveUserRequest $request)
    {
        $this->authorize('view', User::class);
        $user = new User;
@@ -139,7 +140,7 @@ class UsersController extends Controller
     * @param  int  $id
     * @return \Illuminate\Http\Response
     */
-    public function update(Request $request, $id)
+    public function update(SaveUserRequest $request, $id)
    {
        $this->authorize('edit', User::class);
        $user = User::findOrFail($id);
@@ -414,7 +414,7 @@ class AssetModelsController extends Controller
        $manufacturer_list = $nochange + Helper::manufacturerList();

        
-            return view('models/bulk-edit', compact('models'))
+             return view('models/bulk-edit', compact('models'))
                ->with('manufacturer_list', $manufacturer_list)
                ->with('category_list', $category_list)
                ->with('fieldset_list', $fieldset_list)
@@ -116,9 +116,9 @@ class AssetsController extends Controller
            ->with('statuslabel_list', Helper::statusLabelList())
            ->with('location_list', Helper::locationsList())
            ->with('item', new Asset)
-            ->with('manufacturer', Helper::manufacturerList())
-            ->with('category', Helper::categoryList('asset'))
-            ->with('statuslabel_types', Helper::statusTypeList())
+            ->with('manufacturer', Helper::manufacturerList()) //handled in modal now?
+            ->with('category', Helper::categoryList('asset')) //handled in modal now?
+            ->with('statuslabel_types', Helper::statusTypeList()) //handled in modal now?
            ->with('users_list', Helper::usersList())
            ->with('assets_list', Helper::assetsList())
            ->with('locations_list', Helper::locationsList());
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use App\Helpers\Helper;
+
+class ModalController extends Controller
+{
+    function location() {
+        return view('modals.location');
+    }
+
+    function model() {
+        return view('modals.model')
+            ->with('manufacturer', Helper::manufacturerList())
+            ->with('category', Helper::categoryList('asset'));
+    }
+
+    function statuslabel() {
+        return view('modals.statuslabel')->with('statuslabel_types', Helper::statusTypeList());
+    }
+
+    function supplier() {
+        return view('modals.supplier');
+    }
+
+    function user() {
+        return view('modals.user');
+    }
+}
@@ -4,12 +4,13 @@ namespace App\Http\Controllers;
 use Image;
 use Input;
 use Redirect;
-use App\Models\Location;
 use View;
 use Auth;
 use App\Helpers\Helper;
 use App\Models\Setting;
 use Gate;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;

 /**
 * This controller handles all actions related to User Profiles for
@@ -87,4 +88,60 @@ class ProfileController extends Controller
    public function api() {
        return view('account/api');
    }
+
+    /**
+     * User change email page.
+     *
+     * @return View
+     */
+    public function password()
+    {
+        $user = Auth::user();
+        return view('account/change-password', compact('user'));
+    }
+
+    /**
+     * Users change password form processing page.
+     *
+     * @return Redirect
+     */
+    public function passwordSave(Request $request)
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/table.lock_passwords'));
+        }
+
+        $user = Auth::user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account.password.index')->with('error', Lang::get('admin/users/message.error.password_ldap'));
+        }
+
+        $rules = array(
+            'current_password'     => 'required',
+            'password'         => Setting::passwordComplexityRulesSaving('store'),
+            'password_confirm' => 'required|same:password',
+        );
+
+        $validator = \Validator::make($request->all(), $rules);
+        $validator->after(function($validator) use ($request, $user) {
+
+            if (!Hash::check($request->input('current_password'), $user->password)) {
+                $validator->errors()->add('current_password', trans('validation.hashed_pass'));
+            }
+            
+        });
+
+        if (!$validator->fails()) {
+            $user->password = Hash::make($request->input('password'));
+            $user->save();
+            return redirect()->route('account.password.index')->with('success', 'Password updated!');
+
+        }
+        return redirect()->back()->withInput()->withErrors($validator);
+
+
+    }
+
+
 }
@@ -259,6 +259,13 @@ class SettingsController extends Controller
        Artisan::call('migrate', ['--force' => true]);

        $output = Artisan::output();
+
+        if ((!file_exists(storage_path().'/oauth-private.key')) || (!file_exists(storage_path().'/oauth-public.key'))) {
+            Artisan::call('passport:install');
+            Artisan::call('migrate', ['--force' => true]);
+        }
+
+
        return view('setup/migrate')
        ->with('output', $output)
        ->with('step', 2)
@@ -462,6 +469,15 @@ class SettingsController extends Controller

        }

+        $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon');
+        $setting->pwd_secure_min = (int) $request->input('pwd_secure_min');
+        $setting->pwd_secure_complexity = '';
+
+        if ($request->has('pwd_secure_complexity')) {
+            $setting->pwd_secure_complexity =  implode('|', $request->input('pwd_secure_complexity'));
+        }
+
+

        if ($setting->save()) {
            return redirect()->route('settings.index')
@@ -12,9 +12,7 @@ use App\Models\Company;
 use App\Models\Location;
 use App\Models\License;
 use App\Models\Setting;
-use App\Models\Statuslabel;
 use App\Http\Requests\SaveUserRequest;
-use App\Http\Requests\UpdateUserRequest;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use App\Models\User;
 use App\Models\Ldap;
@@ -23,7 +21,6 @@ use Config;
 use Crypt;
 use DB;
 use HTML;
-use Illuminate\Support\Facades\Log;
 use Input;
 use Lang;
 use League\Csv\Reader;
@@ -169,7 +166,7 @@ class UsersController extends Controller
    * @since [v1.8]
    * @return string JSON
    */
-    public function apiStore(Request $request)
+    public function apiStore(SaveUserRequest $request)
    {
        $this->authorize('create', User::class);

@@ -270,7 +267,7 @@ class UsersController extends Controller
     * @param  int $id
     * @return \Illuminate\Http\RedirectResponse
     */
-    public function update(UpdateUserRequest $request, $id = null)
+    public function update(SaveUserRequest $request, $id = null)
    {
        // We need to reverse the UI specific logic for our
        // permissions here before we update the user.
@@ -309,14 +306,11 @@ class UsersController extends Controller
            }
        }

-        // Do we want to update the user password?
-        if ($request->has('password')) {
-            $user->password = bcrypt($request->input('password'));
-        }
+
        if ($request->has('username')) {
-            $user->username = e($request->input('username'));
+            $user->username = $request->input('username');
        }
-        $user->email = e($request->input('email'));
+        $user->email = $request->input('email');


       // Update the user
@@ -334,6 +328,12 @@ class UsersController extends Controller
        $user->notes = $request->input('notes');
        $user->department_id = $request->input('department_id', null);

+
+        // Do we want to update the user password?
+        if ($request->has('password')) {
+            $user->password = bcrypt($request->input('password'));
+        }
+
        // Strip out the superuser permission if the user isn't a superadmin
        $permissions_array = $request->input('permission');

@@ -3,6 +3,7 @@
 namespace App\Http\Requests;

 use App\Http\Requests\Request;
+use App\Models\Setting;

 class SaveUserRequest extends Request
 {
@@ -23,12 +24,38 @@ class SaveUserRequest extends Request
     */
    public function rules()
    {
-        return [
-            'first_name'              => 'required|string|min:1',
-            'email'                   => 'email',
-            'password'                => 'required|min:6',
-            'password_confirm'        => 'sometimes|required_with:password',
-            'username'                => 'required|string|min:2|unique:users,username,NULL,deleted_at',
-        ];
+
+        $rules = [];
+
+        switch($this->method())
+        {
+
+            // Brand new asset
+            case 'POST':
+            {
+                $rules['first_name'] = 'required|string|min:1';
+                $rules['username'] = 'required|string|min:1';
+                $rules['password'] = Setting::passwordComplexityRulesSaving('store');
+            }
+
+            // Save all fields
+            case 'PUT':
+                $rules['first_name'] = 'required|string|min:1';
+                $rules['username'] = 'required|string|min:1';
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+
+            // Save only what's passed
+            case 'PATCH':
+            {
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+            }
+
+            default:break;
+        }
+
+        $rules['password_confirm'] = 'sometimes|required_with:password';
+
+        return $rules;
+
    }
 }
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Http\Requests\Request;
-
-class UpdateUserRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'first_name'              => 'required|string|min:1',
-            'email'                   => 'email',
-            'password_confirm'        => 'sometimes|required_with:password',
-        ];
-    }
-}
@@ -0,0 +1,53 @@
+<?php
+namespace App\Http\Transformers;
+
+use App\Models\AssetMaintenance;
+use Gate;
+use Illuminate\Database\Eloquent\Collection;
+use App\Helpers\Helper;
+
+class AssetMaintenancesTransformer
+{
+
+    public function transformAssetMaintenances (Collection $assetmaintenances, $total)
+    {
+        $array = array();
+        foreach ($assetmaintenances as $assetmaintenance) {
+            $array[] = self::transformAssetMaintenance($assetmaintenance);
+        }
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetMaintenance (AssetMaintenance $assetmaintenance)
+    {
+        $array = [
+            'id'            => (int) $assetmaintenance->id,
+            'asset_name'    => ($assetmaintenance->asset) ? ['id' => $assetmaintenance->asset->id,'name'=> e($assetmaintenance->asset->name)] : null,
+            'title'         => ($assetmaintenance->title) ? e($assetmaintenance->title) : null,
+            'notes'         => ($assetmaintenance->notes) ? e($assetmaintenance->notes) : null,
+            'supplier'      => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id,'name'=> e($assetmaintenance->supplier->name)] : null,
+            'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
+            'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
+            'start_date'         => Helper::getFormattedDateObject($assetmaintenance->start_date, 'datetime'),
+            'asset_maintenance_time'          => $assetmaintenance->asset_maintenance_time,
+            'completion_date'     => Helper::getFormattedDateObject($assetmaintenance->completion_date, 'datetime'),
+            'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id,'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
+            'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
+
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (bool) Gate::allows('delete', Asset::class),
+        ];
+
+        $array += $permissions_array;
+
+        return $array;
+    }
+
+
+
+
+
+}
@@ -110,6 +110,8 @@ class AssetsTransformer
                //array += $fields_array;
                $array['custom_fields'] = $fields_array;
            }
+        } else {
+            $array['custom_fields'] = array();
        }

        $permissions_array['available_actions'] = [
@@ -4,6 +4,7 @@ namespace App\Http\Transformers;
 use App\Models\Category;
 use Illuminate\Database\Eloquent\Collection;
 use Gate;
+use App\Helpers\Helper;

 class CategoriesTransformer
 {
@@ -22,15 +23,18 @@ class CategoriesTransformer
        if ($category) {

            $array = [
-                'id' => e($category->id),
+                'id' => (int) $category->id,
                'name' => e($category->name),
                'type' => e($category->category_type),
                'use_default_eula' => ($category->use_default_eula =='1') ? true : false,
+                'checkin_email' => ($category->checkin_email =='1') ? true : false,
                'require_acceptance' => ($category->require_acceptance =='1') ? true : false,
                'assets_count' => $category->assets_count,
                'accessories_count' => $category->accessories_count,
                'consumables_count' => $category->consumables_count,
                'components_count' => $category->components_count,
+                'created_at' => Helper::getFormattedDateObject($category->created_at, 'datetime'),
+                'updated_at' => Helper::getFormattedDateObject($category->updated_at, 'datetime'),
            ];

            $permissions_array['available_actions'] = [
@@ -23,7 +23,7 @@ class CompaniesTransformer
        if ($company) {

            $array = [
-                'id' => e($company->id),
+                'id' => (int) $company->id,
                'name' => e($company->name),
                "created_at" => Helper::getFormattedDateObject($company->created_at, 'datetime'),
                "updated_at" => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
@@ -44,7 +44,10 @@ class LocationsTransformer
                'assets' => $assets_arr,
                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
-                'parent_id' => ($location->parent_id) ? (int) $location->parent_id : null,
+                'parent' => ($location->parent) ? [
+                    'id' => (int) $location->parent->id,
+                    'name'=> e($location->parent->name)
+                ] : null,
                'children' => $children_arr,
            ];

@@ -30,6 +30,7 @@ class SuppliersTransformer
                'city' => ($supplier->city) ? e($supplier->city) : null,
                'state' => ($supplier->state) ? e($supplier->state) : null,
                'country' => ($supplier->country) ? e($supplier->country) : null,
+                'zip' => ($supplier->zip) ? e($supplier->zip) : null,
                'fax' => ($supplier->fax) ? e($supplier->fax) : null,
                'phone' => ($supplier->phone) ? e($supplier->phone) : null,
                'email' => ($supplier->email) ? e($supplier->email) : null,
@@ -37,6 +38,7 @@ class SuppliersTransformer
                'assets_count' => (int) $supplier->assets_count,
                'licenses_count' => (int) $supplier->licenses_count,
                'image' =>   ($supplier->image) ? e($supplier->image) : null,
+                'notes' => ($supplier->notes) ? e($supplier->notes) : null,
                'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),

@@ -32,11 +32,6 @@ class UsersTransformer
                    'id' => (int) $user->manager->id,
                    'name'=> e($user->manager->username)
                ]  : null,
-
-                'groups' => ($user->groups) ? [
-                    'id' => (int) $user->userloc->id,
-                    'name'=> e($user->userloc->name)
-                ]  : null,
                'jobtitle' => ($user->jobtitle) ? e($user->jobtitle) : null,
                'email' => e($user->email),
                'department' => ($user->department) ? [
@@ -68,6 +63,24 @@ class UsersTransformer

        $array += $permissions_array;

+
+        $numGroups = count($user->groups);
+        if($numGroups > 0)
+        {
+            $groups["total"] = $numGroups;
+            foreach($user->groups as $group)
+            {
+                $groups["rows"][] = [
+                    'id' => (int) $group->id,
+                    'name' => e($group->name)
+                ];
+            }
+            $array["groups"] = $groups;
+        }
+        else {
+            $array["groups"] = null;
+        }
+
        return $array;
    }

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\LegacyEncrypter;
+
+use Illuminate\Contracts\Encryption\DecryptException;
+
+abstract class BaseEncrypter
+{
+    /**
+     * The encryption key.
+     *
+     * @var string
+     */
+    protected $key;
+
+    /**
+     * Create a MAC for the given value.
+     *
+     * @param  string  $iv
+     * @param  string  $value
+     * @return string
+     */
+    protected function hash($iv, $value)
+    {
+        return hash_hmac('sha256', $iv.$value, $this->key);
+    }
+
+    /**
+     * Get the JSON array from the given payload.
+     *
+     * @param  string  $payload
+     * @return array
+     *
+     * @throws \Illuminate\Contracts\Encryption\DecryptException
+     */
+    protected function getJsonPayload($payload)
+    {
+        $payload = json_decode(base64_decode($payload), true);
+
+        // If the payload is not valid JSON or does not have the proper keys set we will
+        // assume it is invalid and bail out of the routine since we will not be able
+        // to decrypt the given value. We'll also check the MAC for this encryption.
+        if (! $payload || $this->invalidPayload($payload)) {
+            throw new DecryptException('The payload is invalid.');
+        }
+
+        if (! $this->validMac($payload)) {
+            throw new DecryptException('The MAC is invalid.');
+        }
+
+        return $payload;
+    }
+
+    /**
+     * Verify that the encryption payload is valid.
+     *
+     * @param  array|mixed  $data
+     * @return bool
+     */
+    protected function invalidPayload($data)
+    {
+        return ! is_array($data) || ! isset($data['iv']) || ! isset($data['value']) || ! isset($data['mac']);
+    }
+
+    /**
+     * Determine if the MAC for the given payload is valid.
+     *
+     * @param  array  $payload
+     * @return bool
+     *
+     * @throws \RuntimeException
+     */
+    protected function validMac(array $payload)
+    {
+        $bytes = random_bytes(16);
+
+        $calcMac = hash_hmac('sha256', $this->hash($payload['iv'], $payload['value']), $bytes, true);
+
+        return hash_equals(hash_hmac('sha256', $payload['mac'], $bytes, true), $calcMac);
+    }
+}
@@ -0,0 +1,214 @@
+<?php
+
+namespace App\LegacyEncrypter;
+
+use Exception;
+use RuntimeException;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Encryption\EncryptException;
+use Illuminate\Contracts\Encryption\Encrypter as EncrypterContract;
+
+/**
+ * @deprecated since version 5.1. Use Illuminate\Encryption\Encrypter.
+ */
+class McryptEncrypter extends BaseEncrypter implements EncrypterContract
+{
+    /**
+     * The algorithm used for encryption.
+     *
+     * @var string
+     */
+    protected $cipher;
+
+    /**
+     * The block size of the cipher.
+     *
+     * @var int
+     */
+    protected $block;
+
+    /**
+     * Create a new encrypter instance.
+     *
+     * @param  string  $key
+     * @param  string  $cipher
+     * @return void
+     *
+     * @throws \RuntimeException
+     */
+    public function __construct($key, $cipher = MCRYPT_RIJNDAEL_128)
+    {
+        $key = (string) $key;
+
+        if (static::supported($key, $cipher)) {
+            $this->key = $key;
+            $this->cipher = $cipher;
+            $this->block = mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
+        } else {
+            throw new RuntimeException('The only supported ciphers are MCRYPT_RIJNDAEL_128 and MCRYPT_RIJNDAEL_256.');
+        }
+    }
+
+    /**
+     * Determine if the given key and cipher combination is valid.
+     *
+     * @param  string  $key
+     * @param  string  $cipher
+     * @return bool
+     */
+    public static function supported($key, $cipher)
+    {
+        return defined('MCRYPT_RIJNDAEL_128') &&
+                ($cipher === MCRYPT_RIJNDAEL_128 || $cipher === MCRYPT_RIJNDAEL_256);
+    }
+
+    /**
+     * Encrypt the given value.
+     *
+     * @param  string  $value
+     * @return string
+     *
+     * @throws \Illuminate\Contracts\Encryption\EncryptException
+     */
+    public function encrypt($value, $serialize = true)
+    {
+        $iv = mcrypt_create_iv($this->getIvSize(), $this->getRandomizer());
+
+        $value = base64_encode($this->padAndMcrypt($value, $iv));
+
+        // Once we have the encrypted value we will go ahead base64_encode the input
+        // vector and create the MAC for the encrypted value so we can verify its
+        // authenticity. Then, we'll JSON encode the data in a "payload" array.
+        $mac = $this->hash($iv = base64_encode($iv), $value);
+
+        $json = json_encode(compact('iv', 'value', 'mac'));
+
+        if (! is_string($json)) {
+            throw new EncryptException('Could not encrypt the data.');
+        }
+
+        return base64_encode($json);
+    }
+
+    /**
+     * Pad and use mcrypt on the given value and input vector.
+     *
+     * @param  string  $value
+     * @param  string  $iv
+     * @return string
+     */
+    protected function padAndMcrypt($value, $iv)
+    {
+        $value = $this->addPadding(serialize($value));
+
+        return mcrypt_encrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
+    }
+
+    /**
+     * Decrypt the given value.
+     *
+     * @param  string  $payload
+     * @return string
+     */
+    public function decrypt($payload, $unserialize = true)
+    {
+        $payload = $this->getJsonPayload($payload);
+
+        // We'll go ahead and remove the PKCS7 padding from the encrypted value before
+        // we decrypt it. Once we have the de-padded value, we will grab the vector
+        // and decrypt the data, passing back the unserialized from of the value.
+        $value = base64_decode($payload['value']);
+
+        $iv = base64_decode($payload['iv']);
+
+        return unserialize($this->stripPadding($this->mcryptDecrypt($value, $iv)));
+    }
+
+    /**
+     * Run the mcrypt decryption routine for the value.
+     *
+     * @param  string  $value
+     * @param  string  $iv
+     * @return string
+     *
+     * @throws \Illuminate\Contracts\Encryption\DecryptException
+     */
+    protected function mcryptDecrypt($value, $iv)
+    {
+        try {
+            return mcrypt_decrypt($this->cipher, $this->key, $value, MCRYPT_MODE_CBC, $iv);
+        } catch (Exception $e) {
+            throw new DecryptException($e->getMessage());
+        }
+    }
+
+    /**
+     * Add PKCS7 padding to a given value.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function addPadding($value)
+    {
+        $pad = $this->block - (strlen($value) % $this->block);
+
+        return $value.str_repeat(chr($pad), $pad);
+    }
+
+    /**
+     * Remove the padding from the given value.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    protected function stripPadding($value)
+    {
+        $pad = ord($value[($len = strlen($value)) - 1]);
+
+        return $this->paddingIsValid($pad, $value) ? substr($value, 0, $len - $pad) : $value;
+    }
+
+    /**
+     * Determine if the given padding for a value is valid.
+     *
+     * @param  string  $pad
+     * @param  string  $value
+     * @return bool
+     */
+    protected function paddingIsValid($pad, $value)
+    {
+        $beforePad = strlen($value) - $pad;
+
+        return substr($value, $beforePad) == str_repeat(substr($value, -1), $pad);
+    }
+
+    /**
+     * Get the IV size for the cipher.
+     *
+     * @return int
+     */
+    protected function getIvSize()
+    {
+        return mcrypt_get_iv_size($this->cipher, MCRYPT_MODE_CBC);
+    }
+
+    /**
+     * Get the random data source available for the OS.
+     *
+     * @return int
+     */
+    protected function getRandomizer()
+    {
+        if (defined('MCRYPT_DEV_URANDOM')) {
+            return MCRYPT_DEV_URANDOM;
+        }
+
+        if (defined('MCRYPT_DEV_RANDOM')) {
+            return MCRYPT_DEV_RANDOM;
+        }
+
+        mt_srand();
+
+        return MCRYPT_RAND;
+    }
+}
@@ -55,7 +55,7 @@ class AssetModel extends SnipeModel
     *
     * @var array
     */
-    protected $fillable = ['name','manufacturer_id','category_id','eol', 'user_id', 'fieldset_id'];
+    protected $fillable = ['name','manufacturer_id','category_id','eol', 'user_id', 'fieldset_id', 'model_number', 'notes'];

    public function assets()
    {
@@ -38,12 +38,10 @@ class CustomField extends Model
    public static function boot()
    {
        self::created(function ($custom_field) {
-            \Log::debug("\n\nCreating Original Name: ".$custom_field->name);
-            \Log::debug('Creating Column Name: '.$custom_field->convertUnicodeDbSlug());


+            // column exists - nothing to do here
            if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) {
-                \Log::debug('Column exists. Nothing to do here.');
                return false;
            }

@@ -57,18 +55,13 @@ class CustomField extends Model


        self::updating(function ($custom_field) {
-            \Log::debug('Updating column name');
-            \Log::debug('Updating Original Name: '.$custom_field->getOriginal("name"));
-            \Log::debug('Updating New Column Name: '.$custom_field->convertUnicodeDbSlug());

+             // Column already exists. Nothing to update.
            if ($custom_field->isDirty("name")) {
                if (Schema::hasColumn(CustomField::$table_name, $custom_field->convertUnicodeDbSlug())) {
-                    \Log::debug('Column already exists. Nothing to update.');
                    return true;
                }

-                \Log::debug('Updating column name to.'.$custom_field->convertUnicodeDbSlug());
-
                return Schema::table(CustomField::$table_name, function ($table) use ($custom_field) {
                    $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug());
                });
@@ -85,7 +78,7 @@ class CustomField extends Model

    public function fieldset()
    {
-        return $this->belongsToMany('\App\Models\CustomFieldset'); //?!?!?!?!?!?
+        return $this->belongsToMany('\App\Models\CustomFieldset');
    }

    public function user()
@@ -102,10 +95,9 @@ class CustomField extends Model
    public function db_column_name()
    {
        return $this->db_column;
-        // return self::convertUnicodeDbSlug();
    }

-    //mutators for 'format' attribute
+    // mutators for 'format' attribute
    public function getFormatAttribute($value)
    {
        foreach (self::$PredefinedFormats as $name => $pattern) {
@@ -116,6 +108,13 @@ class CustomField extends Model
        return $value;
    }

+    /**
+     * Format a value string as an array for select boxes and checkboxes.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.4]
+     * @return Array
+     */
    public function setFormatAttribute($value)
    {
        if (isset(self::$PredefinedFormats[$value])) {
@@ -401,6 +401,20 @@ class License extends Depreciable
            ->orderBy('manufacturers.name', $order);
    }

+    /**
+     * Query builder scope to order on supplier
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order         Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderSupplier($query, $order)
+    {
+        return $query->leftJoin('suppliers', 'licenses.supplier_id', '=', 'suppliers.id')->select('licenses.*')
+            ->orderBy('suppliers.name', $order);
+    }
+
    /**
     * Query builder scope to order on company
     *
@@ -80,8 +80,11 @@ trait Loggable
            'admin' => $log->user,
            'note' => $note
        ];
-        Setting::getSettings()->notify(new CheckoutNotification($params));

+        if ($settings = Setting::getSettings()) {
+            $settings->notify(new CheckoutNotification($params));
+        }
+        
        return $log;
    }

@@ -14,36 +14,37 @@ class Setting extends Model

    protected $rules = [
          "brand"     => 'required|min:1|numeric',
-          "qr_text"         => 'max:31',
+          "qr_text"         => 'max:31|nullable',
          "logo_img"        => 'mimes:jpeg,bmp,png,gif',
-          "alert_email"   => 'email_array',
+          "alert_email"   => 'email_array|nullable',
          "default_currency"   => 'required',
          "locale"   => 'required',
-          "slack_endpoint"   => 'url|required_with:slack_channel',
-          "slack_channel"   => 'regex:/(?<!\w)#\w+/|required_with:slack_endpoint',
+          "slack_endpoint"   => 'url|required_with:slack_channel|nullable',
+          "slack_channel"   => 'regex:/(?<!\w)#\w+/|required_with:slack_endpoint|nullable',
          "slack_botname"   => 'string|nullable',
          'labels_per_page' => 'numeric',
          'labels_width' => 'numeric',
          'labels_height' => 'numeric',
-          'labels_pmargin_left' => 'numeric',
-          'labels_pmargin_right' => 'numeric',
-          'labels_pmargin_top' => 'numeric',
-          'labels_pmargin_bottom' => 'numeric',
-          'labels_display_bgutter' => 'numeric',
-          'labels_display_sgutter' => 'numeric',
+          'labels_pmargin_left' => 'numeric|nullable',
+          'labels_pmargin_right' => 'numeric|nullable',
+          'labels_pmargin_top' => 'numeric|nullable',
+          'labels_pmargin_bottom' => 'numeric|nullable',
+          'labels_display_bgutter' => 'numeric|nullable',
+          'labels_display_sgutter' => 'numeric|nullable',
          'labels_fontsize' => 'numeric|min:5',
-          'labels_pagewidth' => 'numeric',
-          'labels_pageheight' => 'numeric',
-          "ldap_server"   => 'sometimes|required_if:ldap_enabled,1|url',
-          "ldap_uname"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_basedn"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_filter"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_username_field"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_fname_field"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_lname_field"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_auth_filter_query"     => 'sometimes|required_if:ldap_enabled,1',
-          "ldap_version"     => 'sometimes|required_if:ldap_enabled,1',
+          'labels_pagewidth' => 'numeric|nullable',
+          'labels_pageheight' => 'numeric|nullable',
+          "ldap_server"   => 'sometimes|required_if:ldap_enabled,1|url|nullable',
+          "ldap_uname"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_basedn"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_filter"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_username_field"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_fname_field"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_lname_field"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_auth_filter_query"     => 'sometimes|required_if:ldap_enabled,1|nullable',
+          "ldap_version"     => 'sometimes|required_if:ldap_enabled,1|nullable',
          "thumbnail_max_h"     => 'numeric|max:500|min:25',
+          "pwd_secure_min" => "numeric|required|min:5",
    ];

    protected $fillable = ['site_name','email_domain','email_format','username_format'];
@@ -158,4 +159,30 @@ class Setting extends Model
        //  In the future this may want to be adapted for individual notifications.
        return $this->slack_endpoint;
    }
+
+    public static function passwordComplexityRulesSaving($action = 'update')
+    {
+        $security_rules = '';
+        $settings = Setting::getSettings();
+
+        // Check if they have uncommon password enforcement selected in settings
+        if ($settings->pwd_secure_uncommon == 1) {
+            $security_rules .= '|dumbpwd';
+        }
+
+        // Check for any secure password complexity rules that may have been selected
+        if ($settings->pwd_secure_complexity!='') {
+            $security_rules  .= '|'.$settings->pwd_secure_complexity;
+        }
+
+        if ($action == 'update') {
+            return 'nullable|min:'.$settings->pwd_secure_min.$security_rules;
+        }
+
+        return 'required|min:'.$settings->pwd_secure_min.$security_rules;
+
+    }
+
+
+
 }
@@ -45,7 +45,7 @@ class Supplier extends SnipeModel
     *
     * @var array
     */
-    protected $fillable = ['name'];
+    protected $fillable = ['name','address','address2','city','state','country','zip','phone','fax','email','contact','url','notes'];


    // Eager load counts.
@@ -51,9 +51,9 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
    protected $rules = [
        'first_name'              => 'required|string|min:1',
        'username'                => 'required|string|min:1|unique_undeleted',
-        'email'                   => 'email',
+        'email'                   => 'email|nullable',
        'password'                => 'required|min:6',
-        'locale'                  => 'max:10'
+        'locale'                  => 'max:10|nullable'
    ];


@@ -28,8 +28,7 @@ class AccessoryObserver


    /**
-     * Listen to the Accessory created event, and increment
-     * the next_auto_tag_base value in the settings table when i
+     * Listen to the Accessory created event when
     * a new accessory is created.
     *
     * @param  Accessory  $accessory
@@ -37,9 +36,6 @@ class AccessoryObserver
     */
    public function created(Accessory $accessory)
    {
-        $settings = Setting::first();
-        $settings->increment('next_auto_tag_base');
-
        $logAction = new Actionlog();
        $logAction->item_type = Accessory::class;
        $logAction->item_id = $accessory->id;
@@ -18,7 +18,8 @@ class AssetObserver
    public function updating(Asset $asset)
    {

-        if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
+
+        if ((isset($asset->getOriginal()['assigned_to'])) && ($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])
            && ($asset->getAttributes()['status_id'] == $asset->getOriginal()['status_id']))
        {
@@ -43,8 +44,9 @@ class AssetObserver
     */
    public function created(Asset $asset)
    {
-        $settings = Setting::first();
-        $settings->increment('next_auto_tag_base');
+        if ($settings = Setting::first()) {
+            $settings->increment('next_auto_tag_base');
+        }

        $logAction = new Actionlog();
        $logAction->item_type = Asset::class;
@@ -28,8 +28,7 @@ class ComponentObserver


    /**
-     * Listen to the Component created event, and increment
-     * the next_auto_tag_base value in the settings table when i
+     * Listen to the Component created event when
     * a new component is created.
     *
     * @param  Component  $component
@@ -37,9 +36,6 @@ class ComponentObserver
     */
    public function created(Component $component)
    {
-        $settings = Setting::first();
-        $settings->increment('next_auto_tag_base');
-
        $logAction = new Actionlog();
        $logAction->item_type = Component::class;
        $logAction->item_id = $component->id;
@@ -28,8 +28,7 @@ class ConsumableObserver


    /**
-     * Listen to the Consumable created event, and increment
-     * the next_auto_tag_base value in the settings table when i
+     * Listen to the Consumable created event when
     * a new consumable is created.
     *
     * @param  Consumable  $consumable
@@ -37,8 +36,6 @@ class ConsumableObserver
     */
    public function created(Consumable $consumable)
    {
-        $settings = Setting::first();
-        $settings->increment('next_auto_tag_base');

        $logAction = new Actionlog();
        $logAction->item_type = Consumable::class;
@@ -28,8 +28,7 @@ class LicenseObserver


    /**
-     * Listen to the License created event, and increment
-     * the next_auto_tag_base value in the settings table when i
+     * Listen to the License created event when
     * a new license is created.
     *
     * @param  License  $license
@@ -37,8 +36,6 @@ class LicenseObserver
     */
    public function created(License $license)
    {
-        $settings = Setting::first();
-        $settings->increment('next_auto_tag_base');

        $logAction = new Actionlog();
        $logAction->item_type = License::class;
@@ -100,13 +100,12 @@ class AssetPresenter extends Presenter
                "visible" => true,
                "formatter" => "usersLinkObjFormatter"
            ], [
-                "field" => "assigned_to",
+                "field" => "employee_number",
                "searchable" => false,
                "sortable" => false,
                "title" => trans('admin/users/table.employee_num'),
                "visible" => false,
                "formatter" => "employeeNumFormatter"
-
            ],[
                "field" => "location",
                "searchable" => true,
@@ -61,6 +61,14 @@ class LicensePresenter extends Presenter
                "searchable" => true,
                "sortable" => true,
                "title" => trans('admin/licenses/form.to_name'),
+            ], [
+                "field" => "supplier",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.supplier'),
+                "visible" => false,
+                "formatter" => "suppliersLinkObjFormatter"
            ], [
                "field" => "manufacturer",
                "searchable" => true,
@@ -67,11 +67,15 @@ class AppServiceProvider extends ServiceProvider
        // This works around the use case where multiple deleted items have the same unique attribute.
        // (I think this is a bug in Laravel's validator?)
        Validator::extend('unique_undeleted', function ($attribute, $value, $parameters, $validator) {
-            $count = DB::table($parameters[0])->select('id')->where($attribute, '=', $value)->whereNull('deleted_at')->where('id', '!=', $parameters[1])->count();
-            return $count < 1;
+
+            if (count($parameters)) {
+                $count = DB::table($parameters[0])->select('id')->where($attribute, '=', $value)->whereNull('deleted_at')->where('id', '!=', $parameters[1])->count();
+                return $count < 1;
+            }
+
        });

-        // Share common variables with all views.
+        // Share common setting variables with all views.
        view()->composer('*', function ($view) {
            $view->with('snipeSettings', \App\Models\Setting::getSettings());
        });
@@ -15,7 +15,7 @@
    "fideloper/proxy": "^3.1",
    "intervention/image": "^2.3",
    "javiereguiluz/easyslugger": "^1.0",
-    "laravel/framework": "5.4.27",
+    "laravel/framework": "5.4.20",
    "laravel/passport": "^1.0",
    "laravel/tinker": "^1.0",
    "laravelcollective/html": "^5.3",
@@ -24,9 +24,13 @@
    "neitanod/forceutf8": "^2.0",
    "patchwork/utf8": "~1.2",
    "pragmarx/google2fa": "^1.0",
+    "schuppo/password-strength": "~1.5",
    "spatie/laravel-backup": "^3.0.0",
    "tecnickcom/tc-lib-barcode": "^1.15",
-    "watson/validating": "^3.0"
+    "unicodeveloper/laravel-password": "^1.0",
+    "watson/validating": "^3.0",
+    "doctrine/instantiator": "1.0.5",
+    "doctrine/inflector": "1.0.*"
  },
    "require-dev": {
        "fzaninotto/faker": "~1.4",
@@ -34,7 +38,8 @@
        "symfony/css-selector": "3.1.*",
        "symfony/dom-crawler": "3.1.*",
        "codeception/codeception": "2.2.9",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "*",
+        "phpunit/php-token-stream": "1.4.11"

    },
    "autoload": {
@@ -220,6 +220,8 @@ return [
        PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
        Laravel\Passport\PassportServiceProvider::class,
        Laravel\Tinker\TinkerServiceProvider::class,
+        Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
+        Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,


        /*
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v4.0-beta',
-  'build_version' => '1',
-  'hash_version' => 'gcb1e3b7',
-  'full_hash' => 'v4.0-beta-244-gcb1e3b7',
+  'app_version' => 'v4.0',
+  'build_version' => 'beta 2',
+  'hash_version' => '46',
+  'full_hash' => 'v4.0-beta-246-g73ce5f9',
 );
@@ -21,7 +21,7 @@ use Illuminate\Database\Schema\Blueprint;
 function updateLegacyColumnName($customfield) {

    $name_to_db_name = CustomField::name_to_db_name($customfield->name);
-    \Log::debug('Trying to rename '.$name_to_db_name." to ".$customfield->convertUnicodeDbSlug()."...\n");
+    //\Log::debug('Trying to rename '.$name_to_db_name." to ".$customfield->convertUnicodeDbSlug()."...\n");

    if (Schema::hasColumn(CustomField::$table_name, $name_to_db_name)) {

@@ -32,7 +32,7 @@ function updateLegacyColumnName($customfield) {
        );

    } else {
-        \Log::debug('Legacy DB column '.$name_to_db_name.' was not found on the assets table.');
+        //\Log::debug('Legacy DB column '.$name_to_db_name.' was not found on the assets table.');
    }

 }
@@ -25,7 +25,7 @@ class AddNextAutoincrementToSettings extends Migration
            $table->bigInteger('next_auto_tag_base')->default('1');
        });

-        \Log::debug('Setting '.$next.' as default auto-increment');
+        //\Log::debug('Setting '.$next.' as default auto-increment');

        if ($settings = App\Models\Setting::first()) {
            $settings->next_auto_tag_base = $next;
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSecurePasswordOptions extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('pwd_secure_uncommon')->default('0');
+            $table->string('pwd_secure_complexity')->nullable()->default(NULL);
+            $table->integer('pwd_secure_min')->default('8');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('pwd_secure_uncommon');
+            $table->dropColumn('pwd_secure_complexity');
+            $table->dropColumn('pwd_secure_min');
+        });
+    }
+}
@@ -73,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -41,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "The selected :attribute is invalid.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "The :attribute must be an image.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
@@ -2,35 +2,35 @@

 {{-- Page title --}}
@section('title')
-Change your Password
+{{ trans('general.changepassword') }}
@stop

 {{-- Account page content --}}
@section('content')
-<div class="row header">
-    <div class="col-md-12">
-        <h3>{{ trans('general.changepassword') }}</h3>
-    </div>
-</div>

-<div class="row form-wrapper">
-<form method="post" action="" class="form-horizontal" autocomplete="off">
+
+<div class="row">
+    <div class="col-md-9">
+    {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'autocomplete' => 'off']) }}
    <!-- CSRF Token -->
-    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+        <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+        <div class="box box-default">
+            <div class="box-body">
+

    <!-- Old Password -->
-    <div class="form-group {{ $errors->has('old_password') ? ' has-error' : '' }}">
-        <label for="old_password" class="col-md-2 control-label">Old Password
+    <div class="form-group {{ $errors->has('current_password') ? ' has-error' : '' }}">
+        <label for="current_password" class="col-md-3 control-label">Current Password
            <i class='fa fa-asterisk'></i>
        </label>
        <div class="col-md-5">
-            <input class="form-control" type="password" name="old_password" id="old_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
-            {!! $errors->first('old_password', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+            <input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
+            {!! $errors->first('current_password', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
        </div>
    </div>

    <div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
-        <label for="password" class="col-md-2 control-label">New Password
+        <label for="password" class="col-md-3 control-label">New Password
        <i class='fa fa-asterisk'></i></label>
        <div class="col-md-5">
            <input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
@@ -40,7 +40,7 @@ Change your Password


    <div class="form-group {{ $errors->has('password_confirm') ? ' has-error' : '' }}">
-        <label for="password_confirm" class="col-md-2 control-label">New Password
+        <label for="password_confirm" class="col-md-3 control-label">New Password
            <i class='fa fa-asterisk'></i>
        </label>
        <div class="col-md-5">
@@ -52,17 +52,16 @@ Change your Password
        </div>
    </div>

-    <hr>

-    <!-- Form actions -->
-    <div class="form-group">
-        <label class="col-md-2 control-label"></label>
-        <div class="col-md-7">
-            <a class="btn btn-link" href="{{ route('view-assets') }}">{{ trans('button.cancel') }}</a>
-            <button type="submit" class="btn btn-success" {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }}><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
-		</div>
-	</div>

-</form>
-</div>
+            </div> <!-- .box-body -->
+            <div class="box-footer text-right">
+                <a class="btn btn-link" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+                <button type="submit" class="btn btn-success"><i class="fa fa-check icon-white"></i> {{ trans('general.save') }}</button>
+            </div>
+
+        </div> <!-- .box-default -->
+        {{ Form::close() }}
+    </div> <!-- .col-md-9 -->
+</div> <!-- .row-->
@stop
@@ -72,24 +72,28 @@

        <!-- Start Date -->
        <div class="form-group {{ $errors->has('start_date') ? ' has-error' : '' }}">
-          <label for="start_date" class="col-md-3 control-label">
-            {{ trans('admin/asset_maintenances/form.start_date') }}
-          </label>
-          <div class="input-group col-md-2{{  (\App\Helpers\Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
-            <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+          <label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.start_date') }}</label>
+
+          <div class="input-group col-md-3{{  (\App\Helpers\Helper::checkIfRequired($item, 'start_date')) ? ' required' : '' }}">
+            <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+              <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="start_date" id="start_date" value="{{ Input::old('start_date', $item->start_date) }}">
+              <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            </div>
            {!! $errors->first('start_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
          </div>
        </div>

+
+
        <!-- Completion Date -->
        <div class="form-group {{ $errors->has('completion_date') ? ' has-error' : '' }}">
-          <label for="start_date" class="col-md-3 control-label">
-            {{ trans('admin/asset_maintenances/form.completion_date') }}
-          </label>
-          <div class="input-group col-md-2">
-            <input type="date" class="datepicker form-control" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}">
-            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+          <label for="start_date" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.completion_date') }}</label>
+
+          <div class="input-group col-md-3{{  (\App\Helpers\Helper::checkIfRequired($item, 'completion_date')) ? ' required' : '' }}">
+            <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+              <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="completion_date" id="completion_date" value="{{ Input::old('completion_date', $item->completion_date) }}">
+              <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+            </div>
            {!! $errors->first('completion_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
          </div>
        </div>
@@ -24,7 +24,7 @@
          name="maintenances"
          id="table"
          class="table table-striped snipe-table"
-          data-url="{{route('api.asset_maintenances.list') }}"
+          data-url="{{route('api.maintenances.index') }}"
          data-cookie="true"
          data-click-to-select="true"
          data-cookie-id-table="maintenancesTable-{{ config('version.hash_version') }}"
@@ -33,18 +33,18 @@
            <tr>
              <th data-field="company" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
              <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-              <th data-sortable="false" data-field="asset_name">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
-              <th data-sortable="false" data-field="supplier">{{ trans('general.supplier') }}</th>
+              <th data-sortable="false" data-field="asset_name" data-formatter="hardwareLinkObjFormatter">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
+              <th data-sortable="false" data-field="supplier" data-formatter="suppliersLinkObjFormatter">{{ trans('general.supplier') }}</th>
              <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_type">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
              <th data-searchable="true" data-sortable="true" data-field="title">{{ trans('admin/asset_maintenances/form.title') }}</th>
-              <th data-searchable="true" data-sortable="false" data-field="start_date">{{ trans('admin/asset_maintenances/form.start_date') }}</th>
-              <th data-searchable="true" data-sortable="true" data-field="completion_date">{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
+              <th data-searchable="true" data-sortable="false" data-field="start_date" data-formatter="dateDisplayFormatter">{{ trans('admin/asset_maintenances/form.start_date') }}</th>
+              <th data-searchable="true" data-sortable="true" data-field="completion_date" data-formatter="dateDisplayFormatter">{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
              <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_time">{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}</th>
              <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right">{{ trans('admin/asset_maintenances/form.cost') }}</th>
-              <th data-searchable="true" data-sortable="true" data-field="user_id">{{ trans('general.admin') }}</th>
+              <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
              <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
              @can('update', \App\Models\Asset::class)
-                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
+                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions" data-formatter="maintenanceActions">{{ trans('table.actions') }}</th>
              @endcan
            </tr>
          </thead>
@@ -58,4 +58,18 @@

@section('moar_scripts')
@include ('partials.bootstrap-table', ['exportFile' => 'maintenances-export', 'search' => true])
+<script>
+    function maintenanceActions(value, row) {
+
+        if ((row) && (row.available_actions.delete === true)) {
+            return '<a href="{{ url('/') }}/hardware/maintenances/' + row.id + '" '
+                + ' class="btn btn-danger btn-sm delete-asset"  data-tooltip="true"  '
+                + ' data-toggle="modal" '
+                + ' data-content="{{ trans('general.sure_to_delete') }} ' + row.name + '?" '
+                + ' data-title="{{  trans('general.delete') }}" onClick="return false;">'
+                + '<i class="fa fa-trash"></i></a></nobr>';
+        }
+    }
+
+</script>
@stop
@@ -31,15 +31,15 @@
    <label for="parent" class="col-md-3 control-label">{{ trans('admin/hardware/form.model') }}</label>
    <div class="col-md-7 col-sm-10{{  (\App\Helpers\Helper::checkIfRequired($item, 'model_id')) ? ' required' : '' }}">
      @if (isset($selected_model))
-      {{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
+      {{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' => 'model_select_id', 'id' =>'model_select_id')) }}
      @else
-      {{ Form::select('model_id', $model_list , Input::old('model_id', $item->model_id), array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
+      {{ Form::select('model_id', $model_list , Input::old('model_id', $item->model_id), array('class'=>'select2 model', 'id' => 'model_select_id', 'style'=>'width:100%','id' =>'model_select_id')) }}
      @endif
      <!-- onclick="return dependency('model')" -->
      {!! $errors->first('model_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
    </div>
    <div class="col-md-1 col-sm-1 text-left">
-        <a href='#' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select="model_select_id" class="btn btn-sm btn-default">New</a>
+        <a href='{{ route('modal.model') }}' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select="model_select_id" class="btn btn-sm btn-default">New</a>
        <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
    </div>
  </div>
@@ -74,7 +74,7 @@
    </div>
    <div class="col-md-1 col-sm-1 text-left" style="margin-left: -20px; padding-top: 3px">
        @can('users.create')
-      <a href='#' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_user' class="btn btn-sm btn-default">New</a>
+      <a href='{{ route('modal.user') }}' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_user' class="btn btn-sm btn-default">New</a>
        @endcan
    </div>
  </div>
@@ -86,9 +86,7 @@
      {{ Form::select('assigned_asset', $assets_list , Input::old('assigned_asset', $item->assigned_type == 'App\Models\Asset' ? $item->assigned_to : 0), array('class'=>'select2', 'id'=>'assigned_asset', 'style'=>'width:100%')) }}
      {!! $errors->first('assigned_asset', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
    </div>
-    <div class="col-md-1 col-sm-1 text-left">
-      <a href='#' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_asset' class="btn btn-sm btn-default">New</a>
-    </div>
+
  </div>

  <!-- Locations -->
@@ -100,7 +98,7 @@
      {!! $errors->first('assigned_location', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
    </div>
    <div class="col-md-1 col-sm-1 text-left">
-      <a href='#' data-toggle="modal"  data-target="#createModal" data-dependency="user" data-select='assigned_location' class="btn btn-sm btn-default">New</a>
+      <a href='{{ route('modal.location') }}' data-toggle="modal"  data-target="#createModal" data-dependency="location" data-select='assigned_location' class="btn btn-sm btn-default">New</a>
    </div>
  </div>
  @endif
@@ -129,7 +127,7 @@
      {!! $errors->first('rtd_location_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
      </div>
      <div class="col-md-1 col-sm-1 text-left">
-        <a href='#' data-toggle="modal" data-target="#createModal" data-dependency='location' data-select='rtd_location_select' class="btn btn-sm btn-default">New</a>
+        <a href='{{ route('modal.location') }}' data-toggle="modal" data-target="#createModal" data-dependency='location' data-select='rtd_location_select' class="btn btn-sm btn-default">New</a>
      </div>
  </div>

@@ -162,7 +160,9 @@
@stop

@section('moar_scripts')
-@include('partials/modals')
+{{-- Some room for the modals --}}
+<div class="modal fade" id="createModal">
+</div><!-- /.modal -->
 <script>


@@ -190,19 +190,6 @@
        }
    }

-    $(function () {
-        $('#model_select_id').on("change", fetchCustomFields);
-    });
-
-    $(function () {
-        user_add($(".status_id option:selected").val());
-    });
-
-    var $statusSelect = $(".status_id");
-    $statusSelect.on("change", function () {
-        user_add($statusSelect.val());
-    });
-
    function user_add(status_id) {

        if (status_id != '') {
@@ -232,52 +219,30 @@
    ;

    $(function () {
+        //grab custom fields for this model whenever model changes.
+        $('#model_select_id').on("change", fetchCustomFields);
+
+        //initialize assigned user/loc/asset based on statuslabel's statustype
+        user_add($(".status_id option:selected").val());
+
+        //whenever statuslabel changes, update assigned user/loc/asset
+        $(".status_id").on("change", function () {
+            user_add($(".status_id").val());
+        });
+
+        //handle modal-add-interstitial calls
        var model, select;

        $('#createModal').on("show.bs.modal", function (event) {
            var link = $(event.relatedTarget);
            model = link.data("dependency");
            select = link.data("select");
-
-            var modal = $(this);
-            modal.find('.modal-title').text('Add a new ' + model);
-
-            $('.dynamic-form-row').hide();
-            function show_er(selector) {
-                $(selector).parent().parent().show();
-            }
-
-            show_er('#modal-name');
-            switch (model) {
-                case 'model':
-                    show_er('#modal-manufacturer_id');
-                    show_er('#modal-category_id');
-                    show_er('#modal-modelno');
-                    show_er('#modal-fieldset_id');
-                    break;
-
-                case 'user':
-                    $('.dynamic-form-row').hide(); //we don't want a generic "name"
-                    show_er("#modal-first_name");
-                    show_er("#modal-last_name");
-                    show_er("#modal-username");
-                    show_er("#modal-password");
-                    show_er("#modal-password_confirm");
-                    break;
-
-                case 'location':
-                    show_er('#modal-city');
-                    show_er('#modal-country');
-                    break;
-
-                case 'statuslabel':
-                    show_er("#modal-statuslabel_types");
-                    break;
-
-                case 'supplier':
-
-            }
-
+            // console.warn("Uh, href is: "+link.attr('href'));
+            // console.dir(link);
+            $('#createModal').load(link.attr('href'),function () {
+                //do we need to re-select2 this, after load? Probably.
+                $('#createModal').find('select.select2').select2();                
+            });
        });

        $("form").submit(function (event) {
@@ -406,7 +371,8 @@
        }


-        $('#modal-save').on('click', function () {
+        $('#createModal').on('click','#modal-save', function () {
+            console.warn("MODAL SAVE CALLED FOR MODAL!");
            var data = {};
            console.warn("We are about to SAVE!!! for model: "+model+" and select ID: "+select);
            $('.modal-body input:visible').each(function (index, elem) {
@@ -416,6 +382,7 @@
                    data[bits[1]] = $(elem).val();
                }
            });
+            //this can probably get replaced with a normal 'serialize' instead
            $('.modal-body select:visible').each(function (index, elem) {
                var bits = elem.id.split("-");
                data[bits[1]] = $(elem).val();
@@ -434,12 +401,27 @@

                    data: data,
                    success: function (result) {
-
-                        var id = result.id;
-                        var name = result.name || (result.first_name + " " + result.last_name);
-                        $('.modal-body input:visible').val("");
+                        // {"status":"error","messages":{"name":["The name field is required."]}}
+                        if(result.status == "error") {
+                            var error_message="";
+                            for(var field in result.messages) {
+                                error_message+="Problem(s) with field '"+field+"': "+result.messages[field].join(", ");
+                            }
+                            //window.alert("Error adding "+model+": "+error_message);
+                            $('#modal_error_msg').html(error_message).show();
+                            return false;
+                        }
+                        var id = result.payload.id;
+                        var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
+                        console.log(name);
                        $('#createModal').modal('hide');
+                        $('#createModal').html("");
+
+                        // "select" is the original drop-down menu that someone
+                        // clicked 'add' on to add a new 'thing'
+                        // this code adds the newly created object to that select
                        var selector = document.getElementById(select);
+                        //console.log(document.getElementById(select));
                        selector.options[selector.length] = new Option(name, id);
                        selector.selectedIndex = selector.length - 1;
                        $(selector).trigger("change");
@@ -447,8 +429,10 @@

                    },
                    error: function (result) {
-                        msg = result.responseJSON.error.message || result.responseJSON.error;
-                        window.alert("Unable to add new " + model + " - error: " + msg);
+                       // console.log('Error: ' + result.responseJSON.error.message );
+                        msg = result.responseJSON.messages || result.responseJSON.error;
+                        $('#modal_error_msg').html("Server Error: "+msg).show();
+                        //window.alert("Unable to add new " + model + " - error: " + msg);
                    }


@@ -301,6 +301,14 @@
                             <i class="fa fa-user fa-fw"></i> @lang('general.editprofile')
                         </a>
                     </li>
+                     <li>
+                         <a href="{{ route('account.password.index') }}">
+                             <i class="fa fa-asterisk"></i> @lang('general.changepassword')
+                         </a>
+                     </li>
+
+
+
                     @can('self.api')
                     <li>
                         <a href="{{ route('user.api') }}">
@@ -29,7 +29,7 @@
              <tr>
                <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                <th data-sortable="true" data-formatter="locationsLinkFormatter" data-field="name" data-searchable="true">{{ trans('admin/locations/table.name') }}</th>
-                <th data-sortable="true" data-field="parent">{{ trans('admin/locations/table.parent') }}</th>
+                <th data-sortable="true" data-field="parent" data-formatter="locationsLinkObjFormatter">{{ trans('admin/locations/table.parent') }}</th>
                <th data-searchable="false" data-sortable="false" data-field="assets_default">{{ trans('admin/locations/table.assets_rtd') }}</th>
                <th data-searchable="false" data-sortable="false" data-field="assets_checkedout">{{ trans('admin/locations/table.assets_checkedout') }}</th>
                <th data-searchable="true" data-sortable="true" data-field="currency">{{ App\Models\Setting::first()->default_currency }}</th>
@@ -0,0 +1,32 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('general.location') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-city' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12 country"><label for="modal-country">{{ trans('general.country') }}:</label></div>
+                <div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div>
+            </div>
+        </div>
+
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
@@ -0,0 +1,43 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('general.model') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:100%','id' =>'modal-manufacturer_id')) }}</div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:100%','id' => 'modal-category_id')) }}</div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
+                <div class="col-md-8 col-xs-12"><input type='text' id='modal-modelno' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
+                <div class="col-md-8 col-xs-12">{{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
@@ -0,0 +1,28 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('admin/hardware/form.status') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-type')) }}</div>
+            </div>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
@@ -0,0 +1,22 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('general.supplier') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div>
+            </div>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
@@ -0,0 +1,45 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('general.user') }}</h4>
+        </div>
+            <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-first_name' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div>
+                <div class="col-md-8 col-xs-12"><input type='text' id='modal-last_name' class="form-control"> </div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-username' class="form-control"></div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
+                <div class="col-md-8 col-xs-12 required"><input type='password' id='modal-password' class="form-control">
+                    <a href="#" class="left" id="genPassword">Generate</a>
+                </div>
+            </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' id='modal-password_confirm' class="form-control">
+                    <div id="generated-password"></div>
+                </div>
+            </div>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
@@ -1,4 +1,4 @@
-@if($model->fieldset)
+@if (($model) && ($model->fieldset))
  @foreach($model->fieldset->fields AS $field)
    <div class="form-group{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">
      <label for="{{ $field->db_column_name() }}" class="col-md-3 control-label">{{ $field->name }} </label>
@@ -82,7 +82,7 @@ $('.snipe-table').bootstrapTable({
        formatLoadingMessage: function () {
            return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';
        },
-        pageList: ['50','100','150','200','500','1000'],
+        pageList: ['30','50','100','150','200','500','1000'],
        icons: {
            advancedSearchIcon: 'fa fa-search-plus',
            paginationSwitchDown: 'fa-caret-square-o-down',
@@ -256,7 +256,7 @@ $('.snipe-table').bootstrapTable({
            // Pull out any HTMl that might be passed via the presenter
            // (for example, the locked icon for encrypted fields)
            var field_column_plain = field_column.replace(/<(?:.|\n)*?> ?/gm, '');
-            if (row.custom_fields[field_column_plain]) {
+            if ((row.custom_fields) && (row.custom_fields[field_column_plain])) {
                return row.custom_fields[field_column_plain].value;
            }

@@ -322,10 +322,9 @@ $('.snipe-table').bootstrapTable({
    }

    function employeeNumFormatter(value, row) {
-        if ((value) && (value.employee_number)) {
-            return '<a href="{{ url('/') }}/users/' + row.id + '"> ' + value.employee_number + '</a>';
-        } else {
-            return value;
+
+        if ((row.assigned_to) && ((row.assigned_to.employee_number))) {
+            return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '"> ' + row.assigned_to.employee_number + '</a>';
        }
    }

@@ -6,7 +6,7 @@
        {!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
    </div>
    <div class="col-md-1 col-sm-1 text-left">
-        <a href='#' data-toggle="modal"  data-target="#createModal" data-dependency='statuslabel' data-select='status_select_id' class="btn btn-sm btn-default">New</a>
+        <a href='{{ route('modal.statuslabel') }}' data-toggle="modal"  data-target="#createModal" data-dependency='statuslabel' data-select='status_select_id' class="btn btn-sm btn-default">New</a>
        <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
    </div>
    <div class="col-md-7 col-sm-11 col-md-offset-3">
@@ -2,10 +2,10 @@
 <div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
    <label for="supplier_id" class="col-md-3 control-label">{{ trans('general.supplier') }}</label>
    <div class="col-md-7{{  (\App\Helpers\Helper::checkIfRequired($item, 'supplier_id')) ? ' required' : '' }}">
-        {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px']) }}
+        {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px', 'id' => 'supplier_select_id']) }}
        {!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
    </div>
    <div class="col-md-1 col-sm-1 text-left">
-             <a href='#' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-default">New</a>
+             <a href='{{ route('modal.supplier') }}' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-default">New</a>
    </div>
 </div>
@@ -1,90 +0,0 @@
-{{-- Some room for the modals --}}
-<div class="modal fade" id="createModal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">Modal title</h4>
-            </div>
-            <div class="modal-body">
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:100%','id' =>'modal-manufacturer_id')) }}</div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:100%','id' => 'modal-category_id')) }}</div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' id='modal-modelno' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-statuslabel_types">{{ trans('admin/statuslabels/table.status_type') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('modal-statuslabel_types', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-statuslabel_types')) }}</div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-city' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12 country"><label for="modal-country">{{ trans('general.country') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-first_name' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' id='modal-last_name' class="form-control"> </div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' id='modal-username' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='password' id='modal-password' class="form-control">
-                        <a href="#" class="left" id="genPassword">Generate</a>
-                    </div>
-                </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' id='modal-password_confirm' class="form-control">
-                        <div id="generated-password"></div>
-                    </div>
-                </div>
-
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-                <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-            </div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
@@ -31,7 +31,7 @@
          <a href="{{ route('settings.general.index') }}" class="btn btn-lg btn-white"><i class="fa fa-wrench fa-3x"></i></a>
          <br>
          General Settings
-          <p class="help-block">Language and stuff</p>
+          <p class="help-block">Default EULA and more</p>
        </div>
      </div>
    </div>
@@ -43,7 +43,7 @@
          <a href="{{ route('settings.security.index') }}" class="btn btn-lg btn-white"><i class="fa fa-lock fa-3x"></i></a>
          <br>
          Security
-          <p class="help-block">Two-factor</p>
+          <p class="help-block">Two-factor, Password Restrictions</p>
        </div>
      </div>
    </div>
@@ -112,7 +112,7 @@
          <a href="{{ route('settings.barcodes.index') }}" class="btn btn-lg btn-white"><i class="fa fa-barcode fa-3x"></i></a>
          <br>
          Barcodes
-          <p class="help-block">Barcode &amp;amp; QR settings</p>
+          <p class="help-block">Barcode &amp; QR settings</p>
        </div>
      </div>
    </div>
@@ -123,7 +123,7 @@
          <a href="{{ route('settings.labels.index') }}" class="btn btn-lg btn-white"><i class="fa fa-tags fa-3x"></i></a>
          <br>
          Labels
-          <p class="help-block">Label sizes &amp;amp; settings</p>
+          <p class="help-block">Label sizes &amp; settings</p>
        </div>
      </div>
    </div>
@@ -158,7 +158,7 @@
          <a href="{{ route('settings.oauth.index') }}" class="btn btn-lg btn-white"><i class="fa fa-user-secret fa-3x"></i></a>
          <br>
          OAuth
-          <p class="help-block">Oauth endpoint Settings</p>
+          <p class="help-block">Oauth Endpoint Settings</p>
        </div>
      </div>
    </div>
@@ -14,11 +14,6 @@
 {{-- Page content --}}
@section('content')

-    <style>
-        .checkbox label {
-            padding-right: 40px;
-        }
-    </style>


    {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
@@ -58,6 +53,68 @@
                            </div>
                        </div>

+                        <!-- Min characters -->
+                        <div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                {{ Form::label('pwd_secure_min', trans('admin/settings/general.pwd_secure_min')) }}
+                            </div>
+                            <div class="col-md-9">
+                                {{ Form::text('pwd_secure_min', Input::old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control',  'style'=>'width: 50px;')) }}
+
+                                {!! $errors->first('pwd_secure_min', '<span class="alert-msg">:message</span>') !!}
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.pwd_secure_min_help') }}
+                                </p>
+
+
+                            </div>
+                        </div>
+
+
+                        <!-- Common Passwords -->
+                        <div class="form-group {{ $errors->has('pwd_secure_uncommon') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                {{ Form::label('pwd_secure_text',
+                                              trans('admin/settings/general.pwd_secure_uncommon')) }}
+
+                            </div>
+                            <div class="col-md-9">
+                                {{ Form::checkbox('pwd_secure_uncommon', '1', Input::old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array('class' => 'minimal')) }}
+                                {{ Form::label('pwd_secure_uncommon',  trans('general.yes')) }}
+                                {!! $errors->first('pwd_secure_uncommon', '<span class="alert-msg">:message</span>') !!}
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.pwd_secure_uncommon_help') }}
+                                </p>
+                            </div>
+                        </div>
+                        <!-- /.form-group -->
+
+                        <!-- Common Passwords -->
+                        <div class="form-group">
+                            <div class="col-md-3">
+                                {{ Form::label('pwd_secure_complexity', trans('admin/settings/general.pwd_secure_complexity')) }}
+                            </div>
+                            <div class="col-md-9">
+
+                                {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal')) }}
+                                Require at least one letter <br>
+
+                                {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal')) }}
+                                Require at least one number<br>
+
+                                {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal')) }}
+                                Require at least one symbol<br>
+
+                                {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal')) }}
+                                Require at least one uppercase and one lowercase
+
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_help') }}
+                                </p>
+                            </div>
+                        </div>
+                        <!-- /.form-group -->
+

                    </div>

@@ -89,11 +89,15 @@
 <script>

    function groupsFormatter(value) {
-        var groups = '';
-        for (var index = 0; index < value.length; index++) {
-            groups += '<a href="#" class="label label-default"> ' + value[index].name + '</a> ';
+
+        if (value) {
+            var groups = '';
+            for (var index in value.rows) {
+                groups += '<a href="#" class="label label-default"> ' + value.rows[index].name + '</a> ';
+            }
+            return groups;
        }
-        return groups;
+
    }


@@ -230,6 +230,22 @@ Route::group(['prefix' => 'v1','namespace' => 'Api'], function () {

    });

+    /*--- Asset Maintenances API ---*/
+    Route::resource('maintenances', 'AssetMaintenancesController',
+        [
+            'names' =>
+                [
+                    'index' => 'api.maintenances.index',
+                    'show' => 'api.maintenances.show',
+                    'store' => 'api.maintenances.store',
+                    'update' => 'api.maintenances.update',
+                    'destroy' => 'api.maintenances.destroy'
+                ],
+            'except' => ['create', 'edit'],
+            'parameters' => ['maintenance' => 'maintenance_id']
+        ]
+    ); // Consumables resource
+

    Route::resource('hardware', 'AssetsController',
        [
@@ -70,6 +70,23 @@ Route::group(['middleware' => 'auth'], function () {
 });


+/*
+|
+|--------------------------------------------------------------------------
+| Re-Usable Modal Dialog routes.
+|--------------------------------------------------------------------------
+|
+| Routes for various modal dialogs to interstitially create various things
+| 
+*/
+
+Route::group(['middleware' => 'auth','prefix' => 'modals'], function () {
+    Route::get('location',['as' => 'modal.location','uses' => 'ModalController@location']);
+    Route::get('model',['as' => 'modal.model','uses' => 'ModalController@model']);
+    Route::get('statuslabel',['as' => 'modal.statuslabel','uses' => 'ModalController@statuslabel']);
+    Route::get('supplier',['as' => 'modal.supplier','uses' => 'ModalController@supplier']);
+    Route::get('user',['as' => 'modal.user','uses' => 'ModalController@user']);
+});

 /*
 |--------------------------------------------------------------------------
@@ -215,6 +232,10 @@ Route::group([ 'prefix' => 'account', 'middleware' => ['auth']], function () {
    # Profile
    Route::get('profile', [ 'as' => 'profile', 'uses' => 'ProfileController@getIndex' ]);
    Route::post('profile', 'ProfileController@postIndex');
+
+    Route::get('password', [ 'as' => 'account.password.index', 'uses' => 'ProfileController@password' ]);
+    Route::post('password', [ 'uses' => 'ProfileController@passwordSave' ]);
+
    Route::get('api', [ 'as' => 'user.api', 'uses' => 'ProfileController@api' ]);

    # View Assets
@@ -151,7 +151,7 @@ case $distro in
                echo "  The installer has detected Debian version $version as the OS."
                distro=debian
                ;;
-        *centos*|*redhat*|*ol*)
+        *centos*|*redhat*|*ol*|*rhel*)
                echo "  The installer has detected $distro version $version as the OS."
                distro=centos
                ;;
@@ -292,7 +292,7 @@ case $distro in
 		service apache2 restart
 		;;
 	centos )
-	if [ "$version" == "6" ]; then
+	if [[ "$version" =~ ^6 ]]; then
 		#####################################  Install for Centos/Redhat 6  ##############################################

 		webdir=/var/www/html
@@ -409,7 +409,7 @@ case $distro in

 	       service httpd restart

-	elif [ "$version" == "7" ]; then
+	elif [[ "$version" =~ ^7 ]]; then
 		#####################################  Install for Centos/Redhat 7  ##############################################

 		webdir=/var/www/html
@@ -1,2 +1,3 @@
 *
-!.gitignore
+!.gitignore
+!env-backups
@@ -0,0 +1,2 @@
+*
+!.gitignore
Author	SHA1	Message	Date
snipe	e6323e0a1b	Version bump for beta 2	2017-08-24 23:32:33 -07:00
snipe	73ce5f98bb	Removed some logging to make test debugging less verbose	2017-08-24 23:20:51 -07:00
Brady Wetherington	a37cb616eb	Add Error DIV's to all modals (#3886 )	2017-08-24 22:43:05 -07:00
snipe	659d953f3f	Fixed custom error message for status labels	2017-08-24 22:40:07 -07:00
Brady Wetherington	c1dcc22217	Refactor and improve Modal support for Assets (#3884 )	2017-08-24 22:24:02 -07:00
snipe	6a67426140	Create travis user? I don’t know wqhy it’s still looking for a travis user	2017-08-24 17:21:50 -07:00
snipe	4ba474cf73	Fixes asset test	2017-08-24 16:52:27 -07:00
snipe	fb6caa35ff	Only increment if settings table has a value (This should only ever come up in the CI tests)	2017-08-23 14:07:01 -07:00
snipe	a5870c888e	Removed incrementer from non-asset event listeners	2017-08-23 13:59:59 -07:00
snipe	f35f8477d3	Maybe the travis user isn’t created automatically anymore?	2017-08-23 13:42:17 -07:00
snipe	d0637d38f3	More travis fixes	2017-08-23 13:32:30 -07:00
snipe	7141968d64	Trying to fix travis. Again. Always.	2017-08-23 13:22:01 -07:00
snipe	0f7b7d8e6a	Add @zwerch as a contributor	2017-08-23 13:13:50 -07:00
snipe	ca78b3ed7c	Fixes models on create asset	2017-08-23 13:08:42 -07:00
snipe	2d2cae10b9	Fixed wonky “maintained” badge	2017-08-23 12:07:00 -07:00
snipe	5e9331f5ae	Fixed typo. (English is hard. Let’s go shopping!)	2017-08-23 04:00:10 -07:00
snipe	6e30fa6922	Fixes custom fields in asset listing where no custom fields were assigned	2017-08-23 03:28:13 -07:00
snipe	58b3f0519d	Add empty errors array	2017-08-23 00:31:37 -07:00
snipe	f119c69698	Possible fix for #3852	2017-08-22 22:46:02 -07:00
snipe	57f4c986af	Enforce password complexity rules on new account password change	2017-08-22 22:41:35 -07:00
snipe	2958630923	Fixed some settings text	2017-08-22 22:11:26 -07:00
snipe	72dacda4f9	Trying again to resolve doctrine/php7 issue	2017-08-22 21:58:42 -07:00
snipe	9c2b986bb0	Fixes doctrine/etc compatibility issue See: https://github.com/laravel/framework/issues/20490	2017-08-22 21:51:50 -07:00
snipe	06c5bce3c7	Fixes #3865 - employee number mislabeled in list output	2017-08-22 21:40:35 -07:00
snipe	a0cbca85bf	Fixes for API calls for password complexity stuff	2017-08-22 21:15:35 -07:00
snipe	9bda62d295	ADDED: Password rules for complexity, min length, rejecting common passwords	2017-08-22 20:32:39 -07:00
snipe	1d7e243d0a	Fixes #3790 - parent display on locations index	2017-08-22 15:02:31 -07:00
snipe	63bc2ec09f	Fixes #3802 - make id an (int) in API repsonse	2017-08-22 14:53:48 -07:00
snipe	d5cadeab1a	Fixes #3854 - more fillable fields for supplier API	2017-08-22 14:30:39 -07:00
snipe	31516abef9	Fixes #3858 - use transformer for single listing categories	2017-08-22 14:26:08 -07:00
snipe	d2535582f3	Fixes #3853 - added notes/zip to suppliers API response	2017-08-22 14:18:21 -07:00
snipe	eaaea303f4	Fixes #3860 - return JSON instead of redirect in API delete dept call	2017-08-22 14:15:13 -07:00
snipe	8c5312b931	Fixes #3866 - weird API behavior in status label types	2017-08-22 14:10:54 -07:00
snipe	4ef6e292d1	Fixes #3868 - model_number/notes in models API call	2017-08-22 13:56:51 -07:00
snipe	6310670835	Fixes #3869 - asset maintenances API endpoints	2017-08-22 13:52:06 -07:00
snipe	15bb30acd6	Fixes #3873 - show groups correctly on user listing page	2017-08-22 12:29:46 -07:00
snipe	148d41d8dc	Removes erroneous else	2017-08-22 12:22:32 -07:00
snipe	71c1c74164	Fixes #3085 - adds “change password” functionality back to user accounts	2017-08-22 12:09:04 -07:00
snipe	9c02526a37	Make fields nullable in settings	2017-08-22 10:41:59 -07:00
snipe	25dc26aac3	Added 30 as page selector value for label printing	2017-08-21 22:31:37 -07:00
snipe	afc763ebac	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-08-21 22:31:04 -07:00
snipe	6a73ec6537	First stab at a recrypter for legacy mcrypt conversion	2017-08-21 22:30:56 -07:00
Ryan McGuire	481143b891	Fixes for Red Hat Enterprise Linux 7 and CentOS 6 (#3846 ) * Changes for Red Hat Enterprise Linux. RHEL uses "rhel" in the ID field in /etc/os-release. We'll leave "redhat" in the script just in case. Also, RHEL uses a two digit version number in the VERSION_ID field. So instead of looking for just "7", look for anything that starts with "7". This should fix RHEL installations as well as not break anything with CentOS. * Fixes issue #3079. "lsb_release -s -r" returns a two digit version number (at least on recent CentOS releases) while the script is looking for a single digit version. We'll change the script so that it only looks for the version starting with 6. This fixes recent releases of CentOS, while also not breaking previous versions that may have used a single digit.	2017-08-18 15:12:09 -07:00
Brady Wetherington	cef67695cd	New Dockerfile fixes to add support for the new barcode library (#3856 )	2017-08-16 13:10:25 -07:00
snipe	4576cb6f56	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-08-10 14:38:08 -07:00
snipe	56f88d2c22	Fixes #3836 - Adds supplier to licenses column	2017-08-10 14:38:04 -07:00
gibsonjoshua55	c1d1cb8122	Address #3840 and fixes group transformation in UsersTransformer (#3841 ) Removes the incorrect variable access in UsersTransformer of a users's groups and adds an array of groups' ids and names to the return array.	2017-08-10 13:37:54 -07:00