From 7fe2a1f802a95b50d9cc6b7271c4a8e93728d4ad Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 29 Sep 2017 01:48:16 -0700
Subject: [PATCH 1/2] Fixes #4051 - use delete method for deleting user files

---
 resources/views/users/view.blade.php | 2 +-
 routes/web/users.php                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index cb443c26aa..1ae0724941 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -426,7 +426,7 @@
                       </td>
                       <td>
                         @can('update', $user)
-                        <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('delete/userfile', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a>
+                        <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a>
                         @endcan
                       </td>
                     </tr>
diff --git a/routes/web/users.php b/routes/web/users.php
index d863c4a22a..56d35cf81c 100644
--- a/routes/web/users.php
+++ b/routes/web/users.php
@@ -13,9 +13,9 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['auth']], function () {
     Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);
     Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]);
     Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]);
-    Route::get(
+    Route::delete(
         '{userId}/deletefile/{fileId}',
-        [ 'as' => 'delete/userfile', 'uses' => 'UsersController@getDeleteFile' ]
+        [ 'as' => 'userfile.destroy', 'uses' => 'UsersController@getDeleteFile' ]
     );
     Route::get(
         '{userId}/showfile/{fileId}',

From faf3802971b928376fa39225dceaaba41b86dbec Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 29 Sep 2017 02:00:49 -0700
Subject: [PATCH 2/2] Fixes #4011 - do not send email to user on license
 checkout

---
 app/Http/Controllers/LicensesController.php |  2 +-
 app/Notifications/CheckoutNotification.php  | 53 +++++++++++----------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php
index 6e6b67c78b..f008dec107 100755
--- a/app/Http/Controllers/LicensesController.php
+++ b/app/Http/Controllers/LicensesController.php
@@ -279,7 +279,7 @@ class LicensesController extends Controller
 
         // Declare the rules for the form validation
         $rules = [
-            'note'   => 'string',
+            'note'   => 'string|nullable',
             'asset_id'  => 'required_without:assigned_to',
         ];
 
diff --git a/app/Notifications/CheckoutNotification.php b/app/Notifications/CheckoutNotification.php
index 64fc92abce..607a91b04d 100644
--- a/app/Notifications/CheckoutNotification.php
+++ b/app/Notifications/CheckoutNotification.php
@@ -44,7 +44,9 @@ class CheckoutNotification extends Notification
         }
         $item = $this->params['item'];
 
-        $notifyBy[]='mail';
+        if (class_basename(get_class($this->params['item']))!='License') {
+            $notifyBy[] = 'mail';
+        }
         // if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1'))
         //     || (method_exists($item, 'getEula') && ($item->getEula()))
         // ) {
@@ -81,30 +83,31 @@ class CheckoutNotification extends Notification
      */
     public function toMail($notifiable)
     {
-        //TODO: Expand for non assets.
-        $item = $this->params['item'];
-        $admin_user = $this->params['admin'];
-        $target = $this->params['target'];
-        $data = [
-            'eula' => method_exists($item, 'getEula') ? $item->getEula() : '',
-            'first_name' => $target->present()->fullName(),
-            'item_name' => $item->present()->name(),
-            'checkout_date' => $item->last_checkout,
-            'expected_checkin' => $item->expected_checkin,
-            'item_tag' => $item->asset_tag,
-            'note' => $this->params['note'],
-            'item_serial' => $item->serial,
-            'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
-            'log_id' => $this->params['log_id'],
-        ];
-        return (new MailMessage)
-                    ->view('emails.accept-asset', $data)
-                    ->subject(trans('mail.Confirm_asset_delivery'));
-            // \Mail::send('emails.accept-asset', $data, function ($m) use ($target) {
-            //     $m->to($target->email, $target->first_name . ' ' . $target->last_name);
-            //     $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
-            //     $m->subject(trans('mail.Confirm_asset_delivery'));
-            // });
+
+            //TODO: Expand for non assets.
+            $item = $this->params['item'];
+            $admin_user = $this->params['admin'];
+            $target = $this->params['target'];
+            $data = [
+                'eula' => method_exists($item, 'getEula') ? $item->getEula() : '',
+                'first_name' => $target->present()->fullName(),
+                'item_name' => $item->present()->name(),
+                'checkout_date' => $item->last_checkout,
+                'expected_checkin' => $item->expected_checkin,
+                'item_tag' => $item->asset_tag,
+                'note' => $this->params['note'],
+                'item_serial' => $item->serial,
+                'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
+                'log_id' => $this->params['log_id'],
+            ];
+
+            return (new MailMessage)
+                ->view('emails.accept-asset', $data)
+                ->subject(trans('mail.Confirm_asset_delivery'));
+
+
+
+
     }
 
     /**