Merge remote-tracking branch 'origin/develop'

.gitignore

@@ -1,49 +1,38 @@
-/vendor
+.couscous
-/node_modules
-Homestead.yaml
-Homestead.json
-.env
-
-tests/_output/*
 .DS_Store
-public/uploads/models/*
+.env
-public/uploads/avatars/*
+.idea
-public/uploads/suppliers/*
+/bin/
-public/uploads/assets/*
+/bootstrap/compiled.php
-public/uploads/users/*
+/node_modules
+/vendor
+app/database/*.sqlite
+app/storage/meta/services.json
+composer.phar
+crowdin.yaml
+Homestead.json
+Homestead.yaml
+output
+phpDocumentor.phar
 public/uploads/*.gif
 public/uploads/*.jpg
 public/uploads/*.png
-public/uploads/*.tif
 public/uploads/*.svg
-storage/app/private_uploads/users/*
+public/uploads/*.tif
-phpDocumentor.phar
+public/uploads/assets/*
-output
+public/uploads/avatars/*
-tests/_support/_generated/*
-
-
-/bootstrap/compiled.php
-composer.phar
-app/config/database.php
-app/config/mail.php
-app/database/*.sqlite
-app/storage/meta/services.json
-app/config/*/mail.php
-app/config/*/session.php
-app/config/*/database.php
-app/config/*/app.php
-app/config/*/ldap.php
-public/packages/*
-storage/logs/*
-storage/debugbar/
-/bin/
-.idea
-crowdin.yaml
 public/uploads/logo.gif
-public/uploads/logo.svg
 public/uploads/logo.png
-.couscous
+public/uploads/logo.svg
+public/uploads/models/*
+public/uploads/suppliers/*
+public/uploads/users/*
+storage/app/private_uploads/users/*
+storage/debugbar/
 storage/dumps/*
-tests/_data/scenarios
 storage/laravel-backups
+storage/logs/*
 storage/private_uploads/users/*
+tests/_data/scenarios
+tests/_output/*
+tests/_support/_generated/*

app/Http/Controllers/CategoriesController.php

@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
 use App\Helpers\Helper;
 use App\Models\Category as Category;
 use App\Models\Company;
@@ -133,7 +134,7 @@ class CategoriesController extends Controller
     * @since [v1.0]
     * @return Redirect
     */
-    public function postEdit($categoryId = null)
+    public function postEdit(Request $request, $categoryId = null)
     {
         // Check if the blog post exists
         if (is_null($category = Category::find($categoryId))) {
@@ -142,12 +143,14 @@ class CategoriesController extends Controller
         }
 
         // Update the category data
-        $category->name            = e(Input::get('name'));
+        $category->name            = e($request->input('name'));
-        $category->category_type        = e(Input::get('category_type'));
+        // If the item count is > 0, we disable the category type in the edit. Disabled items
-        $category->eula_text            = e(Input::get('eula_text'));
+        // don't POST, so if the category_type is blank we just set it to the default.
-        $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
+        $category->category_type        = e($request->input('category_type', $category->category_type));
-        $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
+        $category->eula_text            = e($request->input('eula_text'));
-        $category->checkin_email        = e(Input::get('checkin_email', '0'));
+        $category->use_default_eula     = e($request->input('use_default_eula', '0'));
+        $category->require_acceptance   = e($request->input('require_acceptance', '0'));
+        $category->checkin_email        = e($request->input('checkin_email', '0'));
 
         if ($category->save()) {
         // Redirect to the new category page

config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v3.0',
-  'hash_version' => 'v3.0-32-gba25972',
+  'hash_version' => 'v3.0-55-g3fd5fb8',
 );

public/uploads/.gitignore

@@ -0,0 +1 @@
+!.gitignore

public/uploads/assets/.gitignore

@@ -0,0 +1 @@
+!.gitignore

public/uploads/avatars/.gitignore

@@ -0,0 +1 @@
+!.gitignore

public/uploads/models/.gitignore

@@ -0,0 +1 @@
+!.gitignore

public/uploads/suppliers/.gitignore

@@ -0,0 +1 @@
+!.gitignore

resources/views/accessories/index.blade.php

@@ -75,6 +75,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'accessories-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/asset_maintenances/index.blade.php

@@ -80,6 +80,9 @@
       showColumns: true,
       exportDataType: 'all',
       exportTypes: ['csv', 'txt','json', 'xml'],
+      exportOptions: {
+          fileName: 'maintenances-export-' + (new Date()).toISOString().slice(0,10),
+      },
       maintainSelected: true,
       paginationFirstText: "{{ trans('general.first') }}",
       paginationLastText: "{{ trans('general.last') }}",

resources/views/categories/index.blade.php

@@ -77,6 +77,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'categories-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/components/index.blade.php

@@ -96,6 +96,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'components-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/consumables/index.blade.php

@@ -80,6 +80,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'consumables-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/depreciations/index.blade.php

@@ -75,6 +75,9 @@ $('#table').bootstrapTable({
     showColumns: true,
     exportDataType: 'all',
     exportTypes: ['csv', 'txt','json', 'xml'],
+    exportOptions: {
+        fileName: 'depreciations-export-' + (new Date()).toISOString().slice(0,10),
+    },
     maintainSelected: true,
     paginationFirstText: "{{ trans('general.first') }}",
     paginationLastText: "{{ trans('general.last') }}",

resources/views/groups/index.blade.php

@@ -70,6 +70,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'groups-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/hardware/index.blade.php

@@ -161,6 +161,9 @@
         paginationPreText: "{{ trans('general.previous') }}",
         paginationNextText: "{{ trans('general.next') }}",
         pageList: ['10','25','50','100','150','200','500','1000'],
+        exportOptions: {
+            fileName: 'assets-export-' + (new Date()).toISOString().slice(0,10),
+        },
         icons: {
             paginationSwitchDown: 'fa-caret-square-o-down',
             paginationSwitchUp: 'fa-caret-square-o-up',

resources/views/hardware/view.blade.php

@@ -247,7 +247,7 @@
                    @endif
                    <tr>
                       <td>{{ trans('admin/hardware/form.notes') }}</td>
-                      <td>{{ $asset->notes }}</td>
+                      <td> {!! nl2br(e($asset->notes)) !!}</td>
                     </tr>
                    @if ($asset->created_at)
                       <tr>
@@ -514,7 +514,7 @@
                       <td></td>
                       <td>
       <!--             @if ($asset->notes)
-                      {{ $asset->notes }}
+                      {!! nl2br(e($asset->notes)) !!}
                       @endif -->
                       </td>
                   </tr>

resources/views/licenses/index.blade.php

@@ -85,6 +85,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'licenses-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/locations/index.blade.php

@@ -20,7 +20,7 @@
         <div class="table-responsive">
 
           <table
-          name="categories"
+          name="locations"
           class="table table-striped"
           id="table"
           data-url="{{ route('api.locations.list') }}"
@@ -77,6 +77,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'locations-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/manufacturers/index.blade.php

@@ -74,6 +74,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'manufacturers-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/models/index.blade.php

@@ -76,11 +76,16 @@
         pagination: true,
         sidePagination: 'server',
         sortable: true,
-        mobileResponsive: true,
-        showExport: true,
         cookie: true,
         cookieExpire: '2y',
+        mobileResponsive: true,
+        showExport: true,
         showColumns: true,
+        exportDataType: 'all',
+        exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'models-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/statuslabels/index.blade.php

@@ -72,6 +72,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'statuslabels-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/suppliers/index.blade.php

@@ -75,6 +75,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'suppliers-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

resources/views/users/index.blade.php

@@ -53,7 +53,7 @@
 
 
              <table
-              name="assets"
+              name="users"
               data-toolbar="#toolbar"
               class="table table-striped"
               id="table"
@@ -149,6 +149,9 @@
         showColumns: true,
         exportDataType: 'all',
         exportTypes: ['csv', 'txt','json', 'xml'],
+        exportOptions: {
+            fileName: 'users-export-' + (new Date()).toISOString().slice(0,10),
+        },
         maintainSelected: true,
         paginationFirstText: "{{ trans('general.first') }}",
         paginationLastText: "{{ trans('general.last') }}",

snipeit.sh

@@ -259,7 +259,7 @@ case $distro in
 		sudo DEBIAN_FRONTEND=noninteractive apt-get install -y lamp-server^ >> /var/log/snipeit-install.log 2>&1 
 
 		if [ "$version" == "16.04" ]; then
-			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-mbstring >> /var/log/snipeit-install.log 2>&1
+			sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1
 			#Enable mcrypt and rewrite
 			echo "##  Enabling mcrypt and rewrite"
 			sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1