Passed
Push — dev5 ( 8662bf...df64bd )
by Ron
12:04
created
routes/web.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 /*
9 9
 *   Non user Routes
10 10
 */
11
-Route::get('/',         'Auth\LoginController@showLoginForm')->name('index');
12
-Route::get('logout',    'Auth\LoginController@logout')       ->name('logout');
11
+Route::get('/', 'Auth\LoginController@showLoginForm')->name('index');
12
+Route::get('logout', 'Auth\LoginController@logout')       ->name('logout');
13 13
 Route::get('no-script', 'Controller@noScript')               ->name('noscript');
14 14
 
15 15
 
@@ -21,52 +21,52 @@  discard block
 block discarded – undo
21 21
 /*
22 22
 *   Download File Routes
23 23
 */
24
-Route::get('download/{id}/{filename}',    'DownloadController@index')          ->name('download');
24
+Route::get('download/{id}/{filename}', 'DownloadController@index')          ->name('download');
25 25
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
26
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
26
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
27 27
 
28 28
 /*
29 29
 *   User Settings Routes
30 30
 */
31
-Route::get('account',                   'AccountController@index')         ->name('account');
32
-Route::post('account',                  'AccountController@submit')        ->name('account');
33
-Route::put('account',                   'AccountController@notifications') ->name('account');
34
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
31
+Route::get('account', 'AccountController@index')         ->name('account');
32
+Route::post('account', 'AccountController@submit')        ->name('account');
33
+Route::put('account', 'AccountController@notifications') ->name('account');
34
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
35 35
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
36 36
 
37 37
 /*
38 38
 *   Basic Logged In Routes
39 39
 */
40
-Route::get('about',                  'DashboardController@about')           ->name('about');
41
-Route::get('dashboard',              'DashboardController@index')           ->name('dashboard');
42
-Route::get('notifications',          'DashboardController@getNotifications')->name('getNotifications');
40
+Route::get('about', 'DashboardController@about')           ->name('about');
41
+Route::get('dashboard', 'DashboardController@index')           ->name('dashboard');
42
+Route::get('notifications', 'DashboardController@getNotifications')->name('getNotifications');
43 43
 Route::get('mark-notification/{id}', 'DashboardController@markNotification')->name('markNotification');
44
-Route::delete('notifications/{id}',  'DashboardController@delNotification') ->name('delNotification');
44
+Route::delete('notifications/{id}', 'DashboardController@delNotification') ->name('delNotification');
45 45
 
46 46
 /*
47 47
 *   File Link Routes
48 48
 */
49
-Route::prefix('links')->name('links.')->group(function () {
49
+Route::prefix('links')->name('links.')->group(function() {
50 50
     //  Resource controllers for base access
51
-    Route::resource('data',           'FileLinks\FileLinksController');
52
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
53
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
51
+    Route::resource('data', 'FileLinks\FileLinksController');
52
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
53
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
54 54
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
55
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
55
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
56 56
     //  File Link Files
57
-    Route::resource('files',          'FileLinks\LinkFilesController');
57
+    Route::resource('files', 'FileLinks\LinkFilesController');
58 58
     //  Index landing page
59
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
59
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
60 60
 });
61 61
 
62 62
 /*
63 63
 *   Guest File Link Routes
64 64
 */
65 65
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
66
-Route::put('file-links/{id}',           'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
67
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
68
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
69
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
66
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
67
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
68
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
69
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
70 70
 
71 71
 /*
72 72
 *   Customer Routes
@@ -74,53 +74,53 @@  discard block
 block discarded – undo
74 74
 Route::prefix('customer')->name('customer.')->group(function()
75 75
 {
76 76
     //  Customer Files
77
-    Route::resource('files',                   'Customers\CustomerFilesController');
77
+    Route::resource('files', 'Customers\CustomerFilesController');
78 78
     //  Custome Notes
79
-    Route::get('download-note/{id}',           'DownloadController@downloadCustNote')        ->name('download-note');
80
-    Route::resource('notes',                   'Customers\CustomerNotesController');
79
+    Route::get('download-note/{id}', 'DownloadController@downloadCustNote')        ->name('download-note');
80
+    Route::resource('notes', 'Customers\CustomerNotesController');
81 81
     //  Customer Contacts
82
-    Route::resource('contacts',                'Customers\CustomerContactsController');
82
+    Route::resource('contacts', 'Customers\CustomerContactsController');
83 83
     //  Customer Systems
84
-    Route::resource('systems',                 'Customers\CustomerSystemsController');
84
+    Route::resource('systems', 'Customers\CustomerSystemsController');
85 85
     //  Customer Details
86
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')->name('details');
87
-    Route::resource('id',                      'Customers\CustomerDetailsController');
86
+    Route::get('id/{id}/{name}', 'Customers\CustomerDetailsController@details')->name('details');
87
+    Route::resource('id', 'Customers\CustomerDetailsController');
88 88
     //  check Id and bookmark customer
89 89
     Route::get('toggle-fav/{action}/{custID}', 'Customers\CustomerController@toggleFav')     ->name('toggle-fav');
90
-    Route::get('check-id/{id}',                'Customers\CustomerController@checkID')       ->name('check-id');
90
+    Route::get('check-id/{id}', 'Customers\CustomerController@checkID')       ->name('check-id');
91 91
     //  Index landing/search page
92
-    Route::get('search',                       'Customers\CustomerController@search')        ->name('search');
93
-    Route::get('/',                            'Customers\CustomerController@index')         ->name('index');
92
+    Route::get('search', 'Customers\CustomerController@search')        ->name('search');
93
+    Route::get('/', 'Customers\CustomerController@index')         ->name('index');
94 94
 });
95 95
 
96 96
 /*
97 97
 *   Tech Tip Routes
98 98
 */
99
-Route::resource('tips',                       'TechTips\TechTipsController');
100
-Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
99
+Route::resource('tips', 'TechTips\TechTipsController');
100
+Route::post('submit-edit/{id}', 'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
101 101
 Route::prefix('tip')->name('tip.')->group(function()
102 102
 {
103
-    Route::resource('comments',               'TechTips\TechTipCommentsController');
104
-    Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
105
-    Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
106
-    Route::post('process-image',              'TechTips\TechTipsController@processImage')->name('processImage');
103
+    Route::resource('comments', 'TechTips\TechTipCommentsController');
104
+    Route::get('search', 'TechTips\TechTipsController@search')      ->name('search');
105
+    Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details')     ->name('details');
106
+    Route::post('process-image', 'TechTips\TechTipsController@processImage')->name('processImage');
107 107
     Route::get('toggle-fav/{action}/{tipID}', 'TechTips\TechTipsController@toggleFav')   ->name('toggle-fav');
108
-    Route::get('download-tip/{id}',           'DownloadController@downloadTechTip')      ->name('downloadTip');
108
+    Route::get('download-tip/{id}', 'DownloadController@downloadTechTip')      ->name('downloadTip');
109 109
 });
110 110
 
111 111
 /*
112 112
     *   Administration Routes
113 113
 */
114
-Route::prefix('admin')->name('admin.')->group(function () {
114
+Route::prefix('admin')->name('admin.')->group(function() {
115 115
 
116 116
 
117 117
 
118 118
     //  Administrative routes for users
119
-    Route::resource('user',                'Admin\UserController');
120
-    Route::post('user/change-password',     'Admin\UserController@submitPassword')->name('user.changePassword');
119
+    Route::resource('user', 'Admin\UserController');
120
+    Route::post('user/change-password', 'Admin\UserController@submitPassword')->name('user.changePassword');
121 121
     Route::get('check-user/{name}/{type}', 'Admin\UserController@checkUser')      ->name('checkUser');
122
-    Route::get('links/show/{id}',          'Admin\AdminController@showLinks')     ->name('user.showLinks');
123
-    Route::get('links',                    'Admin\AdminController@userLinks')     ->name('user.links');
122
+    Route::get('links/show/{id}', 'Admin\AdminController@showLinks')     ->name('user.showLinks');
123
+    Route::get('links', 'Admin\AdminController@userLinks')     ->name('user.links');
124 124
 
125 125
 
126 126
 
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/UserController.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     public function __construct()
32 32
     {
33 33
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
34
-        $this->middleware(function ($request, $next) {
35
-            $this->user = auth()->user();  //  TODO - is this correct????
34
+        $this->middleware(function($request, $next) {
35
+            $this->user = auth()->user(); //  TODO - is this correct????
36 36
             $this->authorize('hasAccess', 'Manage Users');
37 37
             return $next($request);
38 38
         });
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
     //  Show the list of current users to edit
42 42
     public function index()
43 43
     {
44
-        $userList = new UserCollection(User::where('active', 1)->with(['UserLogins' => function ($query) {
44
+        $userList = new UserCollection(User::where('active', 1)->with(['UserLogins' => function($query) {
45 45
             $query->latest()->limit(1);
46 46
         }])->get()
47 47
             /** @scrutinizer ignore-call */
48 48
             ->makeVisible('user_id'));
49
-        $route    = 'admin.user.edit';
49
+        $route = 'admin.user.edit';
50 50
 
51 51
         return view('admin.userIndex', [
52 52
             'userList' => $userList,
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
     {
110 110
         //  Validate the new user form
111 111
         $request->validate([
112
-            'role'       => 'required|numeric',  //  TODO - add validation rule - is in user roles table
112
+            'role'       => 'required|numeric', //  TODO - add validation rule - is in user roles table
113 113
             'username'   => 'required|unique:users|regex:/^[a-zA-Z0-9_]*$/',
114 114
             'first_name' => 'required',
115 115
             'last_name'  => 'required',
@@ -187,17 +187,17 @@  discard block
 block discarded – undo
187 187
         $user  = new UserResource(User::findOrFail($id));
188 188
 
189 189
         //  Make sure that the user is not trying to deactivate someone with more permissions
190
-        if ($user->role_id < Auth::user()->role_id) 
190
+        if($user->role_id < Auth::user()->role_id) 
191 191
         {
192 192
             return abort(403);
193 193
         }
194 194
 
195 195
         //  Good to go - update user password
196 196
         $roleArr = [];
197
-        foreach ($roles as $role) {
198
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
197
+        foreach($roles as $role) {
198
+            if($role->role_id == 1 && Auth::user()->role_id != 1) {
199 199
                 continue;
200
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
200
+            } else if($role->role_id == 2 && Auth::user()->role_id > 1) {
201 201
                 continue;
202 202
             } else {
203 203
                 // $roleArr[$role->role_id] = $role->name;
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
             }
209 209
         }
210 210
 
211
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
211
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
212 212
         return view('admin.userEdit', [
213 213
             'roles' => $roleArr,
214 214
             'user'  => $user->makeVisible(['user_id', 'username']),
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
         //  Update the user data
236 236
         $user = User::findOrFail($id);
237 237
 
238
-        if ($user->role_id < Auth::user()->role_id) 
238
+        if($user->role_id < Auth::user()->role_id) 
239 239
         {
240 240
             return abort(403);
241 241
         }
@@ -278,12 +278,12 @@  discard block
 block discarded – undo
278 278
         $user = User::find($request->user_id);
279 279
 
280 280
         //  Verify this is a valid user ID
281
-        if (!$user) {
281
+        if(!$user) {
282 282
             $success = false;
283 283
             $reason  = 'Cannot find user with this ID';
284 284
         }
285 285
         //  Make sure that the user is not trying to deactivate someone with more permissions
286
-        else if ($user->role_id < Auth::user()->role_id) {
286
+        else if($user->role_id < Auth::user()->role_id) {
287 287
             $success = false;
288 288
             $reason  = 'You cannot change password for a user with higher permissions that you.  If this user has locked themselves out, have then use the reset link on the login page.';
289 289
         }
@@ -296,11 +296,11 @@  discard block
 block discarded – undo
296 296
                 'password_expires' => $nextChange
297 297
             ]);
298 298
             $success = true;
299
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
299
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
300 300
         }
301 301
 
302
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
303
-        Log::notice('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->user_id, [
302
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
303
+        Log::notice('User ID-'.$request->user_id.' password chagned by '.Auth::user()->user_id, [
304 304
             'success' => $success,
305 305
             'reason'  => $reason,
306 306
         ]);
Please login to merge, or discard this patch.
app/Http/Controllers/Admin/AdminController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     //  Show the links for the selected user
53 53
     public function showLinks($id)
54 54
     {
55
-        $user     = User::find($id);
55
+        $user = User::find($id);
56 56
 
57 57
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
58 58
         return view('admin.linkDetails', [
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,7 @@
 block discarded – undo
34 34
                         User::where('active', 1)
35 35
                             ->withCount([
36 36
                                 'FileLinks',
37
-                                'FileLinks as expired_file_links_count' => function($query)
38
-                                {
37
+                                'FileLinks as expired_file_links_count' => function($query) {
39 38
                                     $query->where('expire', '<', Carbon::now());
40 39
                                 }
41 40
                             ])
Please login to merge, or discard this patch.