Bumped version

Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts: # app/controllers/admin/AssetsController.php
2015-07-09 01:24:43 -07:00 · 2015-07-09 01:24:34 -07:00 · 2015-07-09 01:19:57 -07:00 · 2015-07-09 01:17:02 -07:00 · 2015-07-09 01:02:49 -07:00 · 2015-07-09 00:53:58 -07:00
1712 changed files with 90677 additions and 23105 deletions
@@ -0,0 +1,5 @@
+.git
+.dockerignore
+app/storage/logs/*
+app/storage/views/*
+vendor/*
@@ -7,9 +7,22 @@ composer.phar
 /app/database/*.sqlite
 /app/storage/meta/services.json
 /app/config/*/mail.php
+/app/config/*/session.php
 /app/config/*/database.php
 /app/config/*/app.php
 public/packages/*
+public/uploads/models/*
+public/uploads/avatars/*
 /app/storage/views/*
 /app/storage/logs/*
-/app/storage/debugbar/
+/app/storage/debugbar/
+/bin/
+.idea
+crowdin.yaml
+public/uploads/logo.gif
+public/uploads/logo.png
+.siteflow
+public/assets/.siteflow
+.settings/settings.json
+
+
@@ -1,3 +1,7 @@
+addons:
+  hosts:
+    - AlisonMBP
+
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php

@@ -15,15 +19,16 @@ env:
 before_script:
  - if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS snipeit_laravel;" -utravis; fi
  - curl -s http://getcomposer.org/installer | php
-  - cp app/config/production/database.example.php app/config/database.php
-  - cp app/config/production/mail.example.php app/config/mail.php
-  - php composer.phar self-update
-  - php composer.phar install --prefer-source --no-interaction --dev
-  - php artisan key:generate
-  - php artisan migrate:install
-  - php artisan migrate --package cartalyst/sentry
-  - php artisan migrate
-  - php artisan db:seed
+  - cp app/config/testing/app.example.php app/config/testing/app.php
+  - cp app/config/testing/database.example.php app/config/testing/database.php
+  - cp app/config/testing/mail.example.php app/config/testing/mail.php
+  - composer self-update
+  - composer install --prefer-source --no-interaction
+  - php artisan key:generate --env=testing
+  - php artisan migrate:install --env=testing --no-interaction -vvv
+  - php artisan migrate --package cartalyst/sentry --env=testing --no-interaction -vvv
+  - php artisan migrate --env=testing --no-interaction -vvv
+  - php artisan db:seed --env=testing --no-interaction -vvv

 # omitting "script:" will default to phpunit
 # use the $DB env variable to determine the phpunit.xml to use
@@ -31,4 +36,5 @@ script: phpunit

 # configure notifications (email, IRC, campfire etc)
 notifications:
-  slack: snipe:F6LWbfP6vhr3aRBoeARFG6Ti
+  slack:
+    secure: vv9we1RxB9RsrMbomSdq6D7vz/okobw87pEkgIZjB+hj1QpQ2by90gsPsOa+NgsJEFaEP7e4KlT6SH8kK+zhbmuKaUd3d1//XdcancE22LZXi6tkiB5yuR/Jhhb1LLDqyGJTB4D92hMnnCPiUjpxNA3r437ttNeYRdYIEEP3drA=
@@ -0,0 +1,406 @@
+
+
+###  v1.2.6.1 - Released Mar 12, 2015 08:25:28
+* <a href="http://github.com/snipe/snipe-it/commit/7047af44f6544d2eeed0f0fcefdbdd44489f189a">view</a> &bull; Fixed layout for remember me button 
+* <a href="http://github.com/snipe/snipe-it/commit/4502582beb064ffeee4a1cdf892f513e58534014">view</a> &bull; Trying to fix pre-commit hook :( 
+* <a href="http://github.com/snipe/snipe-it/commit/61b04d6e40baa9054e1701455259d8d62fa868ff">view</a> &bull; Fixes #579 - user cannot accept more than once 
+* <a href="http://github.com/snipe/snipe-it/commit/2d196b1595ec87f119ad5a82f8f676918c52c896">view</a> &bull; Fixes #602 for strict_mode 
+* <a href="http://github.com/snipe/snipe-it/commit/2540e90c37f37515d8d0277a4152c4b8198a4222">view</a> &bull; Fixes #605 - hides user requestable view from admins 
+* <a href="http://github.com/snipe/snipe-it/commit/1c333e4a24a4950418175a8c354d7541637b7658">view</a> &bull; Fixes #596 - better routes for checking in multiple items from user 
+* <a href="http://github.com/snipe/snipe-it/commit/7d5ee9750f912d85ac0c7f42e2beaba7e026989c">view</a> &bull; Added #596 fix for accessories 
+* <a href="http://github.com/snipe/snipe-it/commit/3f9d9f23d5190052deb1f36be919c650e8f773b8">view</a> &bull; Fixes #280 - updated link to use config url 
+* <a href="http://github.com/snipe/snipe-it/commit/817384b7615a301d6d692aefe6e41cd92ecfd6e1">view</a> &bull; Fixes #597 - print-friendly view on users 
+* <a href="http://github.com/snipe/snipe-it/commit/2115c82587e06049245f17f9d710fbc7a61e57b9">view</a> &bull; Fixed DB format for nullable EULA 
+* <a href="http://github.com/snipe/snipe-it/commit/f62f22b4bf1399c3b98041dfe17f4cc8450847b2">view</a> &bull; ref #599. showing groups in user detail view. fixes a small design bug with group edit view 
+* <a href="http://github.com/snipe/snipe-it/commit/ad25c048c4a52a7f80a479a3b7d621aaad18b1d7">view</a> &bull; Updated Sentry version to fix #625 
+* <a href="http://github.com/snipe/snipe-it/commit/d31c12cfafb2ba323973964215f033bd9aeb1f9b">view</a> &bull; Merge pull request #629 from uberbrady/unicode_fix 
+* <a href="http://github.com/snipe/snipe-it/commit/33dd59fb814089c81886c0264b2356df2b212864">view</a> &bull; Fix #637 - Remove Deleted Models from drop down 
+* <a href="http://github.com/snipe/snipe-it/commit/cb171bcac5c4ccbb347f370e3d2b28783378c0b2">view</a> &bull; Fixes #645 - adds zip and rar to filetype 
+
+
+###  v1.2.6 - Released Feb 28, 2015 08:27:45
+
+
+###  v1.2.6-beta - Released Feb 27, 2015 03:17:06
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/30df21c7aa2582bc3b1efbfd788c1aea2733aa7d">view</a> &bull; Fixed missing checkedout-to info on asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/70ae59ed6260101bcfb6e3cbd6309ecb9c1c935a">view</a> &bull; Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date. 
+* <a href="http://github.com/snipe/snipe-it/commit/f8e12cabd4af8875abd759a3c9d6c2216cb88601">view</a> &bull; Fixes #476 - added logo upload and header color 
+* <a href="http://github.com/snipe/snipe-it/commit/f85061f988a946f1d4a284fbfc8c442636c1364c">view</a> &bull; Fix #541 - Headers not being skipped if checked 
+* <a href="http://github.com/snipe/snipe-it/commit/8b3e22b58e080b44e4de809b8598283fa6ba5bb0">view</a> &bull; Fixes #546 - only insert data if values exist 
+* <a href="http://github.com/snipe/snipe-it/commit/083cb1b5ec51aa2b6932a59b9436a1a45fad5460">view</a> &bull; Fix activate for strict db 
+* <a href="http://github.com/snipe/snipe-it/commit/35cf5b3d609fec2bc3613bdae42d338448413520">view</a> &bull; Fixes #423 
+* <a href="http://github.com/snipe/snipe-it/commit/097bb38a231795aa52ff772a38887700e828256d">view</a> &bull; Fixes #163 - accept acceptance + eula 
+* <a href="http://github.com/snipe/snipe-it/commit/b2af455523fcca1bb02018b38fdb6dc4861819d8">view</a> &bull; Merge conflict resolution. Added a use at the same line as remote. Fixed 
+* <a href="http://github.com/snipe/snipe-it/commit/8879bff16084b2cfa0280fcb1f83d3f90368797f">view</a> &bull; Fixed bug for reporting on upload in dashboard 
+* <a href="http://github.com/snipe/snipe-it/commit/3135869d5a3fafcf70e49dcbb99e36c2ec04ddd0">view</a> &bull; Fixed font path 
+* <a href="http://github.com/snipe/snipe-it/commit/a5a1c4223b357b9cc2751a28e0c4e3085e476733">view</a> &bull; Fixed chevrons 
+* <a href="http://github.com/snipe/snipe-it/commit/734dc49564e4f970846f786177c9d2928284fb5f">view</a> &bull; Fixed icon 
+* <a href="http://github.com/snipe/snipe-it/commit/a6232cbfd8050ace613259df56afae243954c625">view</a> &bull; Fix language string for create accessory 
+* <a href="http://github.com/snipe/snipe-it/commit/c2bbc1281ccdda65caa55665c66c78613142099f">view</a> &bull; Mobile fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/29863004e2e622a9b3b4616abdcd92f2b950bebe">view</a> &bull; more small mobile fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/8eaa70c39b3ace90a517387dc91f452aede18958">view</a> &bull; Fixes #567 - bug in depreciation report csv export 
+* <a href="http://github.com/snipe/snipe-it/commit/e41621def05994302627cd4a6a81abd8e43c86be">view</a> &bull; Fixed relation between accessory and category 
+* <a href="http://github.com/snipe/snipe-it/commit/9f3edd701b51a7aecf792e5736534c1bb15aca9a">view</a> &bull; Fixes #565 - Soft Delete Models and Allow Restore 
+* <a href="http://github.com/snipe/snipe-it/commit/528c06cf7fb4f5c35d4b90eb256c0d195b8366b7">view</a> &bull; Reverting icon fix 
+* <a href="http://github.com/snipe/snipe-it/commit/1ac401f0c036eca0cec1df0986d4c7e1903556fa">view</a> &bull; Fixed EULA mail 
+* <a href="http://github.com/snipe/snipe-it/commit/6d16c97902dadad2351b627f3157257774a075f3">view</a> &bull; Fixed back arrow 
+* <a href="http://github.com/snipe/snipe-it/commit/3e189d3502f8147c012b641cc366394875e9005c">view</a> &bull; Fixes #538 - sortable tables 
+* <a href="http://github.com/snipe/snipe-it/commit/31df29cac878deeb75d8b9b5a2efc7c84ef4b592">view</a> &bull; Fixed funky layout from datatables 
+* <a href="http://github.com/snipe/snipe-it/commit/efaf067b948899d0b784f47092dc3bc22fe504ca">view</a> &bull; Fixed user relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/5010720a976019306e37b89f5aa0e917c0ffdea3">view</a> &bull; Fixed accessory relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/a20e1f6943eab11fc937fcfeb3fe99dc0d520734">view</a> &bull; Fixed attach to relation 
+* <a href="http://github.com/snipe/snipe-it/commit/19ad8970d76a1676de3494b758efa65c0ed6a5c1">view</a> &bull; Fixed arrow icon 
+* <a href="http://github.com/snipe/snipe-it/commit/430b8233ed6f23402597fe54215b9988a3405dd7">view</a> &bull; Fixed user relationship 
+* <a href="http://github.com/snipe/snipe-it/commit/c0c563b1c77ff9942212af89384c8ded40b83b29">view</a> &bull; Fixes accessory relationshop for pivot 
+* <a href="http://github.com/snipe/snipe-it/commit/ef6eae63d86f159a170c3a322a44e08bab827080">view</a> &bull; Fixed error icon 
+* <a href="http://github.com/snipe/snipe-it/commit/d33dcbbcb12172527cec977f679198f594ac975b">view</a> &bull; Fixed bad method call in accessories on delete 
+* <a href="http://github.com/snipe/snipe-it/commit/04735f1affd2fdff9d6cf96ed583ece895cfb341">view</a> &bull; Fixed assetlog display 
+* <a href="http://github.com/snipe/snipe-it/commit/c484afb12b0720eaba2d28f501bf547e2ad9caa9">view</a> &bull; Fixed typo for accessories accept 
+
+
+###  v1.2.5 - Released Feb 18, 2015 03:18:10
+* <a href="http://github.com/snipe/snipe-it/commit/00f7717142e11b90764ffce2d554c566f8ad219f">view</a> &bull; Fix #475 and styling 
+* <a href="http://github.com/snipe/snipe-it/commit/49f25a23a99c08606d58101e039a885b89503fa7">view</a> &bull; Merge pull request #516 from splaer/fix-475 
+* <a href="http://github.com/snipe/snipe-it/commit/58ff929d7193b054073ef46ae2fafdef51d51919">view</a> &bull; Fixes error when no model present because new asset 
+* <a href="http://github.com/snipe/snipe-it/commit/f57c61dd4d789635cee6f62899807b1a7928800e">view</a> &bull; Possible fix for #518 - license count issue 
+* <a href="http://github.com/snipe/snipe-it/commit/064c0211dbb310d1dfdb126e3ce2cee72a80f628">view</a> &bull; Fix #517 - User Requestable Assets 
+* <a href="http://github.com/snipe/snipe-it/commit/4a5007264e1712250726047162df91041d12d28c">view</a> &bull; Fixed mac address not showing 
+* <a href="http://github.com/snipe/snipe-it/commit/17258b73a1c09918960d894702a0ae341a18f0b8">view</a> &bull; Fixes #520 - state no longer required 
+* <a href="http://github.com/snipe/snipe-it/commit/f40bb7b8b3a17ff772c797a3f91a845b068be3d2">view</a> &bull; Fixes #520 postal code requirement 
+* <a href="http://github.com/snipe/snipe-it/commit/08ee02d0cd4d1ff9ed2b0600b75390c1e34c1f53">view</a> &bull; Fixes #525 - added serial to asset model UI 
+* <a href="http://github.com/snipe/snipe-it/commit/24f5cdc743acd55ead02282e13e07f3cbd3551b0">view</a> &bull; Fixes #523 - added file uploads to assets 
+* <a href="http://github.com/snipe/snipe-it/commit/e02bea4275306fb3d2696e3018066b4b1486fa8d">view</a> &bull; Fixes #457 - added bulk options to hardware 
+* <a href="http://github.com/snipe/snipe-it/commit/4e4144ea749974332f645fa77eb74fbbfef51b90">view</a> &bull; Fixed blade reference 
+* <a href="http://github.com/snipe/snipe-it/commit/b32d74de57a3a26326a220236838f57550549ca5">view</a> &bull; Fixed seeder with duplicate ID 
+* <a href="http://github.com/snipe/snipe-it/commit/ea6a6d098ad1795fc5463c61b72240cdcd8a43e7">view</a> &bull; Fixes #440 - removed unique constraint on serial 
+* <a href="http://github.com/snipe/snipe-it/commit/38961298ed6efe3649fdbf4b1e9b3278ab85567a">view</a> &bull; Fixes #439 - loads javascript and CSS locally 
+* <a href="http://github.com/snipe/snipe-it/commit/063e5c407c8f817c16026887be16eeb42598417f">view</a> &bull; Fixed the depreciation report, fixes to calculate current depreciated value (which were only used there). Additional fixes and refactoring around Depreciable, in terms of how assets get depreciation via models, and licenses get depreciation directly. 
+
+
+###  v1.2.4 - Released Feb 12, 2015 06:57:47
+* <a href="http://github.com/snipe/snipe-it/commit/2277b6ee699a78108523eee11695a280e76b1bb4">view</a> &bull; Fixed checkout logic for new assigned_to 
+* <a href="http://github.com/snipe/snipe-it/commit/dbc93de6b3966470f83254547f8029c60f489490">view</a> &bull; Fixes checkin button on view 
+* <a href="http://github.com/snipe/snipe-it/commit/c06a4d4118039d112b69e48f9d4efc2be796f2e0">view</a> &bull; Fixed wonky checkin/checkout buttons 
+* <a href="http://github.com/snipe/snipe-it/commit/31f4ba88f655e1386f2f4f0efae84399f7aa6d52">view</a> &bull; Fix RTD query to not display checked out asset 
+* <a href="http://github.com/snipe/snipe-it/commit/5867c604104781c351f870ff3e0fd4b4d6eeb35a">view</a> &bull; Fixed scope chaining on assigned_to 
+* <a href="http://github.com/snipe/snipe-it/commit/a2178392e65bcc35594d516a20f67eea8466e5c1">view</a> &bull; Fixed seeder 
+* <a href="http://github.com/snipe/snipe-it/commit/7715731c4a2e423afb94873227eb728ad4877221">view</a> &bull; Fix count in header 
+* <a href="http://github.com/snipe/snipe-it/commit/c2e532e32e4943e251dcb5fdd005e9b65d9798a5">view</a> &bull; Fixed language file for status label messages 
+* <a href="http://github.com/snipe/snipe-it/commit/f36029a34a696d89b1058c9abdca7953d51e2bc4">view</a> &bull; Fixed migration for to set assigned_to to null per #506 
+* <a href="http://github.com/snipe/snipe-it/commit/f72b38579037d76b5b188c5d85e24ca567e2480b">view</a> &bull; Fix licenses so null instead of 0 
+* <a href="http://github.com/snipe/snipe-it/commit/34032c73ceee7a9666680f21bf7490fdc32dbdb6">view</a> &bull; Fixed licenses so null instead of 0 
+* <a href="http://github.com/snipe/snipe-it/commit/7b165a12e05396b72381fc2789124acd2b98a2b8">view</a> &bull; Fixes #508 - compacted UI for licenses overview 
+* <a href="http://github.com/snipe/snipe-it/commit/c89be345033bfbed326ffd4207a63438ea09378f">view</a> &bull; Fixes #329 and #454 - added category asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/35a133bbf9f7330a038dda2e79995b9825ca7633">view</a> &bull; Fixes #382 - allow admins to restore deleted assets 
+* <a href="http://github.com/snipe/snipe-it/commit/80e10c4c9838ae4acea8847ed907c6ad05bfac1a">view</a> &bull; Fixes #387 - sortable asset view by manufacturer 
+* <a href="http://github.com/snipe/snipe-it/commit/e343c157c5998d6f30a4e25da23ad1092d50c103">view</a> &bull; Fixed naming conflict for requestable 
+* <a href="http://github.com/snipe/snipe-it/commit/cd5a352961a1e1e8d90368abf81fedee5ce94bef">view</a> &bull; Fix for wrong math on remaining licenses when assigned to an asset 
+* <a href="http://github.com/snipe/snipe-it/commit/342a8b81afb2060a128d0667acc15fa5caafc2ea">view</a> &bull; Fix for error when asset has null status 
+* <a href="http://github.com/snipe/snipe-it/commit/8cdd2156143864974423bea70521d45db6d0cb9c">view</a> &bull; Fixed intenting 
+* <a href="http://github.com/snipe/snipe-it/commit/fbf03b225d732e12821bfc83b9bae7fb7b4b8be8">view</a> &bull; Fixes #509 - added MAC address as model option 
+
+
+###  v1.2.4-beta - Released Feb 11, 2015 01:11:40
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/389c27b2e691743eb361cc1fbe4ece4259ae6046">view</a> &bull; Fixes #477 - wrong sidebar on asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/7009b24748edab02921c609c26bc549fa96dcd2f">view</a> &bull; Merge pull request #498 from snipe/fixes/477 
+* <a href="http://github.com/snipe/snipe-it/commit/c1600a33db6d4463d27f74f87389489210de700e">view</a> &bull; Fixes #499 - timestamps in asset logs 
+* <a href="http://github.com/snipe/snipe-it/commit/b360736b7728d2ac872193bbe8888037c9794494">view</a> &bull; Fixes #484 
+* <a href="http://github.com/snipe/snipe-it/commit/addfcd4bc5417784f95145394940f90f1302376f">view</a> &bull; Fix RTD bug 
+* <a href="http://github.com/snipe/snipe-it/commit/d2438f9fdb9b281025c17e22ac2bfaa07ce04a2d">view</a> &bull; Fixes #502 - normalized statuses 
+* <a href="http://github.com/snipe/snipe-it/commit/aef3a734a3530f109b82fc0897e25727293f9862">view</a> &bull; Small fix for pending status 
+* <a href="http://github.com/snipe/snipe-it/commit/f175f52530e58bd5ab80139c526fc7838750cb11">view</a> &bull; Fixed spacer in sidenav for list all 
+
+
+###  v1.2.3 - Released Feb 09, 2015 12:22:12
+
+
+###  v1.2.3-beta - Released Feb 07, 2015 06:02:52
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/950567e9d66a6836cbca1383d24fc8548d3cbadf">view</a> &bull; Fixes issue related to #471 - assigning to user ID 0 causes erro 
+* <a href="http://github.com/snipe/snipe-it/commit/2b86f14e30c155f72b903428fd05a896ee9adfcc">view</a> &bull; Possible fix for #484 - fullname issue 
+* <a href="http://github.com/snipe/snipe-it/commit/b3af102d22a2f4f147b863e0ba8c2e4064aad01a">view</a> &bull; Fixed safe mode issue with license seeder 
+* <a href="http://github.com/snipe/snipe-it/commit/1db806f8b283e13dd04f20335d7087d12a04fa23">view</a> &bull; Fixes #488 - longer user jobtitle 
+* <a href="http://github.com/snipe/snipe-it/commit/f5efc368a58e1b26689dadb285918b090b66eb59">view</a> &bull; Fixes #487 - maintained and purchase order in strict mode 
+* <a href="http://github.com/snipe/snipe-it/commit/4dc81ce65fddced3282a9255a5a31ba8aa6a1458">view</a> &bull; Resolves #478 - redirects non-reporting users to view assets page 
+* <a href="http://github.com/snipe/snipe-it/commit/cd338d2a70e1bd4dca3bc651813e51095d7155f0">view</a> &bull; Fixes #483 - line breaks in notes on view 
+* <a href="http://github.com/snipe/snipe-it/commit/e67ba8a7437d4f27ae869072898e65749602f2dd">view</a> &bull; Fix reporting error on depreciation 
+* <a href="http://github.com/snipe/snipe-it/commit/1aeb4de0fae723801f0cdb555c77b5ee17ae1919">view</a> &bull; Possible fix for #491 - solving for giticide on package dep 
+* <a href="http://github.com/snipe/snipe-it/commit/c255edaf617872ac4a896106e56cc816209c2d5b">view</a> &bull; More travis fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/feeef4b66c1b6049a1f18c67e034907ea26c7da9">view</a> &bull; Fix for asset log incorrectly using soft deletes 
+* <a href="http://github.com/snipe/snipe-it/commit/140bd137a48c199269d635aef57d14b1f0a4330a">view</a> &bull; Minor display fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/29f5b7c5e3adc994b727842730c0157429520197">view</a> &bull; Fixed datetime 
+
+
+###  v1.2.2 - Released Jan 22, 2015 11:41:36
+* <a href="http://github.com/snipe/snipe-it/commit/4a77dee79c18f0e2ab155c7024234150ce98b808">view</a> &bull; Fixes #447 - added asset log entry on save 
+* <a href="http://github.com/snipe/snipe-it/commit/d85e5246807e597c1efac85c368a642a6fdcf944">view</a> &bull; Fixes #451 - allows spaces in state name 
+* <a href="http://github.com/snipe/snipe-it/commit/95141d49ba3c4f2b17ed6a26c20e7ad2a8aac9cb">view</a> &bull; Fixes #432 - add model name to checkout 
+* <a href="http://github.com/snipe/snipe-it/commit/3787a3f4bab9908f4903abdc2951cc254c8dc911">view</a> &bull; Fixed language strings for incrementing IDs 
+
+
+###  v1.2.1 - Released Jan 22, 2015 09:24:01
+
+
+###  v1.2.0 - Released Jan 22, 2015 09:24:01
+* <a href="http://github.com/snipe/snipe-it/commit/8699a90093bd27c0502dcc25f6e7d55344d54a3b">view</a> &bull; Fixed changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/cff24309a1514f9ea991881ca72898c7a6358562">view</a> &bull; Possibly fixes #343 
+* <a href="http://github.com/snipe/snipe-it/commit/b2d5dc9ec5460ff1f02db6c1a31ea87d224de4c9">view</a> &bull; Fix #342 
+* <a href="http://github.com/snipe/snipe-it/commit/74ae2fceea68d18514e87edc008cb3016361beee">view</a> &bull; Fix class on th 
+* <a href="http://github.com/snipe/snipe-it/commit/fc2d472ed350d7d63fb97942d00a97b62d4bed55">view</a> &bull; Fixed english language string 
+* <a href="http://github.com/snipe/snipe-it/commit/89c7159c56f88bcf8459a5eb02d79d636335cb28">view</a> &bull; Fix array check for empty rows 
+* <a href="http://github.com/snipe/snipe-it/commit/7ddc6d497af13e7894031ac763939be9863889a4">view</a> &bull; Fix Report Langs 
+* <a href="http://github.com/snipe/snipe-it/commit/13b173409fcd5b5ce8e79566b5110eadcf51c233">view</a> &bull; Fix License form langs 
+* <a href="http://github.com/snipe/snipe-it/commit/b73ae3147a60b29ac455063ecf419a609cce2cac">view</a> &bull; Fixes #362, reduced asset name to 2 char min 
+* <a href="http://github.com/snipe/snipe-it/commit/637009054cc74b17e2dd226c6f8c467eed5b0962">view</a> &bull; Fixed typo in english 
+* <a href="http://github.com/snipe/snipe-it/commit/6905d82fc48998f9c95c454c8bf37a34e30c002e">view</a> &bull; Fixes #374 to keep the requirement to PHP 5.4 
+* <a href="http://github.com/snipe/snipe-it/commit/102481631330fbed894bf72510845bff6c88e59e">view</a> &bull; Fix #377 - Checkout users last_name, first_name 
+* <a href="http://github.com/snipe/snipe-it/commit/d6a0249c60cbb026b2e3190285d50723a76f22ee">view</a> &bull; Fixed #373 - added ability to auto-increment asset tags 
+* <a href="http://github.com/snipe/snipe-it/commit/1b41c974cf67c550b2cae39eeec8f90cb2da79e0">view</a> &bull; Fixes #348 - remove constraints on license keys 
+* <a href="http://github.com/snipe/snipe-it/commit/89a2b87e42c18b308835ef71d196b91002b451ef">view</a> &bull; Fixes #367 - added model number to dropdown 
+* <a href="http://github.com/snipe/snipe-it/commit/64c16a0bacfcde7c4d92971f2129f1b1aeac2c0e">view</a> &bull; Fixes #386 and #273 - altered column type to text 
+* <a href="http://github.com/snipe/snipe-it/commit/daefc86e5878a21f9909806599f22198360c1f9b">view</a> &bull; Formattig fixes for #386 
+* <a href="http://github.com/snipe/snipe-it/commit/73dd339772fcc35e50603ded115f67714620da69">view</a> &bull; Fix #388 - License not showing checked out in view 
+* <a href="http://github.com/snipe/snipe-it/commit/0663ccb99fa926ff944dded330ba1f0cd95abbb3">view</a> &bull; Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349 
+* <a href="http://github.com/snipe/snipe-it/commit/533be7f942cb6dfccd1e8a79c043d61791e4c54b">view</a> &bull; fixed #435. using namespace with route groups to increase the readability 
+* <a href="http://github.com/snipe/snipe-it/commit/e434616db83a8d693af63b4705e1b24476fc3c17">view</a> &bull; Merge pull request #436 from rashivkp/fix-435 
+* <a href="http://github.com/snipe/snipe-it/commit/5e496672c66428a1bbd37772aabd44f8bb1cb0fa">view</a> &bull; Fixes #469 
+* <a href="http://github.com/snipe/snipe-it/commit/3c141e8f5017e8f161b6fd1fb82b288283b8450c">view</a> &bull; Fixes #467 
+* <a href="http://github.com/snipe/snipe-it/commit/548de1a1a217e6b5c6fcbbf6cd4918f078e64542">view</a> &bull; Fixes #468 - updated ordering on license checkout 
+
+
+###  v1.1 - Released Nov 06, 2014 02:16:26
+* <a href="http://github.com/snipe/snipe-it/commit/fafd03f00f49cb9ffe81d50aa9ca3d1f1fa1d043">view</a> &bull; Added DB Prefix to Migrations 
+* <a href="http://github.com/snipe/snipe-it/commit/309772e67d62989f1f60141a4a10d724a44c6baa">view</a> &bull; Fixed operator for setting bool display 
+* <a href="http://github.com/snipe/snipe-it/commit/22f81912e416cfe1227a08b5d8b6323e32e1ef36">view</a> &bull; Fixes #299 
+* <a href="http://github.com/snipe/snipe-it/commit/86b7b6946f1e1bd404127e228c615e4abe0b20fb">view</a> &bull; Fixes #316 - added model name back to view 
+* <a href="http://github.com/snipe/snipe-it/commit/9e85dcb9fcb4cc932ecddd23caa6b51e83110543">view</a> &bull; Fixes #315 - add EOL as display option in settings (run migrations) 
+* <a href="http://github.com/snipe/snipe-it/commit/ee35948980c22f9256241c02d7febd90275f6229">view</a> &bull; fix div issues 
+* <a href="http://github.com/snipe/snipe-it/commit/0022389463e251e73402450cfbc280cb05633bd1">view</a> &bull; Fix dropdown menu position 
+* <a href="http://github.com/snipe/snipe-it/commit/343798d241172707145ef365445062db9bb6b99a">view</a> &bull; Merge pull request #322 from madd15/fix-js-delete-asset 
+* <a href="http://github.com/snipe/snipe-it/commit/1078dbf5c5f6a5bec1a2ef864cebfcc7883d31e6">view</a> &bull; Fixes #324 
+* <a href="http://github.com/snipe/snipe-it/commit/6b2d3efe3e76429c9c2f5de78f04c4f7e2748a3d">view</a> &bull; Fixes #237 - reporting-only group 
+* <a href="http://github.com/snipe/snipe-it/commit/e04cc806d9209b54a1833172ebb66ab55b5f0c06">view</a> &bull; Fixes #327 
+
+
+###  v1.0 - Released Oct 16, 2014 09:46:47
+* <a href="http://github.com/snipe/snipe-it/commit/a4b220d6c31c97f6504023f0b52527825a4cd897">view</a> &bull; Fixed #191 - allow admins to assign a user during asset creation 
+* <a href="http://github.com/snipe/snipe-it/commit/dc1033025a0bc1b2d657e06c89058c3ab95f2c59">view</a> &bull; Fixed #151 - more complete translations 
+* <a href="http://github.com/snipe/snipe-it/commit/56d619b218794b43d8c6b182c89c75f83af9dcd9">view</a> &bull; Fixed missing language string 
+* <a href="http://github.com/snipe/snipe-it/commit/69fca5d1eda0e5f26d2085f7eebc08fafd84a3ae">view</a> &bull; Fixed #58 
+* <a href="http://github.com/snipe/snipe-it/commit/8197e6174e9f12bcfddd94c6bf606ee36e6801bf">view</a> &bull; Fixes #200 
+* <a href="http://github.com/snipe/snipe-it/commit/cb8369e9de96aaf1cf9108e22f4038fa6486b881">view</a> &bull; Initial QA Patch to fix errors Add License Add Asset Show Deleted Users License Assign 
+* <a href="http://github.com/snipe/snipe-it/commit/62a3ed671bbd957075563933f49e8a5445042737">view</a> &bull; DB migration, layout and clone fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/9ccc7d756f9361757eafc1dce9684ee9f5ecc1c3">view</a> &bull; A0.4.2: Added asset, license, user, model cloning and fixed some bugs. 
+* <a href="http://github.com/snipe/snipe-it/commit/652f1c746c4757dce9d33d7bd90a9357822c4656">view</a> &bull; Fixes Travis CI build 
+* <a href="http://github.com/snipe/snipe-it/commit/363d084bd623f778cd72ca7d385a4fb2f67ef474">view</a> &bull; Fixed DB name in travis CI 
+* <a href="http://github.com/snipe/snipe-it/commit/49c5607e1c8a82a3111123ad84b537644546ebb3">view</a> &bull; Fixes #222 
+* <a href="http://github.com/snipe/snipe-it/commit/96e40d72b9ac3f74b94b0e39b6f296f0f0b2a1f4">view</a> &bull; fix typo: artisand -> artisan 
+* <a href="http://github.com/snipe/snipe-it/commit/e978038cc044f60c2eca71b6319063009a57886f">view</a> &bull; Merge pull request #234 from burlito/typo-fix 
+* <a href="http://github.com/snipe/snipe-it/commit/a829fcf52f933d087c3776993b42311ec9a8988e">view</a> &bull; fix: Use the old asset tag when cloning 
+* <a href="http://github.com/snipe/snipe-it/commit/ee7d9bec7082dc2e60a4797dea84a0b7443c8090">view</a> &bull; Fixes #279 - QR checkbox not staying checked 
+* <a href="http://github.com/snipe/snipe-it/commit/bf1e07555160ede517d41f649d6b1d0911f89dd2">view</a> &bull; Fixes #87 - made datatables responsive 
+
+
+###  v0.3.11-alpha - Released Jul 19, 2014 05:16:53
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/ac4c905c42d920d2cf8455d644f4c65332a81d0d">view</a> &bull; Fixed #140 
+* <a href="http://github.com/snipe/snipe-it/commit/4a13cded607415d749151cef495332c48c58cf86">view</a> &bull; Fixed path for Travis composer 
+* <a href="http://github.com/snipe/snipe-it/commit/ddf946ad5eb6dd8480eeaa709f82af75e0c61444">view</a> &bull; Tried to fix failing build caused by travis composer 
+
+
+###  v0.3.10-alpha - Released Jul 17, 2014 05:54:10
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/89a8f3c277d2482b2cd04c4c5c582c9e507770f8">view</a> &bull; Fixes #183 - added employee number to users 
+* <a href="http://github.com/snipe/snipe-it/commit/a7b809cb91f49fb2c8eaecc67822fa155a0f20ce">view</a> &bull; Updated title/header for users, additional fixes for #151 
+* <a href="http://github.com/snipe/snipe-it/commit/5266d9a30a9663fa80ff764b25ff71726e5c4f4c">view</a> &bull; Fixed title tag for user list view 
+* <a href="http://github.com/snipe/snipe-it/commit/43485e1a51330ef585a65b469d7eb85ae7bde13a">view</a> &bull; Fixed language definition 
+* <a href="http://github.com/snipe/snipe-it/commit/6b5a552d95ff6f6d5567275b50fcd487fb793820">view</a> &bull; Fixed #186 - Bug with select box not retaining selections on edit screen 
+* <a href="http://github.com/snipe/snipe-it/commit/90eb883b671919ea360122c2bf44433995a12144">view</a> &bull; Fixed #187 - replaced dummy site name with site name from admin panel preferences 
+* <a href="http://github.com/snipe/snipe-it/commit/f22f23f21dc11d393854849580f0c1229cec9827">view</a> &bull; Fixed button label on forgotten password page 
+* <a href="http://github.com/snipe/snipe-it/commit/2b9494ed8271254f8f84e016f238d518e6109842">view</a> &bull; Fixed inconsistent password requirements across admin user creation, user profile and forgotten password 
+* <a href="http://github.com/snipe/snipe-it/commit/9dc40a3a9c161267fd8c88aacc1fbf536c1ec2de">view</a> &bull; Fixed a few CSS quirks 
+* <a href="http://github.com/snipe/snipe-it/commit/99003e126a8fd0ad9aaea5a550e0af5e306fc1bb">view</a> &bull; Fixed bug with edit (supplier_id), added requestable field for assets 
+* <a href="http://github.com/snipe/snipe-it/commit/21251b462308f2d783b83be1a331a0faf0813d16">view</a> &bull; Fixed #190, where depreciation on licenses would not be saved 
+* <a href="http://github.com/snipe/snipe-it/commit/89000440f344f766a31adc69718d7f66df235abf">view</a> &bull; Added admin ability to unsuspend locked accounts #changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/e203fc516fadf6218f5ce87c070d0cdba9fca188">view</a> &bull; Fixes #194 
+
+
+###  v0.3.9-alpha - Released Jul 03, 2014 02:08:38
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/2825bcb4310899e89ccbc73dfa8b59ade28018da">view</a> &bull; Fixed #179 - account page to show assets checked out to the logged in user 
+* <a href="http://github.com/snipe/snipe-it/commit/c782f29f5aae752a6246be9778d418df172dd4f6">view</a> &bull; Pulled account sub-nav into top menu to free up UI space. #changelog 
+* <a href="http://github.com/snipe/snipe-it/commit/fad2ec66fa9abe0b34baf16cce453a7e9fc9e4d4">view</a> &bull; More README fixes and refinement 
+
+
+###  v0.3.8-alpha - Released Jun 27, 2014 09:28:22
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/3e7a9e45d1954531bbc3b73f2ed59dd16d59c657">view</a> &bull; Fixes PR #168 and #167 
+* <a href="http://github.com/snipe/snipe-it/commit/945cb3253f1349e30aafa4e7cb57bb507a2ea0cc">view</a> &bull; Fix #117 
+* <a href="http://github.com/snipe/snipe-it/commit/6f42b3045e2a65cdf98ec1038284cc2ecf01fa5d">view</a> &bull; Resolves #155 
+* <a href="http://github.com/snipe/snipe-it/commit/380417953b6b67a506f0cc395fd2dfb744cf26cd">view</a> &bull; Fixed missing string 
+* <a href="http://github.com/snipe/snipe-it/commit/b09aec67f1ab76ff0435a2e1e49b179c3d73bc12">view</a> &bull; Fixes #155 
+* <a href="http://github.com/snipe/snipe-it/commit/124acc89c4027e346daf54c62cb38b85586de870">view</a> &bull; Resolves #174 
+* <a href="http://github.com/snipe/snipe-it/commit/afabd2814205fdcd83b7bf9ce9095aa367b08311">view</a> &bull; Additional fixes for #167 
+* <a href="http://github.com/snipe/snipe-it/commit/a170efae2796314896d548d86b79d89d859c37d2">view</a> &bull; fix for #167 
+* <a href="http://github.com/snipe/snipe-it/commit/ec9eab81bfb3b35bfe7ad06008b26f19009e6638">view</a> &bull; Closes #177 - change log file added, needs refining 
+
+
+###  v.0.3.5-alpha - Released Jun 20, 2014 02:23:09
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/d1499deecdff3c7a4235ffdfad5adbddc1a5098f">view</a> &bull; Provisions for strict mode, fixed license deletion bug 
+
+
+###  v.0.3.4-alpha - Released Jun 19, 2014 10:27:59
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/08d05b481f6366ad48fcdce72a8df53755f5dee8">view</a> &bull; Fixes #158 
+
+
+###  v.0.3.3-alpha - Released Jun 18, 2014 08:04:46
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/3518ab9f55f7992d6d4f886389d67b062a02f2d8">view</a> &bull; Fixes #139 
+* <a href="http://github.com/snipe/snipe-it/commit/ad9b1fc446ab15157502fe7c52ddbda455e3ea8f">view</a> &bull; Fixes #139 
+* <a href="http://github.com/snipe/snipe-it/commit/dfa5d1c64205b23c4c3d16190d1478da8aa0edbb">view</a> &bull; Fixes #136 
+* <a href="http://github.com/snipe/snipe-it/commit/9714178ce1fa1e2814389e4b6b82eb596a650084">view</a> &bull; Fixes #141 
+* <a href="http://github.com/snipe/snipe-it/commit/607484b29407718238571eb5269c9c27830338f7">view</a> &bull; Fixes #141 for mysql with strict mode enabled 
+* <a href="http://github.com/snipe/snipe-it/commit/cbc945299e7f67f5f10dfdc6a875e5c53ac8440a">view</a> &bull; Fixes #148 
+* <a href="http://github.com/snipe/snipe-it/commit/dc256583d410cb09253e30b075149c79fb4864e5">view</a> &bull; Fixes #144 
+* <a href="http://github.com/snipe/snipe-it/commit/610c405aa50118163ad5d26d43e4bf6c2456f624">view</a> &bull; More fixes for #151 
+
+
+###  v.0.3.2-alpha - Released May 06, 2014 08:26:21
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/f4c5da57d0397877d90aa398267e59fcffee7b47">view</a> &bull; Fixed auth error when user isn't logged in 
+
+
+###  v.0.3.1-alpha - Released May 06, 2014 04:48:09
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/efad5db082d1461ea26556fad2f1671a49dc1480">view</a> &bull; Fix for broken datatables in upgrading to v2.2 
+* <a href="http://github.com/snipe/snipe-it/commit/5690e9ce1f178486179ce6cdfb00ca417acd87dd">view</a> &bull; Fixed code indentation for Apache virtualhost example 
+* <a href="http://github.com/snipe/snipe-it/commit/67aba76d3f83c5f374c05fe07d52eebd81d13278">view</a> &bull; Fixing this change from #109 that somehow got reverted 
+* <a href="http://github.com/snipe/snipe-it/commit/06067fc19c0127fdcbb78541e7cdc8e77f5444ac">view</a> &bull; Fixed CSV rexport 
+
+
+###  v0.3.0-alpha - Released Jan 29, 2014 01:28:31
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/d91d75abe4df19dd6cd54705ba9967295973ced0">view</a> &bull; Fixing JSON parse errors from #97 
+* <a href="http://github.com/snipe/snipe-it/commit/baab758377e117a86c3273dd1d6e03e66b02dc8b">view</a> &bull; Fixed language support 
+* <a href="http://github.com/snipe/snipe-it/commit/a678ec41714f5d7f77418b5933bc112aa67eae9c">view</a> &bull; Fixed Gravatar Hash 
+* <a href="http://github.com/snipe/snipe-it/commit/c08d672e4923b12972eae76d0699e6a301f911cd">view</a> &bull; Fixes mail config documentation 
+* <a href="http://github.com/snipe/snipe-it/commit/fba853a6a7a2f8166265cac2e99a526fd9b88c7b">view</a> &bull; Fixes composer formatting issues 
+* <a href="http://github.com/snipe/snipe-it/commit/c11510fdcac2b2de09ae9e241c846426bdf0b187">view</a> &bull; Removes sorting from actions column.  Fixes #56 
+* <a href="http://github.com/snipe/snipe-it/commit/ae05f2701559a841cb8d9bc8767e6d7a56dcd93c">view</a> &bull; Fixed depreciation bug 
+* <a href="http://github.com/snipe/snipe-it/commit/d591c1ea0495de091eb0f71daa8572929096c897">view</a> &bull; Fixed bug where RTD = 1 instead of 0 
+* <a href="http://github.com/snipe/snipe-it/commit/e49420f62d26405b2fa0385f0ae7b3009b3beeaf">view</a> &bull; Fixed bug in depreciation display 
+* <a href="http://github.com/snipe/snipe-it/commit/1dc7fd1bdf8852fed6d886938f632c8ea69d4798">view</a> &bull; Fixed depreciation display on asset view 
+* <a href="http://github.com/snipe/snipe-it/commit/211a527ae176df667f6f8fbc95901c53a368d8e2">view</a> &bull; Fixed FK 
+* <a href="http://github.com/snipe/snipe-it/commit/aaebaa8d36158aafc61988a6370239e85f2e75e5">view</a> &bull; Bugfix to put custom title in the page title 
+* <a href="http://github.com/snipe/snipe-it/commit/194150bbf0493512018390d011e8d88d144e9763">view</a> &bull; Hacky shit to fix pagination weirdness - will come back to this 
+* <a href="http://github.com/snipe/snipe-it/commit/5fb649b59e76aa9db6e433ad8c9fc75b4b8d5fc2">view</a> &bull; Fixed error message layout 
+* <a href="http://github.com/snipe/snipe-it/commit/7bc9a53b133895206a3df230baca50d3879abbe5">view</a> &bull; Fixed error when user is invalid 
+* <a href="http://github.com/snipe/snipe-it/commit/82de635a75aba376209b741ce1ed4497b91e65e0">view</a> &bull; Fixed invalid seed data 
+* <a href="http://github.com/snipe/snipe-it/commit/b697c77cd85416ca502ec3bb28c990099c7faae3">view</a> &bull; Fixing error when no depreciation 
+* <a href="http://github.com/snipe/snipe-it/commit/432f44118f46381bdaa44daf61dfa35677aba0ee">view</a> &bull; Fixed FK in licenses model 
+* <a href="http://github.com/snipe/snipe-it/commit/4468cbd096e9990300240205baf7139eafbc423c">view</a> &bull; Fixes #112 
+* <a href="http://github.com/snipe/snipe-it/commit/cd62be0de03da071f344c8f66730cbc9e1475fb7">view</a> &bull; Minor div fix 
+* <a href="http://github.com/snipe/snipe-it/commit/9c369d72e1e7e29f3c205586c916b2f42b250047">view</a> &bull; Fixed typo 
+* <a href="http://github.com/snipe/snipe-it/commit/60d94eea04d1ebb93704e6a0d20621ff18708272">view</a> &bull; Changes serial to text area, allow new lines. Fixes #118 
+* <a href="http://github.com/snipe/snipe-it/commit/580590b4c0b4a2f76ef8edfe02de986267fc7395">view</a> &bull; Fixed  === to  == (PHP is loosely typed) 
+
+
+###  v0.2.0-alpha - Released Nov 29, 2013 10:09:07
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/06cbd0723e415d81ea12aa48f2c37188741b2dbc">view</a> &bull; Fixes #93 
+* <a href="http://github.com/snipe/snipe-it/commit/e305099b45401c871f16fec23c200080830fcd5d">view</a> &bull; Fixed model view 
+* <a href="http://github.com/snipe/snipe-it/commit/7003eff42ca0e0ea2b9070187c0afd8ba1a8d8b0">view</a> &bull; More fixes for #88 
+* <a href="http://github.com/snipe/snipe-it/commit/567f395afaa19335671f366ce889630426f33273">view</a> &bull; More fixes for #88 
+* <a href="http://github.com/snipe/snipe-it/commit/02f1977d301cd449aa806e02e8a829516d436ef7">view</a> &bull; Fixed error message 
+* <a href="http://github.com/snipe/snipe-it/commit/11c657ffa4c3bdd01cd04b81d01980b2d795107c">view</a> &bull; Fixes #36 
+
+
+###  v0.1.2-alpha - Released Nov 29, 2013 01:59:05
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/b1aa67ddb72158513f0a706996c8c1f5b3609aa5">view</a> &bull; Fixes #69 
+* <a href="http://github.com/snipe/snipe-it/commit/aa38d83ba6369215451d905e599492214e9f4b8b">view</a> &bull; Fixes #63 and #70 
+* <a href="http://github.com/snipe/snipe-it/commit/65cd28aad3903e11879e01faba382454dec7e75c">view</a> &bull; Fixes #14 
+* <a href="http://github.com/snipe/snipe-it/commit/6552401fd869fd285aef5e217438f4f055b53ab6">view</a> &bull; Fixes #77 
+* <a href="http://github.com/snipe/snipe-it/commit/012a889444fa25b174a5fb2c67e89c8c5fcf09aa">view</a> &bull; Corrected license seat count associated with license. Fixes #75 
+* <a href="http://github.com/snipe/snipe-it/commit/9e189aa309750c221c27352f35e2ca1f5fab9173">view</a> &bull; Fixes #80, also prevents the user from checking out an asset that is undeployable, etc 
+* <a href="http://github.com/snipe/snipe-it/commit/8680d98bc36bffa08f87020300b315d26be09928">view</a> &bull; Fixed status display bug 
+* <a href="http://github.com/snipe/snipe-it/commit/4fcdf72ab6505625f244a6e6ee8683204fb81ccd">view</a> &bull; Responsive design bug fixes, placeholder code for #64 (commented out) 
+* <a href="http://github.com/snipe/snipe-it/commit/d9a37f38228d55bb6265efc626e3ab7919013362">view</a> &bull; Fixes #88 
+* <a href="http://github.com/snipe/snipe-it/commit/5858bfb99b2144fbc805ec62cc90e6aaaf019f77">view</a> &bull; Fixed language file paths caused by #88 
+* <a href="http://github.com/snipe/snipe-it/commit/9f7cbc8a4f01ddf2596e831f658c9a8c321b2f46">view</a> &bull; Another fix related to #88, also accounts for users with invalid location_ids 
+* <a href="http://github.com/snipe/snipe-it/commit/1b56c31a22afd39a875677714b9c07e96876b8df">view</a> &bull; Fixed relationship between users/locations because fuck you ORM 
+* <a href="http://github.com/snipe/snipe-it/commit/f0f07b578b2439a627e5e946df0849d88d8526cf">view</a> &bull; Fixing pivot for users 
+* <a href="http://github.com/snipe/snipe-it/commit/9fa826b2e77ce22d25a8b3094bc825802d25be85">view</a> &bull; Fixed assigned to id 
+* <a href="http://github.com/snipe/snipe-it/commit/839d01a3af08d780be4152bc02b33bff1a7d7f20">view</a> &bull; Fixed relationship method because fuck you ORM 
+
+
+###  v0.1.1-alpha - Released Nov 26, 2013 11:11:00
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/1527b88fd671a20c879c9b2061ae95f3b386ba27">view</a> &bull; Fixes #61 
+* <a href="http://github.com/snipe/snipe-it/commit/4c0af1eae1031c2630f6e29cc73f8a9dfac1081c">view</a> &bull; Fixed typo causing failure with mysql strict 
+* <a href="http://github.com/snipe/snipe-it/commit/0e3bcfecd05a39bfea6fc7ba11cb24d9d49e6d86">view</a> &bull; Should be final fixes for mysql strict mode 
+
+
+###  Initial alpha - Released Nov 26, 2013 09:01:13
+#### This is a pre-release 
+* <a href="http://github.com/snipe/snipe-it/commit/14972f894bb0e761e2d0170a2c93c9aac4edfca6">view</a> &bull; fixed typo 
+* <a href="http://github.com/snipe/snipe-it/commit/79da13dff767d57f6f4fbb12f195e25f409ee5ec">view</a> &bull; Fixed layout for category view 
+* <a href="http://github.com/snipe/snipe-it/commit/0e4e26206bdcc164e5df586368ed45edd45b9a74">view</a> &bull; fixed broken redirect route 
+* <a href="http://github.com/snipe/snipe-it/commit/9364c46c2df79c0de07dc5dbb724a3c44485b739">view</a> &bull; Fixed licensed link 
+* <a href="http://github.com/snipe/snipe-it/commit/4f0a1789db01f12ebc4bd47e7e0594bf67b64daf">view</a> &bull; Fixed license blades 
+* <a href="http://github.com/snipe/snipe-it/commit/27514f85c3ba9056c4609774a482a58605f4d8cf">view</a> &bull; Fixed typo in variable name 
+* <a href="http://github.com/snipe/snipe-it/commit/ffe786f659e3e8c5b91c27cd33cb77b6d24d3545">view</a> &bull; Fixed routes. 
+* <a href="http://github.com/snipe/snipe-it/commit/cf59ec8c67e142c0612fb7797448057b19af5cfa">view</a> &bull; Fixed pagination bug 
+* <a href="http://github.com/snipe/snipe-it/commit/76ac39115347dabac8ada21d981494a3edf7a29c">view</a> &bull; Fixed edit bug where new Category was invoked twice 
+* <a href="http://github.com/snipe/snipe-it/commit/940281dd4dd0a69b900a052c0bb84e24dde89666">view</a> &bull; Fixed bug on validation display 
+* <a href="http://github.com/snipe/snipe-it/commit/31d323fb71fcbe94f17f0a2b38183709e8c77151">view</a> &bull; Cosmetic fix on form 
+* <a href="http://github.com/snipe/snipe-it/commit/8f86ec9dae58cef27387b028f70c8116d649b425">view</a> &bull; Change depreciation to be by month; formatting fixes. 
+* <a href="http://github.com/snipe/snipe-it/commit/4da2bccbf78a0b630267c6ed75f3a1bd8100e20d">view</a> &bull; Merge pull request #27 from snipe/depreciation_fix 
+* <a href="http://github.com/snipe/snipe-it/commit/7bc7ffb72813cd176658d536bbdd6be0faa9a45c">view</a> &bull; Fixed some error reporting/required fields around checkout/checkin 
+* <a href="http://github.com/snipe/snipe-it/commit/48e180c6910d30732559b0cc077fce679344f56e">view</a> &bull; Fixed asset bug caused by unique validation in assets model 
+* <a href="http://github.com/snipe/snipe-it/commit/57107dceeee81e8618198da33af79fe66bde0d9e">view</a> &bull; Fixed checkin text 
+* <a href="http://github.com/snipe/snipe-it/commit/7b59f42fb03ee5017c11cf32abc8a23c3f5d2141">view</a> &bull; Fixed pagination bug, styled buttons 
+* <a href="http://github.com/snipe/snipe-it/commit/ffdb4b1aa8dde9942f7c3b110e9a68006779998b">view</a> &bull; Fixed wonky layout issue 
+* <a href="http://github.com/snipe/snipe-it/commit/3401fee672d796f4aca8dafced6917c7caf87866">view</a> &bull; Another table fix 
+* <a href="http://github.com/snipe/snipe-it/commit/ddfd69e5100b19bb05d6b76cb9fad3dbadad1921">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/5c43caf0579a26c1604fc81f5cbdf8f0d43c157d">view</a> &bull; More table fixes 
+* <a href="http://github.com/snipe/snipe-it/commit/44ba90f9f0a968999a743c35dd2bf153c2edbf1d">view</a> &bull; Fixed icon set to white in main nav 
+* <a href="http://github.com/snipe/snipe-it/commit/719c36d482cc67f1513351672eda057519f7f735">view</a> &bull; migration to fix a few fields in the log table 
+* <a href="http://github.com/snipe/snipe-it/commit/5b27a34f050646467a178ff780efc80036aadf1b">view</a> &bull; Fixed fieldname in userlog 
+* <a href="http://github.com/snipe/snipe-it/commit/76da83cbe1c4334380bb996a40cc374ab4ec12e9">view</a> &bull; Fixed links to edit/checkout 
+* <a href="http://github.com/snipe/snipe-it/commit/d6a718e99766829e700760c2266b62ad37cdb66b">view</a> &bull; Fixed bug in views for created_at date 
+* <a href="http://github.com/snipe/snipe-it/commit/0ee08e47e9f2b144084703142ae5eb099090476d">view</a> &bull; Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...) 
+* <a href="http://github.com/snipe/snipe-it/commit/61cceb5f0b44e7f2a82ccca44be2bc42e8825156">view</a> &bull; Fixed open tag in CSS 
+* <a href="http://github.com/snipe/snipe-it/commit/c93469c465c0ce8a291d595ac8ccbafbfc68c71a">view</a> &bull; Fixed query for asset/license header boxes 
+* <a href="http://github.com/snipe/snipe-it/commit/d46556a83d5335913b8b7fe8558f416540290343">view</a> &bull; Fixed phone display if no value set 
+* <a href="http://github.com/snipe/snipe-it/commit/fc8c3c086ca70a513cd3fff39275fcf035cead5a">view</a> &bull; fixed #37 
+* <a href="http://github.com/snipe/snipe-it/commit/52020d09f034c9de78b798725c0f3700d0253beb">view</a> &bull; Fixed bomb when asset is unassigned 
+* <a href="http://github.com/snipe/snipe-it/commit/1b1efec858e8e0cfc5cfafc63bfb537e45191cd1">view</a> &bull; Fixed foreign key in assets 
+* <a href="http://github.com/snipe/snipe-it/commit/b7251d9992401c04a5da1771af0fcddad2754362">view</a> &bull; Fixed potential bug in blade 
+* <a href="http://github.com/snipe/snipe-it/commit/9249786a25bc166bf5341f59a11d644cf4f6425c">view</a> &bull; Fixed status display 
+* <a href="http://github.com/snipe/snipe-it/commit/c32d45e90142b41b567a350af6d399af67994a02">view</a> &bull; Fixed ID 
+* <a href="http://github.com/snipe/snipe-it/commit/2203789f4c5310599a94799bb3ead9ff9c1ce802">view</a> &bull; Fixes #41 
+* <a href="http://github.com/snipe/snipe-it/commit/03edbc008c671c868fced94a7761683309d9ab8b">view</a> &bull; Fixes #43 
+* <a href="http://github.com/snipe/snipe-it/commit/2b088a3fb2ea7711f66e4a887882b17f401ba4bc">view</a> &bull; Fixes #17 
+* <a href="http://github.com/snipe/snipe-it/commit/ad680a337e50638b4b9865e42e4ea7e453c4151b">view</a> &bull; Fixed column name spelling in DB 
+* <a href="http://github.com/snipe/snipe-it/commit/718236b2d4bedeaaad80cc601e3e91a3229e81fa">view</a> &bull; Fixed #9 
+* <a href="http://github.com/snipe/snipe-it/commit/3cc0ed87438b632679ce8b61a7ea0fae48999438">view</a> &bull; Fixed sorting weirdness 
+* <a href="http://github.com/snipe/snipe-it/commit/57d0f3643518190f0b4a6fe33ac6d83eda647119">view</a> &bull; Fixes #4 
+* <a href="http://github.com/snipe/snipe-it/commit/3ea0ad87c8733ce1bac0e9c10c2cdaf3254743d5">view</a> &bull; Fixes #22 
+* <a href="http://github.com/snipe/snipe-it/commit/e87e5b9cae19bfd06b815cf01be309d665409828">view</a> &bull; Fixes #46 
+* <a href="http://github.com/snipe/snipe-it/commit/7a5b133c5875959c5d7bebf16ea82bac7ceb3989">view</a> &bull; Fixed bug linking to assets when they should be pointing to licenses 
+* <a href="http://github.com/snipe/snipe-it/commit/e13578d97d6b1ef1990f171beda9b35868fda47c">view</a> &bull; Fixed error when no category is given 
+* <a href="http://github.com/snipe/snipe-it/commit/45c04b1cdebc0b19243a519d2580af921c82b47b">view</a> &bull; Fixed display bug 
+* <a href="http://github.com/snipe/snipe-it/commit/4d1dd1c446f76e5530d6fb7f932a77a8da2d0b73">view</a> &bull; Fixed #50 - MOAR VALIDATION! 
+* <a href="http://github.com/snipe/snipe-it/commit/12958553022d4b7b2184ebf837d4113b23f5cf27">view</a> &bull; Fixes #51 
+* <a href="http://github.com/snipe/snipe-it/commit/d0cbb9f3a7e4a1fc05ddcabd19e201434c14370b">view</a> &bull; Fixes #52 
+* <a href="http://github.com/snipe/snipe-it/commit/5bf38b1d02e743af22a51393f1e477100b1f76b7">view</a> &bull; Fixes #50 
+* <a href="http://github.com/snipe/snipe-it/commit/e6fc1956fc93132d04bf5ac4c0d108c1ae9eee0b">view</a> &bull; Fixes #55 
+* <a href="http://github.com/snipe/snipe-it/commit/ee3fb2785e719c938b6036f6ea74527c1217aba8">view</a> &bull; Fixed XSS on modal 
+* <a href="http://github.com/snipe/snipe-it/commit/dc5ad876863a1e17babce06adfb365f38c30ca59">view</a> &bull; Fixes #59 
+* <a href="http://github.com/snipe/snipe-it/commit/d7a8cac1dc6158983673688c2e48e9a48217b6f2">view</a> &bull; Fixed validation 
+* <a href="http://github.com/snipe/snipe-it/commit/196710dac807d48f6c73b02c2444a5b8d301b8a6">view</a> &bull; Fixed bug in error validation display 
@@ -0,0 +1,15 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.1.0, available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/)
@@ -1,5 +1,31 @@
 # Contribution Guidelines

-Please submit all issues and pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the develop branch!
+**Before opening an issue to report a bug or request help, make sure you've checked the [Common Issues](http://snipeitapp.com/documentation/common-issues/) and [Getting Help](http://snipeitapp.com/documentation/getting-help/) pages.**

-As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch. It makes it much easier to decipher down the road, as you open multiple pull requests over time.
+## Developing on Snipe-IT
+
+Please submit all pull requests to the [snipe/snipe-it](http://github.com/snipe/snipe-it) repository in the `develop` branch!
+
+**As you're working on bug-fixes or features, please break them out into their own feature branches and open the pull request against your feature branch**. It makes it _much_ easier to decipher down the road, as you open multiple pull requests over time, and makes it much easier for me to approve pull requests quickly.
+
+If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
+
+We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+
+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
+
+The labels we use in GitHub Issues and Waffle.io indicate whether we've confirmed an issue as a bug, whether we're considering the issue as a potential feature, and whether it's ready for someone to work on it. We also provide labels such as "n00b", "intermediate" and "advanced" for the experience level we think it requires for contributors who want to help.
+
+-----
+
+## Translations!
+
+If you're not a coder but want to give back to the project and you're fluent in other languages, that's okay too. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations (or validate proposed translations) to the project without messing with code. __Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/)__.
+
+Thanks!
+
+-----
+
+## Contributor Code of Conduct
+
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
@@ -0,0 +1,88 @@
+FROM ubuntu
+MAINTAINER Brady Wetherington <uberbrady@gmail.com>
+
+RUN apt-get update && apt-get install -y \
+apache2-bin \
+libapache2-mod-php5 \
+php5-mysql \
+php5-mcrypt \
+php5-gd \
+patch \
+curl \
+vim \
+git 
+
+RUN php5enmod mcrypt
+RUN php5enmod gd
+
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/apache2/php.ini
+RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/cli/php.ini
+
+RUN useradd --uid 1000 --gid 50 docker
+
+RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
+RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
+
+COPY docker/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+
+COPY . /var/www/html
+
+RUN a2enmod rewrite
+
+############ INITIAL APPLICATION SETUP #####################
+
+COPY docker/app_start.patch /tmp/app_start.patch
+
+WORKDIR /var/www/html
+
+#Patch bootstrap file
+RUN patch -p1 < /tmp/app_start.patch
+
+#DB create?
+# mysqladmin -u root  create snipeit_laravel
+
+#DB create user, grant access to new DB?
+# grant all privileges on snipeit_laravel.* TO snipeit;
+
+#DB config file init? (NEVER overwrite!)
+#RUN cp -n /var/www/html/app/config/production/database.example.php /var/www/html/app/config/production/database.php
+COPY docker/database.php /var/www/html/app/config/production/database.php
+
+COPY docker/mail.php /var/www/html/app/config/production/mail.php
+
+#change DB file user
+#RUN sed -i s/travis/snipe_it/ /var/www/html/app/config/production/database.php
+
+#init app config file (DO NOT overwrite!)
+RUN cp -n /var/www/html/app/config/production/app.example.php /var/www/html/app/config/production/app.php
+
+# Change default hostname to blank...I guess?
+RUN sed -i s%http://staging.yourserver.com%% /var/www/html/app/config/production/app.php
+
+# turn off the toolbar
+RUN sed -i 's%\x27debug\x27 => true%\x27debug\x27 => false%' /var/www/html/app/config/production/app.php
+
+RUN chown -R docker /var/www/html
+
+############## DEPENDENCIES via COMPOSER ###################
+
+#global install of composer
+RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer
+
+# Get dependencies
+RUN cd /var/www/html;composer install
+
+############### APPLICATION INSTALL/INIT #################
+
+#RUN php artisan app:install
+# too interactive! Try something else
+
+#COPY docker/app_install.exp /tmp/app_install.exp
+#RUN chmod +x /tmp/app_install.exp
+#RUN /tmp/app_install.exp
+
+##### START SERVER
+
+CMD . /etc/apache2/envvars ;apache2 -DFOREGROUND
+
+EXPOSE 80
@@ -1,29 +1,63 @@
-[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it)
+[![Click here to lend your support to: Snipe IT - Free Open Source Asset Management System and make a donation at pledgie.com](https://pledgie.com/campaigns/22899.png?skin_name=chrome)](https://pledgie.com/campaigns/22899) [![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&title=Ready)](http://waffle.io/snipe/snipe-it) [![ProjectStatus](http://stillmaintained.com/snipe/snipe-it.png)](http://stillmaintained.com/snipe/snipe-it) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it)
+

 ## Snipe-IT - Asset Management For the Rest of Us

+[![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)
+
 This is a FOSS project for asset management in IT Operations. Knowing who has which laptop, when it was purchased in order to depreciate it correctly, handling software licenses, etc.

-It is built on [Laravel 4.1](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.
+It is built on [Laravel 4.2](http://laravel.com) and uses the [Sentry 2](https://github.com/cartalyst/sentry) package.

-Many thanks to the [Laravel 4 starter site](https://github.com/brunogaspar/laravel4-starter-kit) for a quick start.
+This project is being actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](http://snipeitapp.com/demo/).)

-This project is being actively developed (at what seems like breakneck speed sometimes!) We're still in alpha release, so this is NOT recommended for production use yet, as many more things will likely change before v1.0-stable is ready - but we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases).
-
-### Bug Reports and Feature Requests
-
-Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to check on progress, open a bug report, request a feature, or see what open issues you can help with.
+__This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows.

 -----
+### Documentation & Installation

+__Installation and configuration documentation for this project has been moved to http://snipeitapp.com/documentation/.__
+
+We'll be adding a long-overdue user's manual soon as well.
+
+__To deploy on Ubuntu using Ansible and Vagrant, be sure to check out the [Snipe-IT Installation scripts](https://github.com/GR360RY/snipeit-ansible) created by [@GR360RY](https://github.com/GR360RY/).__
+
+-----
+### Bug Reports & Feature Requests
+
+Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open and closed) to see if your question hasn't already been answered before opening a new issue.
+
+We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+
+[![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
+
+-----
+### Announcement List
+
+To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important.
+
+
+### Translations!
+
+If you're not a coder but want to give back to the project and you're fluent in other languages, consider helping out with the translations. We use [CrowdIn](https://crowdin.com) to manage translations, and it makes it super-simple for you to add translations to the project without messing with code. Check out [the Snipe-IT CrowdIn translation project here](https://crowdin.com/project/snipe-it/).
+
+We currently have English, Chinese, Finnish, Malay, Romanian and Spanish completed, and are looking for lots more!
+
+-----
 ## Requirements

 - PHP 5.4 or later
 - MCrypt PHP Extension
+- Fileinfo Extension
+
+And _one_ of the following image libraries (for QR codes, asset model image and user avatar image uploads).
+
+- GD Library (>=2.0) … or …
+- Imagick PHP extension (>=6.3.8)

 -----

-## Important Note on Updating
+## Important Notes on Updating

 Whenever you pull down a new version from master or develop, when you grab the [latest official release](https://github.com/snipe/snipe-it/releases), make sure to run the following commands via command line:

@@ -32,216 +66,7 @@ Whenever you pull down a new version from master or develop, when you grab the [

 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.

-----
+## Contributor Code of Conduct

-## How to Install
-
-### 1) Downloading
-#### 1.1) Clone the Repository
-
-	git clone https://github.com/snipe/snipe-it your-folder
-
-#### 1.2) Download the Repository
-
-	https://github.com/snipe/snipe-it/archive/master.zip
-
-----
-
-### 2) Setup Environment, Database and Mail Settings
-
-#### 2.1) Adjust Environments
-
-Update the file `boostrap/start.php` under the section `Detect The Application Environment`.
-
-	vi bootstrap/start.php
-
-----
-
-__AS OF LARAVEL 4.1__
-Per the [Laravel 4.1 upgrade docs](http://laravel.com/docs/upgrade):
-
-__*"For security reasons, URL domains may no longer be used to detect your application environment. These values are easily spoofable and allow attackers to modify the environment for a request. You should convert your environment detection to use machine host names (hostname command on Mac & Ubuntu)."*__
-
-To find out your local machine's hostname, type `hostname` from a terminal prompt on the machine you're installing it on. The command-line response is that machine's hostname. Please note that the hostname is NOT always the same as the domain name.
-
-So for example, if you're installing this locally on your Mac named SnipeMBP, the environmental variable section of `bootstrap/start.php` might look like this:
-
-	$env = $app->detectEnvironment(array(
-		'local'		 	=> array('SnipeMBP'),
-		'staging' 		=> array('staging.mysite.com'),
-		'production' 	=> array('www.mysite.com')
-	));
-
-If your development, staging and production sites all run on the same server (which is generally a terrible idea), [see this example](http://words.weareloring.com/development/setting-up-multiple-environments-in-laravel-4-1/) of how to configure the app using environmental variables.
-
-----
-
-#### 2.2) Setup Your Database
-
-Copy the example database config `app/config/local/database.example.php` to `app/config/local/database.php`.
-Update the file `app/config/local/database.php` with your database name and credentials.
-
-    vi app/config/local/database.php
-
-
-#### 2.3) Setup Mail Settings
-
-Copy the example mail config `app/config/local/mail.example.php` to `app/config/local/mail.php`.
-Update the file `app/config/local/mail.php` with your mail settings.
-
-    vi app/config/local/mail.php
-
-This will be used to send emails to your users, when they register and they request a password reset.
-
-#### 2.4) Adjust the application settings.
-
-Copy the example app config `app/config/local/app.example.php` to `app/config/local/app.php`.
-
-Update the file `app/config/local/app.php` with your URL settings.
-
-	vi app/config/local/app.php
-
-You should also change your secret key here -- if you prefer to have your key randomly generated, run the artisan key:generate command from the application root.
-
-	php artisan key:generate --env=local
-
-
-#### 2.5) Additional Adjustments
-
-The app is configured to automatically detect if you're in a local, staging, or production environment.  Before deploying to a staging or production environment, follow sets 2.1, 2.2, and 2.3 above to tweak each environment as necessary.  Configuration files for each environment can be found in app/config/{environment} (local, staging, and production).
-
-----
-
-### 3) Install the Dependencies via Composer
-##### 3.1) If you don't have composer installed globally
-
-	cd your-folder
-	curl -sS https://getcomposer.org/installer | php
-	php composer.phar install
-
-##### 3.2) For global composer installations
-
-	cd your-folder
-	composer install
-
-----
-
-### 4) Use custom CLI Installer Command
-
-Now, you need to create yourself a user and finish the installation.
-
-Use the following command to create your default user, user groups and run all the necessary migrations automatically.
-
-	php artisan app:install
-
-----
-
-### 6) Fix permissions
-
-You'll need to make sure that the `app/storage` directory is writable by your webserver, since caches and log files get written there. You should use the minimum permissions available for writing, based on how you've got your webserver configured.
-
-	chmod -R 755 app/storage
-
-If you still run into a permissions error, you may need to increase the permissions to 775, or twiddle your user/group permissions on your server.
-
-	chmod -R 775 app/storage
-
-----
-
-### 7) Set the correct document root for your server
-
-The document root for the app should be set to the public directory. In a standard Apache virtualhost setup, that might look something like this on a standard linux LAMP stack:
-
-	<VirtualHost *:80>
-		<Directory /var/www/html/public>
-			AllowOverride All
-		</Directory>
-		DocumentRoot /var/www/html/public
-	    	ServerName www.example.org
-
-	    	# Other directives here
-	</VirtualHost>
-
-An OS X virtualhost setup could look more like:
-
-	Directory "/Users/flashingcursor/Sites/snipe-it/public/">
-	Allow From All
-	AllowOverride All
-	Options +Indexes
-	</Directory>
-	<VirtualHost *:80>
-	        ServerName "snipe-it.dev"
-	        DocumentRoot "/Users/flashingcursor/Sites/snipe-it/public"
-	SetEnv LARAVEL_ENV development
-	</VirtualHost>
-
-----
-
-### 8) Seed the Database
-
-Loading up the sample data will give you an idea of how this should look, how your info should be structured, etc. It only pre-loads a handful of items, so you won't have to spend an hour deleting sample data.
-
-	php artisan db:seed
-
-----
-
-
-## Optional Development Stuff
-### Set up the debugbar
-
-In dev mode, I use the fabulous [Laravel Debugbar](https://github.com/barryvdh/laravel-debugbar) by @barryvdh. After you've installed/updated composer, you'll need to publish the assets for the debugbar:
-
-	php artisan debugbar:publish
-
-The profiler is enabled by default if you have debug set to true in your app.php. You certainly don't have to use it, but it's pretty handy for troubleshooting queries, seeing how much memory your pages are using, etc.
-
-----
-
-### Purging the autoloader
-
-If you're doing any development on this, make sure you purge the auto-loader if you see any errors stating the new model you created can't be found, etc, otherwise your new models won't be grokked.
-
-	php composer.phar dump-autoload
-
-
-----
-
-### Application logs
-
-Application logs for this app are found in `app/storage/logs`, as is customary of Laravel.
-
-----
-
-### Running this on an EC2 Micro Instance
-
-Depending on your needs, you could probably run this system in an EC2 micro instance. It doesn't take up very much memory and typically won't be a super-high-traffic application. EC2 micros fall into the free/dirt-cheap tier, which might make this a nice option. One thing to note though - composer can be a little memory-intensive while you're running updates, and you may have trouble with it failing on a micro. You can crank the memory_limit up in php.ini, but EC2 micros have swap disabled by default, so even that may not cut it. If you run into totally unhelpful error messages while running composer updates (like simply 'Killed') or fatal memory issues mentioning phar, your best bet will be to enable swap:
-
-	sudo /bin/dd if=/dev/zero of=/var/swap.1 bs=1M count=1024
-	sudo /sbin/mkswap /var/swap.1
-	sudo /sbin/swapon /var/swap.1
-
-If you need more than 1024 then change that to something higher.
-
-To enable it by default after reboot, add this line to /etc/fstab:
-
-	/var/swap.1 swap swap defaults 0 0
-
-----
-
-## License
-
-	Copyright (C) 2013 Alison Gianotto - snipe@snipe.net
-
-	This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.

@@ -4,341 +4,387 @@ use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;

-class AppCommand extends Command {
+class AppCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var	string
+     */
+    protected $name = 'app:install';
+
+    /**
+     * The console command description.
+     *
+     * @var	string
+     */
+    protected $description = 'This command kicks off your database table creation and migration, and creates your first admin user.';
+
+    /**
+     * Holds the user information.
+     *
+     * @var array
+     */
+    protected $userData = array(
+        'first_name' => null,
+        'last_name'  => null,
+        'username'      => null,
+        'password'   => null
+    );
+
+	protected $dummyData = true;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $this->comment('=====================================');
+        $this->comment('');
+        $this->info('  Step: 1');
+        $this->comment('');
+        $this->info('    Please follow the following');
+        $this->info('    instructions to create your');
+        $this->info('    default user.');
+        $this->comment('');
+        $this->comment('-------------------------------------');
+        $this->comment('');
+
+
+        // Let's ask the user some questions, shall we?
+        $this->askUserFirstName();
+        $this->askUserLastName();
+        $this->askUserUsername();
+        $this->askUserPassword();
+
+		$this->askUserDummyData();
+
+        $this->comment('');
+        $this->comment('');
+        $this->comment('=====================================');
+        $this->comment('');
+        $this->info('  Step: 2');
+        $this->comment('');
+        $this->info('    Preparing your Application');
+        $this->comment('');
+        $this->comment('-------------------------------------');
+        $this->comment('');
+
+        // Generate the Application Encryption key
+        $this->call('key:generate');
+
+        // Create the migrations table
+        $this->call('migrate:install');
+
+        // Run the Sentry Migrations
+        $this->call('migrate', array('--package' => 'cartalyst/sentry'));
+
+        // Run the Migrations
+        $this->call('migrate');
+
+        // Create the default user and default groups.
+        $this->sentryRunner();
+
+        // Seed the tables with dummy data
+		if( $this->dummyData === true )
+		{
+			$this->call('db:seed', array('--force'=>true));
+		}
+		else
+		{
+			// Seeding Settings table is mandatory
+			$this->call('db:seed', array('--class' => 'SettingsSeeder', '--force'=>true));
+			// Seeding Statuslabels is strongly recommended
+			$this->call('db:seed', array('--class' => 'StatuslabelsSeeder', '--force'=>true));
+			// Seeding Categories is good to have
+			$this->call('db:seed', array('--class' => 'CategoriesSeeder', '--force'=>true));
+		}
+    }
+
+    /**
+     * Asks the user for the first name.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserFirstName()
+    {
+        do {
+            // Ask the user to input the first name
+            $first_name = $this->ask('Please enter your first name: ');
+
+            // Check if the first name is valid
+            if ($first_name == '') {
+                // Return an error message
+                $this->error('Your first name is invalid. Please try again.');
+            }
+
+            // Store the user first name
+            $this->userData['first_name'] = $first_name;
+        }
+        while( ! $first_name);
+    }
+
+    /**
+     * Asks the user for the last name.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserLastName()
+    {
+        do {
+            // Ask the user to input the last name
+            $last_name = $this->ask('Please enter your last name: ');
+
+            // Check if the last name is valid.
+            if ($last_name == '') {
+                // Return an error message
+                $this->error('Your last name is invalid. Please try again.');
+            }
+
+            // Store the user last name
+            $this->userData['last_name'] = $last_name;
+        }
+        while( ! $last_name);
+    }
+
+    /**
+     * Asks the user for the username address.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserEmail()
+    {
+        do {
+            // Ask the user to input the email address
+            $email = $this->ask('Please enter your email: ');
+
+            // Check if email is valid
+            if ($email == '') {
+                // Return an error message
+                $this->error('Email is invalid. Please try again.');
+            }
+
+            // Store the email address
+            $this->userData['email'] = $email;
+        }
+        while ( ! $email);
+    }
+
+
+    /**
+     * Asks the user for the username address.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserUsername()
+    {
+        do {
+            // Ask the user to input the username
+            $username = $this->ask('Please enter your username: ');
+
+            // Check if username is valid
+            if ($username == '') {
+                // Return an error message
+                $this->error('Username is invalid. Please try again.');
+            }
+
+            // Store the username address
+            $this->userData['username'] = $username;
+        }
+        while ( ! $username);
+    }
+
+
+    /**
+     * Asks the user for the user password.
+     *
+     * @return void
+     * @todo   Use the Laravel Validator
+     */
+    protected function askUserPassword()
+    {
+        do {
+            // Ask the user to input the user password
+            $password = $this->ask('Please enter your user password (at least 8 characters): ');
+
+            // Check if password is valid
+            if ($password == '') {
+                // Return an error message
+                $this->error('Password is invalid. Please try again.');
+            }
+
+            // Store the password
+            $this->userData['password'] = $password;
+        } while( ! $password);
+    }

 	/**
-	 * The console command name.
-	 *
-	 * @var	string
-	 */
-	protected $name = 'app:install';
-
-	/**
-	 * The console command description.
-	 *
-	 * @var	string
-	 */
-	protected $description = '';
-
-	/**
-	 * Holds the user information.
-	 *
-	 * @var array
-	 */
-	protected $userData = array(
-		'first_name' => null,
-		'last_name'  => null,
-		'email'      => null,
-		'password'   => null
-	);
-
-	/**
-	 * Create a new command instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
-
-	/**
-	 * Execute the console command.
-	 *
-	 * @return void
-	 */
-	public function fire()
-	{
-		$this->comment('=====================================');
-		$this->comment('');
-		$this->info('  Step: 1');
-		$this->comment('');
-		$this->info('    Please follow the following');
-		$this->info('    instructions to create your');
-		$this->info('    default user.');
-		$this->comment('');
-		$this->comment('-------------------------------------');
-		$this->comment('');
-
-
-		// Let's ask the user some questions, shall we?
-		$this->askUserFirstName();
-		$this->askUserLastName();
-		$this->askUserEmail();
-		$this->askUserPassword();
-
-
-		$this->comment('');
-		$this->comment('');
-		$this->comment('=====================================');
-		$this->comment('');
-		$this->info('  Step: 2');
-		$this->comment('');
-		$this->info('    Preparing your Application');
-		$this->comment('');
-		$this->comment('-------------------------------------');
-		$this->comment('');
-
-		// Generate the Application Encryption key
-		$this->call('key:generate');
-
-		// Create the migrations table
-		$this->call('migrate:install');
-
-		// Run the Sentry Migrations
-		$this->call('migrate', array('--package' => 'cartalyst/sentry'));
-
-		// Run the Migrations
-		$this->call('migrate');
-
-		// Create the default user and default groups.
-		$this->sentryRunner();
-
-		// Seed the tables with dummy data
-		$this->call('db:seed');
-	}
-
-	/**
-	 * Asks the user for the first name.
+	 * Asks the user to create dummy data
 	 *
 	 * @return void
 	 * @todo   Use the Laravel Validator
 	 */
-	protected function askUserFirstName()
+	protected function askUserDummyData()
 	{
-		do
-		{
-			// Ask the user to input the first name
-			$first_name = $this->ask('Please enter your first name: ');
+		// Ask the user to input the user password
+		$dummydata = $this->ask('Do you want to seed your database with dummy data? Y/n (default is yes): ');

-			// Check if the first name is valid
-			if ($first_name == '')
-			{
-				// Return an error message
-				$this->error('Your first name is invalid. Please try again.');
-			}
-
-			// Store the user first name
-			$this->userData['first_name'] = $first_name;
-		}
-		while( ! $first_name);
+		$this->dummyData = ( strstr($dummydata, 'Y' ) || empty($dummydata) ) ? true : false;
 	}

-	/**
-	 * Asks the user for the last name.
-	 *
-	 * @return void
-	 * @todo   Use the Laravel Validator
-	 */
-	protected function askUserLastName()
-	{
-		do
+    /**
+     * Runs all the necessary Sentry commands.
+     *
+     * @return void
+     */
+    protected function sentryRunner()
+    {
+        // Create the default groups
+        $this->sentryCreateDefaultGroups();
+
+        // Create the user
+        $this->sentryCreateUser();
+
+        // Create dummy user
+		if( $this->dummyData === true )
 		{
-			// Ask the user to input the last name
-			$last_name = $this->ask('Please enter your last name: ');
-
-			// Check if the last name is valid.
-			if ($last_name == '')
-			{
-				// Return an error message
-				$this->error('Your last name is invalid. Please try again.');
-			}
-
-			// Store the user last name
-			$this->userData['last_name'] = $last_name;
+			$this->sentryCreateDummyUser();
 		}
-		while( ! $last_name);
-	}
+    }

-	/**
-	 * Asks the user for the user email address.
-	 *
-	 * @return void
-	 * @todo   Use the Laravel Validator
-	 */
-	protected function askUserEmail()
-	{
-		do
-		{
-			// Ask the user to input the email address
-			$email = $this->ask('Please enter your user email: ');
+    /**
+     * Creates the default groups.
+     *
+     * @return void
+     */
+    protected function sentryCreateDefaultGroups()
+    {
+        try {
+            // Create the admin group
+            $group = Sentry::getGroupProvider()->create(array(
+                'name'        => 'Admin',
+                'permissions' => array(
+                    'admin' => 1,
+                    'users' => 1,
+                    'reports' => 1
+                )
+            ));

-			// Check if email is valid
-			if ($email == '')
-			{
-				// Return an error message
-				$this->error('Email is invalid. Please try again.');
-			}
-
-			// Store the email address
-			$this->userData['email'] = $email;
-		}
-		while ( ! $email);
-	}
-
-	/**
-	 * Asks the user for the user password.
-	 *
-	 * @return void
-	 * @todo   Use the Laravel Validator
-	 */
-	protected function askUserPassword()
-	{
-		do
-		{
-			// Ask the user to input the user password
-			$password = $this->ask('Please enter your user password: ');
-
-			// Check if email is valid
-			if ($password == '')
-			{
-				// Return an error message
-				$this->error('Password is invalid. Please try again.');
-			}
-
-			// Store the password
-			$this->userData['password'] = $password;
-		}
-		while( ! $password);
-	}
-
-	/**
-	 * Runs all the necessary Sentry commands.
-	 *
-	 * @return void
-	 */
-	protected function sentryRunner()
-	{
-		// Create the default groups
-		$this->sentryCreateDefaultGroups();
-
-		// Create the user
-		$this->sentryCreateUser();
-
-		// Create dummy user
-		$this->sentryCreateDummyUser();
-	}
-
-	/**
-	 * Creates the default groups.
-	 *
-	 * @return void
-	 */
-	protected function sentryCreateDefaultGroups()
-	{
-		try
-		{
-			// Create the admin group
-			$group = Sentry::getGroupProvider()->create(array(
-				'name'        => 'Admin',
-				'permissions' => array(
-					'admin' => 1,
-					'users' => 1
-				)
-			));
-
-			// Show the success message.
-			$this->comment('');
-			$this->info('Admin group created successfully.');
-		}
-		catch (Cartalyst\Sentry\Groups\GroupExistsException $e)
-		{
-			$this->error('Group already exists.');
-		}
+            // Show the success message.
+            $this->comment('');
+            $this->info('Admin group created successfully.');
+        } catch (Cartalyst\Sentry\Groups\GroupExistsException $e) {
+            $this->error('Group already exists.');
+        }



-		try
-		{
-			// Create the reporting group
-			$group = Sentry::getGroupProvider()->create(array(
-				'name'        => 'Reporting',
-				'permissions' => array(
-					'admin' => 0,
-					'users' => 1
-				)
-			));
+        try {
+            // Create the reporting group
+            $group = Sentry::getGroupProvider()->create(array(
+                'name'        => 'Reporting',
+                'permissions' => array(
+                    'admin' => 0,
+                    'users' => 1,
+                    'reports' => 1,
+                )
+            ));

-			// Show the success message.
-			$this->comment('');
-			$this->info('Reporting group created successfully.');
-		}
-		catch (Cartalyst\Sentry\Groups\GroupExistsException $e)
-		{
-			$this->error('Group already exists.');
-		}
+            // Show the success message.
+            $this->comment('');
+            $this->info('Reporting group created successfully.');
+        } catch (Cartalyst\Sentry\Groups\GroupExistsException $e) {
+            $this->error('Group already exists.');
+        }


-		try
-		{
-			// Create the general users group
-			$group = Sentry::getGroupProvider()->create(array(
-				'name'        => 'Users',
-				'permissions' => array(
-					'admin' => 0,
-					'users' => 1
-				)
-			));
+        try {
+            // Create the general users group
+            $group = Sentry::getGroupProvider()->create(array(
+                'name'        => 'Users',
+                'permissions' => array(
+                    'admin' => 0,
+                    'users' => 1,
+                    'reports' => 0,
+                )
+            ));

-			// Show the success message.
-			$this->comment('');
-			$this->info('Users group created successfully.');
-		}
-		catch (Cartalyst\Sentry\Groups\GroupExistsException $e)
-		{
-			$this->error('Group already exists.');
-		}
-	}
+            // Show the success message.
+            $this->comment('');
+            $this->info('Users group created successfully.');
+        } catch (Cartalyst\Sentry\Groups\GroupExistsException $e) {
+            $this->error('Group already exists.');
+        }
+    }

-	/**
-	 * Create the user and associates the admin group to that user.
-	 *
-	 * @return void
-	 */
-	protected function sentryCreateUser()
-	{
-		// Prepare the user data array.
-		$data = array_merge($this->userData, array(
-			'activated'   => 1,
-			'manager_id'  => NULL,
-			'permissions' => array(
-				'admin' => 1,
-				'user'  => 1,
-			),
-		));
+    /**
+     * Create the user and associates the admin group to that user.
+     *
+     * @return void
+     */
+    protected function sentryCreateUser()
+    {
+        // Prepare the user data array.
+        $data = array_merge($this->userData, array(
+            'activated'   => 1,
+            'manager_id'  => NULL,
+            'notes'  => 'Generated on install',
+            'permissions' => array(
+                'admin' => 1,
+                'user'  => 1,
+            ),
+        ));

-		// Create the user
-		$user = Sentry::getUserProvider()->create($data);
+        // Create the user
+        $user = Sentry::getUserProvider()->create($data);

-		// Associate the Admin group to this user
-		$group = Sentry::getGroupProvider()->findById(1);
-		$user->addGroup($group);
+        // Associate the Admin group to this user
+        $group = Sentry::findGroupByName('Admin');
+        $user->addGroup($group);

-		// Show the success message
-		$this->comment('');
-		$this->info('Your user was created successfully.');
-		$this->comment('');
-	}
+        // Show the success message
+        $this->comment('');
+        $this->info('Your user was created successfully.');
+        $this->comment('');
+    }

-	/**
-	 * Create a dummy user.
-	 *
-	 * @return void
-	 */
-	protected function sentryCreateDummyUser()
-	{
-		// Prepare the user data array.
-		$data = array(
-			'first_name' => 'John',
-			'last_name'  => 'Doe',
-			'email'      => 'john.doe@example.com',
-			'password'   => 'johndoe',
-			'activated'  => 1,
-			'manager_id'  => 1,
-		);
+    /**
+     * Create a dummy user.
+     *
+     * @return void
+     */
+    protected function sentryCreateDummyUser()
+    {
+        // Prepare the user data array.
+        $data = array(
+            'first_name' => 'John',
+            'last_name'  => 'Doe',
+            'email'      => 'john.doe@example.com',
+            'username'      => 'john.doe@example.com',
+            'password'   => substr(str_shuffle(str_repeat('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', mt_rand(1,10))),1,10),
+            'notes'      => 'Generated on install',
+            'activated'  => 1,
+            'manager_id'  => 1,
+        );

-		// Create the user
-		Sentry::getUserProvider()->create($data);
-	}
+        // Create the user
+        Sentry::getUserProvider()->create($data);
+    }

 }
@@ -0,0 +1,275 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use League\Csv\Reader;
+
+class ImportCommand extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'import:csv';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Import from CSV';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		$filename = $this->argument('filename');
+
+
+		if (!$this->option('testrun')=='true') {
+			$this->comment('======= Importing '.$filename.' =========');
+		} else {
+			$this->comment('====== TEST ONLY Import for '.$filename.' ====');
+			$this->comment('============== NO DATA WILL BE WRITTEN ==============');
+		}
+
+		if (! ini_get("auto_detect_line_endings")) {
+			ini_set("auto_detect_line_endings", '1');
+		}
+
+		$csv = Reader::createFromPath($this->argument('filename'));
+		$csv->setNewline("\r\n");
+		$csv->setOffset(1);
+		$duplicates = '';
+
+		// Loop through the records
+		$nbInsert = $csv->each(function ($row) use ($duplicates) {
+			$status_id = 1;
+
+			if (is_numeric($row[0])) {
+				$this->comment('User '.$row[0].' is not a name - assume this user already exists');
+			} elseif ($row[0]=='') {
+				$this->comment('No user data provided - skipping user creation, just adding asset');
+			} else {
+
+				// Generate an email based on their name
+				$name = explode(" ", $row[0]);
+				$first_name = $name[0];
+				$last_name = '';
+				$email_last_name = '';
+
+				if ($first_name=='Unknown') {
+					$status_id = 7;
+				}
+
+				if (!array_key_exists(1, $name)) {
+					$last_name='';
+					$email_last_name = $last_name;
+					$email_prefix = $first_name;
+				} else {
+					// Loop through the rest of the explode so you don't truncate
+					for ($x=0; $x < count($name); $x++) {
+						if (($x > 0) && ($name[$x]!='')) {
+							$last_name.=' '.$name[$x];
+							$email_last_name.=$name[$x];
+						}
+					}
+					$email_prefix = $first_name[0].$email_last_name;
+				}
+
+				$email = strtolower(str_replace('.','',$email_prefix)).'@'.$this->option('domain');
+				$email = str_replace("'",'',$email);
+
+				$this->comment('Full Name: '.$row[0]);
+				$this->comment('First Name: '.$first_name);
+				$this->comment('Last Name: '.$last_name);
+				$this->comment('Email: '.$email);
+				$this->comment('Category Name: '.$row[1]);
+				$this->comment('Item: '.$row[2]);
+				$this->comment('Manufacturer ID: '.$row[3]);
+				$this->comment('Model No: '.$row[4]);
+				$this->comment('Serial No: '.$row[5]);
+				$this->comment('Asset Tag: '.$row[6]);
+				$this->comment('Location: '.$row[7]);
+			}
+
+			$this->comment('------------- Action Summary ----------------');
+
+			if (isset($email)) {
+				if ($user = User::where('email', $email)->first()) {
+					$this->comment('User '.$email.' already exists');
+				} else {
+					// Create the user
+					$user = Sentry::createUser(array(
+						'first_name' => $first_name,
+						'last_name' => $last_name,
+						'email'     => $email,
+						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
+						'activated' => true,
+						'permissions' => array(
+							'admin' => 0,
+							'user'  => 1,
+						),
+						'notes'         => 'Imported user'
+					));
+
+					// Find the group using the group id
+					$userGroup = Sentry::findGroupById(3);
+
+					// Assign the group to the user
+					$user->addGroup($userGroup);
+					$this->comment('User '.$first_name.' created');
+				}
+			} else {
+				$user = new User;
+			}
+
+			// Check for the location match and create it if it doesn't exist
+			if ($location = Location::where('name', $row[7])->first()) {
+				$this->comment('Location '.$row[7].' already exists');
+			} else {
+				$location = new Location();
+				$location->name = e($row[7]);
+				$location->address = '';
+				$location->city = '';
+				$location->state = '';
+				$location->country = '';
+				$location->user_id = 1;
+
+				if (!$this->option('testrun')=='true') {
+
+					if ($location->save()) {
+						$this->comment('Location '.$row[7].' was created');
+		            } else {
+						$this->comment('Something went wrong! Location '.$row[1].' was NOT created');
+					}
+
+				} else {
+					$this->comment('Location '.$row[7].' was (not) created - test run only');
+				}
+
+			}
+
+			// Check for the category match and create it if it doesn't exist
+			if ($category = Category::where('name', $row[1])->where('category_type', 'asset')->first()) {
+				$this->comment('Category '.$row[1].' already exists');
+			} else {
+				$category = new Category();
+				$category->name = e($row[1]);
+				$category->category_type = 'asset';
+				$category->user_id = 1;
+
+				if ($category->save()) {
+					$this->comment('Category '.$row[1].' was created');
+	            } else {
+					$this->comment('Something went wrong! Category '.$row[1].' was NOT created');
+				}
+
+			}
+
+			// Check for the manufacturer match and create it if it doesn't exist
+			if ($manufacturer = Manufacturer::where('name', $row[3])->first()) {
+				$this->comment('Manufacturer '.$row[3].' already exists');
+			} else {
+				$manufacturer = new Manufacturer();
+				$manufacturer->name = e($row[3]);
+				$manufacturer->user_id = 1;
+
+				if ($manufacturer->save()) {
+					$this->comment('Manufacturer '.$row[3].' was created');
+	            } else {
+					$this->comment('Something went wrong! Manufacturer '.$row[3].' was NOT created');
+				}
+
+			}
+
+			// Check for the asset model match and create it if it doesn't exist
+			if ($asset_model = Model::where('name', $row[2])->where('modelno', $row[4])->where('category_id', $category->id)->where('manufacturer_id', $manufacturer->id)->first()) {
+				$this->comment('The Asset Model '.$row[2].' with model number '.$row[4].' already exists');
+			} else {
+				$asset_model = new Model();
+				$asset_model->name = e($row[2]);
+				$asset_model->manufacturer_id = $manufacturer->id;
+				$asset_model->modelno = e($row[4]);
+				$asset_model->category_id = $category->id;
+				$asset_model->user_id = 1;
+
+				if ($asset_model->save()) {
+					$this->comment('Asset Model '.$row[2].' with model number '.$row[4].' was created');
+	            } else {
+					$this->comment('Something went wrong! Asset Model '.$row[2].' was NOT created');
+				}
+
+			}
+
+			// Check for the asset match and create it if it doesn't exist
+
+				$asset = new Asset();
+				$asset->name = e($row[2]);
+				$asset->serial = e($row[5]);
+				$asset->asset_tag = e($row[6]);
+				$asset->model_id = $asset_model->id;
+				$asset->assigned_to = $user->id;
+				$asset->rtd_location_id = $location->id;
+				$asset->user_id = 1;
+				$asset->status_id = $status_id;
+
+				if ($asset->save()) {
+					$this->comment('Asset '.$row[2].' with serial number '.$row[5].' was created');
+	            } else {
+					$this->comment('Something went wrong! Asset '.$row[5].' was NOT created');
+				}
+
+
+			$this->comment('=====================================');
+
+			return true;
+
+		});
+
+
+	}
+
+	/**
+	 * Get the console command arguments.
+	 *
+	 * @return array
+	 */
+	protected function getArguments()
+	{
+		return array(
+			array('filename', InputArgument::REQUIRED, 'File for the CSV import.'),
+		);
+	}
+
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+		return array(
+			array('domain', null, InputOption::VALUE_REQUIRED, 'Email domain for generated email addresses.', null),
+			array('testrun', null, InputOption::VALUE_REQUIRED, 'Test the output without writing to the database or not.', null),
+		);
+	}
+
+
+}
@@ -0,0 +1,130 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class SendExpirationAlerts extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'alerts:expiring';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'This command checks for expiring warrantees and service agreements, and sends out an alert email.';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+
+		// Expiring Assets
+		$expiring_assets = Asset::getExpiringWarrantee(60);
+		$this->info(count($expiring_assets).' expiring assets');
+
+		$asset_data['count'] =  count($expiring_assets);
+		$asset_data['email_content'] ='';
+		$now = date("Y-m-d");
+
+
+		foreach ($expiring_assets as $asset) {
+
+			$expires = $asset->warrantee_expires();
+			$difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+			if ($difference > 30) {
+				$asset_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+			} else {
+				$asset_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+			}
+				$asset_data['email_content'] .= '<td><a href="'.Config::get('app.url').'/hardware/'.$asset->id.'/view">';
+				$asset_data['email_content'] .= $asset->showAssetName().'</a></td><td>'.$asset->asset_tag.'</td>';
+				$asset_data['email_content'] .= '<td>'.$asset->warrantee_expires().'</td>';
+				$asset_data['email_content'] .= '<td>'.$difference.' days</td>';
+				$asset_data['email_content'] .= '</tr>';
+		}
+
+		// Expiring licenses
+		$expiring_licenses = License::getExpiringLicenses(60);
+		$this->info(count($expiring_licenses).' expiring licenses');
+
+
+		$license_data['count'] =  count($expiring_licenses);
+		$license_data['email_content'] = '';
+
+		foreach ($expiring_licenses as $license) {
+			$expires = $license->expiration_date;
+			$difference =  round(abs(strtotime($expires) - strtotime($now))/86400);
+
+			if ($difference > 30) {
+				$license_data['email_content'] .= '<tr style="background-color: #fcffa3;">';
+			} else {
+				$license_data['email_content'] .= '<tr style="background-color:#d9534f;">';
+			}
+				$license_data['email_content'] .= '<td><a href="'.Config::get('app.url').'/admin/licenses/'.$license->id.'/view">';
+				$license_data['email_content'] .= $license->name.'</a></td>';
+				$license_data['email_content'] .= '<td>'.$license->expiration_date.'</td>';
+				$license_data['email_content'] .= '<td>'.$difference.' days</td>';
+				$license_data['email_content'] .= '</tr>';
+		}
+
+		if ((Setting::getSettings()->alert_email!='')  && (Setting::getSettings()->alerts_enabled==1)) {
+
+
+			if (count($expiring_assets) > 0) {
+				Mail::send('emails.expiring-assets-report', $asset_data, function ($m)  {
+	                $m->to(Setting::getSettings()->alert_email, Setting::getSettings()->site_name);
+	                $m->subject('Expiring Assets Report');
+	        	});
+
+			}
+
+			if (count($expiring_licenses) > 0) {
+				Mail::send('emails.expiring-licenses-report', $license_data, function ($m)  {
+	                $m->to(Setting::getSettings()->alert_email, Setting::getSettings()->site_name);
+	                $m->subject('Expiring Licenses Report');
+	        	});
+
+			}
+
+
+		} else {
+
+			if (Setting::getSettings()->alert_email=='') {
+				echo "Could not send email. No alert email configured in settings. \n";
+			} elseif (Setting::getSettings()->alerts_enabled!=1) {
+				echo "Alerts are disabled in the settings. No mail will be sent. \n";
+			}
+
+		}
+
+
+
+
+	}
+
+
+
+
+
+}
@@ -0,0 +1,65 @@
+<?php
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+
+class SystemBackup extends Command {
+
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'snipeit:backup';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'This commandcreates a database dump and zips up all of the uploaded files in the upload directories.';
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function fire()
+	{
+		//
+		$files['avatars'] = glob(public_path().'/uploads/avatars/*');
+		$files['models'] = glob(public_path().'/uploads/models/*');
+		$files['suppliers'] = glob(public_path().'/uploads/suppliers/*');
+		$files['private_uploads'] = glob(app_path().'/private_uploads/*');
+		$base_filename = date('Ymdgis');
+		$zip_file = app_path().'/storage/dumps/'.$base_filename.'-backup.zip';
+		$db_dump = Config::get('backup::path').$base_filename.'-db.sql';
+		$this->call('db:backup', array('filename' => $db_dump));
+
+		Zipper::make($zip_file)
+			->folder('avatars')->add($files['avatars'])
+			->folder('models')->add($files['models'])
+			->folder('suppliers')->add($files['suppliers'])
+			->folder('private_uploads')->add($files['private_uploads'])
+			->folder('database')->add($db_dump)->close();
+
+		$this->info('Backup file created at '.$zip_file);
+		$this->info('Removing SQL dump at '.$db_dump);
+		unlink($db_dump);
+
+	}
+
+
+
+}
@@ -0,0 +1,89 @@
+<?php
+	
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+ 
+class Versioning extends Command {
+ 
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'versioning:update';
+ 
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate and update app\'s version via git.';
+ 
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+ 
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        // Path to the file containing your version
+        // This will be overwritten everything you commit a message
+        $versionFile = app_path().'/config/version.php';
+ 
+        // The git's output
+        // get the argument passed in the git command
+		 $hash_version = $this->argument('app_version');
+		 
+		 // discard the commit hash
+		 $version = explode('-', $hash_version);
+		 $realVersion = $version[0] . '-' . $version[1];
+		 
+		 // save the version array to a variable
+		 $array = var_export(array('app_version' => $realVersion,'hash_version' => $hash_version), true);
+ 
+ 
+        // Construct our file content
+        $content = <<<CON
+<?php
+return $array;
+CON;
+
+        // And finally write the file and output the current version
+        \File::put($versionFile, $content);
+        $this->line('Setting version: '. \Config::get('version.latest'));
+    }
+ 
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return array(
+            array('app_version', InputArgument::REQUIRED, 'version number is required.'),
+        );
+    }
+ 
+    /**
+     * Get the console command options.
+     *
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return array(
+        );
+    }
+}
@@ -2,144 +2,185 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Application Timezone
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the default timezone for your application, which
-	| will be used by the PHP date and date-time functions. We have gone
-	| ahead and set this to a sensible default for you out of the box.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Timezone
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default timezone for your application, which
+    | will be used by the PHP date and date-time functions. We have gone
+    | ahead and set this to a sensible default for you out of the box.
+    |
+    */

-	'timezone' => 'UTC',
+    'timezone' => 'UTC',

-	/*
-	|--------------------------------------------------------------------------
-	| Application Locale
-	|--------------------------------------------------------------------------
-	|
-	| This locale ties into the languaage files in app/lang, which contain the
-	| language files for each translation.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale ties into the languaage files in app/lang, which contain the
+    | language files for each translation.
+    |
+    */

-	'locale' => 'en',
+    'locale' => 'en',

-	/*
-	|--------------------------------------------------------------------------
-	| Autoloaded Service Providers
-	|--------------------------------------------------------------------------
-	|
-	| The service providers listed here will be automatically loaded on the
-	| request to your application. Feel free to add your own services to
-	| this array to grant expanded functionality to your applications.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | This setting may be used to control the default cipher used by the Laravel
+    | encryption facilities.
+    |
+    | Note: In Laravel 4.2, the default cipher is MCRYPT_RIJNDAEL_128 (AES),
+    | which is considered to be the most secure cipher. Changing the cipher
+    | back to MCRYPT_RIJNDAEL_256 is required to decrypt cookies/values that
+    | were encrypted in Laravel <= 4.1
+    |
+    */
+
+    'cipher' => MCRYPT_RIJNDAEL_256,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Prevent Password changes
+    |--------------------------------------------------------------------------
+    |
+    | If for some reason you do not wish for admins to be able to edit the password
+    | for any user (including themselves), set this to true.
+    |
+    */
+
+    'lock_passwords' => false,


-	'providers' => array(

-		'Illuminate\Foundation\Providers\ArtisanServiceProvider',
-		'Illuminate\Auth\AuthServiceProvider',
-		'Illuminate\Cache\CacheServiceProvider',
-		'Illuminate\Session\CommandsServiceProvider',
-		'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
-		'Illuminate\Routing\ControllerServiceProvider',
-		'Illuminate\Cookie\CookieServiceProvider',
-		'Illuminate\Database\DatabaseServiceProvider',
-		'Illuminate\Encryption\EncryptionServiceProvider',
-		'Illuminate\Filesystem\FilesystemServiceProvider',
-		'Illuminate\Hashing\HashServiceProvider',
-		'Illuminate\Html\HtmlServiceProvider',
-		'Illuminate\Log\LogServiceProvider',
-		'Illuminate\Mail\MailServiceProvider',
-		'Illuminate\Database\MigrationServiceProvider',
-		'Illuminate\Pagination\PaginationServiceProvider',
-		'Illuminate\Queue\QueueServiceProvider',
-		'Illuminate\Redis\RedisServiceProvider',
-		'Illuminate\Remote\RemoteServiceProvider',
-		'Illuminate\Auth\Reminders\ReminderServiceProvider',
-		'Illuminate\Database\SeedServiceProvider',
-		'Illuminate\Session\SessionServiceProvider',
-		'Illuminate\Translation\TranslationServiceProvider',
-		'Illuminate\Validation\ValidationServiceProvider',
-		'Illuminate\View\ViewServiceProvider',
-		'Illuminate\Workbench\WorkbenchServiceProvider',
+    /*
+    |--------------------------------------------------------------------------
+    | Autoloaded Service Providers
+    |--------------------------------------------------------------------------
+    |
+    | The service providers listed here will be automatically loaded on the
+    | request to your application. Feel free to add your own services to
+    | this array to grant expanded functionality to your applications.
+    |
+    */

-		'Barryvdh\Debugbar\ServiceProvider',
-		'Cartalyst\Sentry\SentryServiceProvider',
-		'Chumper\Datatable\DatatableServiceProvider',

-	),
+    'providers' => array(

-	/*
-	|--------------------------------------------------------------------------
-	| Service Provider Manifest
-	|--------------------------------------------------------------------------
-	|
-	| The service provider manifest is used by Laravel to lazy load service
-	| providers which are not needed for each request, as well to keep a
-	| list of all of the services. Here, you may set its storage spot.
-	|
-	*/
+        'Illuminate\Foundation\Providers\ArtisanServiceProvider',
+        'Illuminate\Auth\AuthServiceProvider',
+        'Illuminate\Cache\CacheServiceProvider',
+        'Illuminate\Session\CommandsServiceProvider',
+        'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider',
+        'Illuminate\Routing\ControllerServiceProvider',
+        'Illuminate\Cookie\CookieServiceProvider',
+        'Illuminate\Database\DatabaseServiceProvider',
+        'Illuminate\Encryption\EncryptionServiceProvider',
+        'Illuminate\Filesystem\FilesystemServiceProvider',
+        'Illuminate\Hashing\HashServiceProvider',
+        'Illuminate\Html\HtmlServiceProvider',
+        'Illuminate\Log\LogServiceProvider',
+        'Illuminate\Mail\MailServiceProvider',
+        'Illuminate\Database\MigrationServiceProvider',
+        'Illuminate\Pagination\PaginationServiceProvider',
+        'Illuminate\Queue\QueueServiceProvider',
+        'Illuminate\Redis\RedisServiceProvider',
+        'Illuminate\Remote\RemoteServiceProvider',
+        'Illuminate\Auth\Reminders\ReminderServiceProvider',
+        'Illuminate\Database\SeedServiceProvider',
+        'Illuminate\Session\SessionServiceProvider',
+        'Illuminate\Translation\TranslationServiceProvider',
+        'Illuminate\Validation\ValidationServiceProvider',
+        'Illuminate\View\ViewServiceProvider',
+        'Illuminate\Workbench\WorkbenchServiceProvider',
+        'Barryvdh\Debugbar\ServiceProvider',
+        'Cartalyst\Sentry\SentryServiceProvider',
+        'Chumper\Datatable\DatatableServiceProvider',
+        'Dinesh\Barcode\BarcodeServiceProvider',
+        'Maknz\Slack\SlackServiceProvider',
+        'Schickling\Backup\BackupServiceProvider',
+        'Chumper\Zipper\ZipperServiceProvider',

-	'manifest' => storage_path().'/meta',
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Class Aliases
-	|--------------------------------------------------------------------------
-	|
-	| This array of class aliases will be registered when this application
-	| is started. However, feel free to register as many as you wish as
-	| the aliases are "lazy" loaded so they don't hinder performance.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Service Provider Manifest
+    |--------------------------------------------------------------------------
+    |
+    | The service provider manifest is used by Laravel to lazy load service
+    | providers which are not needed for each request, as well to keep a
+    | list of all of the services. Here, you may set its storage spot.
+    |
+    */

-	'aliases' => array(
+    'manifest' => storage_path().'/meta',

-			'App'             => 'Illuminate\Support\Facades\App',
-			'Artisan'         => 'Illuminate\Support\Facades\Artisan',
-			'Auth'            => 'Illuminate\Support\Facades\Auth',
-			'Blade'           => 'Illuminate\Support\Facades\Blade',
-			'Cache'           => 'Illuminate\Support\Facades\Cache',
-			'ClassLoader'     => 'Illuminate\Support\ClassLoader',
-			'Config'          => 'Illuminate\Support\Facades\Config',
-			'Controller'      => 'Illuminate\Routing\Controller',
-			'Cookie'          => 'Illuminate\Support\Facades\Cookie',
-			'Crypt'           => 'Illuminate\Support\Facades\Crypt',
-			'DB'              => 'Illuminate\Support\Facades\DB',
-			'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
-			'Eloquent'        => 'Illuminate\Database\Eloquent\Model',
-			'Event'           => 'Illuminate\Support\Facades\Event',
-			'File'            => 'Illuminate\Support\Facades\File',
-			'Form'            => 'Illuminate\Support\Facades\Form',
-			'Hash'            => 'Illuminate\Support\Facades\Hash',
-			'HTML'            => 'Illuminate\Support\Facades\HTML',
-			'Input'           => 'Illuminate\Support\Facades\Input',
-			'Lang'            => 'Illuminate\Support\Facades\Lang',
-			'Log'             => 'Illuminate\Support\Facades\Log',
-			'Mail'            => 'Illuminate\Support\Facades\Mail',
-			'Paginator'       => 'Illuminate\Support\Facades\Paginator',
-			'Password'        => 'Illuminate\Support\Facades\Password',
-			'Queue'           => 'Illuminate\Support\Facades\Queue',
-			'Redirect'        => 'Illuminate\Support\Facades\Redirect',
-			'Redis'           => 'Illuminate\Support\Facades\Redis',
-			'Request'         => 'Illuminate\Support\Facades\Request',
-			'Response'        => 'Illuminate\Support\Facades\Response',
-			'Route'           => 'Illuminate\Support\Facades\Route',
-			'Schema'          => 'Illuminate\Support\Facades\Schema',
-			'Seeder'          => 'Illuminate\Database\Seeder',
-			'Sentry'          => 'Cartalyst\Sentry\Facades\Laravel\Sentry',
-			'Session'         => 'Illuminate\Support\Facades\Session',
-			'SSH'             => 'Illuminate\Support\Facades\SSH',
-			'Str'             => 'Illuminate\Support\Str',
-			'URL'             => 'Illuminate\Support\Facades\URL',
-			'Validator'       => 'Illuminate\Support\Facades\Validator',
-			'View'            => 'Illuminate\Support\Facades\View'
+    /*
+    |--------------------------------------------------------------------------
+    | Class Aliases
+    |--------------------------------------------------------------------------
+    |
+    | This array of class aliases will be registered when this application
+    | is started. However, feel free to register as many as you wish as
+    | the aliases are "lazy" loaded so they don't hinder performance.
+    |
+    */

-	),
+    'aliases' => array(
+
+            'App'             		=> 'Illuminate\Support\Facades\App',
+            'Artisan'         		=> 'Illuminate\Support\Facades\Artisan',
+            'Auth'            		=> 'Illuminate\Support\Facades\Auth',
+            'Blade'           		=> 'Illuminate\Support\Facades\Blade',
+            'Cache'           		=> 'Illuminate\Support\Facades\Cache',
+            'ClassLoader'     		=> 'Illuminate\Support\ClassLoader',
+            'Config'          		=> 'Illuminate\Support\Facades\Config',
+            'Controller'      		=> 'Illuminate\Routing\Controller',
+            'Cookie'          		=> 'Illuminate\Support\Facades\Cookie',
+            'Crypt'           		=> 'Illuminate\Support\Facades\Crypt',
+            'DB'              		=> 'Illuminate\Support\Facades\DB',
+            'Datatable' 			=> 'Chumper\Datatable\Facades\DatatableFacade',
+            'Eloquent'        		=> 'Illuminate\Database\Eloquent\Model',
+            'Event'           		=> 'Illuminate\Support\Facades\Event',
+            'File'            		=> 'Illuminate\Support\Facades\File',
+            'Form'            		=> 'Illuminate\Support\Facades\Form',
+            'Hash'            		=> 'Illuminate\Support\Facades\Hash',
+            'HTML'            		=> 'Illuminate\Support\Facades\HTML',
+			'Image'           		=> 'Intervention\Image\ImageManagerStatic',
+            'Input'           		=> 'Illuminate\Support\Facades\Input',
+            'Lang'            		=> 'Illuminate\Support\Facades\Lang',
+            'Log'             		=> 'Illuminate\Support\Facades\Log',
+            'Mail'            		=> 'Illuminate\Support\Facades\Mail',
+            'Paginator'       		=> 'Illuminate\Support\Facades\Paginator',
+            'Password'        		=> 'Illuminate\Support\Facades\Password',
+            'Queue'           		=> 'Illuminate\Support\Facades\Queue',
+            'Redirect'        		=> 'Illuminate\Support\Facades\Redirect',
+            'Redis'           		=> 'Illuminate\Support\Facades\Redis',
+            'Request'         		=> 'Illuminate\Support\Facades\Request',
+            'Response'        		=> 'Illuminate\Support\Facades\Response',
+            'Route'           		=> 'Illuminate\Support\Facades\Route',
+            'Schema'          		=> 'Illuminate\Support\Facades\Schema',
+            'Seeder'          		=> 'Illuminate\Database\Seeder',
+            'Sentry'          		=> 'Cartalyst\Sentry\Facades\Laravel\Sentry',
+            'Session'         		=> 'Illuminate\Support\Facades\Session',
+            'SoftDeletingTrait'     => 'Illuminate\Database\Eloquent\SoftDeletingTrait',
+            'SSH'             		=> 'Illuminate\Support\Facades\SSH',
+            'Str'             		=> 'Illuminate\Support\Str',
+            'URL'             		=> 'Illuminate\Support\Facades\URL',
+            'Validator'       		=> 'Illuminate\Support\Facades\Validator',
+            'View'            		=> 'Illuminate\Support\Facades\View',
+            'Reader'				=> 'League\Csv\Reader',
+            'DNS1D'                 => 'Dinesh\Barcode\Facades\DNS1DFacade',
+            'DNS2D'                 => 'Dinesh\Barcode\Facades\DNS2DFacade',
+            'Slack' 				=> 'Maknz\Slack\Facades\Slack',
+            'Zipper'                => 'Chumper\Zipper\Zipper',
+
+    ),

 );
@@ -2,62 +2,62 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Authentication Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the authentication driver that will be utilized.
-	| This drivers manages the retrieval and authentication of the users
-	| attempting to get access to protected areas of your application.
-	|
-	| Supported: "database", "eloquent"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Authentication Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the authentication driver that will be utilized.
+    | This drivers manages the retrieval and authentication of the users
+    | attempting to get access to protected areas of your application.
+    |
+    | Supported: "database", "eloquent"
+    |
+    */

-	'driver' => 'eloquent',
+    'driver' => 'eloquent',

-	/*
-	|--------------------------------------------------------------------------
-	| Authentication Model
-	|--------------------------------------------------------------------------
-	|
-	| When using the "Eloquent" authentication driver, we need to know which
-	| Eloquent model should be used to retrieve your users. Of course, it
-	| is often just the "User" model but you may use whatever you like.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Model
+    |--------------------------------------------------------------------------
+    |
+    | When using the "Eloquent" authentication driver, we need to know which
+    | Eloquent model should be used to retrieve your users. Of course, it
+    | is often just the "User" model but you may use whatever you like.
+    |
+    */

-	'model' => 'User',
+    'model' => 'User',

-	/*
-	|--------------------------------------------------------------------------
-	| Authentication Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "Database" authentication driver, we need to know which
-	| table should be used to retrieve your users. We have chosen a basic
-	| default value but you may easily change it to any table you like.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "Database" authentication driver, we need to know which
+    | table should be used to retrieve your users. We have chosen a basic
+    | default value but you may easily change it to any table you like.
+    |
+    */

-	'table' => 'users',
+    'table' => 'users',

-	/*
-	|--------------------------------------------------------------------------
-	| Password Reminder Settings
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the settings for password reminders, including a view
-	| that should be used as your password reminder e-mail. You will also
-	| be able to set the name of the table that holds the reset tokens.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Settings
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the settings for password reminders, including a view
+    | that should be used as your password reminder e-mail. You will also
+    | be able to set the name of the table that holds the reset tokens.
+    |
+    */

-	'reminder' => array(
+    'reminder' => array(

-		'email' => 'emails.auth.reminder', 'table' => 'password_reminders',
+        'email' => 'emails.auth.reminder', 'table' => 'password_reminders',

-	),
+    ),

 );
@@ -2,88 +2,88 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Cache Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default cache "driver" that will be used when
-	| using the Caching library. Of course, you may use other drivers any
-	| time you wish. This is the default when another is not specified.
-	|
-	| Supported: "file", "database", "apc", "memcached", "redis", "array"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cache Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default cache "driver" that will be used when
+    | using the Caching library. Of course, you may use other drivers any
+    | time you wish. This is the default when another is not specified.
+    |
+    | Supported: "file", "database", "apc", "memcached", "redis", "array"
+    |
+    */

-	'driver' => 'file',
+    'driver' => 'file',

-	/*
-	|--------------------------------------------------------------------------
-	| File Cache Location
-	|--------------------------------------------------------------------------
-	|
-	| When using the "file" cache driver, we need a location where the cache
-	| files may be stored. A sensible default has been specified, but you
-	| are free to change it to any other place on disk that you desire.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | File Cache Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the "file" cache driver, we need a location where the cache
+    | files may be stored. A sensible default has been specified, but you
+    | are free to change it to any other place on disk that you desire.
+    |
+    */

-	'path' => storage_path().'/cache',
+    'path' => storage_path().'/cache',

-	/*
-	|--------------------------------------------------------------------------
-	| Database Cache Connection
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" cache driver you may specify the connection
-	| that should be used to store the cached items. When this option is
-	| null the default database connection will be utilized for cache.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Cache Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" cache driver you may specify the connection
+    | that should be used to store the cached items. When this option is
+    | null the default database connection will be utilized for cache.
+    |
+    */

-	'connection' => null,
+    'connection' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Database Cache Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" cache driver we need to know the table that
-	| should be used to store the cached items. A default table name has
-	| been provided but you're free to change it however you deem fit.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Cache Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" cache driver we need to know the table that
+    | should be used to store the cached items. A default table name has
+    | been provided but you're free to change it however you deem fit.
+    |
+    */

-	'table' => 'cache',
+    'table' => 'cache',

-	/*
-	|--------------------------------------------------------------------------
-	| Memcached Servers
-	|--------------------------------------------------------------------------
-	|
-	| Now you may specify an array of your Memcached servers that should be
-	| used when utilizing the Memcached cache driver. All of the servers
-	| should contain a value for "host", "port", and "weight" options.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Memcached Servers
+    |--------------------------------------------------------------------------
+    |
+    | Now you may specify an array of your Memcached servers that should be
+    | used when utilizing the Memcached cache driver. All of the servers
+    | should contain a value for "host", "port", and "weight" options.
+    |
+    */

-	'memcached' => array(
+    'memcached' => array(

-		array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),
+        array('host' => '127.0.0.1', 'port' => 11211, 'weight' => 100),

-	),
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Cache Key Prefix
-	|--------------------------------------------------------------------------
-	|
-	| When utilizing a RAM based store such as APC or Memcached, there might
-	| be other applications utilizing the same cache. So, we'll specify a
-	| value to get prefixed to all our keys so we can avoid collisions.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Key Prefix
+    |--------------------------------------------------------------------------
+    |
+    | When utilizing a RAM based store such as APC or Memcached, there might
+    | be other applications utilizing the same cache. So, we'll specify a
+    | value to get prefixed to all our keys so we can avoid collisions.
+    |
+    */

-	'prefix' => 'laravel',
+    'prefix' => 'laravel',

 );
@@ -2,16 +2,16 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Additional Compiled Classes
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify additional classes to include in the compiled file
-	| generated by the `artisan optimize` command. These should be classes
-	| that are included on basically every request into the application.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Additional Compiled Classes
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify additional classes to include in the compiled file
+    | generated by the `artisan optimize` command. These should be classes
+    | that are included on basically every request into the application.
+    |
+    */



@@ -2,44 +2,44 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */

-	'debug' => true,
+    'debug' => true,

-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */

-	'url' => 'http://snipe-it-laravel.local:8888',
+    'url' => 'http://snipe-it-laravel.local:8888',

-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	| Run a php artisand key:generate --env=staging to create a random one
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate to create a random one
+    */

-	'key' => 'Change_this_key_or_snipe_will_get_ya',
+    'key' => 'Change_this_key_or_snipe_will_get_ya',

 );
@@ -2,123 +2,124 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */

-	'fetch' => PDO::FETCH_CLASS,
+    'fetch' => PDO::FETCH_CLASS,

-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */

-	'default' => 'mysql',
+    'default' => 'mysql',

-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */

-	'connections' => array(
+    'connections' => array(

-		'sqlite' => array(
-			'driver'   => 'sqlite',
-			'database' => __DIR__.'/../database/production.sqlite',
-			'prefix'   => '',
-		),
+        'sqlite' => array(
+            'driver'   => 'sqlite',
+            'database' => __DIR__.'/../database/production.sqlite',
+            'prefix'   => '',
+        ),

-		'mysql' => array(
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'snipeit_laravel',
-			'username'  => 'snipeit_laravel',
-			'password'  => '',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		),
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'snipeit_laravel',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+            'strict'    => false,
+        ),

-		'pgsql' => array(
-			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
-		),
+        'pgsql' => array(
+            'driver'   => 'pgsql',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'charset'  => 'utf8',
+            'prefix'   => '',
+            'schema'   => 'public',
+        ),

-		'sqlsrv' => array(
-			'driver'   => 'sqlsrv',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'prefix'   => '',
-		),
+        'sqlsrv' => array(
+            'driver'   => 'sqlsrv',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'prefix'   => '',
+        ),

-	),
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk have not actually be run in the databases.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */

-	'migrations' => 'migrations',
+    'migrations' => 'migrations',

-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */

-	'redis' => array(
+    'redis' => array(

-		'cluster' => true,
+        'cluster' => true,

-		'default' => array(
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
-			'database' => 0,
-		),
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),

-	),
+    ),

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */

-	'driver' => 'smtp',
+    'driver' => 'smtp',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */

-	'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to delivery e-mails to
-	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */

-	'port' => 587,
+    'port' => 587,

-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */

-	'from' => array('address' => null, 'name' => null),
+    'from' => array('address' => null, 'name' => null),

-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */

-	'encryption' => 'tls',
+    'encryption' => 'tls',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */

-	'username' => null,
+    'username' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */

-	'password' => null,
+    'password' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Sendmail System Path
-	|--------------------------------------------------------------------------
-	|
-	| When using the "sendmail" driver to send e-mails, we will need to know
-	| the path to where Sendmail lives on this server. A default path has
-	| been provided here, which will work well on most of your systems.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */

-	'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs',

-	/*
-	|--------------------------------------------------------------------------
-	| Mail "Pretend"
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, e-mail will not actually be sent over the
-	| web and will instead be written to your application's logs files so
-	| you may inspect the message. This is great for local development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */

-	'pretend' => false,
+    'pretend' => false,

-);
+);
@@ -0,0 +1,140 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => false,
+
+);
@@ -0,0 +1,146 @@
+<?php
+
+use Illuminate\Support\Facades\Config;
+
+return array(
+
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar Settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar is enabled by default, when debug is set to true in app.php.
+     |
+     */
+
+    'enabled' => Config::get('app.debug'),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Storage settings
+     |--------------------------------------------------------------------------
+     |
+     | DebugBar stores data for session/ajax requests in a directory.
+     | You can disable this, so the debugbar stores data in headers/session,
+     | but this can cause problems with large data collectors.
+     |
+     */
+    'storage' => array(
+        'enabled' => true,
+        'path' => storage_path() . '/debugbar',
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Vendors
+     |--------------------------------------------------------------------------
+     |
+     | Vendor files are included by default, but can be set to false.
+     | This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     | and for js: jquery and and highlight.js
+     | So if you want syntax highlighting, set it to true. 
+     | jQuery is set to not conflict with existing jQuery scripts.
+     |
+     */
+
+    'include_vendors' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Ajax Requests
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     | you can use this option to disable sending the data through the headers.
+     |
+     */
+
+    'capture_ajax' => true,
+    
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Console Commands
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can listen to Artisan commands. You can view them with the browse button in the Debugbar.
+     |
+     */
+
+    'capture_console' => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DataCollectors
+     |--------------------------------------------------------------------------
+     |
+     | Enable/disable DataCollectors
+     |
+     */
+
+    'collectors' => array(
+        'phpinfo'         => true,  // Php version
+        'messages'        => true,  // Messages
+        'time'            => true,  // Time Datalogger
+        'memory'          => true,  // Memory usage
+        'exceptions'      => true,  // Exception displayer
+        'log'             => true,  // Logs from Monolog (merged in messages if enabled)
+        'db'              => true,  // Show database (PDO) queries and bindings
+        'views'           => true,  // Views with their data
+        'route'           => true,  // Current route information
+        'laravel'         => false, // Laravel version and environment
+        'events'          => false, // All events fired
+        'default_request' => false, // Regular or special Symfony request logger
+        'symfony_request' => true,  // Only one can be enabled..
+        'mail'            => true,  // Catch mail messages
+        'logs'            => false, // Add the latest log messages
+        'files'           => false, // Show the included files
+        'config'          => false, // Display config settings
+        'auth'            => false, // Display Laravel authentication status
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Extra options
+     |--------------------------------------------------------------------------
+     |
+     | Configure some DataCollectors
+     |
+     */
+
+    'options' => array(
+        'auth' => array(
+            'show_name' => false,   // Also show the users name/email in the debugbar
+        ),
+        'db' => array(
+            'with_params'       => true,   // Render SQL with the parameters substituted
+            'timeline'          => false,   // Add the queries to the timeline
+        ),
+        'mail' => array(
+            'full_log' => false
+        ),
+        'views' => array(
+            'data' => false,    //Note: Can slow down the application, because the data can be quite large..
+        ),
+        'route' => array(
+            'label' => true  // show complete route on bar
+        ),
+        'logs' => array(
+            'file' => null
+        ),
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Inject Debugbar in Response
+     |--------------------------------------------------------------------------
+     |
+     | Usually, the debugbar is added just before <body>, by listening to the
+     | Response after the App is done. If you disable this, you have to add them
+     | in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     |
+     */
+
+    'inject' => true,
+
+);
@@ -42,12 +42,38 @@ return array(
 	|
 	| This option allows you to specify the default hasher used by Sentry
 	|
-	| Supported: "native", "bcrypt", "sha256"
+	| Supported: "native", "bcrypt", "sha256", "whirlpool"
 	|
 	*/

 	'hasher' => 'native',

+	/*
+	|--------------------------------------------------------------------------
+	| Cookie
+	|--------------------------------------------------------------------------
+	|
+	| Configuration specific to the cookie component of Sentry.
+	|
+	*/
+
+	'cookie' => array(
+
+		/*
+		|--------------------------------------------------------------------------
+		| Default Cookie Key
+		|--------------------------------------------------------------------------
+		|
+		| This option allows you to specify the default cookie key used by Sentry.
+		|
+		| Supported: string
+		|
+		*/
+
+		'key' => 'cartalyst_sentry',
+
+ 	),
+
 	/*
 	|--------------------------------------------------------------------------
 	| Groups
@@ -56,6 +82,7 @@ return array(
 	| Configuration specific to the group management component of Sentry.
 	|
 	*/
+
 	'groups' => array(

 		/*
@@ -80,6 +107,7 @@ return array(
 	| Configuration specific to the user management component of Sentry.
 	|
 	*/
+
 	'users' => array(

 		/*
@@ -92,6 +120,7 @@ return array(
 		|
 		*/

+		//'model' => 'Cartalyst\Sentry\Users\Eloquent\User',
 		'model' => 'User',

 		/*
@@ -99,16 +128,30 @@ return array(
 		| Login Attribute
 		|--------------------------------------------------------------------------
 		|
-		| If you're the "eloquent" driver and extending the base Eloquent model,
-		| we allow you to globally override the login attribute without even
-		| subclassing the model, simply by specifying the attribute below.
+		| If you're using the "eloquent" driver and extending the base Eloquent
+		| model, we allow you to globally override the login attribute without
+		| even subclassing the model, simply by specifying the attribute below.
 		|
 		*/

-		'login_attribute' => 'email',
+		'login_attribute' => 'username',

 	),

+	/*
+	|--------------------------------------------------------------------------
+	| User Groups Pivot Table
+	|--------------------------------------------------------------------------
+	|
+	| When using the "eloquent" driver, you can specify the table name
+	| for the user groups pivot table.
+	|
+	| Default: users_groups
+	|
+	*/
+
+	'user_groups_pivot_table' => 'users_groups',
+
 	/*
 	|--------------------------------------------------------------------------
 	| Throttling
@@ -118,6 +161,7 @@ return array(
 	| enables limiting of login attempts and the suspension & banning of users.
 	|
 	*/
+
 	'throttling' => array(

 		/*
@@ -0,0 +1,210 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Table specific configuration options.
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'table' => array(
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table class
+        |--------------------------------------------------------------------------
+        |
+        | Class(es) added to the table
+        | Supported: string
+        |
+        */
+
+        'class' => 'table table-bordered',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table ID
+        |--------------------------------------------------------------------------
+        |
+        | ID given to the table. Used for connecting the table and the Datatables
+        | jQuery plugin. If left empty a random ID will be generated.
+        | Supported: string
+        |
+        */
+
+        'id' => '',
+
+        /*
+        |--------------------------------------------------------------------------
+        | DataTable options
+        |--------------------------------------------------------------------------
+        |
+        | jQuery dataTable plugin options. The array will be json_encoded and
+        | passed through to the plugin. See https://datatables.net/usage/options
+        | for more information.
+        | Supported: array
+        |
+        */
+
+        'options' => array(
+
+            "pagingType" => "full_numbers",
+            'processing'=>true,
+            'language'=>array(
+                   'processing'=>'<i class="fa fa-spinner fa-spin"></i> Loading...'
+            ),
+            'deferRender'=> true,
+            'stateSave'=> true,
+            'paging'=>true,
+            'pageLength'=> Setting::getSettings()->per_page,
+            'lengthMenu'=>array(array(10,25,50,75,100,125,150,-1), array(10,25,50,75,100,125,150,'All')),
+            'tableTools' => array(
+                'sSwfPath'=> Config::get('app.url').'/assets/swf/copy_csv_xls_pdf.swf',
+                'aButtons'=>array(
+                    array(
+                        'sExtends'=>'copy',
+                        'sButtonText'=>'Copy',
+                        'mColumns'=>'visible',
+                        'bFooter'=>false,
+                        ),
+                    array(
+                        'sExtends'=>'print',
+                        'sButtonText'=>'Print',
+                        'mColumns'=>'visible',
+                        'bShowAll'=>true,
+                        ),
+                    array(
+                        'sExtends'=>'collection',
+                        'sButtonText'=>'Export',
+                        'aButtons'=>array(
+                            array(
+                                'sExtends'=>'csv',
+                                'sButtonText'=>'csv',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                ),
+                            array(
+                                'sExtends'=>'xls',
+                                'sButtonText'=>'XLS',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                ),
+                            array(
+                                'sExtends'=>'pdf',
+                                'sButtonText'=>'PDF',
+                                'mColumns'=>'visible',
+                                'bFooter'=>false,
+                                )
+                            )
+                        )
+                    ) 
+                ),
+
+        ),
+
+        /*
+        |--------------------------------------------------------------------------
+        | DataTable callbacks
+        |--------------------------------------------------------------------------
+        |
+        | jQuery dataTable plugin callbacks. The array will be json_encoded and
+        | passed through to the plugin. See https://datatables.net/usage/callbacks
+        | for more information.
+        | Supported: array
+        |
+        */
+
+        'callbacks' => array(
+            "stateSaveCallback"=>"function (oSettings, oData) {
+                    localStorage.setItem('DataTables_'+window.location.pathname, JSON.stringify(oData));
+                }",
+            "stateLoadCallback"=>"function (oSettings) {
+                    return JSON.parse(localStorage.getItem('DataTables_'+window.location.pathname));
+                }",
+        ),
+
+        /*
+        |--------------------------------------------------------------------------
+        | Skip javascript in table template
+        |--------------------------------------------------------------------------
+        |
+        | Determines if the template should echo the javascript
+        | Supported: boolean
+        |
+        */
+
+        'noScript' => false,
+
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table view
+        |--------------------------------------------------------------------------
+        |
+        | Template used to render the table
+        | Supported: string
+        |
+        */
+
+        'table_view' => 'datatable::template',
+
+
+        /*
+        |--------------------------------------------------------------------------
+        | Script view
+        |--------------------------------------------------------------------------
+        |
+        | Template used to render the javascript
+        | Supported: string
+        |
+        */
+
+        'script_view' => 'datatable::javascript',
+
+
+    ),
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Engine specific configuration options.
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'engine' => array(
+
+        /*
+        |--------------------------------------------------------------------------
+        | Search for exact words
+        |--------------------------------------------------------------------------
+        |
+        | If the search should be done with exact matching
+        | Supported: boolean
+        |
+        */
+
+        'exactWordSearch' => false,
+        
+        /*
+        |--------------------------------------------------------------------------
+        | Enable to display all records.  
+        |--------------------------------------------------------------------------
+        |
+        | Be careful! It may be overloaded with large record.
+        | Supported: boolean
+        |
+        */
+        'enableDisplayAll' => false,
+        /*
+        |--------------------------------------------------------------------------
+        | Limit display when iDisplayLength invaild
+        |--------------------------------------------------------------------------
+        */
+        'defaultDisplayLength' => 10,
+    )
+
+
+);
@@ -0,0 +1,31 @@
+<?php
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Trusted Proxies
+    |--------------------------------------------------------------------------
+    |
+    | Set an array of trusted proxies, so Laravel knows to grab the client's
+    | information via the X-Forwarded-* headers.
+    |
+    | To trust all proxies, use the value '*':
+    |
+    | 'proxies' => '*'
+    |
+    |
+    | To trust only specific proxies (recommended), set an array of those
+    | proxies' IP addresses:
+    |
+    | 'proxies' => array('192.168.1.1', '192.168.1.2')
+    |
+    |
+    | Or use CIDR notation:
+    |
+    | 'proxies' => array('192.168.12.0/23')
+    |
+    */
+
+    'proxies' => '*',
+
+);
@@ -0,0 +1,122 @@
+<?php
+
+return [
+
+  /*
+  |-------------------------------------------------------------
+  | Incoming webhook endpoint
+  |-------------------------------------------------------------
+  |
+  | The endpoint which Slack generates when creating a
+  | new incoming webhook. It will look something like
+  | https://hooks.slack.com/services/XXXXXXXX/XXXXXXXX/XXXXXXXXXXXXXX
+  |
+  */
+
+  'endpoint' => '',
+
+  /*
+  |-------------------------------------------------------------
+  | Default channel
+  |-------------------------------------------------------------
+  |
+  | The default channel we should post to. The channel can either be a
+  | channel like #general, a private #group, or a @username. Set to
+  | null to use the default set on the Slack webhook
+  |
+  */
+
+  'channel' => '#general',
+
+  /*
+  |-------------------------------------------------------------
+  | Default username
+  |-------------------------------------------------------------
+  |
+  | The default username we should post as. Set to null to use
+  | the default set on the Slack webhook
+  |
+  */
+
+  'username' => 'Snipe-IT Bot',
+
+  /*
+  |-------------------------------------------------------------
+  | Default icon
+  |-------------------------------------------------------------
+  |
+  | The default icon to use. This can either be a URL to an image or Slack
+  | emoji like :ghost: or :heart_eyes:. Set to null to use the default
+  | set on the Slack webhook
+  |
+  */
+
+  'icon' => null,
+
+  /*
+  |-------------------------------------------------------------
+  | Link names
+  |-------------------------------------------------------------
+  |
+  | Whether names like @regan should be converted into links
+  | by Slack
+  |
+  */
+
+  'link_names' => false,
+
+  /*
+  |-------------------------------------------------------------
+  | Unfurl links
+  |-------------------------------------------------------------
+  |
+  | Whether Slack should unfurl links to text-based content
+  |
+  */
+
+  'unfurl_links' => false,
+
+  /*
+  |-------------------------------------------------------------
+  | Unfurl media
+  |-------------------------------------------------------------
+  |
+  | Whether Slack should unfurl links to media content such
+  | as images and YouTube videos
+  |
+  */
+
+  'unfurl_media' => true,
+
+  /*
+  |-------------------------------------------------------------
+  | Markdown in message text
+  |-------------------------------------------------------------
+  |
+  | Whether message text should be interpreted in Slack's Markdown-like
+  | language. For formatting options, see Slack's help article: http://goo.gl/r4fsdO
+  |
+  */
+
+  'allow_markdown' => true,
+
+  /*
+  |-------------------------------------------------------------
+  | Markdown in attachments
+  |-------------------------------------------------------------
+  |
+  | Which attachment fields should be interpreted in Slack's Markdown-like
+  | language. By default, Slack assumes that no fields in an attachment
+  | should be formatted as Markdown. 
+  |
+  */
+
+  'markdown_in_attachments' => [],
+
+  // Allow Markdown in just the text and title fields
+  // 'markdown_in_attachments' => ['text', 'title']
+
+  // Allow Markdown in all fields
+  // 'markdown_in_attachments' => ['pretext', 'text', 'title', 'fields', 'fallback']
+
+];
@@ -0,0 +1,15 @@
+<?php
+return array(
+	'path' => storage_path() . '/dumps/',
+
+	'mysql' => array(
+		'dump_command_path' => '',
+		'restore_command_path' => '',
+	),
+
+	's3' => array(
+		'path' => ''
+	),
+
+    'compress' => false,
+);
@@ -2,18 +2,26 @@

 return array(

-	'Global' => array(
-		array(
-			'permission' => 'superuser',
-			'label'      => 'Super User',
-		),
-	),
+    'Global' => array(
+        array(
+            'permission' => 'superuser',
+            'label'      => 'Super User',
+        ),
+    ),
+
+    'Admin' => array(
+        array(
+            'permission' => 'admin',
+            'label'      => 'Admin Rights',
+        ),
+    ),
+
+    'Reporting' => array(
+        array(
+            'permission' => 'reports',
+            'label'      => 'View Reports',
+        ),
+    ),

-	'Admin' => array(
-		array(
-			'permission' => 'admin',
-			'label'      => 'Admin Rights',
-		),
-	),

 );
@@ -2,44 +2,44 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */

-	'debug' => false,
+    'debug' => false,

-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */

-	'url' => 'http://www.yourserver.com',
+    'url' => 'https://production.yourserver.com',

-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	| Run a php artisand key:generate --env=staging to create a random one
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate --env=staging to create a random one
+    */

-	'key' => 'Change_this_key_or_snipe_will_get_ya',
+    'key' => 'Change_this_key_or_snipe_will_get_ya',

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */

-	'fetch' => PDO::FETCH_CLASS,
+    'fetch' => PDO::FETCH_CLASS,

-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */

-	'default' => 'mysql',
+    'default' => 'mysql',

-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */

-	'connections' => array(
+    'connections' => array(

-		'sqlite' => array(
-			'driver'   => 'sqlite',
-			'database' => __DIR__.'/../database/production.sqlite',
-			'prefix'   => '',
-		),
+        'sqlite' => array(
+            'driver'   => 'sqlite',
+            'database' => __DIR__.'/../database/production.sqlite',
+            'prefix'   => '',
+        ),

-		'mysql' => array(
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'snipeit_laravel',
-			'username'  => 'travis',
-			'password'  => '',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		),
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),

-		'pgsql' => array(
-			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
-		),
+        'pgsql' => array(
+            'driver'   => 'pgsql',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'charset'  => 'utf8',
+            'prefix'   => '',
+            'schema'   => 'public',
+        ),

-		'sqlsrv' => array(
-			'driver'   => 'sqlsrv',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'prefix'   => '',
-		),
+        'sqlsrv' => array(
+            'driver'   => 'sqlsrv',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'prefix'   => '',
+        ),

-	),
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk have not actually be run in the databases.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */

-	'migrations' => 'migrations',
+    'migrations' => 'migrations',

-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */

-	'redis' => array(
+    'redis' => array(

-		'cluster' => true,
+        'cluster' => true,

-		'default' => array(
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
-			'database' => 0,
-		),
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),

-	),
+    ),

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */

-	'driver' => 'smtp',
+    'driver' => 'smtp',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */

-	'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to delivery e-mails to
-	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */

-	'port' => 587,
+    'port' => 587,

-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */

-	'from' => array('address' => null, 'name' => null),
+    'from' => array('address' => null, 'name' => null),

-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */

-	'encryption' => 'tls',
+    'encryption' => 'tls',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */

-	'username' => null,
+    'username' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */

-	'password' => null,
+    'password' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Sendmail System Path
-	|--------------------------------------------------------------------------
-	|
-	| When using the "sendmail" driver to send e-mails, we will need to know
-	| the path to where Sendmail lives on this server. A default path has
-	| been provided here, which will work well on most of your systems.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */

-	'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs',

-	/*
-	|--------------------------------------------------------------------------
-	| Mail "Pretend"
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, e-mail will not actually be sent over the
-	| web and will instead be written to your application's logs files so
-	| you may inspect the message. This is great for local development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */

-	'pretend' => false,
+    'pretend' => false,

-);
+);
@@ -0,0 +1,154 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => false,
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Allow multiple logins from different devices at the same time
+    |--------------------------------------------------------------------------
+    |
+    | By default, if a user logs into an account where someone is already
+    | logged in, the previous user will be logged out. We recommend leaving
+    | this set to false for security reasons.
+    |
+    */
+
+    'multi_login' => false,
+
+);
@@ -2,63 +2,63 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Queue Driver
-	|--------------------------------------------------------------------------
-	|
-	| The Laravel queue API supports a variety of back-ends via an unified
-	| API, giving you convenient access to each back-end using the same
-	| syntax for each one. Here you may set the default queue driver.
-	|
-	| Supported: "sync", "beanstalkd", "sqs", "iron"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Queue Driver
+    |--------------------------------------------------------------------------
+    |
+    | The Laravel queue API supports a variety of back-ends via an unified
+    | API, giving you convenient access to each back-end using the same
+    | syntax for each one. Here you may set the default queue driver.
+    |
+    | Supported: "sync", "beanstalkd", "sqs", "iron"
+    |
+    */

-	'default' => 'sync',
+    'default' => 'sync',

-	/*
-	|--------------------------------------------------------------------------
-	| Queue Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here you may configure the connection information for each server that
-	| is used by your application. A default configuration has been added
-	| for each back-end shipped with Laravel. You are free to add more.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the connection information for each server that
+    | is used by your application. A default configuration has been added
+    | for each back-end shipped with Laravel. You are free to add more.
+    |
+    */

-	'connections' => array(
+    'connections' => array(

-		'sync' => array(
-			'driver' => 'sync',
-		),
+        'sync' => array(
+            'driver' => 'sync',
+        ),

-		'beanstalkd' => array(
-			'driver' => 'beanstalkd',
-			'host'   => 'localhost',
-			'queue'  => 'default',
-		),
+        'beanstalkd' => array(
+            'driver' => 'beanstalkd',
+            'host'   => 'localhost',
+            'queue'  => 'default',
+        ),

-		'sqs' => array(
-			'driver' => 'sqs',
-			'key'    => 'your-public-key',
-			'secret' => 'your-secret-key',
-			'queue'  => 'your-queue-url',
-			'region' => 'us-east-1',
-		),
+        'sqs' => array(
+            'driver' => 'sqs',
+            'key'    => 'your-public-key',
+            'secret' => 'your-secret-key',
+            'queue'  => 'your-queue-url',
+            'region' => 'us-east-1',
+        ),

-		'iron' => array(
-			'driver'  => 'iron',
-			'project' => 'your-project-id',
-			'token'   => 'your-token',
-			'queue'   => 'your-queue-name',
-		),
+        'iron' => array(
+            'driver'  => 'iron',
+            'project' => 'your-project-id',
+            'token'   => 'your-token',
+            'queue'   => 'your-queue-name',
+        ),

-		'failed' => array(
-    		'database' => 'mysql', 'table' => 'failed_jobs',
-		),
+        'failed' => array(
+            'database' => 'mysql', 'table' => 'failed_jobs',
+        ),

-	),
+    ),

 );
@@ -2,58 +2,58 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Remote Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the default connection that will be used for SSH
-	| operations. This name should correspond to a connection name below
-	| in the server list. Each connection will be manually accessible.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Remote Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default connection that will be used for SSH
+    | operations. This name should correspond to a connection name below
+    | in the server list. Each connection will be manually accessible.
+    |
+    */

-	'default' => 'production',
+    'default' => 'production',

-	/*
-	|--------------------------------------------------------------------------
-	| Remote Server Connections
-	|--------------------------------------------------------------------------
-	|
-	| These are the servers that will be accessible via the SSH task runner
-	| facilities of Laravel. This feature radically simplifies executing
-	| tasks on your servers, such as deploying out these applications.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Remote Server Connections
+    |--------------------------------------------------------------------------
+    |
+    | These are the servers that will be accessible via the SSH task runner
+    | facilities of Laravel. This feature radically simplifies executing
+    | tasks on your servers, such as deploying out these applications.
+    |
+    */

-	'connections' => array(
+    'connections' => array(

-		'production' => array(
-			'host'      => '',
-			'username'  => '',
-			'password'  => '',
-			'key'       => '',
-			'keyphrase' => '',
-			'root'      => '/var/www',
-		),
+        'production' => array(
+            'host'      => '',
+            'username'  => '',
+            'password'  => '',
+            'key'       => '',
+            'keyphrase' => '',
+            'root'      => '/var/www',
+        ),

-	),
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Remote Server Groups
-	|--------------------------------------------------------------------------
-	|
-	| Here you may list connections under a single group name, which allows
-	| you to easily access all of the servers at once using a short name
-	| that is extremely easy to remember, such as "web" or "database".
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Remote Server Groups
+    |--------------------------------------------------------------------------
+    |
+    | Here you may list connections under a single group name, which allows
+    | you to easily access all of the servers at once using a short name
+    | that is extremely easy to remember, such as "web" or "database".
+    |
+    */

-	'groups' => array(
+    'groups' => array(

-		'web' => array('production')
+        'web' => array('production')

-	),
+    ),

-);
+);
@@ -2,126 +2,126 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Session Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default session "driver" that will be used on
-	| requests. By default, we will use the lightweight native driver but
-	| you may specify any of the other wonderful drivers provided here.
-	|
-	| Supported: "native", "cookie", "database", "apc",
-	|            "memcached", "redis", "array"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "native", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */

-	'driver' => 'native',
+    'driver' => 'native',

-	/*
-	|--------------------------------------------------------------------------
-	| Session Lifetime
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the number of minutes that you wish the session
-	| to be allowed to remain idle for it is expired. If you want them
-	| to immediately expire when the browser closes, set it to zero.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle for it is expired. If you want them
+    | to immediately expire when the browser closes, set it to zero.
+    |
+    */

-	'lifetime' => 120,
+    'lifetime' => 120,

-	/*
-	|--------------------------------------------------------------------------
-	| Session File Location
-	|--------------------------------------------------------------------------
-	|
-	| When using the native session driver, we need a location where session
-	| files may be stored. A default has been set for you but a different
-	| location may be specified. This is only needed for file sessions.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */

-	'files' => storage_path().'/sessions',
+    'files' => storage_path().'/sessions',

-	/*
-	|--------------------------------------------------------------------------
-	| Session Database Connection
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" session driver, you may specify the database
-	| connection that should be used to manage your sessions. This should
-	| correspond to a connection in your "database" configuration file.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the database
+    | connection that should be used to manage your sessions. This should
+    | correspond to a connection in your "database" configuration file.
+    |
+    */

-	'connection' => null,
+    'connection' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Session Database Table
-	|--------------------------------------------------------------------------
-	|
-	| When using the "database" session driver, you may specify the table we
-	| should use to manage the sessions. Of course, a sensible default is
-	| provided for you; however, you are free to change this as needed.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */

-	'table' => 'sessions',
+    'table' => 'sessions',

-	/*
-	|--------------------------------------------------------------------------
-	| Session Sweeping Lottery
-	|--------------------------------------------------------------------------
-	|
-	| Some session drivers must manually sweep their storage location to get
-	| rid of old sessions from storage. Here are the chances that it will
-	| happen on a given request. By default, the odds are 2 out of 100.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */

-	'lottery' => array(2, 100),
+    'lottery' => array(2, 100),

-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may change the name of the cookie used to identify a session
-	| instance by ID. The name specified here will get used every time a
-	| new session cookie is created by the framework for every driver.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */

-	'cookie' => 'laravel_session',
+    'cookie' => 'laravel_session',

-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Path
-	|--------------------------------------------------------------------------
-	|
-	| The session cookie path determines the path for which the cookie will
-	| be regarded as available. Typically, this will be the root path of
-	| your application but you are free to change this when necessary.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */

-	'path' => '/',
+    'path' => '/',

-	/*
-	|--------------------------------------------------------------------------
-	| Session Cookie Domain
-	|--------------------------------------------------------------------------
-	|
-	| Here you may change the domain of the cookie used to identify a session
-	| in your application. This will determine which domains the cookie is
-	| available to in your application. A sensible default has been set.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */

-	'domain' => null,
+    'domain' => null,

-	'expire_on_close' => false,
+    'expire_on_close' => false,

 );
@@ -2,44 +2,44 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */

-	'debug' => true,
+    'debug' => true,

-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */

-	'url' => 'http://staging.yourserver.com',
+    'url' => 'http://staging.yourserver.com',

-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	| Run a php artisand key:generate --env=staging to create a random one
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate --env=staging to create a random one
+    */

-	'key' => 'Change_this_key_or_snipe_will_get_ya',
+    'key' => 'Change_this_key_or_snipe_will_get_ya',

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */

-	'fetch' => PDO::FETCH_CLASS,
+    'fetch' => PDO::FETCH_CLASS,

-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */

-	'default' => 'mysql',
+    'default' => 'mysql',

-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */

-	'connections' => array(
+    'connections' => array(

-		'sqlite' => array(
-			'driver'   => 'sqlite',
-			'database' => __DIR__.'/../database/production.sqlite',
-			'prefix'   => '',
-		),
+        'sqlite' => array(
+            'driver'   => 'sqlite',
+            'database' => __DIR__.'/../database/production.sqlite',
+            'prefix'   => '',
+        ),

-		'mysql' => array(
-			'driver'    => 'mysql',
-			'host'      => 'localhost',
-			'database'  => 'snipeit_laravel',
-			'username'  => 'snipeit_laravel',
-			'password'  => '',
-			'charset'   => 'utf8',
-			'collation' => 'utf8_unicode_ci',
-			'prefix'    => '',
-		),
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'snipeit_laravel',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),

-		'pgsql' => array(
-			'driver'   => 'pgsql',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'charset'  => 'utf8',
-			'prefix'   => '',
-			'schema'   => 'public',
-		),
+        'pgsql' => array(
+            'driver'   => 'pgsql',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'charset'  => 'utf8',
+            'prefix'   => '',
+            'schema'   => 'public',
+        ),

-		'sqlsrv' => array(
-			'driver'   => 'sqlsrv',
-			'host'     => 'localhost',
-			'database' => 'database',
-			'username' => 'root',
-			'password' => '',
-			'prefix'   => '',
-		),
+        'sqlsrv' => array(
+            'driver'   => 'sqlsrv',
+            'host'     => 'localhost',
+            'database' => 'database',
+            'username' => 'root',
+            'password' => '',
+            'prefix'   => '',
+        ),

-	),
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk have not actually be run in the databases.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */

-	'migrations' => 'migrations',
+    'migrations' => 'migrations',

-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */

-	'redis' => array(
+    'redis' => array(

-		'cluster' => true,
+        'cluster' => true,

-		'default' => array(
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
-			'database' => 0,
-		),
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),

-	),
+    ),

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */

-	'driver' => 'smtp',
+    'driver' => 'smtp',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */

-	'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to delivery e-mails to
-	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */

-	'port' => 587,
+    'port' => 587,

-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */

-	'from' => array('address' => null, 'name' => null),
+    'from' => array('address' => null, 'name' => null),

-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */

-	'encryption' => 'tls',
+    'encryption' => 'tls',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */

-	'username' => null,
+    'username' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */

-	'password' => null,
+    'password' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Sendmail System Path
-	|--------------------------------------------------------------------------
-	|
-	| When using the "sendmail" driver to send e-mails, we will need to know
-	| the path to where Sendmail lives on this server. A default path has
-	| been provided here, which will work well on most of your systems.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */

-	'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs',

-	/*
-	|--------------------------------------------------------------------------
-	| Mail "Pretend"
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, e-mail will not actually be sent over the
-	| web and will instead be written to your application's logs files so
-	| you may inspect the message. This is great for local development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */

-	'pretend' => false,
+    'pretend' => false,

-);
+);
@@ -0,0 +1,154 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "file", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */
+
+    'driver' => 'file',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Lifetime
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the number of minutes that you wish the session
+    | to be allowed to remain idle before it expires. If you want them
+    | to immediately expire on the browser closing, set that option.
+    |
+    */
+
+    'lifetime' => 12000,
+
+    'expire_on_close' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session File Location
+    |--------------------------------------------------------------------------
+    |
+    | When using the native session driver, we need a location where session
+    | files may be stored. A default has been set for you but a different
+    | location may be specified. This is only needed for file sessions.
+    |
+    */
+
+    'files' => storage_path().'/sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Connection
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" or "redis" session drivers, you may specify a
+    | connection that should be used to manage these sessions. This should
+    | correspond to a connection in your database configuration options.
+    |
+    */
+
+    'connection' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Database Table
+    |--------------------------------------------------------------------------
+    |
+    | When using the "database" session driver, you may specify the table we
+    | should use to manage the sessions. Of course, a sensible default is
+    | provided for you; however, you are free to change this as needed.
+    |
+    */
+
+    'table' => 'sessions',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Sweeping Lottery
+    |--------------------------------------------------------------------------
+    |
+    | Some session drivers must manually sweep their storage location to get
+    | rid of old sessions from storage. Here are the chances that it will
+    | happen on a given request. By default, the odds are 2 out of 100.
+    |
+    */
+
+    'lottery' => array(2, 100),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the name of the cookie used to identify a session
+    | instance by ID. The name specified here will get used every time a
+    | new session cookie is created by the framework for every driver.
+    |
+    */
+
+    'cookie' => 'snipeit_session',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Path
+    |--------------------------------------------------------------------------
+    |
+    | The session cookie path determines the path for which the cookie will
+    | be regarded as available. Typically, this will be the root path of
+    | your application but you are free to change this when necessary.
+    |
+    */
+
+    'path' => '/',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cookie Domain
+    |--------------------------------------------------------------------------
+    |
+    | Here you may change the domain of the cookie used to identify a session
+    | in your application. This will determine which domains the cookie is
+    | available to in your application. A sensible default has been set.
+    |
+    */
+
+    'domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | HTTPS Only Cookies
+    |--------------------------------------------------------------------------
+    |
+    | By setting this option to true, session cookies will only be sent back
+    | to the server if the browser has a HTTPS connection. This will keep
+    | the cookie from being sent to you if it can not be done securely.
+    |
+    */
+
+    'secure' => true,
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Allow multiple logins from different devices at the same time
+    |--------------------------------------------------------------------------
+    |
+    | By default, if a user logs into an account where someone is already
+    | logged in, the previous user will be logged out. We recommend leaving
+    | this set to false for security reasons.
+    |
+    */
+
+    'multi_login' => true,
+
+);
@@ -2,44 +2,44 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Application Debug Mode
-	|--------------------------------------------------------------------------
-	|
-	| When your application is in debug mode, detailed error messages with
-	| stack traces will be shown on every error that occurs within your
-	| application. If disabled, a simple generic error page is shown.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */

-	'debug' => true,
+    'debug' => true,

-	/*
-	|--------------------------------------------------------------------------
-	| Application URL
-	|--------------------------------------------------------------------------
-	|
-	| This URL is used by the console to properly generate URLs when using
-	| the Artisan command line tool. You should set this to the root of
-	| your application so that it is used when running Artisan tasks.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */

-	'url' => 'http://staging.yourserver.com',
+    'url' => 'http://staging.yourserver.com',

-	/*
-	|--------------------------------------------------------------------------
-	| Encryption Key
-	|--------------------------------------------------------------------------
-	|
-	| This key is used by the Illuminate encrypter service and should be set
-	| to a random, 32 character string, otherwise these encrypted strings
-	| will not be safe. Please do this before deploying an application!
-	|
-	| Run a php artisand key:generate --env=staging to create a random one
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is used by the Illuminate encrypter service and should be set
+    | to a random, 32 character string, otherwise these encrypted strings
+    | will not be safe. Please do this before deploying an application!
+    |
+    | Run a php artisan key:generate --env=staging to create a random one
+    */

-	'key' => 'Change_this_key_or_snipe_will_get_ya',
+    'key' => 'Change_this_key_or_snipe_will_get_ya',

 );
@@ -2,19 +2,19 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Cache Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default cache "driver" that will be used when
-	| using the Caching library. Of course, you may use other drivers any
-	| time you wish. This is the default when another is not specified.
-	|
-	| Supported: "file", "database", "apc", "memcached", "redis", "array"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Cache Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default cache "driver" that will be used when
+    | using the Caching library. Of course, you may use other drivers any
+    | time you wish. This is the default when another is not specified.
+    |
+    | Supported: "file", "database", "apc", "memcached", "redis", "array"
+    |
+    */

-	'driver' => 'array',
+    'driver' => 'array',

-);
+);
@@ -2,90 +2,102 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| PDO Fetch Style
-	|--------------------------------------------------------------------------
-	|
-	| By default, database results will be returned as instances of the PHP
-	| stdClass object; however, you may desire to retrieve records in an
-	| array format for simplicity. Here you can tweak the fetch style.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | PDO Fetch Style
+    |--------------------------------------------------------------------------
+    |
+    | By default, database results will be returned as instances of the PHP
+    | stdClass object; however, you may desire to retrieve records in an
+    | array format for simplicity. Here you can tweak the fetch style.
+    |
+    */

-	'fetch' => PDO::FETCH_CLASS,
+    'fetch' => PDO::FETCH_CLASS,

-	/*
-	|--------------------------------------------------------------------------
-	| Default Database Connection Name
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify which of the database connections below you wish
-	| to use as your default connection for all database work. Of course
-	| you may use many connections at once using the Database library.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */

-	'default' => 'sqlite',
+    'default' => 'mysql',

-	/*
-	|--------------------------------------------------------------------------
-	| Database Connections
-	|--------------------------------------------------------------------------
-	|
-	| Here are each of the database connections setup for your application.
-	| Of course, examples of configuring each database platform that is
-	| supported by Laravel is shown below to make development simple.
-	|
-	|
-	| All database work in Laravel is done through the PHP PDO facilities
-	| so make sure you have the driver for your particular database of
-	| choice installed on your machine before you begin development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */

-	'connections' => array(
+    'connections' => array(
        'sqlite' => array(
            'driver'   => 'sqlite',
            'database' => ':memory:',
            'prefix'   => ''
        ),
-	),

-	/*
-	|--------------------------------------------------------------------------
-	| Migration Repository Table
-	|--------------------------------------------------------------------------
-	|
-	| This table keeps track of all the migrations that have already run for
-	| your application. Using this information, we can determine which of
-	| the migrations on disk have not actually be run in the databases.
-	|
-	*/
+        'mysql' => array(
+            'driver'    => 'mysql',
+            'host'      => 'localhost',
+            'database'  => 'snipeit_laravel',
+            'username'  => 'travis',
+            'password'  => '',
+            'charset'   => 'utf8',
+            'collation' => 'utf8_unicode_ci',
+            'prefix'    => '',
+        ),

-	'migrations' => 'migrations',
+    ),

-	/*
-	|--------------------------------------------------------------------------
-	| Redis Databases
-	|--------------------------------------------------------------------------
-	|
-	| Redis is an open source, fast, and advanced key-value store that also
-	| provides a richer set of commands than a typical key-value systems
-	| such as APC or Memcached. Laravel makes it easy to dig right in.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk have not actually be run in the databases.
+    |
+    */

-	'redis' => array(
+    'migrations' => 'migrations',

-		'cluster' => true,
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */

-		'default' => array(
-			'host'     => '127.0.0.1',
-			'port'     => 6379,
-			'database' => 0,
-		),
+    'redis' => array(

-	),
+        'cluster' => true,
+
+        'default' => array(
+            'host'     => '127.0.0.1',
+            'port'     => 6379,
+            'database' => 0,
+        ),
+
+    ),

 );
@@ -2,123 +2,123 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Mail Driver
-	|--------------------------------------------------------------------------
-	|
-	| Laravel supports both SMTP and PHP's "mail" function as drivers for the
-	| sending of e-mail. You may specify which one you're using throughout
-	| your application here. By default, Laravel is setup for SMTP mail.
-	|
-	| Supported: "smtp", "mail", "sendmail"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail Driver
+    |--------------------------------------------------------------------------
+    |
+    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | sending of e-mail. You may specify which one you're using throughout
+    | your application here. By default, Laravel is setup for SMTP mail.
+    |
+    | Supported: "smtp", "mail", "sendmail"
+    |
+    */

-	'driver' => 'smtp',
+    'driver' => 'smtp',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Address
-	|--------------------------------------------------------------------------
-	|
-	| Here you may provide the host address of the SMTP server used by your
-	| applications. A default option is provided that is compatible with
-	| the Postmark mail service, which will provide reliable delivery.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Address
+    |--------------------------------------------------------------------------
+    |
+    | Here you may provide the host address of the SMTP server used by your
+    | applications. A default option is provided that is compatible with
+    | the Postmark mail service, which will provide reliable delivery.
+    |
+    */

-	'host' => 'smtp.mailgun.org',
+    'host' => 'smtp.mandrillapp.com',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Host Port
-	|--------------------------------------------------------------------------
-	|
-	| This is the SMTP port used by your application to delivery e-mails to
-	| users of your application. Like the host we have set this value to
-	| stay compatible with the Postmark e-mail application by default.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Host Port
+    |--------------------------------------------------------------------------
+    |
+    | This is the SMTP port used by your application to delivery e-mails to
+    | users of your application. Like the host we have set this value to
+    | stay compatible with the Postmark e-mail application by default.
+    |
+    */

-	'port' => 587,
+    'port' => 587,

-	/*
-	|--------------------------------------------------------------------------
-	| Global "From" Address
-	|--------------------------------------------------------------------------
-	|
-	| You may wish for all e-mails sent by your application to be sent from
-	| the same address. Here, you may specify a name and address that is
-	| used globally for all e-mails that are sent by your application.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Global "From" Address
+    |--------------------------------------------------------------------------
+    |
+    | You may wish for all e-mails sent by your application to be sent from
+    | the same address. Here, you may specify a name and address that is
+    | used globally for all e-mails that are sent by your application.
+    |
+    */

-	'from' => array('address' => null, 'name' => null),
+    'from' => array('address' => null, 'name' => null),

-	/*
-	|--------------------------------------------------------------------------
-	| E-Mail Encryption Protocol
-	|--------------------------------------------------------------------------
-	|
-	| Here you may specify the encryption protocol that should be used when
-	| the application send e-mail messages. A sensible default using the
-	| transport layer security protocol should provide great security.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | E-Mail Encryption Protocol
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the encryption protocol that should be used when
+    | the application send e-mail messages. A sensible default using the
+    | transport layer security protocol should provide great security.
+    |
+    */

-	'encryption' => 'tls',
+    'encryption' => 'tls',

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Username
-	|--------------------------------------------------------------------------
-	|
-	| If your SMTP server requires a username for authentication, you should
-	| set it here. This will get used to authenticate with your server on
-	| connection. You may also set the "password" value below this one.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Username
+    |--------------------------------------------------------------------------
+    |
+    | If your SMTP server requires a username for authentication, you should
+    | set it here. This will get used to authenticate with your server on
+    | connection. You may also set the "password" value below this one.
+    |
+    */

-	'username' => null,
+    'username' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| SMTP Server Password
-	|--------------------------------------------------------------------------
-	|
-	| Here you may set the password required by your SMTP server to send out
-	| messages from your application. This will be given to the server on
-	| connection so that the application will be able to send messages.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | SMTP Server Password
+    |--------------------------------------------------------------------------
+    |
+    | Here you may set the password required by your SMTP server to send out
+    | messages from your application. This will be given to the server on
+    | connection so that the application will be able to send messages.
+    |
+    */

-	'password' => null,
+    'password' => null,

-	/*
-	|--------------------------------------------------------------------------
-	| Sendmail System Path
-	|--------------------------------------------------------------------------
-	|
-	| When using the "sendmail" driver to send e-mails, we will need to know
-	| the path to where Sendmail lives on this server. A default path has
-	| been provided here, which will work well on most of your systems.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Sendmail System Path
+    |--------------------------------------------------------------------------
+    |
+    | When using the "sendmail" driver to send e-mails, we will need to know
+    | the path to where Sendmail lives on this server. A default path has
+    | been provided here, which will work well on most of your systems.
+    |
+    */

-	'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs',

-	/*
-	|--------------------------------------------------------------------------
-	| Mail "Pretend"
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, e-mail will not actually be sent over the
-	| web and will instead be written to your application's logs files so
-	| you may inspect the message. This is great for local development.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Mail "Pretend"
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, e-mail will not actually be sent over the
+    | web and will instead be written to your application's logs files so
+    | you may inspect the message. This is great for local development.
+    |
+    */

-	'pretend' => false,
+    'pretend' => true,

-);
+);
@@ -2,20 +2,20 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Default Session Driver
-	|--------------------------------------------------------------------------
-	|
-	| This option controls the default session "driver" that will be used on
-	| requests. By default, we will use the lightweight native driver but
-	| you may specify any of the other wonderful drivers provided here.
-	|
-	| Supported: "native", "cookie", "database", "apc",
-	|            "memcached", "redis", "array"
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Session Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default session "driver" that will be used on
+    | requests. By default, we will use the lightweight native driver but
+    | you may specify any of the other wonderful drivers provided here.
+    |
+    | Supported: "native", "cookie", "database", "apc",
+    |            "memcached", "redis", "array"
+    |
+    */

-	'driver' => 'array',
+    'driver' => 'array',

-);
+);
@@ -0,0 +1,5 @@
+<?php
+return array (
+  'app_version' => 'v2.0-beta',
+  'hash_version' => 'v2.0-beta-4-g7e5f32c',
+);
@@ -2,30 +2,30 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| View Storage Paths
-	|--------------------------------------------------------------------------
-	|
-	| Most templating systems load templates from disk. Here you may specify
-	| an array of paths that should be checked for your views. Of course
-	| the usual Laravel view path has already been registered for you.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | View Storage Paths
+    |--------------------------------------------------------------------------
+    |
+    | Most templating systems load templates from disk. Here you may specify
+    | an array of paths that should be checked for your views. Of course
+    | the usual Laravel view path has already been registered for you.
+    |
+    */

-	'paths' => array(__DIR__.'/../views'),
+    'paths' => array(__DIR__.'/../views'),

-	/*
-	|--------------------------------------------------------------------------
-	| Pagination View
-	|--------------------------------------------------------------------------
-	|
-	| This view will be used to render the pagination link output, and can
-	| be easily customized here to show any view you like. A clean view
-	| compatible with Twitter's Bootstrap is given to you by default.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination View
+    |--------------------------------------------------------------------------
+    |
+    | This view will be used to render the pagination link output, and can
+    | be easily customized here to show any view you like. A clean view
+    | compatible with Twitter's Bootstrap is given to you by default.
+    |
+    */

-	'pagination' => 'paginator/slider',
+    'pagination' => 'paginator/slider',

 );
@@ -2,30 +2,30 @@

 return array(

-	/*
-	|--------------------------------------------------------------------------
-	| Workbench Author Name
-	|--------------------------------------------------------------------------
-	|
-	| When you create new packages via the Artisan "workbench" command your
-	| name is needed to generate the composer.json file for your package.
-	| You may specify it now so it is used for all of your workbenches.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Workbench Author Name
+    |--------------------------------------------------------------------------
+    |
+    | When you create new packages via the Artisan "workbench" command your
+    | name is needed to generate the composer.json file for your package.
+    | You may specify it now so it is used for all of your workbenches.
+    |
+    */

-	'name' => '',
+    'name' => '',

-	/*
-	|--------------------------------------------------------------------------
-	| Workbench Author E-Mail Address
-	|--------------------------------------------------------------------------
-	|
-	| Like the option above, your e-mail address is used when generating new
-	| workbench packages. The e-mail is placed in your composer.json file
-	| automatically after the package is created by the workbench tool.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Workbench Author E-Mail Address
+    |--------------------------------------------------------------------------
+    |
+    | Like the option above, your e-mail address is used when generating new
+    | workbench packages. The e-mail is placed in your composer.json file
+    | automatically after the package is created by the workbench tool.
+    |
+    */

-	'email' => '',
+    'email' => '',

 );
@@ -1,88 +1,85 @@
 <?php

-class AdminController extends AuthorizedController {
+class AdminController extends AuthorizedController
+{
+    /**
+     * Initializer.
+     *
+     * @return void
+     */

-	/**
-	 * Initializer.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		// Apply the admin auth filter
-		$this->beforeFilter('admin-auth');
-	}
+    public function __construct()
+    {
+    	// These have been moved into the routes for more granular control
+        // Apply the admin auth filter
+        //$this->beforeFilter('admin-auth', array('except' => $this->whitelist));
+
+    }



-	/**
-	 * Encodes the permissions so that they are form friendly.
-	 *
-	 * @param  array  $permissions
-	 * @param  bool   $removeSuperUser
-	 * @return void
-	 */
-	protected function encodeAllPermissions(array &$allPermissions, $removeSuperUser = false)
-	{
-		foreach ($allPermissions as $area => &$permissions)
-		{
-			foreach ($permissions as $index => &$permission)
-			{
-				if ($removeSuperUser == true and $permission['permission'] == 'superuser')
-				{
-					unset($permissions[$index]);
-					continue;
-				}
+    /**
+     * Encodes the permissions so that they are form friendly.
+     *
+     * @param  array  $permissions
+     * @param  bool   $removeSuperUser
+     * @return void
+     */
+    protected function encodeAllPermissions(array &$allPermissions, $removeSuperUser = false)
+    {
+        foreach ($allPermissions as $area => &$permissions) {
+            foreach ($permissions as $index => &$permission) {
+                if ($removeSuperUser == true and $permission['permission'] == 'superuser') {
+                    unset($permissions[$index]);
+                    continue;
+                }

-				$permission['can_inherit'] = ($permission['permission'] != 'superuser');
-				$permission['permission']  = base64_encode($permission['permission']);
-			}
+                $permission['can_inherit'] = ($permission['permission'] != 'superuser');
+                $permission['permission']  = base64_encode($permission['permission']);
+            }

-			// If we removed a super user permission and there are
-			// none left, let's remove the group
-			if ($removeSuperUser == true and empty($permissions))
-			{
-				unset($allPermissions[$area]);
-			}
-		}
-	}
+            // If we removed a super user permission and there are
+            // none left, let's remove the group
+            if ($removeSuperUser == true and empty($permissions)) {
+                unset($allPermissions[$area]);
+            }
+        }
+    }

-	/**
-	 * Encodes user permissions to match that of the encoded "all"
-	 * permissions above.
-	 *
-	 * @param  array  $permissions
-	 * @return void
-	 */
-	protected function encodePermissions(array &$permissions)
-	{
-		$encodedPermissions = array();
+    /**
+     * Encodes user permissions to match that of the encoded "all"
+     * permissions above.
+     *
+     * @param  array  $permissions
+     * @return void
+     */
+    protected function encodePermissions(array &$permissions)
+    {
+        $encodedPermissions = array();

-		foreach ($permissions as $permission => $access)
-		{
-			$encodedPermissions[base64_encode($permission)] = $access;
-		}
+        foreach ($permissions as $permission => $access) {
+            $encodedPermissions[base64_encode($permission)] = $access;
+        }

-		$permissions = $encodedPermissions;
-	}
+        $permissions = $encodedPermissions;
+    }

-	/**
-	 * Decodes user permissions to match that of the encoded "all"
-	 * permissions above.
-	 *
-	 * @param  array  $permissions
-	 * @return void
-	 */
-	protected function decodePermissions(array &$permissions)
-	{
-		$decodedPermissions = array();
+    /**
+     * Decodes user permissions to match that of the encoded "all"
+     * permissions above.
+     *
+     * @param  array  $permissions
+     * @return void
+     */
+    protected function decodePermissions(array &$permissions)
+    {
+        $decodedPermissions = array();

-		foreach ($permissions as $permission => $access)
-		{
-			$decodedPermissions[base64_decode($permission)] = $access;
-		}
+        foreach ($permissions as $permission => $access) {
+            $decodedPermissions[base64_decode($permission)] = $access;
+        }

-		$permissions = $decodedPermissions;
-	}
+        $permissions = $decodedPermissions;
+    }

 }
@@ -1,344 +1,235 @@
 <?php

-class AuthController extends BaseController {
+class AuthController extends BaseController
+{
+    /**
+     * Account sign in.
+     *
+     * @return View
+     */
+    public function getSignin()
+    {
+        // Is the user logged in?
+        if (Sentry::check()) {
+            return Redirect::route('account');
+        }

-	/**
-	 * Account sign in.
-	 *
-	 * @return View
-	 */
-	public function getSignin()
-	{
-		// Is the user logged in?
-		if (Sentry::check())
-		{
-			return Redirect::route('account');
-		}
+        // Show the page
+        return View::make('frontend.auth.signin');
+    }

-		// Show the page
-		return View::make('frontend.auth.signin');
-	}
+    /**
+     * Account sign in form processing.
+     *
+     * @return Redirect
+     */
+    public function postSignin()
+    {
+        // Declare the rules for the form validation
+        $rules = array(
+            'username'    => 'required',
+            'password' => 'required',
+        );

-	/**
-	 * Account sign in form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postSignin()
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'email'    => 'required|email',
-			'password' => 'required|between:8,32',
-		);
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        try {
+            // Try to log the user in
+            Sentry::authenticate(Input::only('username', 'password'), Input::get('remember-me', 0));

-		try
-		{
-			// Try to log the user in
-			Sentry::authenticate(Input::only('email', 'password'), Input::get('remember-me', 0));
+            // Get the page we were before
+            $redirect = Session::get('loginRedirect', 'account');

-			// Get the page we were before
-			$redirect = Session::get('loginRedirect', 'account');
+            // Unset the page we were before from the session
+            Session::forget('loginRedirect');

-			// Unset the page we were before from the session
-			Session::forget('loginRedirect');
+            // Redirect to the users page
+            return Redirect::to($redirect)->with('success', Lang::get('auth/message.signin.success'));
+        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
+            $this->messageBag->add('username', Lang::get('auth/message.account_not_found'));
+        } catch (Cartalyst\Sentry\Users\UserNotActivatedException $e) {
+            $this->messageBag->add('username', Lang::get('auth/message.account_not_activated'));
+        } catch (Cartalyst\Sentry\Throttling\UserSuspendedException $e) {
+            $this->messageBag->add('username', Lang::get('auth/message.account_suspended'));
+        } catch (Cartalyst\Sentry\Throttling\UserBannedException $e) {
+            $this->messageBag->add('username', Lang::get('auth/message.account_banned'));
+        }

-			// Redirect to the users page
-			return Redirect::to($redirect)->with('success', Lang::get('auth/message.signin.success'));
-		}
-		catch (Cartalyst\Sentry\Users\UserNotFoundException $e)
-		{
-			$this->messageBag->add('email', Lang::get('auth/message.account_not_found'));
-		}
-		catch (Cartalyst\Sentry\Users\UserNotActivatedException $e)
-		{
-			$this->messageBag->add('email', Lang::get('auth/message.account_not_activated'));
-		}
-		catch (Cartalyst\Sentry\Throttling\UserSuspendedException $e)
-		{
-			$this->messageBag->add('email', Lang::get('auth/message.account_suspended'));
-		}
-		catch (Cartalyst\Sentry\Throttling\UserBannedException $e)
-		{
-			$this->messageBag->add('email', Lang::get('auth/message.account_banned'));
-		}
+        // Ooops.. something went wrong
+        return Redirect::back()->withInput()->withErrors($this->messageBag);
+    }

-		// Ooops.. something went wrong
-		return Redirect::back()->withInput()->withErrors($this->messageBag);
-	}

-	/**
-	 * Account sign up.
-	 *
-	 * @return View
-	 */
-	public function getSignup()
-	{
-		// Is the user logged in?
-		if (Sentry::check())
-		{
-			return Redirect::route('account');
-		}
+    /**
+     * User account activation page.
+     *
+     * @param  string  $actvationCode
+     * @return
+     */
+    public function getActivate($activationCode = null)
+    {
+        // Is the user logged in?
+        if (Sentry::check()) {
+            return Redirect::route('account');
+        }

-		// Show the page
-		return View::make('frontend.auth.signup');
-	}
+        try {
+            // Get the user we are trying to activate
+            $user = Sentry::getUserProvider()->findByActivationCode($activationCode);

-	/**
-	 * Account sign up form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postSignup()
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'first_name'       => 'required|min:3',
-			'last_name'        => 'required|min:3',
-			'email'            => 'required|email|unique:users',
-			'email_confirm'    => 'required|email|same:email',
-			'password'         => 'required|between:8,32',
-			'password_confirm' => 'required|same:password',
-		);
+            // Try to activate this user account
+            if ($user->attemptActivation($activationCode)) {
+                // Redirect to the login page
+                return Redirect::route('signin')->with('success', Lang::get('auth/message.activate.success'));
+            }

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+            // The activation failed.
+            $error = Lang::get('auth/message.activate.error');
+        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
+            $error = Lang::get('auth/message.activate.error');
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        // Ooops.. something went wrong
+        return Redirect::route('signin')->with('error', $error);
+    }

-		try
-		{
-			// Register the user
-			$user = Sentry::register(array(
-				'first_name' => Input::get('first_name'),
-				'last_name'  => Input::get('last_name'),
-				'email'      => Input::get('email'),
-				'password'   => Input::get('password'),
-			));
+    /**
+     * Forgot password page.
+     *
+     * @return View
+     */
+    public function getForgotPassword()
+    {
+        // Show the page
+        return View::make('frontend.auth.forgot-password');
+    }

-			// Data to be used on the email view
-			$data = array(
-				'user'          => $user,
-				'activationUrl' => URL::route('activate', $user->getActivationCode()),
-			);
+    /**
+     * Forgot password form processing page.
+     *
+     * @return Redirect
+     */
+    public function postForgotPassword()
+    {
+        // Declare the rules for the validator
+        $rules = array(
+            'username' => 'required',
+        );

-			// Send the activation code through email
-			Mail::send('emails.register-activate', $data, function($m) use ($user)
-			{
-				$m->to($user->email, $user->first_name . ' ' . $user->last_name);
-				$m->subject('Welcome ' . $user->first_name);
-			});
+        // Create a new validator instance from our dynamic rules
+        $validator = Validator::make(Input::all(), $rules);

-			// Redirect to the register page
-			return Redirect::back()->with('success', Lang::get('auth/message.signup.success'));
-		}
-		catch (Cartalyst\Sentry\Users\UserExistsException $e)
-		{
-			$this->messageBag->add('email', Lang::get('auth/message.account_already_exists'));
-		}
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::route('forgot-password')->withInput()->withErrors($validator);
+        }

-		// Ooops.. something went wrong
-		return Redirect::back()->withInput()->withErrors($this->messageBag);
-	}
+        try {
+            // Get the user password recovery code
+            $user = Sentry::getUserProvider()->findByLogin(Input::get('username'));

-	/**
-	 * User account activation page.
-	 *
-	 * @param  string  $actvationCode
-	 * @return
-	 */
-	public function getActivate($activationCode = null)
-	{
-		// Is the user logged in?
-		if (Sentry::check())
-		{
-			return Redirect::route('account');
-		}
+            // Data to be used on the username view
+            $data = array(
+                'user'              => $user,
+                'forgotPasswordUrl' => URL::route('forgot-password-confirm', $user->getResetPasswordCode()),
+            );

-		try
-		{
-			// Get the user we are trying to activate
-			$user = Sentry::getUserProvider()->findByActivationCode($activationCode);
+            // Send the activation code through username
+            Mail::send('usernames.forgot-password', $data, function ($m) use ($user) {
+                $m->to($user->username, $user->first_name . ' ' . $user->last_name);
+                $m->subject('Account Password Recovery');
+            });
+        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
+            // Even though the username was not found, we will pretend
+            // we have sent the password reset code through username,
+            // this is a security measure against hackers.
+        }

-			// Try to activate this user account
-			if ($user->attemptActivation($activationCode))
-			{
-				// Redirect to the login page
-				return Redirect::route('signin')->with('success', Lang::get('auth/message.activate.success'));
-			}
+        //  Redirect to the forgot password
+        return Redirect::route('forgot-password')->with('success', Lang::get('auth/message.forgot-password.success'));
+    }

-			// The activation failed.
-			$error = Lang::get('auth/message.activate.error');
-		}
-		catch (Cartalyst\Sentry\Users\UserNotFoundException $e)
-		{
-			$error = Lang::get('auth/message.activate.error');
-		}
+    /**
+     * Forgot Password Confirmation page.
+     *
+     * @param  string  $passwordResetCode
+     * @return View
+     */
+    public function getForgotPasswordConfirm($passwordResetCode = null)
+    {
+        try {
+            // Find the user using the password reset code
+            $user = Sentry::getUserProvider()->findByResetPasswordCode($passwordResetCode);
+        } catch(Cartalyst\Sentry\Users\UserNotFoundException $e) {
+            // Redirect to the forgot password page
+            return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
+        }

-		// Ooops.. something went wrong
-		return Redirect::route('signin')->with('error', $error);
-	}
+        // Show the page
+        return View::make('frontend.auth.forgot-password-confirm');
+    }

-	/**
-	 * Forgot password page.
-	 *
-	 * @return View
-	 */
-	public function getForgotPassword()
-	{
-		// Show the page
-		return View::make('frontend.auth.forgot-password');
-	}
+    /**
+     * Forgot Password Confirmation form processing page.
+     *
+     * @param  string  $passwordResetCode
+     * @return Redirect
+     */
+    public function postForgotPasswordConfirm($passwordResetCode = null)
+    {
+        // Declare the rules for the form validation
+        $rules = array(
+            'password'         => 'required|between:10,32',
+            'password_confirm' => 'required|same:password'
+        );

-	/**
-	 * Forgot password form processing page.
-	 *
-	 * @return Redirect
-	 */
-	public function postForgotPassword()
-	{
-		// Declare the rules for the validator
-		$rules = array(
-			'email' => 'required|email',
-		);
+        // Create a new validator instance from our dynamic rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our dynamic rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::route('forgot-password-confirm', $passwordResetCode)->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::route('forgot-password')->withInput()->withErrors($validator);
-		}
+        try {
+            // Find the user using the password reset code
+            $user = Sentry::getUserProvider()->findByResetPasswordCode($passwordResetCode);

-		try
-		{
-			// Get the user password recovery code
-			$user = Sentry::getUserProvider()->findByLogin(Input::get('email'));
+            // Attempt to reset the user password
+            if ($user->attemptResetPassword($passwordResetCode, Input::get('password'))) {
+                // Password successfully reseted
+                return Redirect::route('signin')->with('success', Lang::get('auth/message.forgot-password-confirm.success'));
+            } else {
+                // Ooops.. something went wrong
+                return Redirect::route('signin')->with('error', Lang::get('auth/message.forgot-password-confirm.error'));
+            }
+        } catch (Cartalyst\Sentry\Users\UserNotFoundException $e) {
+            // Redirect to the forgot password page
+            return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
+        }
+    }

-			// Data to be used on the email view
-			$data = array(
-				'user'              => $user,
-				'forgotPasswordUrl' => URL::route('forgot-password-confirm', $user->getResetPasswordCode()),
-			);
+    /**
+     * Logout page.
+     *
+     * @return Redirect
+     */
+    public function getLogout()
+    {
+        // Log the user out
+        Sentry::logout();

-			// Send the activation code through email
-			Mail::send('emails.forgot-password', $data, function($m) use ($user)
-			{
-				$m->to($user->email, $user->first_name . ' ' . $user->last_name);
-				$m->subject('Account Password Recovery');
-			});
-		}
-		catch (Cartalyst\Sentry\Users\UserNotFoundException $e)
-		{
-			// Even though the email was not found, we will pretend
-			// we have sent the password reset code through email,
-			// this is a security measure against hackers.
-		}
-
-		//  Redirect to the forgot password
-		return Redirect::route('forgot-password')->with('success', Lang::get('auth/message.forgot-password.success'));
-	}
-
-	/**
-	 * Forgot Password Confirmation page.
-	 *
-	 * @param  string  $passwordResetCode
-	 * @return View
-	 */
-	public function getForgotPasswordConfirm($passwordResetCode = null)
-	{
-		try
-		{
-			// Find the user using the password reset code
-			$user = Sentry::getUserProvider()->findByResetPasswordCode($passwordResetCode);
-		}
-		catch(Cartalyst\Sentry\Users\UserNotFoundException $e)
-		{
-			// Redirect to the forgot password page
-			return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
-		}
-
-		// Show the page
-		return View::make('frontend.auth.forgot-password-confirm');
-	}
-
-	/**
-	 * Forgot Password Confirmation form processing page.
-	 *
-	 * @param  string  $passwordResetCode
-	 * @return Redirect
-	 */
-	public function postForgotPasswordConfirm($passwordResetCode = null)
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'password'         => 'required',
-			'password_confirm' => 'required|same:password'
-		);
-
-		// Create a new validator instance from our dynamic rules
-		$validator = Validator::make(Input::all(), $rules);
-
-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::route('forgot-password-confirm', $passwordResetCode)->withInput()->withErrors($validator);
-		}
-
-		try
-		{
-			// Find the user using the password reset code
-			$user = Sentry::getUserProvider()->findByResetPasswordCode($passwordResetCode);
-
-			// Attempt to reset the user password
-			if ($user->attemptResetPassword($passwordResetCode, Input::get('password')))
-			{
-				// Password successfully reseted
-				return Redirect::route('signin')->with('success', Lang::get('auth/message.forgot-password-confirm.success'));
-			}
-			else
-			{
-				// Ooops.. something went wrong
-				return Redirect::route('signin')->with('error', Lang::get('auth/message.forgot-password-confirm.error'));
-			}
-		}
-		catch (Cartalyst\Sentry\Users\UserNotFoundException $e)
-		{
-			// Redirect to the forgot password page
-			return Redirect::route('forgot-password')->with('error', Lang::get('auth/message.account_not_found'));
-		}
-	}
-
-	/**
-	 * Logout page.
-	 *
-	 * @return Redirect
-	 */
-	public function getLogout()
-	{
-		// Log the user out
-		Sentry::logout();
-
-		// Redirect to the users page
-		return Redirect::route('home')->with('success', 'You have successfully logged out!');
-	}
+        // Redirect to the users page
+        return Redirect::route('home')->with('success', 'You have successfully logged out!');
+    }

 }
@@ -1,26 +1,26 @@
 <?php

-class AuthorizedController extends BaseController {
+class AuthorizedController extends BaseController
+{
+    /**
+     * Whitelisted auth routes.
+     *
+     * @var array
+     */
+    protected $whitelist = array();

-	/**
-	 * Whitelisted auth routes.
-	 *
-	 * @var array
-	 */
-	protected $whitelist = array();
+    /**
+     * Initializer.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        // Apply the auth filter
+        $this->beforeFilter('auth', array('except' => $this->whitelist));

-	/**
-	 * Initializer.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		// Apply the auth filter
-		$this->beforeFilter('auth', array('except' => $this->whitelist));
-
-		// Call parent
-		parent::__construct();
-	}
+        // Call parent
+        parent::__construct();
+    }

 }
@@ -1,39 +1,38 @@
 <?php

-class BaseController extends Controller {
+class BaseController extends Controller
+{
+    /**
+     * Message bag.
+     *
+     * @var Illuminate\Support\MessageBag
+     */
+    protected $messageBag = null;

-	/**
-	 * Message bag.
-	 *
-	 * @var Illuminate\Support\MessageBag
-	 */
-	protected $messageBag = null;
+    /**
+     * Initializer.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        // CSRF Protection
+        $this->beforeFilter('csrf', array('on' => 'post'));

-	/**
-	 * Initializer.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		// CSRF Protection
-		$this->beforeFilter('csrf', array('on' => 'post'));
+        //
+        $this->messageBag = new Illuminate\Support\MessageBag;
+    }

-		//
-		$this->messageBag = new Illuminate\Support\MessageBag;
-	}
-
-	/**
-	 * Setup the layout used by the controller.
-	 *
-	 * @return void
-	 */
-	protected function setupLayout()
-	{
-		if ( ! is_null($this->layout))
-		{
-			$this->layout = View::make($this->layout);
-		}
-	}
+    /**
+     * Setup the layout used by the controller.
+     *
+     * @return void
+     */
+    protected function setupLayout()
+    {
+        if ( ! is_null($this->layout)) {
+            $this->layout = View::make($this->layout);
+        }
+    }

 }
@@ -1,23 +1,23 @@
 <?php

-class HomeController extends BaseController {
+class HomeController extends BaseController
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Default Home Controller
+    |--------------------------------------------------------------------------
+    |
+    | You may wish to use controllers instead of, or in addition to, Closure
+    | based routes. That's great! Here is an example controller method to
+    | get you started. To route to this controller, just add the route:
+    |
+    |	Route::get('/', 'HomeController@showWelcome');
+    |
+    */

-	/*
-	|--------------------------------------------------------------------------
-	| Default Home Controller
-	|--------------------------------------------------------------------------
-	|
-	| You may wish to use controllers instead of, or in addition to, Closure
-	| based routes. That's great! Here is an example controller method to
-	| get you started. To route to this controller, just add the route:
-	|
-	|	Route::get('/', 'HomeController@showWelcome');
-	|
-	*/
+    public function showWelcome()
+    {
+        return View::make('hello');
+    }

-	public function showWelcome()
-	{
-		return View::make('hello');
-	}
-
-}
+}
@@ -6,66 +6,73 @@ use Redirect;
 use Sentry;
 use Validator;
 use View;
+use Config;
+use Lang;

-class ChangeEmailController extends AuthorizedController {
+class ChangeEmailController extends AuthorizedController
+{
+    /**
+     * User change email page.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Get the user information
+        $user = Sentry::getUser();

-	/**
-	 * User change email page.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Get the user information
-		$user = Sentry::getUser();
+        // Show the page
+        return View::make('frontend/account/change-email', compact('user'));
+    }

-		// Show the page
-		return View::make('frontend/account/change-email', compact('user'));
-	}
+    /**
+     * Users change email form processing page.
+     *
+     * @return Redirect
+     */
+    public function postIndex()
+    {
+        
+        
+        if (Config::get('app.lock_passwords')) {
+			return Redirect::route('change-password')->with('error',  Lang::get('admin/users/table.lock_passwords'));
+		} else {
+			
+			// Declare the rules for the form validation
+	        $rules = array(
+	            'current_password' => 'required|between:3,32',
+	            'email'            => 'required|email|unique:users,email,'.Sentry::getUser()->email.',email',
+	            'email_confirm'    => 'required|same:email',
+	        );

-	/**
-	 * Users change email form processing page.
-	 *
-	 * @return Redirect
-	 */
-	public function postIndex()
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'current_password' => 'required|between:3,32',
-			'email'            => 'required|email|unique:users,email,'.Sentry::getUser()->email.',email',
-			'email_confirm'    => 'required|same:email',
-		);
-
-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
-
-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
-
-		// Grab the user
-		$user = Sentry::getUser();
-
-		// Check the user current password
-		if ( ! $user->checkPassword(Input::get('current_password')))
-		{
-			// Set the error message
-			$this->messageBag->add('current_password', 'Your current password is incorrect');
-
-			// Redirect to the change email page
-			return Redirect::route('change-email')->withErrors($this->messageBag);
-		}
-
-		// Update the user email
-		$user->email = Input::get('email');
-		$user->save();
-
-		// Redirect to the settings page
-		return Redirect::route('change-email')->with('success', 'Email successfully updated');
-	}
+	        // Create a new validator instance from our validation rules
+	        $validator = Validator::make(Input::all(), $rules);
+	
+	        // If validation fails, we'll exit the operation now.
+	        if ($validator->fails()) {
+	            // Ooops.. something went wrong
+	            return Redirect::back()->withInput()->withErrors($validator);
+	        }
+	
+	        // Grab the user
+	        $user = Sentry::getUser();
+	
+	        // Check the user current password
+	        if ( ! $user->checkPassword(Input::get('current_password'))) {
+	            // Set the error message
+	            $this->messageBag->add('current_password', 'Your current password is incorrect');
+	
+	            // Redirect to the change email page
+	            return Redirect::route('change-email')->withErrors($this->messageBag);
+	        }
+	
+	        // Update the user email
+	        $user->email = Input::get('email');
+	        $user->save();
+	
+	        // Redirect to the settings page
+	        return Redirect::route('change-email')->with('success', 'Email successfully updated');
+	     }
+    }

 }
@@ -6,66 +6,73 @@ use Redirect;
 use Sentry;
 use Validator;
 use View;
+use Config;
+use Lang;

-class ChangePasswordController extends AuthorizedController {
+class ChangePasswordController extends AuthorizedController
+{
+    /**
+     * User change password page.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Get the user information
+        $user = Sentry::getUser();

-	/**
-	 * User change password page.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Get the user information
-		$user = Sentry::getUser();
+        // Show the page
+        return View::make('frontend/account/change-password', compact('user'));
+    }

-		// Show the page
-		return View::make('frontend/account/change-password', compact('user'));
-	}
+    /**
+     * User change password form processing page.
+     *
+     * @return Redirect
+     */
+    protected function postIndex()
+    {
+        

-	/**
-	 * User change password form processing page.
-	 *
-	 * @return Redirect
-	 */
-	protected function postIndex()
-	{
+		if (Config::get('app.lock_passwords')) {
+			return Redirect::route('change-password')->with('error',  Lang::get('admin/users/table.lock_passwords'));
+		} else {
+			
 		// Declare the rules for the form validation
-		$rules = array(
-			'old_password'     => 'required|between:3,32',
-			'password'         => 'required|between:3,32',
-			'password_confirm' => 'required|same:password',
-		);
+        $rules = array(
+            'old_password'     => 'required|min:6',
+            'password'         => 'required|min:6',
+            'password_confirm' => 'required|same:password',
+        );
+        
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        // Grab the user
+        $user = Sentry::getUser();

-		// Grab the user
-		$user = Sentry::getUser();
+        // Check the user current password
+        if ( ! $user->checkPassword(Input::get('old_password'))) {
+            // Set the error message
+            $this->messageBag->add('old_password', 'Your current password is incorrect.');

-		// Check the user current password
-		if ( ! $user->checkPassword(Input::get('old_password')))
-		{
-			// Set the error message
-			$this->messageBag->add('old_password', 'Your current password is incorrect.');
+            // Redirect to the change password page
+            return Redirect::route('change-password')->withErrors($this->messageBag);
+        }

-			// Redirect to the change password page
-			return Redirect::route('change-password')->withErrors($this->messageBag);
-		}
+        // Update the user password
+        $user->password = Input::get('password');
+        $user->save();
+        }

-		// Update the user password
-		$user->password = Input::get('password');
-		$user->save();
-
-		// Redirect to the change-password page
-		return Redirect::route('change-password')->with('success', 'Password successfully updated');
-	}
+        // Redirect to the change-password page
+        return Redirect::route('change-password')->with('success', 'Password successfully updated');
+    }

 }
@@ -3,17 +3,17 @@
 use AuthorizedController;
 use Redirect;

-class DashboardController extends AuthorizedController {
-
-	/**
-	 * Redirect to the profile page.
-	 *
-	 * @return Redirect
-	 */
-	public function getIndex()
-	{
-		// Redirect to the profile page
-		return Redirect::route('profile');
-	}
+class DashboardController extends AuthorizedController
+{
+    /**
+     * Redirect to the profile page.
+     *
+     * @return Redirect
+     */
+    public function getIndex()
+    {
+        // Redirect to the profile page
+        return Redirect::route('profile');
+    }

 }
@@ -1,6 +1,7 @@
 <?php namespace Controllers\Account;

 use AuthorizedController;
+use Image;
 use Input;
 use Redirect;
 use Sentry;
@@ -8,65 +9,77 @@ use Validator;
 use Location;
 use View;

-class ProfileController extends AuthorizedController {
+class ProfileController extends AuthorizedController
+{
+    /**
+     * User profile page.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Get the user information
+        $user = Sentry::getUser();

-	/**
-	 * User profile page.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Get the user information
-		$user = Sentry::getUser();
+        // Show the page

-		// Show the page
+        $location_list = array('' => 'Select One') + Location::lists('name', 'id');

-		$location_list = array('' => 'Select One') + Location::lists('name', 'id');
+        // Show the page
+        return View::make('frontend/account/profile', compact('user'))->with('location_list',$location_list);
+    }

-		// Show the page
-		return View::make('frontend/account/profile', compact('user'))->with('location_list',$location_list);
-	}
+    /**
+     * User profile form processing page.
+     *
+     * @return Redirect
+     */
+    public function postIndex()
+    {
+        // Declare the rules for the form validation
+        $rules = array(
+            'first_name' => 'required|alpha_space|min:2',
+            'last_name'  => 'required|alpha_space|min:2',
+            'location_id'  => 'required',
+            'website'    => 'url|alpha_space|min:10',
+            'gravatar'   => 'email',
+        );

-	/**
-	 * User profile form processing page.
-	 *
-	 * @return Redirect
-	 */
-	public function postIndex()
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'first_name' => 'required|min:3',
-			'last_name'  => 'required|min:3',
-			'location_id'  => 'required',
-			'website'    => 'url',
-			'gravatar'   => 'email',
-		);
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        // Grab the user
+        $user = Sentry::getUser();

-		// Grab the user
-		$user = Sentry::getUser();
+        // Update the user information
+        $user->first_name = Input::get('first_name');
+        $user->last_name  = Input::get('last_name');
+        $user->website    = Input::get('website');
+        $user->location_id    = Input::get('location_id');
+        $user->gravatar   = Input::get('gravatar');
+		
+		if (Input::file('avatar')) {
+            $image = Input::file('avatar');
+            $file_name = $user->first_name."-".$user->last_name.".".$image->getClientOriginalExtension();
+            $path = public_path('uploads/avatars/'.$file_name);
+            Image::make($image->getRealPath())->resize(84, 84)->save($path);
+            $user->avatar = $file_name;
+        }

-		// Update the user information
-		$user->first_name = Input::get('first_name');
-		$user->last_name  = Input::get('last_name');
-		$user->website    = Input::get('website');
-		$user->location_id    = Input::get('location_id');
-		$user->gravatar   = Input::get('gravatar');
-		$user->save();
+        if (Input::get('avatar_delete') == 1 && Input::file('avatar') == "") {
+            $user->avatar = NULL;
+        }
+		
+        $user->save();

-		// Redirect to the settings page
-		return Redirect::route('profile')->with('success', 'Account successfully updated');
-	}
+        // Redirect to the settings page
+        return Redirect::route('profile')->with('success', 'Account successfully updated');
+    }

 }
@@ -0,0 +1,164 @@
+<?php namespace Controllers\Account;
+
+use AuthorizedController;
+use Input;
+use Redirect;
+use Sentry;
+use Validator;
+use Location;
+use View;
+use Asset;
+use Actionlog;
+use Lang;
+use Accessory;
+use DB;
+
+class ViewAssetsController extends AuthorizedController
+{
+    /**
+     * Redirect to the profile page.
+     *
+     * @return Redirect
+     */
+    public function getIndex()
+    {
+    	$user = Sentry::getUser();
+
+
+            if (isset($user->id)) {
+                return View::make('frontend/account/view-assets', compact('user'));
+            } else {
+                // Prepare the error message
+                $error = Lang::get('admin/users/message.user_not_found', compact('id' ));
+
+                // Redirect to the user management page
+                return Redirect::route('users')->with('error', $error);
+            }
+
+	}
+
+
+	public function getRequestableIndex() {
+
+		$assets = Asset::with('model','defaultLoc')->Hardware()->RequestableAssets()->get();
+        return View::make('frontend/account/requestable-assets', compact('user','assets'));
+    }
+
+
+    public function getRequestAsset($assetId = null) {
+
+    	// Check if the asset exists
+        if (is_null($asset = Asset::find($assetId))) {
+            // Redirect to the asset management page
+            return Redirect::to('frontend/account/view-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        } else {
+
+
+			 return View::make('frontend/account/view-assets', compact('asset'));
+        }
+
+
+    }
+    
+    
+    
+    // Get the acceptance screen
+    public function getAcceptAsset($logID = null) {
+	    
+	    if (is_null($findlog = Actionlog::find($logID))) {
+            // Redirect to the asset management page
+            return Redirect::to('account')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        }
+        
+        // Asset
+        if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
+        	$item = Asset::find($findlog->asset_id);
+        
+        // software	
+        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {     
+	        $item = License::find($findlog->asset_id);
+	    // accessories    
+	    } elseif ($findlog->accessory_id!='') {
+		   $item = Accessory::find($findlog->accessory_id);         
+        }
+        
+	    // Check if the asset exists
+        if (is_null($item)) {
+            // Redirect to the asset management page
+            return Redirect::to('account')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        }
+        
+        return View::make('frontend/account/accept-asset', compact('item'))->with('findlog', $findlog);
+        
+        
+
+	    
+    }
+    
+    // Save the acceptance
+    public function postAcceptAsset($logID = null) {
+	  
+	  	
+	  	// Check if the asset exists
+        if (is_null($findlog = Actionlog::find($logID))) {
+            // Redirect to the asset management page
+            return Redirect::to('account/view-assets')->with('error', Lang::get('admin/hardware/message.does_not_exist'));
+        }
+                
+        
+        if ($findlog->accepted_id!='') {
+            // Redirect to the asset management page
+            return Redirect::to('account/view-assets')->with('error', Lang::get('admin/users/message.error.asset_already_accepted'));
+        }
+        
+    	$user = Sentry::getUser();
+		$logaction = new Actionlog();
+			
+		// Asset
+        if (($findlog->asset_id!='') && ($findlog->asset_type=='hardware')) {
+        	$logaction->asset_id = $findlog->asset_id;
+        	$logaction->accessory_id = NULL;
+        	$logaction->asset_type = 'hardware';
+        
+        // software	
+        } elseif (($findlog->asset_id!='') && ($findlog->asset_type=='software')) {     
+	        $logaction->asset_id = $findlog->asset_id;
+        	$logaction->accessory_id = NULL;
+        	$logaction->asset_type = 'software';
+        	
+		// accessories    
+	    } elseif ($findlog->accessory_id!='') {
+		    $logaction->asset_id = NULL;
+        	$logaction->accessory_id = $findlog->accessory_id;
+        	$logaction->asset_type = 'accessory';         
+        }
+			
+		$logaction->checkedout_to = $findlog->checkedout_to;
+		
+		$logaction->note = e(Input::get('note'));
+		$logaction->user_id = $user->id;
+		$logaction->accepted_at = date("Y-m-d h:i:s");
+		$log = $logaction->logaction('accepted');
+		
+      
+		$update_checkout = DB::table('asset_logs')
+			->where('id',$findlog->id)
+			->update(array('accepted_id' => $logaction->id));
+		
+		if ($update_checkout ) {
+			return Redirect::to('account/view-assets')->with('success', 'You have successfully accept this asset.');
+			
+		} else {
+			return Redirect::to('account/view-assets')->with('error', 'Something went wrong ');
+		}
+		
+		
+
+  
+	    
+    }
+    
+
+
+
+}
@@ -0,0 +1,493 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Accessory;
+use Redirect;
+use Setting;
+use DB;
+use Sentry;
+use Str;
+use Validator;
+use View;
+use User;
+use Actionlog;
+use Mail;
+use Datatable;
+use Slack;
+use Config;
+
+class AccessoriesController extends AdminController
+{
+    /**
+     * Show a list of all the accessories.
+     *
+     * @return View
+     */
+
+    public function getIndex()
+    {
+        return View::make('backend/accessories/index');
+    }
+
+
+    /**
+     * Accessory create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/accessories/edit')->with('accessory',new Accessory)->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Accessory create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+
+        // create a new model instance
+        $accessory = new Accessory();
+
+        $validator = Validator::make(Input::all(), $accessory->rules);
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        else{
+
+            // Update the accessory data
+            $accessory->name            		= e(Input::get('name'));
+            $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->qty            			= e(Input::get('qty'));
+            $accessory->user_id          		= Sentry::getId();
+
+            // Was the accessory created?
+            if($accessory->save()) {
+                // Redirect to the new accessory  page
+                return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.create.success'));
+            }
+        }
+
+        // Redirect to the accessory create page
+        return Redirect::to('admin/accessories/create')->with('error', Lang::get('admin/accessories/message.create.error'));
+
+
+    }
+
+    /**
+     * Accessory update.
+     *
+     * @param  int  $accessoryId
+     * @return View
+     */
+    public function getEdit($accessoryId = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
+        }
+
+		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','accessory')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/accessories/edit', compact('accessory'))->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Accessory update form processing page.
+     *
+     * @param  int  $accessoryId
+     * @return Redirect
+     */
+    public function postEdit($accessoryId = null)
+    {
+        // Check if the blog post exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.does_not_exist'));
+        }
+
+
+        // get the POST data
+        $new = Input::all();
+
+        // attempt validation
+        $validator = Validator::make(Input::all(), $accessory->validationRules($accessoryId));
+
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Update the accessory data
+            $accessory->name            		= e(Input::get('name'));
+            $accessory->category_id            	= e(Input::get('category_id'));
+            $accessory->qty            			= e(Input::get('qty'));
+
+            // Was the accessory created?
+            if($accessory->save()) {
+                // Redirect to the new accessory page
+                return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.update.success'));
+            }
+        }
+
+        // Redirect to the accessory management page
+        return Redirect::to("admin/accessories/$accessoryID/edit")->with('error', Lang::get('admin/accessories/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given accessory.
+     *
+     * @param  int  $accessoryId
+     * @return Redirect
+     */
+    public function getDelete($accessoryId)
+    {
+        // Check if the blog post exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+
+		if ($accessory->hasUsers() > 0) {
+			 return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.assoc_users', array('count'=> $accessory->hasUsers())));
+		} else {
+			$accessory->delete();
+
+            // Redirect to the locations management page
+            return Redirect::to('admin/accessories')->with('success', Lang::get('admin/accessories/message.delete.success'));
+
+		}
+
+
+
+
+
+    }
+
+
+
+    /**
+    *  Get the accessory information to present to the accessory view page
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function getView($accessoryID = null)
+    {
+        $accessory = Accessory::find($accessoryID);
+
+        if (isset($accessory->id)) {
+                return View::make('backend/accessories/view', compact('accessory'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/accessories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('accessories')->with('error', $error);
+        }
+
+
+    }
+
+    /**
+    * Check out the accessory to a person
+    **/
+    public function getCheckout($accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+        // Get the dropdown of users and then pass it to the checkout view
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+
+        return View::make('backend/accessories/checkout', compact('accessory'))->with('users_list',$users_list);
+
+    }
+
+    /**
+    * Check out the accessory to a person
+    **/
+    public function postCheckout($accessoryId)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+		$admin_user = Sentry::getUser();
+        $assigned_to = e(Input::get('assigned_to'));
+
+
+        // Declare the rules for the form validation
+        $rules = array(
+            'assigned_to'   => 'required|min:1'
+        );
+
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);
+
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }
+
+
+        // Check if the user exists
+        if (is_null($user = User::find($assigned_to))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.user_does_not_exist'));
+        }
+
+        // Update the accessory data
+        $accessory->assigned_to            		= e(Input::get('assigned_to'));
+
+        $accessory->users()->attach($accessory->id, array(
+        'accessory_id' => $accessory->id,
+        'assigned_to' => e(Input::get('assigned_to'))));
+
+            $logaction = new Actionlog();
+            $logaction->accessory_id = $accessory->id;
+            $logaction->checkedout_to = $accessory->assigned_to;
+            $logaction->asset_type = 'accessory';
+            $logaction->location_id = $user->location_id;
+            $logaction->user_id = Sentry::getUser()->id;
+            $logaction->note = e(Input::get('note'));
+
+            $settings = Setting::getSettings();
+
+			if ($settings->slack_endpoint) {
+
+
+				$slack_settings = [
+				    'username' => $settings->botname,
+				    'channel' => $settings->slack_channel,
+				    'link_names' => true
+				];
+
+				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
+
+				try {
+						$client->attach([
+						    'color' => 'good',
+						    'fields' => [
+						        [
+						            'title' => 'Checked Out:',
+						            'value' => strtoupper($logaction->asset_type).' <'.Config::get('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+
+
+						    ]
+						])->send('Accessory Checked Out');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+
+
+            $log = $logaction->logaction('checkout');
+
+            $accessory_user = DB::table('accessories_users')->where('assigned_to','=',$accessory->assigned_to)->where('accessory_id','=',$accessory->id)->first();
+
+            $data['log_id'] = $logaction->id;
+            $data['eula'] = $accessory->getEula();
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $accessory->name;
+            $data['require_acceptance'] = $accessory->requireAcceptance();
+
+
+            if (($accessory->requireAcceptance()=='1')  || ($accessory->getEula())) {
+
+	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
+	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+	                $m->subject('Confirm accessory delivery');
+	            });
+            }
+
+            // Redirect to the new accessory page
+            return Redirect::to("admin/accessories")->with('success', Lang::get('admin/accessories/message.checkout.success'));
+
+
+
+    }
+
+
+    /**
+    * Check the accessory back into inventory
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function getCheckin($accessoryUserId = null, $backto = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+		$accessory = Accessory::find($accessory_user->accessory_id);
+        return View::make('backend/accessories/checkin', compact('accessory'))->with('backto',$backto);
+    }
+
+
+    /**
+    * Check in the item so that it can be checked out again to someone else
+    *
+    * @param  int  $accessoryId
+    * @return View
+    **/
+    public function postCheckin($accessoryUserId = null, $backto = null)
+    {
+        // Check if the accessory exists
+        if (is_null($accessory_user = DB::table('accessories_users')->find($accessoryUserId))) {
+            // Redirect to the accessory management page with error
+            return Redirect::to('admin/accessories')->with('error', Lang::get('admin/accessories/message.not_found'));
+        }
+
+
+		$accessory = Accessory::find($accessory_user->accessory_id);
+        $logaction = new Actionlog();
+        $logaction->checkedout_to = $accessory_user->assigned_to;
+        $return_to = $accessory_user->assigned_to;
+        $admin_user = Sentry::getUser();
+
+
+        // Was the accessory updated?
+        if(DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
+
+            $logaction->accessory_id = $accessory->id;
+            $logaction->location_id = NULL;
+            $logaction->asset_type = 'accessory';
+            $logaction->user_id = $admin_user->id;
+            $logaction->note = e(Input::get('note'));
+
+            $settings = Setting::getSettings();
+
+			if ($settings->slack_endpoint) {
+
+
+				$slack_settings = [
+				    'username' => $settings->botname,
+				    'channel' => $settings->slack_channel,
+				    'link_names' => true
+				];
+
+				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
+
+				try {
+						$client->attach([
+						    'color' => 'good',
+						    'fields' => [
+						        [
+						            'title' => 'Checked In:',
+						            'value' => strtoupper($logaction->asset_type).' <'.Config::get('app.url').'/admin/accessories/'.$accessory->id.'/view'.'|'.$accessory->name.'> checked in by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+						    ]
+						])->send('Accessory Checked In');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+
+            $log = $logaction->logaction('checkin from');
+
+            if ($backto=='user') {
+				return Redirect::to("admin/users/".$return_to.'/view')->with('success', Lang::get('admin/accessories/message.checkin.success'));
+			} else {
+				return Redirect::to("admin/accessories/".$accessory->id."/view")->with('success', Lang::get('admin/accessories/message.checkin.success'));
+			}
+        }
+
+        // Redirect to the accessory management page with error
+        return Redirect::to("admin/accessories")->with('error', Lang::get('admin/accessories/message.checkin.error'));
+    }
+
+    public function getDatatable()
+    {
+        $accessories = Accessory::select(array('id','name','qty'))
+        ->whereNull('deleted_at')
+        ->orderBy('created_at', 'DESC');
+
+        $accessories = $accessories->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessories)
+            {
+                return '<a href="'.route('checkout/accessory', $accessories->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($accessories->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/accessory', $accessories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/accessory', $accessories->id).'" data-content="'.Lang::get('admin/accessories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($accessories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            });
+
+        return Datatable::collection($accessories)
+        ->addColumn('name',function($accessories)
+            {
+                return link_to('admin/accessories/'.$accessories->id.'/view', $accessories->name);
+            })
+        ->addColumn('qty',function($accessories)
+            {
+                return $accessories->qty;
+            })
+        ->addColumn('numRemaining',function($accessories)
+            {
+                return $accessories->numRemaining();
+            })
+        ->addColumn($actions)
+        ->searchColumns('name','qty','numRemaining','actions')
+        ->orderColumns('name','qty','numRemaining','actions')
+        ->make();
+    }
+
+	public function getDataView($accessoryID)
+	{
+		$accessory = Accessory::find($accessoryID);
+        $accessory_users = $accessory->users;
+
+		$actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($accessory_users){
+			return '<a href="'.route('checkin/accessory', $accessory_users->pivot->id).'" class="btn-flat info">Checkin</a>';
+		});
+
+		return Datatable::collection($accessory_users)
+		->addColumn('name',function($accessory_users)
+			{
+				return link_to('/admin/users/'.$accessory_users->id.'/view', $accessory_users->fullName());
+			})
+		->addColumn($actions)
+		->make();
+    }
+
+}
@@ -11,178 +11,267 @@ use Sentry;
 use Str;
 use Validator;
 use View;
+use Datatable;

-class CategoriesController extends AdminController {
+class CategoriesController extends AdminController
+{
+    /**
+     * Show a list of all the categories.
+     *
+     * @return View
+     */

-	/**
-	 * Show a list of all the categories.
-	 *
-	 * @return View
-	 */
-
-	public function getIndex()
-	{
-		// Grab all the categories
-		$categories = Category::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
-		// Show the page
-		return View::make('backend/categories/index', compact('categories'));
-	}
+    public function getIndex()
+    {
+        // Show the page
+        return View::make('backend/categories/index');
+    }


-	/**
-	 * Category create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Show the page
-		return View::make('backend/categories/edit')->with('category',new Category);
-	}
+    /**
+     * Category create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+         $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+        return View::make('backend/categories/edit')->with('category',new Category)
+        ->with('category_types',$category_types);
+    }


-	/**
-	 * Category create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Category create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // create a new model instance
+        $category = new Category();

-		// create a new model instance
-		$category = new Category();
+        $validator = Validator::make(Input::all(), $category->rules);

-		// attempt validation
-		if ($category->validate($new))
-		{
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        else{

-			// Update the category data
-			$category->name            = e(Input::get('name'));
-			$category->user_id          = Sentry::getId();
+            // Update the category data
+            $category->name            		= e(Input::get('name'));
+            $category->category_type        = e(Input::get('category_type'));
+            $category->eula_text            = e(Input::get('eula_text'));
+            $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
+            $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
+            $category->user_id          	= Sentry::getId();

-			// Was the asset created?
-			if($category->save())
-			{
-				// Redirect to the new category  page
-				return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $category->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            // Was the asset created?
+            if($category->save()) {
+                // Redirect to the new category  page
+                return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.create.success'));
+            }
+        }

-		// Redirect to the category create page
-		return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));
+        // Redirect to the category create page
+        return Redirect::to('admin/settings/categories/create')->with('error', Lang::get('admin/categories/message.create.error'));


-	}
+    }

-	/**
-	 * Category update.
-	 *
-	 * @param  int  $categoryId
-	 * @return View
-	 */
-	public function getEdit($categoryId = null)
-	{
-		// Check if the category exists
-		if (is_null($category = Category::find($categoryId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.does_not_exist'));
-		}
+    /**
+     * Category update.
+     *
+     * @param  int  $categoryId
+     * @return View
+     */
+    public function getEdit($categoryId = null)
+    {
+        // Check if the category exists
+        if (is_null($category = Category::find($categoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.does_not_exist'));
+        }

-		// Show the page
-		//$category_options = array('' => 'Top Level') + Category::lists('name', 'id');
+        // Show the page
+        //$category_options = array('' => 'Top Level') + Category::lists('name', 'id');

-		$category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
-		return View::make('backend/categories/edit', compact('category'))->with('category_options',$category_options);
-	}
+        $category_options = array('' => 'Top Level') + DB::table('categories')->where('id', '!=', $categoryId)->lists('name', 'id');
+        $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+
+        return View::make('backend/categories/edit', compact('category'))
+        ->with('category_options',$category_options)
+        ->with('category_types',$category_types);
+    }


-	/**
-	 * Category update form processing page.
-	 *
-	 * @param  int  $categoryId
-	 * @return Redirect
-	 */
-	public function postEdit($categoryId = null)
-	{
-		// Check if the blog post exists
-		if (is_null($category = Category::find($categoryId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/categories')->with('error', Lang::get('admin/categories/message.does_not_exist'));
-		}
+    /**
+     * Category update form processing page.
+     *
+     * @param  int  $categoryId
+     * @return Redirect
+     */
+    public function postEdit($categoryId = null)
+    {
+        // Check if the blog post exists
+        if (is_null($category = Category::find($categoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/categories')->with('error', Lang::get('admin/categories/message.does_not_exist'));
+        }


-		// get the POST data
-		$new = Input::all();
+        // get the POST data
+        $new = Input::all();

-		// attempt validation
-		if ($category->validate($new))
-		{
-
-			// Update the category data
-			$category->name            = e(Input::get('name'));
-
-			// Was the asset created?
-			if($category->save())
-			{
-				// Redirect to the new category page
-				return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $category->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
-
-		// Redirect to the category management page
-		return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));
-
-	}
-
-	/**
-	 * Delete the given category.
-	 *
-	 * @param  int  $categoryId
-	 * @return Redirect
-	 */
-	public function getDelete($categoryId)
-	{
-		// Check if the blog post exists
-		if (is_null($category = Category::find($categoryId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.not_found'));
-		}
+        // attempt validation
+        $validator = Validator::make(Input::all(), $category->validationRules($categoryId));


-		if ($category->has_models() > 0) {
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {

-			// Redirect to the asset management page
-			return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.assoc_users'));
-		} else {
+            // Update the category data
+            $category->name            = e(Input::get('name'));
+            $category->category_type        = e(Input::get('category_type'));
+            $category->eula_text            = e(Input::get('eula_text'));
+            $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
+            $category->require_acceptance   = e(Input::get('require_acceptance', '0'));

-			$category->delete();
+            // Was the asset created?
+            if($category->save()) {
+                // Redirect to the new category page
+                return Redirect::to("admin/settings/categories")->with('success', Lang::get('admin/categories/message.update.success'));
+            }
+        }

-			// Redirect to the locations management page
-			return Redirect::to('admin/settings/categories')->with('success', Lang::get('admin/categories/message.delete.success'));
-		}
+        // Redirect to the category management page
+        return Redirect::to("admin/settings/categories/$categoryID/edit")->with('error', Lang::get('admin/categories/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given category.
+     *
+     * @param  int  $categoryId
+     * @return Redirect
+     */
+    public function getDelete($categoryId)
+    {
+        // Check if the category exists
+        if (is_null($category = Category::find($categoryId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.not_found'));
+        }


-	}
+        if ($category->has_models() > 0) {

+            // Redirect to the asset management page
+            return Redirect::to('admin/settings/categories')->with('error', Lang::get('admin/categories/message.assoc_users'));
+        } else {
+
+            $category->delete();
+
+            // Redirect to the locations management page
+            return Redirect::to('admin/settings/categories')->with('success', Lang::get('admin/categories/message.delete.success'));
+        }
+
+
+    }
+
+
+
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($categoryID = null)
+    {
+        $category = Category::find($categoryID);
+
+        if (isset($category->id)) {
+                return View::make('backend/categories/view', compact('category'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/categories/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('categories')->with('error', $error);
+        }
+
+
+    }
+
+    public function getDatatable()
+    {
+        // Grab all the categories
+        $categories = Category::orderBy('created_at', 'DESC')->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($categories) {
+            return '<a href="'.route('update/category', $categories->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/category', $categories->id).'" data-content="'.Lang::get('admin/categories/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($categories->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+        });
+
+        return Datatable::collection($categories)
+        ->showColumns('name')
+        ->addColumn('category_type', function($categories) {
+            return ucwords($categories->category_type);
+        })
+        ->addColumn('count', function($categories) {
+            return ($categories->category_type=='asset') ? link_to('/admin/settings/categories/'.$categories->id.'/view', $categories->assetscount()) : $categories->accessoriescount();
+        })
+        ->addColumn('acceptance', function($categories) {
+            return ($categories->require_acceptance=='1') ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i>' : '';
+        })
+        ->addColumn('eula', function($categories) {
+            return ($categories->getEula()) ? '<i class="fa fa-check" style="margin-right:50%;margin-left:50%;"></i></a>' : '';
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','category_type','count','acceptance','eula','actions')
+        ->orderColumns('name','category_type','count','acceptance','eula','actions')
+        ->make();
+    }
+
+    public function getDataView($categoryID) {
+        $category = Category::find($categoryID);
+        $categoryassets = $category->assets;
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($categoryassets)
+            {
+                if (($categoryassets->assigned_to !='') && ($categoryassets->assigned_to > 0)) {
+                    return '<a href="'.route('checkin/hardware', $categoryassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    return '<a href="'.route('checkout/hardware', $categoryassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            });
+
+        return Datatable::collection($categoryassets)
+        ->addColumn('name', function ($categoryassets) {
+            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->name);
+        })
+        ->addColumn('asset_tag', function ($categoryassets) {
+            return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->asset_tag);
+        })
+        ->addColumn('assigned_to', function ($categoryassets) {
+            if ($categoryassets->assigned_to) {
+                return link_to('/admin/users/'.$categoryassets->assigned_to.'/view', $categoryassets->assigneduser->fullName());
+            }
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','asset_tag','assigned_to','actions')
+        ->orderColumns('name','asset_tag','assigned_to','actions')
+        ->make();
+    }


 }
@@ -0,0 +1,390 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use Redirect;
+use Setting;
+use DB;
+use Sentry;
+use Consumable;
+use Str;
+use Validator;
+use View;
+use User;
+use Actionlog;
+use Mail;
+use Datatable;
+use Slack;
+use Config;
+
+class ConsumablesController extends AdminController
+{
+    /**
+     * Show a list of all the consumables.
+     *
+     * @return View
+     */
+
+    public function getIndex()
+    {
+        return View::make('backend/consumables/index');
+    }
+
+
+    /**
+     * Consumable create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/consumables/edit')->with('consumable',new Consumable)->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Consumable create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+
+        // create a new model instance
+        $consumable = new Consumable();
+
+        $validator = Validator::make(Input::all(), $consumable->rules);
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        else{
+
+            // Update the consumable data
+            $consumable->name            		= e(Input::get('name'));
+            $consumable->category_id            	= e(Input::get('category_id'));
+            $consumable->qty            			= e(Input::get('qty'));
+            $consumable->user_id          		= Sentry::getId();
+
+            // Was the consumable created?
+            if($consumable->save()) {
+                // Redirect to the new consumable  page
+                return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.create.success'));
+            }
+        }
+
+        // Redirect to the consumable create page
+        return Redirect::to('admin/consumables/create')->with('error', Lang::get('admin/consumables/message.create.error'));
+
+
+    }
+
+    /**
+     * Consumable update.
+     *
+     * @param  int  $consumableId
+     * @return View
+     */
+    public function getEdit($consumableId = null)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
+        }
+
+		$category_list = array('' => '') + DB::table('categories')->where('category_type','=','consumable')->whereNull('deleted_at')->orderBy('name','ASC')->lists('name', 'id');
+        return View::make('backend/consumables/edit', compact('consumable'))->with('category_list',$category_list);
+    }
+
+
+    /**
+     * Consumable update form processing page.
+     *
+     * @param  int  $consumableId
+     * @return Redirect
+     */
+    public function postEdit($consumableId = null)
+    {
+        // Check if the blog post exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.does_not_exist'));
+        }
+
+
+        // get the POST data
+        $new = Input::all();
+
+        // attempt validation
+        $validator = Validator::make(Input::all(), $consumable->validationRules($consumableId));
+
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Update the consumable data
+            $consumable->name            		= e(Input::get('name'));
+            $consumable->category_id            	= e(Input::get('category_id'));
+            $consumable->qty            			= e(Input::get('qty'));
+
+            // Was the consumable created?
+            if($consumable->save()) {
+                // Redirect to the new consumable page
+                return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.update.success'));
+            }
+        }
+
+        // Redirect to the consumable management page
+        return Redirect::to("admin/consumables/$consumableID/edit")->with('error', Lang::get('admin/consumables/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given consumable.
+     *
+     * @param  int  $consumableId
+     * @return Redirect
+     */
+    public function getDelete($consumableId)
+    {
+        // Check if the blog post exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+        }
+
+
+		if ($consumable->hasUsers() > 0) {
+			 return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.assoc_users', array('count'=> $consumable->hasUsers())));
+		} else {
+			$consumable->delete();
+
+            // Redirect to the locations management page
+            return Redirect::to('admin/consumables')->with('success', Lang::get('admin/consumables/message.delete.success'));
+
+		}
+
+
+
+
+
+    }
+
+
+
+    /**
+    *  Get the consumable information to present to the consumable view page
+    *
+    * @param  int  $consumableId
+    * @return View
+    **/
+    public function getView($consumableID = null)
+    {
+        $consumable = Consumable::find($consumableID);
+
+        if (isset($consumable->id)) {
+                return View::make('backend/consumables/view', compact('consumable'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/consumables/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('consumables')->with('error', $error);
+        }
+
+
+    }
+
+    /**
+    * Check out the consumable to a person
+    **/
+    public function getCheckout($consumableId)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the consumable management page with error
+            return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+        }
+
+        // Get the dropdown of users and then pass it to the checkout view
+        $users_list = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name) as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+
+        return View::make('backend/consumables/checkout', compact('consumable'))->with('users_list',$users_list);
+
+    }
+
+    /**
+    * Check out the consumable to a person
+    **/
+    public function postCheckout($consumableId)
+    {
+        // Check if the consumable exists
+        if (is_null($consumable = Consumable::find($consumableId))) {
+            // Redirect to the consumable management page with error
+            return Redirect::to('consumables')->with('error', Lang::get('admin/consumables/message.not_found'));
+        }
+
+		$admin_user = Sentry::getUser();
+        $assigned_to = e(Input::get('assigned_to'));
+
+
+        // Declare the rules for the form validation
+        $rules = array(
+            'assigned_to'   => 'required|min:1'
+        );
+
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);
+
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }
+
+
+        // Check if the user exists
+        if (is_null($user = User::find($assigned_to))) {
+            // Redirect to the consumable management page with error
+            return Redirect::to('admin/consumables')->with('error', Lang::get('admin/consumables/message.user_does_not_exist'));
+        }
+
+        // Update the consumable data
+        $consumable->assigned_to            		= e(Input::get('assigned_to'));
+
+        $consumable->users()->attach($consumable->id, array(
+        'consumable_id' => $consumable->id,
+        'assigned_to' => e(Input::get('assigned_to'))));
+
+            $logaction = new Actionlog();
+            $logaction->consumable_id = $consumable->id;
+            $logaction->checkedout_to = $consumable->assigned_to;
+            $logaction->asset_type = 'consumable';
+            $logaction->location_id = $user->location_id;
+            $logaction->user_id = Sentry::getUser()->id;
+            $logaction->note = e(Input::get('note'));
+
+            $settings = Setting::getSettings();
+
+			if ($settings->slack_endpoint) {
+
+
+				$slack_settings = [
+				    'username' => $settings->botname,
+				    'channel' => $settings->slack_channel,
+				    'link_names' => true
+				];
+
+				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
+
+				try {
+						$client->attach([
+						    'color' => 'good',
+						    'fields' => [
+						        [
+						            'title' => 'Checked Out:',
+						            'value' => strtoupper($logaction->asset_type).' <'.Config::get('app.url').'/admin/consumables/'.$consumable->id.'/view'.'|'.$consumable->name.'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/admin/users/'.$admin_user->id.'/view'.'|'.$admin_user->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => e($logaction->note)
+						        ],
+
+
+
+						    ]
+						])->send('Consumable Checked Out');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+
+
+            $log = $logaction->logaction('checkout');
+
+            $consumable_user = DB::table('consumables_users')->where('assigned_to','=',$consumable->assigned_to)->where('consumable_id','=',$consumable->id)->first();
+
+            $data['log_id'] = $logaction->id;
+            $data['eula'] = $consumable->getEula();
+            $data['first_name'] = $user->first_name;
+            $data['item_name'] = $consumable->name;
+            $data['require_acceptance'] = $consumable->requireAcceptance();
+
+
+            if (($consumable->requireAcceptance()=='1')  || ($consumable->getEula())) {
+
+	            Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
+	                $m->to($user->email, $user->first_name . ' ' . $user->last_name);
+	                $m->subject('Confirm consumable delivery');
+	            });
+            }
+
+            // Redirect to the new consumable page
+            return Redirect::to("admin/consumables")->with('success', Lang::get('admin/consumables/message.checkout.success'));
+
+
+
+    }
+
+
+    public function getDatatable()
+    {
+        $consumables = Consumable::select(array('id','name','qty'))
+        ->whereNull('deleted_at')
+        ->orderBy('created_at', 'DESC');
+
+        $consumables = $consumables->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions',function($consumables)
+            {
+                return '<a href="'.route('checkout/consumable', $consumables->id).'" style="margin-right:5px;" class="btn btn-info btn-sm" '.(($consumables->numRemaining() > 0 ) ? '' : ' disabled').'>'.Lang::get('general.checkout').'</a><a href="'.route('update/consumable', $consumables->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/consumable', $consumables->id).'" data-content="'.Lang::get('admin/consumables/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($consumables->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            });
+
+        return Datatable::collection($consumables)
+        ->addColumn('name',function($consumables)
+            {
+                return link_to('admin/consumables/'.$consumables->id.'/view', $consumables->name);
+            })
+        ->addColumn('qty',function($consumables)
+            {
+                return $consumables->qty;
+            })
+        ->addColumn('numRemaining',function($consumables)
+            {
+                return $consumables->numRemaining();
+            })
+        ->addColumn($actions)
+        ->searchColumns('name','qty','numRemaining','actions')
+        ->orderColumns('name','qty','numRemaining','actions')
+        ->make();
+    }
+
+	public function getDataView($consumableID)
+	{
+		$consumable = Consumable::find($consumableID);
+        $consumable_users = $consumable->users;
+
+
+		return Datatable::collection($consumable_users)
+		->addColumn('name',function($consumable_users)
+			{
+				return link_to('/admin/users/'.$consumable_users->id.'/view', $consumable_users->fullName());
+			})
+		->make();
+    }
+
+}
@@ -2,18 +2,70 @@

 use AdminController;
 use View;
+use Asset;
+use Actionlog;

-class DashboardController extends AdminController {
+class DashboardController extends AdminController
+{
+    /**
+     * Show the administration dashboard page.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Show the page

-	/**
-	 * Show the administration dashboard page.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Show the page
-		return View::make('backend/dashboard');
-	}
+        $recent_activity = Actionlog::orderBy('created_at','DESC')->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog')->take(7)->get();
+
+
+        $asset_stats['total'] = Asset::Hardware()->count();
+
+        $asset_stats['rtd']['total'] = Asset::Hardware()->RTD()->count();
+
+        if ($asset_stats['rtd']['total'] > 0) {
+	        $asset_stats['rtd']['percent'] = round(($asset_stats['rtd']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['rtd']['percent'] = 0;
+        }
+
+
+        $asset_stats['pending']['total'] = Asset::Hardware()->Pending()->count();
+
+        if ($asset_stats['pending']['total'] > 0) {
+	        $asset_stats['pending']['percent'] = round(($asset_stats['pending']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['pending']['percent'] = 0;
+        }
+
+
+        $asset_stats['deployed']['total'] = Asset::Hardware()->Deployed()->count();
+
+        if ($asset_stats['deployed']['total'] > 0) {
+	         $asset_stats['deployed']['percent'] = round(($asset_stats['deployed']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['deployed']['percent'] = 0;
+        }
+
+
+        $asset_stats['undeployable']['total'] = Asset::Hardware()->Undeployable()->count();
+
+        if ($asset_stats['undeployable']['total'] > 0) {
+	        $asset_stats['undeployable']['percent'] = round(($asset_stats['undeployable']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['undeployable']['percent'] = 0;
+        }
+
+        $asset_stats['archived']['total'] = Asset::Hardware()->Archived()->count();
+
+        if ($asset_stats['archived']['total'] > 0) {
+	        $asset_stats['archived']['percent'] = round(($asset_stats['archived']['total']/$asset_stats['total']) * 100);
+        } else {
+	        $asset_stats['archived']['percent'] = 0;
+        }
+
+
+        return View::make('backend/dashboard')->with('asset_stats',$asset_stats)->with('recent_activity',$recent_activity);
+    }

 }
@@ -12,178 +12,166 @@ use Str;
 use Validator;
 use View;

-class DepreciationsController extends AdminController {
+class DepreciationsController extends AdminController
+{
+    /**
+     * Show a list of all the depreciations.
+     *
+     * @return View
+     */

-	/**
-	 * Show a list of all the depreciations.
-	 *
-	 * @return View
-	 */
+    public function getIndex()
+    {
+        // Grab all the depreciations
+        $depreciations = Depreciation::orderBy('created_at', 'DESC')->get();

-	public function getIndex()
-	{
-		// Grab all the depreciations
-		$depreciations = Depreciation::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
-		// Show the page
-		return View::make('backend/depreciations/index', compact('depreciations'));
-	}
+        // Show the page
+        return View::make('backend/depreciations/index', compact('depreciations'));
+    }


-	/**
-	 * Depreciation create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Show the page
-		$depreciation_options = array('0' => 'Top Level') + Depreciation::lists('name', 'id');
-		return View::make('backend/depreciations/edit')->with('depreciation_options',$depreciation_options)->with('depreciation',new Depreciation);
-	}
+    /**
+     * Depreciation create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $depreciation_options = array('0' => 'Top Level') + Depreciation::lists('name', 'id');
+        return View::make('backend/depreciations/edit')->with('depreciation_options',$depreciation_options)->with('depreciation',new Depreciation);
+    }


-	/**
-	 * Depreciation create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Depreciation create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // get the POST data
+        $new = Input::all();

-		// create a new instance
-		$depreciation = new Depreciation();
+        // create a new instance
+        $depreciation = new Depreciation();

-		// attempt validation
-		if ($depreciation->validate($new))
-		{
+        // attempt validation
+        if ($depreciation->validate($new)) {

-			// Depreciation data
-			$depreciation->name            = e(Input::get('name'));
-			$depreciation->months    = e(Input::get('months'));
-			$depreciation->user_id          = Sentry::getId();
+            // Depreciation data
+            $depreciation->name            = e(Input::get('name'));
+            $depreciation->months    = e(Input::get('months'));
+            $depreciation->user_id          = Sentry::getId();

-			// Was the asset created?
-			if($depreciation->save())
-			{
-				// Redirect to the new depreciation  page
-				return Redirect::to("admin/settings/depreciations")->with('success', Lang::get('admin/depreciations/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $depreciation->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            // Was the asset created?
+            if($depreciation->save()) {
+                // Redirect to the new depreciation  page
+                return Redirect::to("admin/settings/depreciations")->with('success', Lang::get('admin/depreciations/message.create.success'));
+            }
+        } else {
+            // failure
+            $errors = $depreciation->errors();
+            return Redirect::back()->withInput()->withErrors($errors);
+        }

-		// Redirect to the depreciation create page
-		return Redirect::to('admin/settings/depreciations/create')->with('error', Lang::get('admin/depreciations/message.create.error'));
+        // Redirect to the depreciation create page
+        return Redirect::to('admin/settings/depreciations/create')->with('error', Lang::get('admin/depreciations/message.create.error'));

-	}
+    }

-	/**
-	 * Depreciation update.
-	 *
-	 * @param  int  $depreciationId
-	 * @return View
-	 */
-	public function getEdit($depreciationId = null)
-	{
-		// Check if the depreciation exists
-		if (is_null($depreciation = Depreciation::find($depreciationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.does_not_exist'));
-		}
+    /**
+     * Depreciation update.
+     *
+     * @param  int  $depreciationId
+     * @return View
+     */
+    public function getEdit($depreciationId = null)
+    {
+        // Check if the depreciation exists
+        if (is_null($depreciation = Depreciation::find($depreciationId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.does_not_exist'));
+        }

-		// Show the page
-		//$depreciation_options = array('' => 'Top Level') + Depreciation::lists('name', 'id');
+        // Show the page
+        //$depreciation_options = array('' => 'Top Level') + Depreciation::lists('name', 'id');

-		$depreciation_options = array('' => 'Top Level') + DB::table('depreciations')->where('id', '!=', $depreciationId)->lists('name', 'id');
-		return View::make('backend/depreciations/edit', compact('depreciation'))->with('depreciation_options',$depreciation_options);
-	}
+        $depreciation_options = array('' => 'Top Level') + DB::table('depreciations')->where('id', '!=', $depreciationId)->lists('name', 'id');
+        return View::make('backend/depreciations/edit', compact('depreciation'))->with('depreciation_options',$depreciation_options);
+    }


-	/**
-	 * Depreciation update form processing page.
-	 *
-	 * @param  int  $depreciationId
-	 * @return Redirect
-	 */
-	public function postEdit($depreciationId = null)
-	{
-		// Check if the depreciation exists
-		if (is_null($depreciation = Depreciation::find($depreciationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.does_not_exist'));
-		}
+    /**
+     * Depreciation update form processing page.
+     *
+     * @param  int  $depreciationId
+     * @return Redirect
+     */
+    public function postEdit($depreciationId = null)
+    {
+        // Check if the depreciation exists
+        if (is_null($depreciation = Depreciation::find($depreciationId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.does_not_exist'));
+        }


+//attempt to validate
+        $validator = Validator::make(Input::all(), $depreciation->validationRules($depreciationId));

-		// get the POST data
-		$new = Input::all();
+        if ($validator->fails())
+        {
+            // The given data did not pass validation            
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+            // Depreciation data
+            $depreciation->name      = e(Input::get('name'));
+            $depreciation->months    = e(Input::get('months'));

-		// attempt validation
-		if ($depreciation->validate($new))
-		{
+            // Was the asset created?
+            if($depreciation->save()) {
+                // Redirect to the depreciation page
+                return Redirect::to("admin/settings/depreciations/")->with('success', Lang::get('admin/depreciations/message.update.success'));
+            }
+        } 

-			// Depreciation data
-			$depreciation->name            = e(Input::get('name'));
-			$depreciation->months    = e(Input::get('months'));
-
-			// Was the asset created?
-			if($depreciation->save())
-			{
-				// Redirect to the depreciation page
-				return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('success', Lang::get('admin/depreciations/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $depreciation->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
-
-		// Redirect to the depreciation management page
-		return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('error', Lang::get('admin/depreciations/message.update.error'));
+        // Redirect to the depreciation management page
+        return Redirect::to("admin/settings/depreciations/$depreciationId/edit")->with('error', Lang::get('admin/depreciations/message.update.error'));


-	}
+    }

-	/**
-	 * Delete the given depreciation.
-	 *
-	 * @param  int  $depreciationId
-	 * @return Redirect
-	 */
-	public function getDelete($depreciationId)
-	{
-		// Check if the depreciation exists
-		if (is_null($depreciation = Depreciation::find($depreciationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.not_found'));
-		}
+    /**
+     * Delete the given depreciation.
+     *
+     * @param  int  $depreciationId
+     * @return Redirect
+     */
+    public function getDelete($depreciationId)
+    {
+        // Check if the depreciation exists
+        if (is_null($depreciation = Depreciation::find($depreciationId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.not_found'));
+        }

-		if ($depreciation->has_models() > 0) {
+        if ($depreciation->has_models() > 0) {

-			// Redirect to the asset management page
-			return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.assoc_users'));
-		} else {
+            // Redirect to the asset management page
+            return Redirect::to('admin/settings/depreciations')->with('error', Lang::get('admin/depreciations/message.assoc_users'));
+        } else {

-			$depreciation->delete();
+            $depreciation->delete();

-			// Redirect to the depreciations management page
-			return Redirect::to('admin/settings/depreciations')->with('success', Lang::get('admin/depreciations/message.delete.success'));
-		}
+            // Redirect to the depreciations management page
+            return Redirect::to('admin/settings/depreciations')->with('success', Lang::get('admin/depreciations/message.delete.success'));
+        }

-	}
+    }



@@ -13,219 +13,202 @@ use Sentry;
 use Validator;
 use View;

-class GroupsController extends AdminController {
+class GroupsController extends AdminController
+{
+    /**
+     * Show a list of all the groups.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Grab all the groups
+        $groups = Sentry::getGroupProvider()->createModel()->paginate();

-	/**
-	 * Show a list of all the groups.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Grab all the groups
-		$groups = Sentry::getGroupProvider()->createModel()->paginate();
+        // Show the page
+        return View::make('backend/groups/index', compact('groups'));
+    }

-		// Show the page
-		return View::make('backend/groups/index', compact('groups'));
-	}
+    /**
+     * Group create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Get all the available permissions
+        $permissions = Config::get('permissions');
+        $this->encodeAllPermissions($permissions, true);

-	/**
-	 * Group create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Get all the available permissions
-		$permissions = Config::get('permissions');
-		$this->encodeAllPermissions($permissions, true);
+        // Selected permissions
+        $selectedPermissions = Input::old('permissions', array());

-		// Selected permissions
-		$selectedPermissions = Input::old('permissions', array());
+        // Show the page
+        return View::make('backend/groups/create', compact('permissions', 'selectedPermissions'));
+    }

-		// Show the page
-		return View::make('backend/groups/create', compact('permissions', 'selectedPermissions'));
-	}
+    /**
+     * Group create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+        // Declare the rules for the form validation
+        $rules = array(
+            'name' => 'required|alpha_space|min:2',
+        );

-	/**
-	 * Group create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
-		// Declare the rules for the form validation
-		$rules = array(
-			'name' => 'required|alpha_space|min:2',
-		);
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        try {
+            // We need to reverse the UI specific logic for our
+            // permissions here before we create the user.
+            $permissions = Input::get('permissions', array());
+            $this->decodePermissions($permissions);
+            app('request')->request->set('permissions', $permissions);

-		try
-		{
-			// We need to reverse the UI specific logic for our
-			// permissions here before we create the user.
-			$permissions = Input::get('permissions', array());
-			$this->decodePermissions($permissions);
-			app('request')->request->set('permissions', $permissions);
+            // Get the inputs, with some exceptions
+            $inputs = Input::except('_token');

-			// Get the inputs, with some exceptions
-			$inputs = Input::except('_token');
+            // Was the group created?
+            if ($group = Sentry::getGroupProvider()->create($inputs)) {
+                // Redirect to the new group page
+                return Redirect::route('update/group', $group->id)->with('success', Lang::get('admin/groups/message.success.create'));
+            }

-			// Was the group created?
-			if ($group = Sentry::getGroupProvider()->create($inputs))
-			{
-				// Redirect to the new group page
-				return Redirect::route('update/group', $group->id)->with('success', Lang::get('admin/groups/message.success.create'));
-			}
+            // Redirect to the new group page
+            return Redirect::route('create/group')->with('error', Lang::get('admin/groups/message.error.create'));
+        } catch (NameRequiredException $e) {
+            $error = 'group_name_required';
+        } catch (GroupExistsException $e) {
+            $error = 'group_exists';
+        }

-			// Redirect to the new group page
-			return Redirect::route('create/group')->with('error', Lang::get('admin/groups/message.error.create'));
-		}
-		catch (NameRequiredException $e)
-		{
-			$error = 'group_name_required';
-		}
-		catch (GroupExistsException $e)
-		{
-			$error = 'group_exists';
-		}
+        // Redirect to the group create page
+        return Redirect::route('create/group')->withInput()->with('error', Lang::get('admin/groups/message.'.$error));
+    }

-		// Redirect to the group create page
-		return Redirect::route('create/group')->withInput()->with('error', Lang::get('admin/groups/message.'.$error));
-	}
+    /**
+     * Group update.
+     *
+     * @param  int  $id
+     * @return View
+     */
+    public function getEdit($id = null)
+    {
+        try {
+            // Get the group information
+            $group = Sentry::getGroupProvider()->findById($id);

-	/**
-	 * Group update.
-	 *
-	 * @param  int  $id
-	 * @return View
-	 */
-	public function getEdit($id = null)
-	{
-		try
-		{
-			// Get the group information
-			$group = Sentry::getGroupProvider()->findById($id);
+            // Get all the available permissions
+            $permissions = Config::get('permissions');
+            $this->encodeAllPermissions($permissions, true);

-			// Get all the available permissions
-			$permissions = Config::get('permissions');
-			$this->encodeAllPermissions($permissions, true);
+            // Get this group permissions
+            $groupPermissions = $group->getPermissions();
+            $this->encodePermissions($groupPermissions);
+            $groupPermissions = array_merge($groupPermissions, Input::old('permissions', array()));
+        } catch (GroupNotFoundException $e) {
+            // Redirect to the groups management page
+            return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
+        }

-			// Get this group permissions
-			$groupPermissions = $group->getPermissions();
-			$this->encodePermissions($groupPermissions);
-			$groupPermissions = array_merge($groupPermissions, Input::old('permissions', array()));
-		}
-		catch (GroupNotFoundException $e)
-		{
-			// Redirect to the groups management page
-			return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
-		}
+        // Show the page
+        return View::make('backend/groups/edit', compact('group', 'permissions', 'groupPermissions'));
+    }

-		// Show the page
-		return View::make('backend/groups/edit', compact('group', 'permissions', 'groupPermissions'));
-	}
+    /**
+     * Group update form processing page.
+     *
+     * @param  int  $id
+     * @return Redirect
+     */
+    public function postEdit($id = null)
+    {
+        // We need to reverse the UI specific logic for our
+        // permissions here before we update the group.
+        $permissions = Input::get('permissions', array());
+        $this->decodePermissions($permissions);
+        app('request')->request->set('permissions', $permissions);

-	/**
-	 * Group update form processing page.
-	 *
-	 * @param  int  $id
-	 * @return Redirect
-	 */
-	public function postEdit($id = null)
-	{
-		// We need to reverse the UI specific logic for our
-		// permissions here before we update the group.
-		$permissions = Input::get('permissions', array());
-		$this->decodePermissions($permissions);
-		app('request')->request->set('permissions', $permissions);
+        try {
+            // Get the group information
+            $group = Sentry::getGroupProvider()->findById($id);
+        } catch (GroupNotFoundException $e) {
+            // Redirect to the groups management page
+            return Rediret::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
+        }

-		try
-		{
-			// Get the group information
-			$group = Sentry::getGroupProvider()->findById($id);
-		}
-		catch (GroupNotFoundException $e)
-		{
-			// Redirect to the groups management page
-			return Rediret::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
-		}
+        // Declare the rules for the form validation
+        $rules = array(
+            'name' => 'required|alpha_space|min:2',
+        );

-		// Declare the rules for the form validation
-		$rules = array(
-			'name' => 'required|alpha_space|min:2',
-		);
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        if (!Config::get('app.lock_passwords')) {

-		try
-		{
-			// Update the group data
-			$group->name        = Input::get('name');
-			$group->permissions = Input::get('permissions');
+                try {
+                // Update the group data
+                $group->name        = Input::get('name');
+                $group->permissions = Input::get('permissions');

-			// Was the group updated?
-			if ($group->save())
-			{
-				// Redirect to the group page
-				return Redirect::route('update/group', $id)->with('success', Lang::get('admin/groups/message.success.update'));
-			}
-			else
-			{
-				// Redirect to the group page
-				return Redirect::route('update/group', $id)->with('error', Lang::get('admin/groups/message.error.update'));
-			}
-		}
-		catch (NameRequiredException $e)
-		{
-			$error = Lang::get('admin/group/message.group_name_required');
-		}
+                // Was the group updated?
+                if ($group->save()) {
+                    // Redirect to the group page
+                    return Redirect::route('update/group', $id)->with('success', Lang::get('admin/groups/message.success.update'));
+                } else {
+                    // Redirect to the group page
+                    return Redirect::route('update/group', $id)->with('error', Lang::get('admin/groups/message.error.update'));
+                }
+            } catch (NameRequiredException $e) {
+                $error = Lang::get('admin/group/message.group_name_required');
+            }

-		// Redirect to the group page
-		return Redirect::route('update/group', $id)->withInput()->with('error', $error);
-	}
+        } else {
+            return Redirect::route('update/group', $id)->withInput()->with('error', 'Denied! Editing groups is not allowed in the demo.');
+        }

-	/**
-	 * Delete the given group.
-	 *
-	 * @param  int  $id
-	 * @return Redirect
-	 */
-	public function getDelete($id = null)
-	{
-		try
-		{
-			// Get group information
-			$group = Sentry::getGroupProvider()->findById($id);
+        // Redirect to the group page
+        return Redirect::route('update/group', $id)->withInput()->with('error', $error);
+    }

-			// Delete the group
-			$group->delete();
+    /**
+     * Delete the given group.
+     *
+     * @param  int  $id
+     * @return Redirect
+     */
+    public function getDelete($id = null)
+    {
+        try {
+            // Get group information
+            $group = Sentry::getGroupProvider()->findById($id);

-			// Redirect to the group management page
-			return Redirect::route('groups')->with('success', Lang::get('admin/groups/message.success.delete'));
-		}
-		catch (GroupNotFoundException $e)
-		{
-			// Redirect to the group management page
-			return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
-		}
-	}
+            // Delete the group
+            $group->delete();
+
+            // Redirect to the group management page
+            return Redirect::route('groups')->with('success', Lang::get('admin/groups/message.success.delete'));
+        } catch (GroupNotFoundException $e) {
+            // Redirect to the group management page
+            return Redirect::route('groups')->with('error', Lang::get('admin/groups/message.group_not_found', compact('id')));
+        }
+    }

 }
@@ -12,192 +12,195 @@ use Str;
 use Validator;
 use View;

-class LocationsController extends AdminController {
+class LocationsController extends AdminController
+{
+    /**
+     * Show a list of all the locations.
+     *
+     * @return View
+     */

-	/**
-	 * Show a list of all the locations.
-	 *
-	 * @return View
-	 */
+    public function getIndex()
+    {
+        // Grab all the locations
+        $locations = Location::orderBy('created_at', 'DESC')->with('parent','assets','assignedassets')->get();

-	public function getIndex()
-	{
-		// Grab all the locations
-		$locations = Location::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
-		// Show the page
-		return View::make('backend/locations/index', compact('locations'));
-	}
+        // Show the page
+        return View::make('backend/locations/index', compact('locations'));
+    }


-	/**
-	 * Location create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Show the page
-		$location_options = array('0' => 'Top Level') + Location::lists('name', 'id');
-		return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location);
-	}
+    /**
+     * Location create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        $locations = Location::orderBy('name','ASC')->get();
+
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;
+
+        return View::make('backend/locations/edit')
+        ->with('location_options',$location_options)
+        ->with('location',new Location);
+    }


-	/**
-	 * Location create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Location create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // get the POST data
+        $new = Input::all();

-		// create a new location instance
-		$location = new Location();
+        // create a new location instance
+        $location = new Location();

-		// attempt validation
-		if ($location->validate($new))
-		{
+        // attempt validation
+        if ($location->validate($new)) {

-			// Save the location data
-			$location->name            	= e(Input::get('name'));
-			$location->address			= e(Input::get('address'));
-			$location->address2			= e(Input::get('address2'));
-			$location->city    			= e(Input::get('city'));
-			$location->state    		= e(Input::get('state'));
-			$location->country    		= e(Input::get('country'));
-			$location->zip    		= e(Input::get('zip'));
-			$location->user_id          = Sentry::getId();
+            // Save the location data
+            $location->name            	= e(Input::get('name'));
+            if (Input::get('parent_id')=='') {
+                $location->parent_id		= null;
+            } else {
+                $location->parent_id		= e(Input::get('parent_id'));
+            }
+            $location->currency			= e(Input::get('currency'));
+            $location->address			= e(Input::get('address'));
+            $location->address2			= e(Input::get('address2'));
+            $location->city    			= e(Input::get('city'));
+            $location->state    		= e(Input::get('state'));
+            $location->country    		= e(Input::get('country'));
+            $location->zip    			= e(Input::get('zip'));
+            $location->user_id          = Sentry::getId();

-			// Was the asset created?
-			if($location->save())
-			{
-				// Redirect to the new location  page
-				return Redirect::to("admin/settings/locations")->with('success', Lang::get('admin/locations/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $location->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            // Was the asset created?
+            if($location->save()) {
+                // Redirect to the new location  page
+                return Redirect::to("admin/settings/locations")->with('success', Lang::get('admin/locations/message.create.success'));
+            }
+        } else {
+            // failure
+            $errors = $location->errors();
+            return Redirect::back()->withInput()->withErrors($errors);
+        }

-		// Redirect to the location create page
-		return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));
+        // Redirect to the location create page
+        return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));

-	}
+    }


-	/**
-	 * Location update.
-	 *
-	 * @param  int  $locationId
-	 * @return View
-	 */
-	public function getEdit($locationId = null)
-	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
-		}
+    /**
+     * Location update.
+     *
+     * @param  int  $locationId
+     * @return View
+     */
+    public function getEdit($locationId = null)
+    {
+        // Check if the location exists
+        if (is_null($location = Location::find($locationId))) {
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+        }

-		// Show the page
-		//$location_options = array('' => 'Top Level') + Location::lists('name', 'id');
+        // Show the page
+        $locations = Location::orderBy('name','ASC')->get();
+        $location_options_array = Location::getLocationHierarchy($locations);
+        $location_options = Location::flattenLocationsArray($location_options_array);
+        $location_options = array('' => 'Top Level') + $location_options;

-		$location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id');
-		return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
-	}
+        return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options);
+    }


-	/**
-	 * Location update form processing page.
-	 *
-	 * @param  int  $locationId
-	 * @return Redirect
-	 */
-	public function postEdit($locationId = null)
-	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
-		}
+    /**
+     * Location update form processing page.
+     *
+     * @param  int  $locationId
+     * @return Redirect
+     */
+    public function postEdit($locationId = null)
+    {
+        // Check if the location exists
+        if (is_null($location = Location::find($locationId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.does_not_exist'));
+        }
+
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $location->validationRules($locationId));
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Update the location data
+            $location->name         = e(Input::get('name'));
+            if (Input::get('parent_id')=='') {
+                $location->parent_id		= null;
+            } else {
+                $location->parent_id		= e(Input::get('parent_id',''));
+            }
+            $location->currency			= e(Input::get('currency'));
+            $location->address			= e(Input::get('address'));
+            $location->address2			= e(Input::get('address2'));
+            $location->city    			= e(Input::get('city'));
+            $location->state    		= e(Input::get('state'));
+            $location->country    	= e(Input::get('country'));
+            $location->zip    		  = e(Input::get('zip'));
+
+            // Was the asset created?
+            if($location->save()) {
+                // Redirect to the saved location page
+                return Redirect::to("admin/settings/locations/")->with('success', Lang::get('admin/locations/message.update.success'));
+            }
+        }
+
+        // Redirect to the location management page
+        return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given location.
+     *
+     * @param  int  $locationId
+     * @return Redirect
+     */
+    public function getDelete($locationId)
+    {
+        // Check if the location exists
+        if (is_null($location = Location::find($locationId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.not_found'));
+        }
+
+
+        if ($location->has_users->count() > 0) {
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+        } elseif ($location->childLocations->count() > 0) {
+            return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
+        } else {
+            $location->delete();
+            return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
+        }



-		// get the POST data
-		$new = Input::all();
-
-
-		// attempt validation
-		if ($location->validate($new))
-		{
-
-			// Update the location data
-			$location->name            	= e(Input::get('name'));
-			$location->address			= e(Input::get('address'));
-			$location->address2			= e(Input::get('address2'));
-			$location->city    			= e(Input::get('city'));
-			$location->state    		= e(Input::get('state'));
-			$location->country    		= e(Input::get('country'));
-			$location->zip    		= e(Input::get('zip'));
-
-			// Was the asset created?
-			if($location->save())
-			{
-				// Redirect to the saved location page
-				return Redirect::to("admin/settings/locations/$locationId/edit")->with('success', Lang::get('admin/locations/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $location->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
-
-		// Redirect to the location management page
-		return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error'));
-
-	}
-
-	/**
-	 * Delete the given location.
-	 *
-	 * @param  int  $locationId
-	 * @return Redirect
-	 */
-	public function getDelete($locationId)
-	{
-		// Check if the location exists
-		if (is_null($location = Location::find($locationId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.not_found'));
-		}
-
-
-		if ($location->has_users() > 0) {
-
-			// Redirect to the asset management page
-			return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users'));
-		} else {
-
-			$location->delete();
-
-			// Redirect to the locations management page
-			return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
-		}
-
-
-
-	}
+    }



@@ -11,174 +11,186 @@ use Str;
 use Validator;
 use View;

-class ManufacturersController extends AdminController {
+class ManufacturersController extends AdminController
+{
+    /**
+     * Show a list of all manufacturers
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Grab all the manufacturers
+        $manufacturers = Manufacturer::orderBy('created_at', 'DESC')->get();

-	/**
-	 * Show a list of all manufacturers
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Grab all the manufacturers
-		$manufacturers = Manufacturer::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
-		// Show the page
-		return View::make('backend/manufacturers/index', compact('manufacturers'));
-	}
+        // Show the page
+        return View::make('backend/manufacturers/index', compact('manufacturers'));
+    }


-	/**
-	 * Manufacturer create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		return View::make('backend/manufacturers/edit')->with('manufacturer', new Manufacturer);
-	}
+    /**
+     * Manufacturer create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        return View::make('backend/manufacturers/edit')->with('manufacturer', new Manufacturer);
+    }


-	/**
-	 * Manufacturer create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Manufacturer create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // get the POST data
+        $new = Input::all();

-		// Create a new manufacturer
-		$manufacturer = new Manufacturer;
+        // Create a new manufacturer
+        $manufacturer = new Manufacturer;

-		// attempt validation
-		if ($manufacturer->validate($new))
-		{
+        // attempt validation
+        if ($manufacturer->validate($new)) {

-			// Save the location data
-			$manufacturer->name            = e(Input::get('name'));
-			$manufacturer->user_id          = Sentry::getId();
+            // Save the location data
+            $manufacturer->name            = e(Input::get('name'));
+            $manufacturer->user_id          = Sentry::getId();

-			// Was it created?
-			if($manufacturer->save())
-			{
-				// Redirect to the new manufacturer  page
-				return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $manufacturer->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            // Was it created?
+            if($manufacturer->save()) {
+                // Redirect to the new manufacturer  page
+                return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.create.success'));
+            }
+        } else {
+            // failure
+            $errors = $manufacturer->errors();
+            return Redirect::back()->withInput()->withErrors($errors);
+        }

-		// Redirect to the manufacturer create page
-		return Redirect::to('admin/settings/manufacturers/create')->with('error', Lang::get('admin/manufacturers/message.create.error'));
+        // Redirect to the manufacturer create page
+        return Redirect::to('admin/settings/manufacturers/create')->with('error', Lang::get('admin/manufacturers/message.create.error'));

-	}
+    }

-	/**
-	 * Manufacturer update.
-	 *
-	 * @param  int  $manufacturerId
-	 * @return View
-	 */
-	public function getEdit($manufacturerId = null)
-	{
-		// Check if the manufacturer exists
-		if (is_null($manufacturer = Manufacturer::find($manufacturerId)))
-		{
-			// Redirect to the manufacturer  page
-			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.does_not_exist'));
-		}
+    /**
+     * Manufacturer update.
+     *
+     * @param  int  $manufacturerId
+     * @return View
+     */
+    public function getEdit($manufacturerId = null)
+    {
+        // Check if the manufacturer exists
+        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
+            // Redirect to the manufacturer  page
+            return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.does_not_exist'));
+        }

-		// Show the page
-		return View::make('backend/manufacturers/edit', compact('manufacturer'));
-	}
+        // Show the page
+        return View::make('backend/manufacturers/edit', compact('manufacturer'));
+    }


-	/**
-	 * Manufacturer update form processing page.
-	 *
-	 * @param  int  $manufacturerId
-	 * @return Redirect
-	 */
-	public function postEdit($manufacturerId = null)
-	{
-		// Check if the manufacturer exists
-		if (is_null($manufacturer = Manufacturer::find($manufacturerId)))
-		{
-			// Redirect to the manufacturer  page
-			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.does_not_exist'));
-		}
+    /**
+     * Manufacturer update form processing page.
+     *
+     * @param  int  $manufacturerId
+     * @return Redirect
+     */
+    public function postEdit($manufacturerId = null)
+    {
+        // Check if the manufacturer exists
+        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
+            // Redirect to the manufacturer  page
+            return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.does_not_exist'));
+        }

+        $validator = Validator::make(Input::all(), $manufacturer->validationRules($manufacturerId));

-		// get the POST data
-		$new = Input::all();
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+            // Save the  data
+            $manufacturer->name 	= e(Input::get('name'));

-		// attempt validation
-		if ($manufacturer->validate($new))
-		{
+            // Was it created?
+            if($manufacturer->save()) {
+                // Redirect to the new manufacturer page
+                return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.update.success'));
+            }
+        }

-			// Save the  data
-			$manufacturer->name 	= e(Input::get('name'));
+        // Redirect to the manufacturer management page
+        return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));

-			// Was it created?
-			if($manufacturer->save())
-			{
-				// Redirect to the new manufacturer page
-				return Redirect::to("admin/settings/manufacturers")->with('success', Lang::get('admin/manufacturers/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $manufacturer->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+    }

-		// Redirect to the manufacturer management page
-		return Redirect::to("admin/settings/manufacturers/$manufacturerId/edit")->with('error', Lang::get('admin/manufacturers/message.update.error'));
+    /**
+     * Delete the given manufacturer.
+     *
+     * @param  int  $manufacturerId
+     * @return Redirect
+     */
+    public function getDelete($manufacturerId)
+    {
+        // Check if the manufacturer exists
+        if (is_null($manufacturer = Manufacturer::find($manufacturerId))) {
+            // Redirect to the manufacturers page
+            return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.not_found'));
+        }

-	}
+        if ($manufacturer->has_models() > 0) {

-	/**
-	 * Delete the given manufacturer.
-	 *
-	 * @param  int  $manufacturerId
-	 * @return Redirect
-	 */
-	public function getDelete($manufacturerId)
-	{
-		// Check if the manufacturer exists
-		if (is_null($manufacturer = Manufacturer::find($manufacturerId)))
-		{
-			// Redirect to the manufacturers page
-			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.not_found'));
-		}
+            // Redirect to the asset management page
+            return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.assoc_users'));
+        } else {

-		if ($manufacturer->has_models() > 0) {
+            // Delete the manufacturer
+            $manufacturer->delete();

-			// Redirect to the asset management page
-			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.assoc_users'));
-		} else {
-
-			// Delete the manufacturer
-			$manufacturer->delete();
-
-			// Redirect to the manufacturers management page
-		return Redirect::to('admin/settings/manufacturers')->with('success', Lang::get('admin/manufacturers/message.delete.success'));
-		}
+            // Redirect to the manufacturers management page
+        return Redirect::to('admin/settings/manufacturers')->with('success', Lang::get('admin/manufacturers/message.delete.success'));
+        }






-	}
+    }
+
+
+
+    /**
+    *  Get the asset information to present to the category view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($manufacturerID = null)
+    {
+        $manufacturer = Manufacturer::find($manufacturerID);
+
+        if (isset($manufacturer->id)) {
+                return View::make('backend/manufacturers/view', compact('manufacturer'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/manufacturers/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('manufacturers')->with('error', $error);
+        }
+
+
+    }



@@ -1,6 +1,7 @@
 <?php namespace Controllers\Admin;

 use AdminController;
+use Image;
 use Input;
 use Lang;
 use Model;
@@ -13,217 +14,375 @@ use Manufacturer;
 use Str;
 use Validator;
 use View;
+use Datatable;

-class ModelsController extends AdminController {
-
-	/**
-	 * Show a list of all the models.
-	 *
-	 * @return View
-	 */
-	public function getIndex()
-	{
-		// Grab all the models
-		$models = Model::orderBy('created_at', 'DESC')->paginate(Setting::getSettings()->per_page);
-
-		// Show the page
-		return View::make('backend/models/index', compact('models'));
-	}
+class ModelsController extends AdminController
+{
+    /**
+     * Show a list of all the models.
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Show the page
+        return View::make('backend/models/index');
+    }

 /**
-	 * Model create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Show the page
-		$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
-		$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-		$category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
-		$view = View::make('backend/models/edit');
-		$view->with('category_list',$category_list);
-		$view->with('depreciation_list',$depreciation_list);
-		$view->with('manufacturer_list',$manufacturer_list);
-		$view->with('model',new Model);
-		return $view;
-	}
+     * Model create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
+        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
+        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+        $view = View::make('backend/models/edit');
+        $view->with('category_list',$category_list);
+        $view->with('depreciation_list',$depreciation_list);
+        $view->with('manufacturer_list',$manufacturer_list);
+        $view->with('model',new Model);
+        return $view;
+    }


-	/**
-	 * Model create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Model create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // Create a new manufacturer
+        $model = new Model;

-		// Create a new manufacturer
-		$model = new Model;
+        $validator = Validator::make(Input::all(), $model->validationRules());

-		// attempt validation
-		if ($model->validate($new))
-		{
+        // attempt validation
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {

-			// Save the model data
-			$model->name            	= e(Input::get('name'));
-			$model->modelno            	= e(Input::get('modelno'));
-			$model->depreciation_id    	= e(Input::get('depreciation_id'));
-			$model->manufacturer_id    	= e(Input::get('manufacturer_id'));
-			$model->category_id    		= e(Input::get('category_id'));
-			$model->user_id          	= Sentry::getId();
-			$model->eol    				= e(Input::get('eol'));
+            if ( e(Input::get('depreciation_id')) == '') {
+                $model->depreciation_id =  0;
+            } else {
+                $model->depreciation_id = e(Input::get('depreciation_id'));
+            }
+
+             if ( e(Input::get('eol')) == '') {
+                $model->eol =  0;
+            } else {
+                $model->eol = e(Input::get('eol'));
+            }
+
+            // Save the model data
+            $model->name            	= e(Input::get('name'));
+            $model->modelno            	= e(Input::get('modelno'));
+            $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
+            $model->category_id    		= e(Input::get('category_id'));
+            $model->user_id          	= Sentry::getId();
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));


-			// Was it created?
-			if($model->save())
-			{
-				// Redirect to the new model  page
-				return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $model->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/models/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $model->image = $file_name;
+            }

-		// Redirect to the model create page
-		return Redirect::to('hardware/models/create')->with('error', Lang::get('admin/models/message.create.error'));
+            // Was it created?
+            if($model->save()) {
+                // Redirect to the new model  page
+                return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success'));
+            }
+        }

-	}
+        // Redirect to the model create page
+        return Redirect::to('hardware/models/create')->with('error', Lang::get('admin/models/message.create.error'));

-	/**
-	 * Model update.
-	 *
-	 * @param  int  $modelId
-	 * @return View
-	 */
-	public function getEdit($modelId = null)
-	{
-		// Check if the model exists
-		if (is_null($model = Model::find($modelId)))
-		{
-			// Redirect to the model management page
-			return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
-		}
+    }

-		$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
-		$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-		$category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
-		$view = View::make('backend/models/edit', compact('model'));
-		$view->with('category_list',$category_list);
-		$view->with('depreciation_list',$depreciation_list);
-		$view->with('manufacturer_list',$manufacturer_list);
-		return $view;
-	}
+    /**
+     * Model update.
+     *
+     * @param  int  $modelId
+     * @return View
+     */
+    public function getEdit($modelId = null)
+    {
+        // Check if the model exists
+        if (is_null($model = Model::find($modelId))) {
+            // Redirect to the model management page
+            return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
+        }
+
+        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
+        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
+        $category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
+        $view = View::make('backend/models/edit', compact('model'));
+        $view->with('category_list',$category_list);
+        $view->with('depreciation_list',$depreciation_list);
+        $view->with('manufacturer_list',$manufacturer_list);
+        return $view;
+    }


-	/**
-	 * Model update form processing page.
-	 *
-	 * @param  int  $modelId
-	 * @return Redirect
-	 */
-	public function postEdit($modelId = null)
-	{
-		// Check if the model exists
-		if (is_null($model = Model::find($modelId)))
-		{
-			// Redirect to the models management page
-			return Redirect::to('admin/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
-		}
+    /**
+     * Model update form processing page.
+     *
+     * @param  int  $modelId
+     * @return Redirect
+     */
+    public function postEdit($modelId = null)
+    {
+        // Check if the model exists
+        if (is_null($model = Model::find($modelId))) {
+            // Redirect to the models management page
+            return Redirect::to('admin/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
+        }

-		// get the POST data
-		$new = Input::all();
+          //attempt to validate
+        $validator = Validator::make(Input::all(), $model->validationRules($modelId));

-		// attempt validation
-		if ($model->validate($new))
-		{
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {

-			// Update the model data
-			$model->name            	= e(Input::get('name'));
-			$model->modelno            	= e(Input::get('modelno'));
-			$model->depreciation_id    	= e(Input::get('depreciation_id'));
-			$model->manufacturer_id    	= e(Input::get('manufacturer_id'));
-			$model->category_id    		= e(Input::get('category_id'));
-			$model->eol    				= e(Input::get('eol'));
+            if ( e(Input::get('depreciation_id')) == '') {
+                $model->depreciation_id =  0;
+            } else {
+                $model->depreciation_id = e(Input::get('depreciation_id'));
+            }
+
+             if ( e(Input::get('eol')) == '') {
+                $model->eol =  0;
+            } else {
+                $model->eol = e(Input::get('eol'));
+            }
+
+            // Update the model data
+            $model->name            	= e(Input::get('name'));
+            $model->modelno            	= e(Input::get('modelno'));
+            $model->manufacturer_id    	= e(Input::get('manufacturer_id'));
+            $model->category_id    		= e(Input::get('category_id'));
+            $model->show_mac_address 	= e(Input::get('show_mac_address', '0'));
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/models/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $model->image = $file_name;
+            }
+
+            if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+                $model->image = NULL;
+            }
+
+            // Was it created?
+            if($model->save()) {
+                // Redirect to the new model  page
+                return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.update.success'));
+            }
+        }
+
+        // Redirect to the model create page
+        return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given model.
+     *
+     * @param  int  $modelId
+     * @return Redirect
+     */
+    public function getDelete($modelId)
+    {
+        // Check if the model exists
+        if (is_null($model = Model::find($modelId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.not_found'));
+        }
+
+        if ($model->assets->count() > 0) {
+            // Throw an error that this model is associated with assets
+            return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.assoc_users'));
+
+        } else {
+            // Delete the model
+            $model->delete();
+
+            // Redirect to the models management page
+            return Redirect::to('hardware/models')->with('success', Lang::get('admin/models/message.delete.success'));
+        }
+    }
+
+    public function getRestore($modelId = null)
+    {
+
+		// Get user information
+		$model = Model::withTrashed()->find($modelId);
+
+		 if (isset($model->id)) {
+
+			// Restore the model
+			$model->restore();
+
+			// Prepare the success message
+			$success = Lang::get('admin/models/message.restore.success');
+
+			// Redirect back
+			return Redirect::back()->with('success', $success);
+
+		 } else {
+			 return Redirect::back()->with('error', Lang::get('admin/models/message.not_found'));
+		 }
+
+    }


-			// Was it created?
-			if($model->save())
-			{
-				// Redirect to the new model  page
-				return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $model->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+    /**
+    *  Get the asset information to present to the model view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($modelId = null)
+    {
+        $model = Model::withTrashed()->find($modelId);

-		// Redirect to the model create page
-		return Redirect::to("hardware/models/$modelId/edit")->with('error', Lang::get('admin/models/message.update.error'));
+        if (isset($model->id)) {
+                return View::make('backend/models/view', compact('model'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/models/message.does_not_exist', compact('id'));

-	}
-
-	/**
-	 * Delete the given model.
-	 *
-	 * @param  int  $modelId
-	 * @return Redirect
-	 */
-	public function getDelete($modelId)
-	{
-		// Check if the model exists
-		if (is_null($model = Model::find($modelId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.not_found'));
-		}
-
-		if ($model->assets->count() > 0) {
-			// Throw an error that this model is associated with assets
-			return Redirect::to('hardware/models')->with('error', Lang::get('admin/models/message.assoc_users'));
-
-		} else {
-			// Delete the model
-			$model->delete();
-
-			// Redirect to the models management page
-			return Redirect::to('hardware/models')->with('success', Lang::get('admin/models/message.delete.success'));
-		}
-	}
+            // Redirect to the user management page
+            return Redirect::route('models')->with('error', $error);
+        }


-	/**
-	*  Get the asset information to present to the model view page
-	*
-	* @param  int  $assetId
-	* @return View
-	**/
-	public function getView($modelId = null)
-	{
-		$model = Model::find($modelId);
+    }

-		if (isset($model->id)) {
-				return View::make('backend/models/view', compact('model'));
-		} else {
-			// Prepare the error message
-			$error = Lang::get('admin/models/message.does_not_exist', compact('id'));
+        public function getClone($modelId = null)
+    {
+        // Check if the model exists
+        if (is_null($model_to_clone = Model::find($modelId))) {
+            // Redirect to the model management page
+            return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
+        }

-			// Redirect to the user management page
-			return Redirect::route('models')->with('error', $error);
-		}
+        $model = clone $model_to_clone;
+        $model->id = null;
+
+        // Show the page
+        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
+        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
+        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+        $view = View::make('backend/models/edit');
+        $view->with('category_list',$category_list);
+        $view->with('depreciation_list',$depreciation_list);
+        $view->with('manufacturer_list',$manufacturer_list);
+        $view->with('model',$model);
+        $view->with('clone_model',$model_to_clone);
+        return $view;
+
+    }
+
+    public function getDatatable($status = null)
+    {
+        $models = Model::orderBy('created_at', 'DESC')->with('category','assets','depreciation');
+        ($status != 'Deleted') ?: $models->withTrashed()->Deleted();;
+        $models = $models->get();
+
+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($models) {
+            if($models->deleted_at=='') {
+                return '<a href="'.route('update/model', $models->id).'" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a><a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/model', $models->id).'" data-content="'.Lang::get('admin/models/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($models->name).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
+            } else {
+                return '<a href="'.route('restore/model', $models->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
+            }
+        });
+
+        return Datatable::collection($models)
+        ->addColumn('manufacturer', function($models) {
+            return $models->manufacturer->name;
+        })
+        ->addColumn('name', function ($models) {
+            return link_to('/hardware/models/'.$models->id.'/view', $models->name);
+        })
+        ->showColumns('modelno')
+        ->addColumn('asset_count', function($models) {
+            return $models->assets->count();
+        })
+        ->addColumn('depreciation', function($models) {
+            return (($models->depreciation)&&($models->depreciation->id > 0)) ? $models->depreciation->name.' ('.$models->depreciation->months.')' : Lang::get('general.no_depreciation');
+        })
+        ->addColumn('category', function($models) {
+            return ($models->category) ? $models->category->name : '';
+        })
+        ->addColumn('eol', function($models) {
+            return ($models->eol) ? $models->eol.' '.Lang::get('general.months') : '';
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','modelno','asset_count','depreciation','category','eol','actions')
+        ->orderColumns('name','modelno','asset_count','depreciation','category','eol','actions')
+        ->make();
+    }


-	}
+    public function getDataView($modelID)
+    {
+        $model = Model::withTrashed()->find($modelID);
+        $modelassets = $model->assets;

+        $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($modelassets)
+            {
+                if (($modelassets->assigned_to !='') && ($modelassets->assigned_to > 0)) {
+                    return '<a href="'.route('checkin/hardware', $modelassets->id).'" class="btn btn-primary btn-sm">'.Lang::get('general.checkin').'</a>';
+                } else {
+                    return '<a href="'.route('checkout/hardware', $modelassets->id).'" class="btn btn-info btn-sm">'.Lang::get('general.checkout').'</a>';
+                }
+            });
+
+        return Datatable::collection($modelassets)
+        ->addColumn('name', function ($modelassets) {
+           return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->showAssetName());
+          // return $modelassets->name;
+        })
+        ->addColumn('asset_tag', function ($modelassets) {
+            return link_to('/hardware/'.$modelassets->id.'/view', $modelassets->asset_tag);
+        })
+        ->showColumns('serial')
+        ->addColumn('assigned_to', function ($modelassets) {
+            if ($modelassets->assigned_to) {
+                return link_to('/admin/users/'.$modelassets->assigned_to.'/view', $modelassets->assigneduser->fullName());
+            }
+        })
+        ->addColumn($actions)
+        ->searchColumns('name','asset_tag','serial','assigned_to','actions')
+        ->orderColumns('name','asset_tag','serial','assigned_to','actions')
+        ->make();
+    }

 }
@@ -0,0 +1,481 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Input;
+use Lang;
+use License;
+use Asset;
+use User;
+use View;
+use Location;
+use Redirect;
+use Response;
+use Actionlog;
+use Setting;
+use League\Csv\Writer;
+use League\Csv\Reader;
+
+class ReportsController extends AdminController
+{
+    /**
+     * Show Asset Report
+     *
+     * @return View
+     */
+    public function getAssetsReport()
+    {
+        // Grab all the assets
+        $assets = Asset::with('model','assigneduser.userLoc','assetstatus','defaultLoc','assetlog','supplier','model.manufacturer')->orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/asset', compact('assets'));
+    }
+
+    /**
+     * Export Asset Report as CSV
+     *
+     * @return file download
+     */
+    public function exportAssetReport()
+    {
+        // Grab all the assets
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+
+        $rows = array();
+
+        // Create the header row
+        $header = array(
+            Lang::get('admin/hardware/table.asset_tag'),
+            Lang::get('admin/hardware/form.manufacturer'),
+            Lang::get('admin/hardware/form.model'),
+            Lang::get('general.model_no'),
+            Lang::get('general.name'),
+            Lang::get('admin/hardware/table.serial'),
+            Lang::get('general.status'),
+            Lang::get('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/form.order'),
+            Lang::get('admin/hardware/form.supplier'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location')
+        );
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $row[] = $asset->asset_tag;
+            if ($asset->model->manufacturer) {
+                $row[] = $asset->model->manufacturer->name;
+            } else {
+                $row[] = '';
+            }
+            $row[] = '"'.$asset->model->name.'"';
+            $row[] = '"'.$asset->model->modelno.'"';
+            $row[] = $asset->name;
+            $row[] = $asset->serial;
+            if ($asset->assetstatus) {
+                $row[] = $asset->assetstatus->name;
+            } else {
+                $row[] = '';
+            }
+            $row[] = $asset->purchase_date;
+            $row[] = '"'.number_format($asset->purchase_cost).'"';
+            if ($asset->order_number) {
+                $row[] = $asset->order_number;
+            } else {
+                $row[] = '';
+            }
+            if ($asset->supplier_id) {
+                $row[] = $asset->supplier->name;
+            } else {
+                $row[] = '';
+            }
+
+            if ($asset->assigned_to > 0) {
+                $user = User::find($asset->assigned_to);
+                $row[] = $user->fullName();
+            } else {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                $location = Location::find($asset->assigneduser->location_id);
+                if ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } elseif ($asset->rtd_location_id) {
+                $location = Location::find($asset->rtd_location_id);
+                if ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    /**
+     * Show Depreciation Report for Assets
+     *
+     * @return View
+     */
+    public function getDeprecationReport()
+    {
+        // Grab all the assets
+        $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/depreciation', compact('assets'));
+    }
+
+    /**
+     * Export Depreciation Report as CSV
+     *
+     * @return file download
+     */
+    public function exportDeprecationReport()
+    {
+        // Grab all the assets
+        $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')->orderBy('created_at', 'DESC')->get();
+
+        $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject());
+        $csv->setOutputBOM(Reader::BOM_UTF16_BE);
+
+        $rows = array();
+
+        // Create the header row
+        $header = array(
+            Lang::get('admin/hardware/table.asset_tag'),
+            Lang::get('admin/hardware/table.title'),
+            Lang::get('admin/hardware/table.serial'),
+            Lang::get('admin/hardware/table.checkoutto'),
+            Lang::get('admin/hardware/table.location'),
+            Lang::get('admin/hardware/table.purchase_date'),
+            Lang::get('admin/hardware/table.purchase_cost'),
+            Lang::get('admin/hardware/table.book_value'),
+            Lang::get('admin/hardware/table.diff')
+        );
+
+        //we insert the CSV header
+        $csv->insertOne($header);
+
+        // Create a row per asset
+        foreach ($assets as $asset) {
+            $row = array();
+            $row[] = $asset->asset_tag;
+            $row[] = $asset->name;
+            $row[] = $asset->serial;
+
+
+            if ($asset->assigned_to > 0) {
+              $user = User::find($asset->assigned_to);
+              $row[] = $user->fullName();
+              } else {
+                $row[] = ''; // Empty string if unassigned
+            }
+
+            if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                $location = Location::find($asset->assigneduser->location_id);
+                if ($location->city) {
+                    $row[] = $location->city . ', ' . $location->state;
+                } elseif ($location->name) {
+                    $row[] = $location->name;
+                } else {
+                    $row[] = '';
+                }
+            } else {
+                $row[] = '';  // Empty string if location is not set
+            }
+
+
+
+            if ($asset->assetloc) {
+                $currency =  $asset->assetloc->currency;
+            } else {
+                $currency =   Setting::first()->default_currency;
+            }
+
+            $row[] = $asset->purchase_date;
+            $row[] = $currency.number_format($asset->purchase_cost);
+            $row[] = $currency.number_format($asset->getDepreciatedValue());
+            $row[] = $currency.number_format(($asset->purchase_cost - $asset->getDepreciatedValue()));
+            $csv->insertOne($row);
+        }
+
+        $csv->output('depreciation-report-'.date('Y-m-d').'.csv');
+        die;
+
+    }
+
+	/**
+     * Show Report for Activity
+     *
+     * @return View
+     */
+
+	public function getActivityReport()
+    {
+        $log_actions = Actionlog::orderBy('created_at', 'DESC')
+        ->with('adminlog')
+        ->with('accessorylog')
+        ->with('assetlog')
+        ->with('licenselog')
+        ->with('userlog')
+        ->orderBy('created_at','DESC')
+        ->get();
+        return View::make('backend/reports/activity', compact('log_actions'));
+    }
+
+
+    /**
+     * Show Report for Licenses
+     *
+     * @return View
+     */
+    public function getLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+        return View::make('backend/reports/licenses', compact('licenses'));
+    }
+
+    /**
+     * Export License Report as CSV
+     *
+     * @return file download
+     */
+    public function exportLicenseReport()
+    {
+        $licenses = License::orderBy('created_at', 'DESC')->get();
+        $rows = array();
+        $header = array(
+            Lang::get('admin/licenses/table.title'),
+            Lang::get('admin/licenses/table.serial'),
+            Lang::get('admin/licenses/form.seats'),
+            Lang::get('admin/licenses/form.remaining_seats'),
+            Lang::get('admin/licenses/form.expiration'),
+            Lang::get('admin/licenses/form.date'),
+            Lang::get('admin/licenses/form.cost')
+        );
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ', ');
+
+        // Row per license
+        foreach ($licenses as $license) {
+            $row = array();
+            $row[] = $license->name;
+            $row[] = $license->serial;
+            $row[] = $license->seats;
+            $row[] = $license->remaincount();
+            $row[] = $license->expiration_date;
+            $row[] = $license->purchase_date;
+            $row[] = '"'.number_format($license->purchase_cost).'"';
+
+            $rows[] = implode($row, ',');
+        }
+
+        $csv = implode($rows, "\n");
+        $response = Response::make($csv, 200);
+        $response->header('Content-Type', 'text/csv');
+        $response->header('Content-disposition', 'attachment;filename=report.csv');
+
+        return $response;
+    }
+
+    public function getCustomReport()
+    {
+        return View::make('backend/reports/custom');
+    }
+
+    public function postCustom()
+    {
+        $assets = Asset::orderBy('created_at', 'DESC')->get();
+        $rows = array();
+        $header = array();
+
+        if (e(Input::get('asset_name')) == '1')
+        {
+            $header[] = 'Asset Name';
+        }
+        if (e(Input::get('asset_tag')) == '1')
+        {
+            $header[] = 'Asset Tag';
+        }
+        if (e(Input::get('manufacturer')) == '1')
+        {
+            $header[] = 'Manufacturer';
+        }
+        if (e(Input::get('model')) == '1')
+        {
+            $header[] = 'Model';
+            $header[] = 'Model Number';
+        }
+        if (e(Input::get('serial')) == '1')
+        {
+            $header[] = 'Serial';
+        }
+        if (e(Input::get('purchase_date')) == '1')
+        {
+            $header[] = 'Purchase Date';
+        }
+        if ((e(Input::get('purchase_cost')) == '1') && (e(Input::get('depreciation')) == '0'))
+        {
+            $header[] = 'Purchase Cost';
+        }
+        if (e(Input::get('order')) == '1')
+        {
+            $header[] = 'Order Number';
+        }
+        if (e(Input::get('supplier')) == '1')
+        {
+            $header[] = 'Supplier';
+        }
+        if (e(Input::get('location')) == '1')
+        {
+            $header[] = 'Location';
+        }
+        if (e(Input::get('assigned_to')) == '1')
+        {
+            $header[] = 'Assigned To';
+        }
+        if (e(Input::get('status')) == '1')
+        {
+            $header[] = 'Status';
+        }
+        if (e(Input::get('warranty')) == '1')
+        {
+            $header[] = 'Warranty';
+            $header[] = 'Warranty Expires';
+        }
+        if (e(Input::get('depreciation')) == '1')
+        {
+            $header[] = 'Purchase Cost';
+            $header[] = 'Value';
+            $header[] = 'Diff';
+        }
+
+        $header = array_map('trim', $header);
+        $rows[] = implode($header, ',');
+
+        foreach($assets as $asset) {
+            $row = array();
+            if (e(Input::get('asset_name')) == '1') {
+                $row[] = $asset->name;
+            }
+            if (e(Input::get('asset_tag')) == '1') {
+                $row[] = $asset->asset_tag;
+            }
+            if (e(Input::get('manufacturer')) == '1') {
+                if ($asset->model->manufacturer) {
+                    $row[] = $asset->model->manufacturer->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('model')) == '1') {
+                $row[] = '"'.$asset->model->name.'"';
+                $row[] = '"'.$asset->model->modelno.'"';
+            }
+            if (e(Input::get('serial')) == '1') {
+                $row[] = $asset->serial;
+            }
+            if (e(Input::get('purchase_date')) == '1') {
+                $row[] = $asset->purchase_date;
+            }
+            if (e(Input::get('purchase_cost')) == '1') {
+                $row[] = '"'.number_format($asset->purchase_cost).'"';
+            }
+            if (e(Input::get('order')) == '1') {
+                if ($asset->order_number) {
+                    $row[] = $asset->order_number;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('supplier')) == '1') {
+                if ($asset->supplier_id) {
+                    $row[] = $asset->supplier->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('location')) == '1') {
+                if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {
+                    $location = Location::find($asset->assigneduser->location_id);
+                    if ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } elseif ($asset->rtd_location_id) {
+                    $location = Location::find($asset->rtd_location_id);
+                    if ($location->name) {
+                        $row[] = $location->name;
+                    } else {
+                        $row[] = '';
+                    }
+                } else {
+                    $row[] = '';  // Empty string if location is not set
+                }
+            }
+            if (e(Input::get('assigned_to')) == '1') {
+                if ($asset->assigned_to > 0) {
+                    $user = User::find($asset->assigned_to);
+                    $row[] = $user->fullName();
+                } else {
+                    $row[] = ''; // Empty string if unassigned
+                }
+            }
+            if (e(Input::get('status')) == '1') {
+                if (($asset->status_id == '0') && ($asset->assigned_to == '0')) {
+                    $row[] = Lang::get('general.ready_to_deploy');
+                } elseif (($asset->status_id == '') && ($asset->assigned_to == '0')) {
+                    $row[] = Lang::get('general.pending');
+                } elseif ($asset->assetstatus) {
+                    $row[] = $asset->assetstatus->name;
+                } else {
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('warranty')) == '1') {
+                if ($asset->warranty_months) {
+                    $row[] = $asset->warranty_months;
+                    $row[] = $asset->warrantee_expires();
+                } else {
+                    $row[] = '';
+                    $row[] = '';
+                }
+            }
+            if (e(Input::get('depreciation')) == '1') {
+                $depreciation = $asset->getDepreciatedValue();
+                $row[] = '"'.number_format($asset->purchase_cost).'"';
+                $row[] = '"'.number_format($depreciation).'"';
+                $row[] = '"'.number_format($asset->purchase_cost - $depreciation).'"';
+            }
+            $rows[] = implode($row, ',');
+        }
+
+        // spit out a csv
+        if (array_filter($rows)) {
+            $csv = implode($rows, "\n");
+            $response = Response::make($csv, 200);
+            $response->header('Content-Type', 'text/csv');
+            $response->header('Content-disposition', 'attachment;filename=report.csv');
+            return $response;
+        } else {
+            return Redirect::to("reports/custom")->with('error', Lang::get('admin/reports/message.error'));
+        }
+    }
+}
@@ -10,94 +10,195 @@ use Sentry;
 use Str;
 use Validator;
 use View;
+use Image;
+use Config;
+use Response;

-class SettingsController extends AdminController {
+class SettingsController extends AdminController
+{
+    /**
+     * Show a list of all the settings.
+     *
+     * @return View
+     */

-	/**
-	 * Show a list of all the settings.
-	 *
-	 * @return View
-	 */
+    public function getIndex()
+    {
+        // Grab all the settings
+        $settings = Setting::all();

-	public function getIndex()
-	{
-		// Grab all the settings
-		$settings = Setting::all();
-
-		// Show the page
-		return View::make('backend/settings/index', compact('settings'));
-	}
+        // Show the page
+        return View::make('backend/settings/index', compact('settings'));
+    }


-	/**
-	 * Setting update.
-	 *
-	 * @param  int  $settingId
-	 * @return View
-	 */
-	public function getEdit()
-	{
-		$settings = Setting::orderBy('created_at', 'DESC')->paginate(10);
-		$is_gd_installed = extension_loaded('gd');
-		return View::make('backend/settings/edit', compact('settings', 'is_gd_installed'));
-	}
+    /**
+     * Setting update.
+     *
+     * @param  int  $settingId
+     * @return View
+     */
+    public function getEdit()
+    {
+        $settings = Setting::orderBy('created_at', 'DESC')->paginate(10);
+        $is_gd_installed = extension_loaded('gd');
+        return View::make('backend/settings/edit', compact('settings', 'is_gd_installed'));
+    }


-	/**
-	 * Setting update form processing page.
-	 *
-	 * @param  int  $settingId
-	 * @return Redirect
-	 */
-	public function postEdit()
-	{
+    /**
+     * Setting update form processing page.
+     *
+     * @param  int  $settingId
+     * @return Redirect
+     */
+    public function postEdit()
+    {

-		// Check if the asset exists
-		if (is_null($setting = Setting::find(1)))
-		{
-			// Redirect to the asset management page with error
-			return Redirect::to('admin')->with('error', Lang::get('admin/settings/message.update.error'));
-		}
+        // Check if the asset exists
+        if (is_null($setting = Setting::find(1))) {
+            // Redirect to the asset management page with error
+            return Redirect::to('admin')->with('error', Lang::get('admin/settings/message.update.error'));
+        }

-		$new = Input::all();
+        $new = Input::all();


-		// Declare the rules for the form validation
-		$rules = array(
-		"site_name" 	=> 'required|min:3',
-		"per_page"   		=> 'required|min:1|numeric',
-		"qr_text"		=> 'min:1|max:31'
-    	);
+        // Declare the rules for the form validation

-		// Create a new validator instance from our validation rules
-		$validator = Validator::make(Input::all(), $rules);
+        $rules = array(
+	        "per_page"   	=> 'required|min:1|numeric',
+	        "qr_text"		=> 'min:1|max:31',
+	        "logo"   		=> 'mimes:jpeg,bmp,png,gif',
+	        "alert_email"   => 'email',
+	        "slack_endpoint"   => 'url',
+            "default_currency"   => 'required',
+	        "slack_channel"   => 'regex:/(?<!\w)#\w+/',
+	        "slack_botname"   => 'alpha_dash',
+	        );
+
+        if (Config::get('app.lock_passwords')==false) {
+	        $rules['site_name'] = 'required|min:3';
+
+	    }
+
+        // Create a new validator instance from our validation rules
+        $validator = Validator::make(Input::all(), $rules);


-		// If validation fails, we'll exit the operation now.
-		if ($validator->fails())
-		{
-			// Ooops.. something went wrong
-			return Redirect::back()->withInput()->withErrors($validator);
-		}
+        // If validation fails, we'll exit the operation now.
+        if ($validator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($validator);
+        }

-		// Update the asset data
-			$setting->id = '1';
-			$setting->site_name = e(Input::get('site_name'));
-			$setting->per_page = e(Input::get('per_page'));
-			$setting->qr_code = e(Input::get('qr_code', '0'));
-			$setting->qr_text = e(Input::get('qr_text'));
+        if (Input::get('clear_logo')=='1') {
+	        $setting->logo = NULL;
+        } elseif (Input::file('logo')) {
+            if (!Config::get('app.lock_passwords')) {
+                $image = Input::file('logo');
+                $file_name = "logo.".$image->getClientOriginalExtension();
+                $path = public_path('uploads/'.$file_name);
+                Image::make($image->getRealPath())->resize(null, 40, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $setting->logo = $file_name;
+            }
+        }

-			// Was the asset updated?
-			if($setting->save())
-			{
-				// Redirect to the settings page
-				return Redirect::to("admin/settings/app")->with('success', Lang::get('admin/settings/message.update.success'));
-			}

-			// Redirect to the setting management page
-			return Redirect::to("admin/settings/app/edit")->with('error', Lang::get('admin/settings/message.update.error'));
+        // Update the asset data
+            $setting->id = '1';

-	}
+             if (Config::get('app.lock_passwords')==false) {
+	             $setting->site_name = e(Input::get('site_name'));
+             }
+
+            $setting->per_page = e(Input::get('per_page'));
+            $setting->qr_code = e(Input::get('qr_code', '0'));
+            $setting->barcode_type = e(Input::get('barcode_type'));
+            $setting->load_remote = e(Input::get('load_remote', '0'));
+            $setting->default_currency = e(Input::get('default_currency', '$'));
+            $setting->qr_text = e(Input::get('qr_text'));
+            $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
+            $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
+            $setting->alert_email = e(Input::get('alert_email'));
+            $setting->alerts_enabled = e(Input::get('alerts_enabled', '0'));
+            $setting->header_color = e(Input::get('header_color'));
+            $setting->default_eula_text = e(Input::get('default_eula_text'));
+            $setting->slack_endpoint = e(Input::get('slack_endpoint'));
+            $setting->slack_channel = e(Input::get('slack_channel'));
+            $setting->slack_botname = e(Input::get('slack_botname'));
+
+
+            // Was the asset updated?
+            if($setting->save()) {
+                // Redirect to the settings page
+                return Redirect::to("admin/settings/app")->with('success', Lang::get('admin/settings/message.update.success'));
+            }
+
+            // Redirect to the setting management page
+            return Redirect::to("admin/settings/app/edit")->with('error', Lang::get('admin/settings/message.update.error'));
+
+    }
+
+
+    /**
+    * Generate the backup page
+    *
+    * @return View
+    **/
+
+    public function getBackups()
+    {
+        $path = Config::get('backup::path');
+        $files = array();
+
+        if ($handle = opendir($path)) {
+
+            /* This is the correct way to loop over the directory. */
+            while (false !== ($entry = readdir($handle))) {
+                clearstatcache();
+                if (substr(strrchr($entry,'.'),1)=='zip') {
+                    $files[] = array(
+                            'filename' => $entry,
+                            'filesize' => Setting::fileSizeConvert(filesize(Config::get('backup::path').$entry)),
+                            'modified' => filemtime(Config::get('backup::path').$entry)
+                        );
+                }
+
+            }
+            closedir($handle);
+        }
+
+
+        return View::make('backend/settings/backups', compact('path','files'));
+    }
+
+    /**
+    * Download the dump file
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function downloadFile($filename = null)
+    {
+
+        $file = Config::get('backup::path').'/'.$filename;
+
+
+		// the license is valid
+        if (file_exists($file)) {
+				return Response::download($file);
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/settings/message.does_not_exist');
+
+            // Redirect to the licence management page
+            return Redirect::route('settings/backups')->with('error', $error);
+        }
+    }



@@ -12,176 +12,183 @@ use Str;
 use Validator;
 use View;

-class StatuslabelsController extends AdminController {
+class StatuslabelsController extends AdminController
+{
+    /**
+     * Show a list of all the statuslabels.
+     *
+     * @return View
+     */

-	/**
-	 * Show a list of all the statuslabels.
-	 *
-	 * @return View
-	 */
+    public function getIndex()
+    {
+        // Grab all the statuslabels
+        $statuslabels = Statuslabel::orderBy('created_at', 'DESC')->get();

-	public function getIndex()
-	{
-		// Grab all the statuslabels
-		$statuslabels = Statuslabel::orderBy('created_at', 'DESC')->paginate(10);
-
-		// Show the page
-		return View::make('backend/statuslabels/index', compact('statuslabels'));
-	}
+        // Show the page
+        return View::make('backend/statuslabels/index', compact('statuslabels'));
+    }


-	/**
-	 * Statuslabel create.
-	 *
-	 * @return View
-	 */
-	public function getCreate()
-	{
-		// Show the page
-		return View::make('backend/statuslabels/edit')->with('statuslabel',new Statuslabel);
-	}
+    /**
+     * Statuslabel create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        // Show the page
+		$statuslabel = new Statuslabel;
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
+
+    	$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel_types','statuslabel'))->with('use_statuslabel_type',$use_statuslabel_type);
+    }


-	/**
-	 * Statuslabel create form processing.
-	 *
-	 * @return Redirect
-	 */
-	public function postCreate()
-	{
+    /**
+     * Statuslabel create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {

-		// get the POST data
-		$new = Input::all();
+        // get the POST data
+        $new = Input::all();

-		// create a new model instance
-		$statuslabel = new Statuslabel();
+        // create a new model instance
+        $statuslabel = new Statuslabel();

-		// attempt validation
-		if ($statuslabel->validate($new))
-		{
+        // attempt validation
+        if ($statuslabel->validate($new)) {

-			// Save the Statuslabel data
-			$statuslabel->name            	= e(Input::get('name'));
-			$statuslabel->user_id          = Sentry::getId();
+        	$statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));

-			// Was the asset created?
-			if($statuslabel->save())
-			{
-				// Redirect to the new Statuslabel  page
-				return Redirect::to("admin/settings/statuslabels")->with('success', Lang::get('admin/statuslabels/message.create.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $statuslabel->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
+            // Save the Statuslabel data
+            $statuslabel->name            	= e(Input::get('name'));
+            $statuslabel->user_id          = Sentry::getId();
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];

-		// Redirect to the Statuslabel create page
-		return Redirect::to('admin/settings/statuslabels/create')->with('error', Lang::get('admin/statuslabels/message.create.error'));
+            // Was the asset created?
+            if($statuslabel->save()) {
+                // Redirect to the new Statuslabel  page
+                return Redirect::to("admin/settings/statuslabels")->with('success', Lang::get('admin/statuslabels/message.create.success'));
+            }
+        } else {
+            // failure
+            $errors = $statuslabel->errors();
+            return Redirect::back()->withInput()->withErrors($errors);
+        }

-	}
+        // Redirect to the Statuslabel create page
+        return Redirect::to('admin/settings/statuslabels/create')->with('error', Lang::get('admin/statuslabels/message.create.error'));
+
+    }


-	/**
-	 * Statuslabel update.
-	 *
-	 * @param  int  $statuslabelId
-	 * @return View
-	 */
-	public function getEdit($statuslabelId = null)
-	{
-		// Check if the Statuslabel exists
-		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
-		}
+    /**
+     * Statuslabel update.
+     *
+     * @param  int  $statuslabelId
+     * @return View
+     */
+    public function getEdit($statuslabelId = null)
+    {
+        // Check if the Statuslabel exists
+        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
+        }
+
+		$use_statuslabel_type = $statuslabel->getStatuslabelType();
+
+		$statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
+
+        return View::make('backend/statuslabels/edit', compact('statuslabel','statuslabel_types'))->with('use_statuslabel_type',$use_statuslabel_type);
+    }


-		return View::make('backend/statuslabels/edit', compact('statuslabel'));
-	}
+    /**
+     * Statuslabel update form processing page.
+     *
+     * @param  int  $statuslabelId
+     * @return Redirect
+     */
+    public function postEdit($statuslabelId = null)
+    {
+        // Check if the Statuslabel exists
+        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
+        }
+
+        //attempt to validate
+        $validator = Validator::make(Input::all(), $statuslabel->validationRules($statuslabelId));
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+            // Update the Statuslabel data
+            $statustype = Statuslabel::getStatuslabelTypesForDB(Input::get('statuslabel_types'));
+
+            $statuslabel->name            	= e(Input::get('name'));
+            $statuslabel->notes          =  e(Input::get('notes'));
+            $statuslabel->deployable          =  $statustype['deployable'];
+            $statuslabel->pending          =  $statustype['pending'];
+            $statuslabel->archived          =  $statustype['archived'];


-	/**
-	 * Statuslabel update form processing page.
-	 *
-	 * @param  int  $statuslabelId
-	 * @return Redirect
-	 */
-	public function postEdit($statuslabelId = null)
-	{
-		// Check if the Statuslabel exists
-		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.does_not_exist'));
-		}
+            // Was the asset created?
+            if($statuslabel->save()) {
+                // Redirect to the saved Statuslabel page
+                return Redirect::to("admin/settings/statuslabels/")->with('success', Lang::get('admin/statuslabels/message.update.success'));
+            }
+        }
+
+        // Redirect to the Statuslabel management page
+        return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given Statuslabel.
+     *
+     * @param  int  $statuslabelId
+     * @return Redirect
+     */
+    public function getDelete($statuslabelId)
+    {
+        // Check if the Statuslabel exists
+        if (is_null($statuslabel = Statuslabel::find($statuslabelId))) {
+            // Redirect to the blogs management page
+            return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.not_found'));
+        }
+
+
+        if ($statuslabel->has_assets() > 0) {
+
+            // Redirect to the asset management page
+            return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.assoc_users'));
+        } else {
+
+            $statuslabel->delete();
+
+            // Redirect to the statuslabels management page
+            return Redirect::to('admin/settings/statuslabels')->with('success', Lang::get('admin/statuslabels/message.delete.success'));
+        }



-		// get the POST data
-		$new = Input::all();
-
-
-		// attempt validation
-		if ($statuslabel->validate($new))
-		{
-
-			// Update the Statuslabel data
-			$statuslabel->name            	= e(Input::get('name'));
-
-			// Was the asset created?
-			if($statuslabel->save())
-			{
-				// Redirect to the saved Statuslabel page
-				return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('success', Lang::get('admin/statuslabels/message.update.success'));
-			}
-		}
-		else
-		{
-			// failure
-			$errors = $statuslabel->errors();
-			return Redirect::back()->withInput()->withErrors($errors);
-		}
-
-		// Redirect to the Statuslabel management page
-		return Redirect::to("admin/settings/statuslabels/$statuslabelId/edit")->with('error', Lang::get('admin/statuslabels/message.update.error'));
-
-	}
-
-	/**
-	 * Delete the given Statuslabel.
-	 *
-	 * @param  int  $statuslabelId
-	 * @return Redirect
-	 */
-	public function getDelete($statuslabelId)
-	{
-		// Check if the Statuslabel exists
-		if (is_null($statuslabel = Statuslabel::find($statuslabelId)))
-		{
-			// Redirect to the blogs management page
-			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.not_found'));
-		}
-
-
-		if ($statuslabel->has_assets() > 0) {
-
-			// Redirect to the asset management page
-			return Redirect::to('admin/settings/statuslabels')->with('error', Lang::get('admin/statuslabels/message.assoc_users'));
-		} else {
-
-			$statuslabel->delete();
-
-			// Redirect to the statuslabels management page
-			return Redirect::to('admin/settings/statuslabels')->with('success', Lang::get('admin/statuslabels/message.delete.success'));
-		}
-
-
-
-	}
+    }



@@ -0,0 +1,245 @@
+<?php namespace Controllers\Admin;
+
+use AdminController;
+use Image;
+use Input;
+use Lang;
+use Supplier;
+use Redirect;
+use Setting;
+use Sentry;
+use Str;
+use Validator;
+use View;
+
+class SuppliersController extends AdminController
+{
+    /**
+     * Show a list of all suppliers
+     *
+     * @return View
+     */
+    public function getIndex()
+    {
+        // Grab all the suppliers
+        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();
+
+        // Show the page
+        return View::make('backend/suppliers/index', compact('suppliers'));
+    }
+
+
+    /**
+     * Supplier create.
+     *
+     * @return View
+     */
+    public function getCreate()
+    {
+        return View::make('backend/suppliers/edit')->with('supplier', new Supplier);
+    }
+
+
+    /**
+     * Supplier create form processing.
+     *
+     * @return Redirect
+     */
+    public function postCreate()
+    {
+
+        // get the POST data
+        $new = Input::all();
+
+        // Create a new supplier
+        $supplier = new Supplier;
+
+        // attempt validation
+        if ($supplier->validate($new)) {
+
+            // Save the location data
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->notes                = e(Input::get('notes'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->user_id              = Sentry::getId();
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }
+
+            // Was it created?
+            if($supplier->save()) {
+                // Redirect to the new supplier  page
+                return Redirect::to("admin/settings/suppliers")->with('success', Lang::get('admin/suppliers/message.create.success'));
+            }
+        } else {
+            // failure
+            $errors = $supplier->errors();
+            return Redirect::back()->withInput()->withErrors($errors);
+        }
+
+        // Redirect to the supplier create page
+        return Redirect::to('admin/settings/suppliers/create')->with('error', Lang::get('admin/suppliers/message.create.error'));
+
+    }
+
+    /**
+     * Supplier update.
+     *
+     * @param  int  $supplierId
+     * @return View
+     */
+    public function getEdit($supplierId = null)
+    {
+        // Check if the supplier exists
+        if (is_null($supplier = Supplier::find($supplierId))) {
+            // Redirect to the supplier  page
+            return Redirect::to('admin/settings/suppliers')->with('error', Lang::get('admin/suppliers/message.does_not_exist'));
+        }
+
+        // Show the page
+        return View::make('backend/suppliers/edit', compact('supplier'));
+    }
+
+
+    /**
+     * Supplier update form processing page.
+     *
+     * @param  int  $supplierId
+     * @return Redirect
+     */
+    public function postEdit($supplierId = null)
+    {
+        // Check if the supplier exists
+        if (is_null($supplier = Supplier::find($supplierId))) {
+            // Redirect to the supplier  page
+            return Redirect::to('admin/settings/suppliers')->with('error', Lang::get('admin/suppliers/message.does_not_exist'));
+        }
+
+
+          //attempt to validate
+        $validator = Validator::make(Input::all(), $supplier->validationRules($supplierId));
+
+        if ($validator->fails())
+        {
+            // The given data did not pass validation           
+            return Redirect::back()->withInput()->withErrors($validator->messages());
+        }
+        // attempt validation
+        else {
+
+            // Save the  data
+            $supplier->name                 = e(Input::get('name'));
+            $supplier->address              = e(Input::get('address'));
+            $supplier->address2             = e(Input::get('address2'));
+            $supplier->city                 = e(Input::get('city'));
+            $supplier->state                = e(Input::get('state'));
+            $supplier->country              = e(Input::get('country'));
+            $supplier->zip                  = e(Input::get('zip'));
+            $supplier->contact              = e(Input::get('contact'));
+            $supplier->phone                = e(Input::get('phone'));
+            $supplier->fax                  = e(Input::get('fax'));
+            $supplier->email                = e(Input::get('email'));
+            $supplier->url                  = $supplier->addhttp(e(Input::get('url')));
+            $supplier->notes                = e(Input::get('notes'));
+
+            if (Input::file('image')) {
+                $image = Input::file('image');
+                $file_name = str_random(25).".".$image->getClientOriginalExtension();
+                $path = public_path('uploads/suppliers/'.$file_name);
+                Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
+                    $constraint->aspectRatio();
+                    $constraint->upsize();
+                })->save($path);
+                $supplier->image = $file_name;
+            }
+
+            if (Input::get('image_delete') == 1 && Input::file('image') == "") {
+                $supplier->image = NULL;
+            }
+
+            // Was it created?
+            if($supplier->save()) {
+                // Redirect to the new supplier page
+                return Redirect::to("admin/settings/suppliers")->with('success', Lang::get('admin/suppliers/message.update.success'));
+            }
+        } 
+
+        // Redirect to the supplier management page
+        return Redirect::to("admin/settings/suppliers/$supplierId/edit")->with('error', Lang::get('admin/suppliers/message.update.error'));
+
+    }
+
+    /**
+     * Delete the given supplier.
+     *
+     * @param  int  $supplierId
+     * @return Redirect
+     */
+    public function getDelete($supplierId)
+    {
+        // Check if the supplier exists
+        if (is_null($supplier = Supplier::find($supplierId))) {
+            // Redirect to the suppliers page
+            return Redirect::to('admin/settings/suppliers')->with('error', Lang::get('admin/suppliers/message.not_found'));
+        }
+
+        if ($supplier->num_assets() > 0) {
+
+            // Redirect to the asset management page
+            return Redirect::to('admin/settings/suppliers')->with('error', Lang::get('admin/suppliers/message.assoc_users'));
+        } else {
+
+            // Delete the supplier
+            $supplier->delete();
+
+            // Redirect to the suppliers management page
+        return Redirect::to('admin/settings/suppliers')->with('success', Lang::get('admin/suppliers/message.delete.success'));
+        }
+
+    }
+
+
+    /**
+    *  Get the asset information to present to the supplier view page
+    *
+    * @param  int  $assetId
+    * @return View
+    **/
+    public function getView($supplierId = null)
+    {
+        $supplier = Supplier::find($supplierId);
+
+        if (isset($supplier->id)) {
+                return View::make('backend/suppliers/view', compact('supplier'));
+        } else {
+            // Prepare the error message
+            $error = Lang::get('admin/suppliers/message.does_not_exist', compact('id'));
+
+            // Redirect to the user management page
+            return Redirect::route('suppliers')->with('error', $error);
+        }
+
+
+    }
+
+
+
+}
@@ -2,37 +2,35 @@

 use Illuminate\Database\Migrations\Migration;

-class UpdateUsersTable extends Migration {
+class UpdateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Update the users table
+        Schema::table('users', function ($table) {
+            $table->softDeletes();
+            $table->string('website')->nullable();
+            $table->string('country')->nullable();
+            $table->string('gravatar')->nullable();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		// Update the users table
-		Schema::table('users', function($table)
-		{
-			$table->softDeletes();
-			$table->string('website')->nullable();
-			$table->string('country')->nullable();
-			$table->string('gravatar')->nullable();
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		// Update the users table
-		Schema::table('users', function($table)
-		{
-			$table->dropColumn('deleted_at', 'website', 'country', 'gravatar');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Update the users table
+        Schema::table('users', function ($table) {
+            $table->dropColumn('deleted_at', 'website', 'country', 'gravatar');
+        });
+    }

 }
@@ -2,34 +2,33 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateModelsTable extends Migration {
+class CreateModelsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+         Schema::create('models', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('modelno');
+            $table->integer('manufacturer_id')->nullable();
+            $table->integer('category_id')->nullable();
+            $table->timestamps();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		 Schema::create('models', function($table)
-		 {
-	        $table->increments('id');
-	        $table->string('name');
-	        $table->string('modelno');
-	        $table->integer('manufacturer_id')->nullable();
-	        $table->integer('category_id')->nullable();
-	        $table->timestamps();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('models');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('models');
-	}
-
-}
+}
@@ -2,32 +2,31 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateCategoriesTable extends Migration {
-
+class CreateCategoriesTable extends Migration
+{
 /**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('categories', function($table)
-		 {
-	        $table->increments('id');
-	        $table->string('name');
-	        $table->integer('parent')->default(0);
-	        $table->timestamps();
-		});
-	}
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('categories', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('parent')->default(0);
+            $table->timestamps();
+        });
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('categories');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('categories');
+    }

-}
+}
@@ -2,31 +2,30 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateManufacturersTable extends Migration {
+class CreateManufacturersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('manufacturers', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->timestamps();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('manufacturers', function($table)
-		 {
-	        $table->increments('id');
-	        $table->string('name');
-	        $table->timestamps();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('manufacturers');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('manufacturers');
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddUserIdToCategories extends Migration {
+class AddUserIdToCategories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('categories', function ($table) {
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('categories', function($table)
-		{
-			$table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddUserIdToManufacturers extends Migration {
+class AddUserIdToManufacturers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('manufacturers', function ($table) {
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('manufacturers', function($table)
-		{
-			$table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,40 +2,39 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateAssetsTable extends Migration {
+class CreateAssetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('assets', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('asset_tag')->nullable();
+            $table->integer('model_id');
+            $table->string('serial');
+            $table->date('purchase_date')->nullable();
+            $table->decimal('purchase_cost', 8, 2)->nullable();
+            $table->string('order_number');
+            $table->integer('assigned_to');
+            $table->text('notes');
+            $table->integer('user_id');
+            $table->timestamps();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('assets', function($table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('asset_tag')->nullable();
-	        $table->integer('model_id');
-	        $table->string('serial');
-	        $table->date('purchase_date')->nullable();
-	        $table->decimal('purchase_cost', 8, 2)->nullable();
-	        $table->string('order_number');
-	        $table->integer('assigned_to');
-	        $table->text('notes');
-	        $table->integer('user_id');
-	        $table->timestamps();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('assets');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('assets');
-	}
-
-}
+}
@@ -2,41 +2,40 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateLicensesTable extends Migration {
+class CreateLicensesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('licenses', function ($table) {
+        $table->increments('id');
+        $table->string('name');
+        $table->integer('model_id');
+        $table->string('serial');
+        $table->string('license_email');
+        $table->string('license_name');
+        $table->date('purchase_date')->nullable();
+        $table->decimal('purchase_cost', 8, 2)->nullable();
+        $table->string('order_number');
+        $table->integer('assigned_to');
+        $table->text('notes');
+        $table->integer('user_id');
+        $table->timestamps();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('licenses', function($table)
-		{
-		$table->increments('id');
-		$table->string('name');
-		$table->integer('model_id');
-		$table->string('serial');
-		$table->string('license_email');
-		$table->string('license_name');
-		$table->date('purchase_date')->nullable();
-		$table->decimal('purchase_cost', 8, 2)->nullable();
-		$table->string('order_number');
-		$table->integer('assigned_to');
-		$table->text('notes');
-		$table->integer('user_id');
-		$table->timestamps();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('licenses');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('licenses');
-	}
-
-}
+}
@@ -2,26 +2,26 @@

 use Illuminate\Database\Migrations\Migration;

-class AddLicenseNameToLicenses extends Migration {
+class AddLicenseNameToLicenses extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
+    }

-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,34 +2,33 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateDepreciationsTable extends Migration {
+class CreateDepreciationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('depreciations', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('months');
+            $table->timestamps();
+            $table->integer('user_id');
+            //$table->foreign('user_id')->references('id')->on('users');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('depreciations', function($table)
-		 {
-	        $table->increments('id');
-	        $table->string('name');
-	        $table->integer('months');
-	        $table->timestamps();
-	        $table->integer('user_id');
-	        //$table->foreign('user_id')->references('id')->on('users');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('depreciations');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('depreciations');
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddDepreciationIdToModels extends Migration {
+class AddDepreciationIdToModels extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('models', function ($table) {
+            $table->integer('depreciation_id')->nullable();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('models', function($table)
-		{
-			$table->integer('depreciation_id')->nullable();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddUserIdToModels extends Migration {
+class AddUserIdToModels extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('models', function ($table) {
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('models', function($table)
-		{
-			$table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,35 +2,34 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateLocationsTable extends Migration {
+class CreateLocationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('locations', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('city');
+            $table->string('state',2);
+            $table->string('country',2);
+            $table->timestamps();
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('locations', function($table)
-		{
-			$table->increments('id');
-			$table->string('name');
-			$table->string('city');
-			$table->string('state',2);
-			$table->string('country',2);
-			$table->timestamps();
-			$table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('locations');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('locations');
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddLocationIdToAssets extends Migration {
+class AddLocationIdToAssets extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function ($table) {
+            $table->integer('location_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('assets', function($table)
-		{
-			$table->integer('location_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,29 +2,28 @@

 use Illuminate\Database\Migrations\Migration;

-class AddCheckedoutToToAssets extends Migration {
+class AddCheckedoutToToAssets extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function ($table) {
+            $table->integer('checkedout_to');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('assets', function($table)
-		{
-			$table->integer('checkedout_to');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,33 +2,32 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateHistoryTable extends Migration {
+class CreateHistoryTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('history', function ($table) {
+            $table->increments('id');
+            $table->integer('checkedout_to')->nullable;
+            $table->integer('location_id')->nullable;
+            $table->timestamps();
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::create('history', function($table)
-		{
-			$table->increments('id');
-			$table->integer('checkedout_to')->nullable;
-			$table->integer('location_id')->nullable;
-			$table->timestamps();
-			$table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('history');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('history');
-	}
-
-}
+}
@@ -2,26 +2,26 @@

 use Illuminate\Database\Migrations\Migration;

-class DropLicensesTable extends Migration {
+class DropLicensesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::drop('licenses');
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::drop('licenses');
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,32 +2,31 @@

 use Illuminate\Database\Migrations\Migration;

-class AddPhysicalToAssets extends Migration {
+class AddPhysicalToAssets extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::table('assets', function ($table) {
+            $table->boolean('physical')->default(1);
+            $table->dropColumn('checkedout_to')->nullable();

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		//
-		Schema::table('assets', function($table)
-		{
-			$table->boolean('physical')->default(1);
-			$table->dropColumn('checkedout_to')->nullable();
+        });
+    }

-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,34 +2,33 @@

 use Illuminate\Database\Migrations\Migration;

-class CreateSettingsTable extends Migration {
+class CreateSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::create('settings', function ($table) {
+            $table->increments('id');
+            $table->string('option_name');
+            $table->string('option_value');
+            $table->timestamps();
+            $table->integer('user_id');
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		//
-		Schema::create('settings', function($table)
-		{
-			$table->increments('id');
-	        $table->string('option_name');
-	        $table->string('option_value');
-	        $table->timestamps();
-	        $table->integer('user_id');
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('settings');
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('settings');
-	}
-
-}
+}
@@ -2,30 +2,29 @@

 use Illuminate\Database\Migrations\Migration;

-class AddLicenseToAssets extends Migration {
+class AddLicenseToAssets extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function ($table) {
+            $table->string('license_name')->nullable();
+            $table->string('license_email')->nullable();
+        });
+    }

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('assets', function($table)
-		{
-			$table->string('license_name')->nullable();
-			$table->string('license_email')->nullable();
-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		//
-	}
-
-}
+}
@@ -2,39 +2,37 @@

 use Illuminate\Database\Migrations\Migration;

-class AddContactsToUsers extends Migration {
+class AddContactsToUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function ($table) {
+            $table->integer('location_id')->nullable();
+            $table->string('phone');
+            $table->string('jobtitle');

-	/**
-	 * Run the migrations.
-	 *
-	 * @return void
-	 */
-	public function up()
-	{
-		Schema::table('users', function($table)
-		{
-			$table->integer('location_id')->nullable();
-			$table->string('phone');
-			$table->string('jobtitle');
+        });
+    }

-		});
-	}
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function ($table) {
+            $table->dropColumn('location_id');
+            $table->dropColumn('phone');
+            $table->dropColumn('jobtitle');

-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::table('users', function($table)
-		{
-			$table->dropColumn('location_id');
-			$table->dropColumn('phone');
-			$table->dropColumn('jobtitle');
+        });

-		});
+    }

-	}
-
-}
+}
--- a/Show More
+++ b/Show More