Merge branch 'develop' into integrations/2020-04-15-v5-merge

# Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js
2020-04-20 23:20:34 -07:00
parent 154db9a416 039f5da0e1
commit 87464e6ec0
1780 changed files with 116525 additions and 290164 deletions
@@ -2,8 +2,6 @@

 namespace App\Http\Requests;

-use App\Http\Requests\Request;
-
 class AssetCheckinRequest extends Request
 {
    /**
@@ -2,8 +2,6 @@

 namespace App\Http\Requests;

-use App\Http\Requests\Request;
-
 class AssetCheckoutRequest extends Request
 {
    /**
@@ -2,7 +2,6 @@

 namespace App\Http\Requests;

-use App\Http\Requests\Request;

 class AssetFileRequest extends Request
 {
@@ -25,12 +24,7 @@ class AssetFileRequest extends Request
    {
        $max_file_size = \App\Helpers\Helper::file_upload_max_size();
        return [
-          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic|max:'.$max_file_size,
+          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,lic,xml,rtf|max:'.$max_file_size,
        ];
    }
-
-    public function response(array $errors)
-    {
-        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
-    }
 }
@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\AssetModel;
-use Session;
-use Illuminate\Http\Exceptions\HttpResponseException;
-
-use Illuminate\Contracts\Validation\Validator;
-
-class AssetRequest extends Request
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        $rules = [
-            'name'            => 'max:255|nullable',
-            'model_id'        => 'required|integer|exists:models,id',
-            'status_id'       => 'required|integer|exists:status_labels,id',
-            'company_id'      => 'integer|nullable',
-            'warranty_months' => 'numeric|nullable|digits_between:0,240',
-            'physical'        => 'integer|nullable',
-            'checkout_date'   => 'date',
-            'checkin_date'    => 'date',
-            'supplier_id'     => 'integer|nullable',
-            'status'          => 'integer|nullable',
-            'purchase_cost'   => 'numeric|nullable',
-            "assigned_user"   => 'sometimes:required_without_all:assigned_asset,assigned_location',
-            "assigned_asset"   => 'sometimes:required_without_all:assigned_user,assigned_location',
-            "assigned_location"   => 'sometimes:required_without_all:assigned_user,assigned_asset',
-        ];
-
-        $settings = \App\Models\Setting::getSettings();
-
-        $rules['asset_tag'] = ($settings->auto_increment_assets == '1') ? 'max:255' : 'required';
-
-        if ($this->request->get('model_id') != '') {
-            $model = AssetModel::find($this->request->get('model_id'));
-
-            if (($model) && (isset($model->fieldset)) && ($model->fieldset)) {
-                $rules += $model->fieldset->validation_rules();
-            }
-        }
-
-        return $rules;
-
-    }
-
-
-    /**
-     * Handle a failed validation attempt.
-     *
-     * public function json($data = [], $status = 200, array $headers = [], $options = 0)
-     *
-     * @param  \Illuminate\Contracts\Validation\Validator  $validator
-     * @return void
-     *
-     * @throws \Illuminate\Http\Exceptions\HttpResponseException
-     */
-    protected function failedValidation(Validator $validator)
-    {
-        $this->session()->flash('errors', Session::get('errors', new \Illuminate\Support\ViewErrorBag)
-            ->put('default', new \Illuminate\Support\MessageBag($validator->errors()->toArray())));
-        \Input::flash();
-        throw new HttpResponseException(response()->json([
-            'status' => 'error',
-            'messages' => $validator->errors(),
-            'payload' => null
-        ], 422));
-    }
-}
@@ -5,6 +5,7 @@ namespace App\Http\Requests;
 use App\Models\SnipeModel;
 use Intervention\Image\Facades\Image;
 use enshrined\svgSanitize\Sanitizer;
+use Storage;

 class ImageUploadRequest extends Request
 {
@@ -26,8 +27,8 @@ class ImageUploadRequest extends Request
    public function rules()
    {
        return [
-            'image' => 'mimes:png,gif,jpg,jpeg,svg',
-            'avatar' => 'mimes:png,gif,jpg,jpeg,svg',
+            'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml',
+            'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml',
        ];
    }

@@ -42,7 +43,7 @@ class ImageUploadRequest extends Request
     * @param String $path  location for uploaded images, defaults to uploads/plural of item type.
     * @return SnipeModel        Target asset is being checked out to.
     */
-    public function handleImages($item, $w = 600, $path = null)
+    public function handleImages($item, $w = 550, $fieldname = 'image', $path = null)
    {

        $type = strtolower(class_basename(get_class($item)));
@@ -51,21 +52,27 @@ class ImageUploadRequest extends Request
            $path =  str_plural($type);
        }

+        \Log::debug('Image path is: '.$path);
+        \Log::debug('Image fieldname is: '.$fieldname);
+
+
        \Log::debug('Trying to upload to '. $path);

-        if ($this->hasFile('image')) {
+        if ($this->hasFile($fieldname)) {

            if (!config('app.lock_passwords')) {

+                if (!Storage::disk('public')->exists($path)) Storage::disk('public')->makeDirectory($path, 775);

                if (!is_dir($path)) {
                    \Log::debug($path.' does not exist');
                    mkdir($path);
                }

-                $image = $this->file('image');
+                $image = $this->file($fieldname);
                $ext = $image->getClientOriginalExtension();
                $file_name = $type.'-'.str_random(18).'.'.$ext;
+
                \Log::debug('File name will be: '.$file_name);

                if ($image->getClientOriginalExtension()!=='svg') {
@@ -74,7 +81,12 @@ class ImageUploadRequest extends Request
                    $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) {
                        $constraint->aspectRatio();
                        $constraint->upsize();
-                    })->save($path.'/'.$file_name);
+                     })
+
+                    // This requires a string instead of an object, so we use ($string)
+                    Storage::disk('public')->put($path.'/'.$file_name, (string)$upload->encode());
+
+                // If the file is an SVG, we need to clean it and NOT encode it
                } else {
                    \Log::debug('This is an SVG');
                    $sanitizer = new Sanitizer();
@@ -83,26 +95,31 @@ class ImageUploadRequest extends Request

                    try {
                        \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
-                        file_put_contents($path.'/'.$file_name, $cleanSVG);
+                    Storage::disk('public')->put($path.'/'.$file_name, $cleanSVG);
                    } catch (\Exception $e) {
                        \Log::debug($e);
                    }
                }


-                // Remove Current image if exists
-                if (($item->image) && (file_exists($path.'/'.$item->image))) {
+                 // Remove Current image if exists
+                if (($item->{$fieldname}) && (Storage::disk('public')->exists($path.'/'.$item->{$fieldname}))) {
                    try {
-                        unlink($path.'/'.$item->image);
-                    } catch (\Exception $e) {
-                        \Log::debug($e);
+                         Storage::disk('public')->delete($path.'/'.$item->{$fieldname});                    } catch (\Exception $e) {
+                        \Log::debug('Could not delete old file. '.$path.'/'.$item->{$fieldname}.' does not exist?');
+
                    }
                }

-                $item->image = $file_name;
+                // Assign the new filename as the fieldname
+                $item->{$fieldname} = $file_name;
            }

+        // If the user isn't uploading anything new but wants to delete their old image, do so
        } elseif ($this->input('image_delete')=='1') {
+            Storage::disk('public')->delete($path.'/'.$item->{$fieldname});
+            $item->{$fieldname} = null;
+        }

            try {
                unlink($path.'/'.$item->image);
@@ -114,4 +131,4 @@ class ImageUploadRequest extends Request
        }
        return $item;
    }
-}
+}
@@ -42,21 +42,18 @@ class ItemImportRequest extends FormRequest
        $import->field_map  = request('column-mappings');
        $import->save();
        $fieldMappings=[];
-        if ($import->field_map) {

-            // This checks to make sure the field header has been mapped.
-            // If it hasn't been, it will throw an array_flip error
+        if ($import->field_map) {
            foreach ($import->field_map as $field => $fieldValue) {
                $errorMessage = null;

                if(is_null($fieldValue)){
-                    $errorMessage = 'All import fields must be mapped.';
+                    $errorMessage = trans('validation.import_field_empty');
                    $this->errorCallback($import, $field, $errorMessage);
-
+                    
                    return $this->errors;
                }
            }
-
            // We submit as csv field: column, but the importer is happier if we flip it here.
            $fieldMappings = array_change_key_case(array_flip($import->field_map), CASE_LOWER);
                        // dd($fieldMappings);
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class LicenseCheckoutRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'note'   => 'string|nullable',
+            'asset_id'  => 'required_without:assigned_to',
+        ];
+    }
+}
@@ -2,7 +2,6 @@

 namespace App\Http\Requests;
 use App\Helpers\Helper;
-
 use Illuminate\Foundation\Http\FormRequest;

 abstract class Request extends FormRequest
@@ -19,6 +19,12 @@ class SaveUserRequest extends FormRequest
        return true;
    }

+    public function response(array $errors)
+    {
+        return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
+    }
+
+
    /**
     * Get the validation rules that apply to the request.
     *
@@ -2,7 +2,6 @@

 namespace App\Http\Requests;

-use App\Http\Requests\Request;
 use Session;

 class SettingsLdapRequest extends Request
@@ -34,6 +33,7 @@ class SettingsLdapRequest extends Request
            "ldap_lname_field"          => 'sometimes|required_if:ldap_enabled,1|nullable',
            "ldap_auth_filter_query"    => 'sometimes|required_if:ldap_enabled,1|nullable',
            "ldap_version"              => 'sometimes|required_if:ldap_enabled,1|nullable',
+            "ad_domain"                 => 'sometimes|required_if:is_ad,1|nullable',
        ];

        return $rules;
@@ -2,8 +2,6 @@

 namespace App\Http\Requests;

-use App\Http\Requests\Request;
-
 class SetupUserRequest extends Request
 {
    /**