Bumped version

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/Api/PredefinedKitsController.php

@@ -31,8 +31,8 @@ class PredefinedKitsController extends Controller
 
         $offset = $request->input('offset', 0);
         $limit = $request->input('limit', 50);
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';
+        $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'name';
         $kits->orderBy($sort, $order);
 
         $total = $kits->count();

app/Http/Controllers/BulkAssetModelsController.php

@@ -32,6 +32,7 @@ class BulkAssetModelsController extends Controller
 
             // If deleting....
             if ($request->input('bulk_actions')=='delete') {
+                $this->authorize('delete', AssetModel::class);
                 $valid_count = 0;
                 foreach ($models as $model) {
                     if ($model->assets_count == 0) {
@@ -42,7 +43,7 @@ class BulkAssetModelsController extends Controller
 
             // Otherwise display the bulk edit screen
             }
-
+            $this->authorize('update', AssetModel::class);
             $nochange = ['NC' => 'No Change'];
             return view('models/bulk-edit', compact('models'))
                 ->with('fieldset_list', $nochange + Helper::customFieldsetList())
@@ -63,7 +64,8 @@ class BulkAssetModelsController extends Controller
      */
     public function update(Request $request)
     {
-
+        $this->authorize('update', AssetModel::class);
+      
         $models_raw_array = $request->input('ids');
         $update_array = array();
 
@@ -103,6 +105,8 @@ class BulkAssetModelsController extends Controller
      */
     public function destroy(Request $request)
     {
+        $this->authorize('delete', AssetModel::class);
+      
         $models_raw_array = $request->input('ids');
 
         if ((is_array($models_raw_array)) && (count($models_raw_array) > 0)) {

app/Http/Controllers/CustomFieldsController.php

@@ -178,20 +178,25 @@ class CustomFieldsController extends Controller
      */
     public function edit($id)
     {
-        $field = CustomField::find($id);
+        if ($field = CustomField::find($id)) {
 
-        $this->authorize('update', $field);
+            $this->authorize('update', $field);
 
-        $customFormat = '';
-        if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
-            $customFormat = $field->format;
-        }
+            $customFormat = '';
+            if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
+                $customFormat = $field->format;
+            }
 
-        return view("custom_fields.fields.edit",[
-            'field'             => $field,
-            'customFormat'      => $customFormat,
-            'predefinedFormats' => Helper::predefined_formats()
-        ]);
+            return view("custom_fields.fields.edit",[
+                'field'             => $field,
+                'customFormat'      => $customFormat,
+                'predefinedFormats' => Helper::predefined_formats()
+            ]);
+        } 
+
+        return redirect()->route("fields.index")
+            ->with("error", trans('admin/custom_fields/message.field.invalid'));
+        
     }
 
 

app/Http/Controllers/CustomFieldsetsController.php

@@ -23,6 +23,12 @@ use Redirect;
 class CustomFieldsetsController extends Controller
 {
 
+    public function index() 
+    {
+        return redirect()->route("fields.index")
+        ->with("error", trans('admin/custom_fields/message.fieldset.does_not_exist'));
+    }
+
     /**
      * Validates and stores a new custom field.
      *

app/Http/Controllers/ModalController.php

@@ -6,15 +6,49 @@ use App\Helpers\Helper;
 
 class ModalController extends Controller
 {
-    function show($type, $itemId = null) {
-        $view = view("modals.${type}");
 
-        if($type == "statuslabel") {
-            $view->with('statuslabel_types', Helper::statusTypeList());
+    /** 
+     * Load the modal views after confirming they are in the allowed_types array.
+     * The allowed types away just prevents shithead skiddies from fuzzing the urls 
+     * with automated scripts and junking up the logs. - snipe
+     * 
+     * @version    v5.3.7-pre
+     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net]
+     * @return View
+     */
+    function show ($type, $itemId = null) {
+
+        // These values should correspond to a file in resources/views/modals/
+        $allowed_types = [
+            'category',
+            'kit-model', 
+            'kit-license', 
+            'kit-consumable', 
+            'kit-accessory',
+            'location',
+            'manufacturer',
+            'model',
+            'statuslabel',
+            'supplier',
+            'upload-file',
+            'user',         
+        ];
+
+
+        if (in_array($type, $allowed_types)) {
+            $view = view("modals.${type}");
+
+            if ($type == "statuslabel") {
+                $view->with('statuslabel_types', Helper::statusTypeList());
+            }
+            if (in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
+                $view->with('kitId', $itemId);
+            }
+            return $view;
         }
-        if(in_array($type, ['kit-model', 'kit-license', 'kit-consumable', 'kit-accessory'])) {
-            $view->with('kitId', $itemId);
-        }
-        return $view;
+        
+        abort(404,'Page not found');
+        
     }
 }

app/Http/Transformers/GroupsTransformer.php

@@ -9,13 +9,13 @@ use Illuminate\Database\Eloquent\Collection;
 class GroupsTransformer
 {
 
-    public function transformGroups (Collection $groups)
+    public function transformGroups (Collection $groups, $total = null)
     {
         $array = array();
         foreach ($groups as $group) {
             $array[] = self::transformGroup($group);
         }
-        return (new DatatablesTransformer)->transformDatatables($array);
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
     }
 
     public function transformGroup (Group $group)

app/Models/Supplier.php

@@ -14,8 +14,8 @@ class Supplier extends SnipeModel
 
     protected $rules = array(
         'name'              => 'required|min:1|max:255|unique_undeleted',
-        'address'           => 'max:50|nullable',
-        'address2'          => 'max:50|nullable',
+        'address'           => 'max:250|nullable',
+        'address2'          => 'max:250|nullable',
         'city'              => 'max:255|nullable',
         'state'             => 'max:32|nullable',
         'country'           => 'max:3|nullable',

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.6',
-  'full_app_version' => 'v5.3.6 - build 6567-g9b2dd6522',
-  'build_version' => '6567',
+  'app_version' => 'v5.3.7',
+  'full_app_version' => 'v5.3.7 - build 6587-gcf14a0222',
+  'build_version' => '6587',
   'prerelease_version' => '',
-  'hash_version' => 'g9b2dd6522',
-  'full_hash' => 'v5.3.6-8-g9b2dd6522',
+  'hash_version' => 'gcf14a0222',
+  'full_hash' => 'v5.3.7-19-gcf14a0222',
   'branch' => 'master',
 );

database/migrations/2021_12_27_151849_change_supplier_address_length.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ChangeSupplierAddressLength extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            //
+            $table->string('address', 250)->nullable()->change();
+            $table->string('address2', 250)->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            //
+            $table->text('address', 50)->nullable()->default(null)->change();
+            $table->text('address2', 50)->nullable()->default(null)->change();
+        });
+    }
+}

package-lock.json

@@ -11630,8 +11630,7 @@
         "picomatch": {
           "version": "2.2.2",
           "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-          "optional": true
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
         },
         "pify": {
           "version": "2.3.0",
@@ -14237,7 +14236,6 @@
               "version": "4.0.1",
               "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
               "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-              "optional": true,
               "requires": {
                 "is-extglob": "^2.1.1"
               }
@@ -14251,8 +14249,7 @@
             "normalize-path": {
               "version": "3.0.0",
               "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-              "optional": true
+              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
             },
             "readdirp": {
               "version": "3.4.0",
@@ -18337,8 +18334,7 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=fa8e6e2c8e6ebd812d15",
+    "/js/build/app.js": "/js/build/app.js?id=b6a9a230c52da11a5add",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=89f2b7816c4e00784b59",
     "/css/build/app.css": "/css/build/app.css?id=5d0d4ed9f5ea4d02b6fe",
     "/css/build/overrides.css": "/css/build/overrides.css?id=1a11d122b620ebdc8354",
@@ -18,15 +18,15 @@
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0409748eb4bb77fe171a",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=7abb3dcd41ad0d4700b7",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/all.css": "/css/dist/all.css?id=d428302ff341ffec8b1b",
+    "/css/dist/all.css": "/css/dist/all.css?id=10e6e9b332aa5f1d2c87",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=75760107ce879b26f156",
-    "/js/dist/all.js": "/js/dist/all.js?id=5999105216485cd776ad",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=473d249fc27f1b907d07",
+    "/js/dist/all.js": "/js/dist/all.js?id=a4fa55da3467245c4456",
     "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=1f137fd2dcbac676d291",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=af88a4cc8e58dc298963",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=5ef650950378aeb72dfa",

resources/assets/js/components/importer/importer-file.vue

@@ -178,7 +178,6 @@
                         {id: 'phone_number', text: 'Phone Number' },
                         {id: 'manager_first_name', text: 'Manager First Name' },
                         {id: 'manager_last_name', text: 'Manager Last Name' },
-                        {id: 'department', text: 'Department' },
                         {id: 'activated', text: 'Activated' },
                         {id: 'address', text: 'Address' },
                         {id: 'city', text: 'City' },

resources/lang/en/admin/settings/general.php

@@ -16,14 +16,13 @@ return array(
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
     'allow_user_skin'           => 'Allow user skin',
     'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
-    'asset_ids'					=> 'Asset IDs',
     'audit_interval'            => 'Audit Interval',
     'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months.',
     'audit_warning_days'        => 'Audit Warning Threshold',
     'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
     'auto_increment_prefix'		=> 'Prefix (optional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
+    'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
     'backups'					=> 'Backups',
     'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
@@ -47,6 +46,7 @@ return array(
     'barcode_type'				=> '2D Barcode Type',
     'alt_barcode_type'			=> '1D barcode type',
     'email_logo_size'       => 'Square logos in email look best. ',
+    'enabled'                   => 'Enabled',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'favicon'                   => 'Favicon',

resources/views/settings/asset_tags.blade.php

@@ -43,11 +43,11 @@
                         <!-- auto ids -->
                         <div class="form-group">
                             <div class="col-md-5">
-                                {{ Form::label('auto_increment_assets', trans('admin/settings/general.asset_ids')) }}
+                                {{ Form::label('auto_increment_assets', trans('admin/settings/general.auto_increment_assets')) }}
                             </div>
                             <div class="col-md-7">
                                 {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal', 'aria-label'=>'auto_increment_assets')) }}
-                                {{ trans('admin/settings/general.auto_increment_assets') }}
+                                {{ trans('admin/settings/general.enabled') }}
                             </div>
                         </div>