butcherman / Tech_Bench

app/Http/Controllers/Admin/AdminController.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
     //  Show the links for the selected user
     public function showLinks($id)
     {
-        $user     = User::find($id);
+        $user = User::find($id);
 
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('admin.linkDetails', [
@@ -84,13 +84,13 @@ 
 
         //  Determine if the password expires field is updated
         $oldExpire = config('users.passExpires');
-        if ($request->passExpire != $oldExpire) {
+        if($request->passExpire != $oldExpire) {
             //  Update the setting in the database
             Settings::where('key', 'users.passExpires')->update([
                 'value' => $request->passExpire
             ]);
             //  If the setting is changing from never to xx days, update all users
-            if ($request->passExpire == 0) {
+            if($request->passExpire == 0) {
                 User::whereNotNull('password_expires')->update([
                     'password_expires' => null
                 ]);
@@ -103,9 +103,9 @@ 
                 ]);
             }
 
-            Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
             Log::debug('Submitted Data - ', $request->toArray());
-            Log::notice('User Settings have been changed by User ID-' . Auth::user()->user_id);
+            Log::notice('User Settings have been changed by User ID-'.Auth::user()->user_id);
             return redirect()->back()->with('success', 'User Security Updated');
         }
     }
@@ -165,7 +165,7 @@ 
             'name'        => $request->name,
             'description' => $request->description,
         ]);
-        foreach ($request->permissions as $perm)
+        foreach($request->permissions as $perm)
         {
             UserRolePermissions::create([
                 'role_id'      => $role->role_id,

app/Http/Controllers/Admin/UserController.php

Spacing +16 added lines, -16 removed lines

@@ -31,8 +31,8 @@ 
     public function __construct()
     {
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
-        $this->middleware(function ($request, $next) {
-            $this->user = auth()->user();  //  TODO - is this correct????
+        $this->middleware(function($request, $next) {
+            $this->user = auth()->user(); //  TODO - is this correct????
             $this->authorize('hasAccess', 'Manage Users');
             return $next($request);
         });
@@ -41,12 +41,12 @@ 
     //  Show the list of current users to edit
     public function index()
     {
-        $userList = new UserCollection(User::with(['UserLogins' => function ($query) {
+        $userList = new UserCollection(User::with(['UserLogins' => function($query) {
             $query->latest()->limit(1);
         }])->get()
             /** @scrutinizer ignore-call */
             ->makeVisible('user_id'));
-        $route    = 'admin.user.edit';
+        $route = 'admin.user.edit';
 
         return view('admin.userIndex', [
             'userList' => $userList,
@@ -108,7 +108,7 @@ 
     {
         //  Validate the new user form
         $request->validate([
-            'role'       => 'required|numeric',  //  TODO - add validation rule - is in user roles table
+            'role'       => 'required|numeric', //  TODO - add validation rule - is in user roles table
             'username'   => 'required|unique:users|regex:/^[a-zA-Z0-9_]*$/',
             'first_name' => 'required',
             'last_name'  => 'required',
@@ -174,17 +174,17 @@ 
         $user  = new UserResource(User::findOrFail($id));
 
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        if ($user->role_id < Auth::user()->role_id)
+        if($user->role_id < Auth::user()->role_id)
         {
             return abort(403);
         }
 
         //  Good to go - update user password
         $roleArr = [];
-        foreach ($roles as $role) {
-            if ($role->role_id == 1 && Auth::user()->role_id != 1) {
+        foreach($roles as $role) {
+            if($role->role_id == 1 && Auth::user()->role_id != 1) {
                 continue;
-            } else if ($role->role_id == 2 && Auth::user()->role_id > 1) {
+            } else if($role->role_id == 2 && Auth::user()->role_id > 1) {
                 continue;
             } else {
                 // $roleArr[$role->role_id] = $role->name;
@@ -195,7 +195,7 @@ 
             }
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('admin.userEdit', [
             'roles' => $roleArr,
             'user'  => $user->makeVisible(['user_id', 'username']),
@@ -232,7 +232,7 @@ 
         //  Update the user data
         $user = User::findOrFail($id);
 
-        if ($user->role_id < Auth::user()->role_id)
+        if($user->role_id < Auth::user()->role_id)
         {
             return abort(403);
         }
@@ -275,12 +275,12 @@ 
         $user = User::find($request->user_id);
 
         //  Verify this is a valid user ID
-        if (!$user) {
+        if(!$user) {
             $success = false;
             $reason  = 'Cannot find user with this ID';
         }
         //  Make sure that the user is not trying to deactivate someone with more permissions
-        else if ($user->role_id < Auth::user()->role_id) {
+        else if($user->role_id < Auth::user()->role_id) {
             $success = false;
             $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.';
         }
@@ -293,11 +293,11 @@ 
                 'password_expires' => $nextChange
             ]);
             $success = true;
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::notice('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->user_id, [
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::notice('User ID-'.$request->user_id.' password chagned by '.Auth::user()->user_id, [
             'success' => $success,
             'reason'  => $reason,
         ]);

app/Http/Controllers/Installer/CategoriesController.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
     public function __construct()
     {
         $this->middleware('auth');
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->authorize('hasAccess', 'Manage Equipment');
             return $next($request);
         });
@@ -121,7 +121,7 @@ 
             SystemCategories::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Category Successfully Deleted']);
         }
-        catch (\Illuminate\Database\QueryException $e)
+        catch(\Illuminate\Database\QueryException $e)
         {
             return response()->json(['success' => false, 'reason' => 'Category still in use.  You must delete all systems attached to this category first.']);
         }

app/User.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     //  Database primary key
     protected $primaryKey = 'user_id';
 
-    protected $appends = [ 'full_name' ];
+    protected $appends = ['full_name'];
     protected $casts = [
         'created_at' => 'datetime:M d, Y',
         'updated_at' => 'datetime:M d, Y',

database/migrations/2019_11_30_215206_updates_for_version_5_0.php

Spacing +6 added lines, -6 removed lines

@@ -65,8 +65,8 @@ 
     private function updatePhoneIcons()
     {
         $newIcons = [
-            ['description' => 'Home',   'icon_class' => 'ti-home'],
-            ['description' => 'Work',   'icon_class' => 'ti-briefcase'],
+            ['description' => 'Home', 'icon_class' => 'ti-home'],
+            ['description' => 'Work', 'icon_class' => 'ti-briefcase'],
             ['description' => 'Mobile', 'icon_class' => 'ti-mobile'],
         ];
 
@@ -98,7 +98,7 @@ 
         {
             if(!Schema::hasColumn('users', 'role_id'))
             {
-                Schema::table('users', function (Blueprint $table) {
+                Schema::table('users', function(Blueprint $table) {
                     $table->integer('role_id')->after('user_id')->unsigned()->default(4);
                     $table->foreign('role_id')->references('role_id')->on('user_role_descriptions')->onUpdate('cascade');
                 });
@@ -325,8 +325,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
-            Schema::table('tech_tips', function (Blueprint $table) {
+        if(!Schema::hasColumn('tech_tips', 'deleted_at')) {
+            Schema::table('tech_tips', function(Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
         }
@@ -344,7 +344,7 @@ 
             //  Migrate over all deactivated users
             DB::update('UPDATE `users` SET `deleted_at` = "'.Carbon::now().'" WHERE `active` = 0');
             //  Remove the Active column
-            Schema::table('users', function (Blueprint $table) {
+            Schema::table('users', function(Blueprint $table) {
                 $table->dropColumn('active');
             });
         }

database/factories/UserRolePermissionTypesFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\UserRolePermissionTypes;
 use Faker\Generator as Faker;
 
-$factory->define(UserRolePermissionTypes::class, function (Faker $faker) {
+$factory->define(UserRolePermissionTypes::class, function(Faker $faker) {
     return [
         //
         'description' => $faker->words(2, true),

database/factories/UserRolePermissionsFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\UserRolePermissions;
 use Faker\Generator as Faker;
 
-$factory->define(UserRolePermissionsFactory::class, function (Faker $faker) {
+$factory->define(UserRolePermissionsFactory::class, function(Faker $faker) {
     return [
         //
         'role_id'      => factory(App\UserRoleTypes::class)->create()->role_id,

routes/web.php

Spacing +50 added lines, -50 removed lines

@@ -8,8 +8,8 @@ 
 /*
 *   Non user Routes
 */
-Route::get('/',         'Auth\LoginController@showLoginForm')->name('index');
-Route::get('logout',    'Auth\LoginController@logout')       ->name('logout');
+Route::get('/', 'Auth\LoginController@showLoginForm')->name('index');
+Route::get('logout', 'Auth\LoginController@logout')       ->name('logout');
 Route::get('no-script', 'Controller@noScript')               ->name('noscript');
 
 
@@ -21,52 +21,52 @@ 
 /*
 *   Download File Routes
 */
-Route::get('download/{id}/{filename}',    'DownloadController@index')          ->name('download');
+Route::get('download/{id}/{filename}', 'DownloadController@index')          ->name('download');
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
 
 /*
 *   User Settings Routes
 */
-Route::get('account',                   'AccountController@index')         ->name('account');
-Route::post('account',                  'AccountController@submit')        ->name('account');
-Route::put('account',                   'AccountController@notifications') ->name('account');
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
+Route::get('account', 'AccountController@index')         ->name('account');
+Route::post('account', 'AccountController@submit')        ->name('account');
+Route::put('account', 'AccountController@notifications') ->name('account');
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
 
 /*
 *   Basic Logged In Routes
 */
-Route::get('about',                  'DashboardController@about')           ->name('about');
-Route::get('dashboard',              'DashboardController@index')           ->name('dashboard');
-Route::get('notifications',          'DashboardController@getNotifications')->name('getNotifications');
+Route::get('about', 'DashboardController@about')           ->name('about');
+Route::get('dashboard', 'DashboardController@index')           ->name('dashboard');
+Route::get('notifications', 'DashboardController@getNotifications')->name('getNotifications');
 Route::get('mark-notification/{id}', 'DashboardController@markNotification')->name('markNotification');
-Route::delete('notifications/{id}',  'DashboardController@delNotification') ->name('delNotification');
+Route::delete('notifications/{id}', 'DashboardController@delNotification') ->name('delNotification');
 
 /*
 *   File Link Routes
 */
-Route::prefix('links')->name('links.')->group(function () {
+Route::prefix('links')->name('links.')->group(function() {
     //  Resource controllers for base access
-    Route::resource('data',           'FileLinks\FileLinksController');
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
+    Route::resource('data', 'FileLinks\FileLinksController');
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
     //  File Link Files
-    Route::resource('files',          'FileLinks\LinkFilesController');
+    Route::resource('files', 'FileLinks\LinkFilesController');
     //  Index landing page
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
 });
 
 /*
 *   Guest File Link Routes
 */
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
-Route::put('file-links/{id}',           'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
 
 /*
 *   Customer Routes
@@ -74,44 +74,44 @@ 
 Route::prefix('customer')->name('customer.')->group(function()
 {
     //  Customer Files
-    Route::resource('files',                   'Customers\CustomerFilesController');
+    Route::resource('files', 'Customers\CustomerFilesController');
     //  Custome Notes
-    Route::get('download-note/{id}',           'DownloadController@downloadCustNote')        ->name('download-note');
-    Route::resource('notes',                   'Customers\CustomerNotesController');
+    Route::get('download-note/{id}', 'DownloadController@downloadCustNote')        ->name('download-note');
+    Route::resource('notes', 'Customers\CustomerNotesController');
     //  Customer Contacts
-    Route::resource('contacts',                'Customers\CustomerContactsController');
+    Route::resource('contacts', 'Customers\CustomerContactsController');
     //  Customer Systems
-    Route::resource('systems',                 'Customers\CustomerSystemsController');
+    Route::resource('systems', 'Customers\CustomerSystemsController');
     //  Customer Details
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')->name('details');
-    Route::resource('id',                      'Customers\CustomerDetailsController');
+    Route::get('id/{id}/{name}', 'Customers\CustomerDetailsController@details')->name('details');
+    Route::resource('id', 'Customers\CustomerDetailsController');
     //  check Id and bookmark customer
     Route::get('toggle-fav/{action}/{custID}', 'Customers\CustomerController@toggleFav')     ->name('toggle-fav');
-    Route::get('check-id/{id}',                'Customers\CustomerController@checkID')       ->name('check-id');
+    Route::get('check-id/{id}', 'Customers\CustomerController@checkID')       ->name('check-id');
     //  Index landing/search page
-    Route::get('search',                       'Customers\CustomerController@search')        ->name('search');
-    Route::get('/',                            'Customers\CustomerController@index')         ->name('index');
+    Route::get('search', 'Customers\CustomerController@search')        ->name('search');
+    Route::get('/', 'Customers\CustomerController@index')         ->name('index');
 });
 
 /*
 *   Tech Tip Routes
 */
-Route::resource('tips',                       'TechTips\TechTipsController');
-Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
+Route::resource('tips', 'TechTips\TechTipsController');
+Route::post('submit-edit/{id}', 'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
 Route::prefix('tip')->name('tip.')->group(function()
 {
-    Route::resource('comments',               'TechTips\TechTipCommentsController');
-    Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
-    Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
-    Route::post('process-image',              'TechTips\TechTipsController@processImage')->name('processImage');
+    Route::resource('comments', 'TechTips\TechTipCommentsController');
+    Route::get('search', 'TechTips\TechTipsController@search')      ->name('search');
+    Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details')     ->name('details');
+    Route::post('process-image', 'TechTips\TechTipsController@processImage')->name('processImage');
     Route::get('toggle-fav/{action}/{tipID}', 'TechTips\TechTipsController@toggleFav')   ->name('toggle-fav');
-    Route::get('download-tip/{id}',           'DownloadController@downloadTechTip')      ->name('downloadTip');
+    Route::get('download-tip/{id}', 'DownloadController@downloadTechTip')      ->name('downloadTip');
 });
 
 /*
     *   Administration Routes
 */
-Route::prefix('admin')->name('admin.')->group(function () {
+Route::prefix('admin')->name('admin.')->group(function() {
 
 
 
@@ -138,16 +138,16 @@ 
 
 
     //  Administrative routes for users
-    Route::resource('user',                'Admin\UserController');
-    Route::get('user/enable/{id}',         'Admin\UserController@reactivateUser')     ->name('user.reactivate');
-    Route::post('user/change-password',    'Admin\UserController@submitPassword')     ->name('user.changePassword');
+    Route::resource('user', 'Admin\UserController');
+    Route::get('user/enable/{id}', 'Admin\UserController@reactivateUser')     ->name('user.reactivate');
+    Route::post('user/change-password', 'Admin\UserController@submitPassword')     ->name('user.changePassword');
     Route::get('check-user/{name}/{type}', 'Admin\UserController@checkUser')          ->name('checkUser');
-    Route::get('links/show/{id}',          'Admin\AdminController@showLinks')         ->name('user.showLinks');
-    Route::get('links',                    'Admin\AdminController@userLinks')         ->name('user.links');
-    Route::post('password-policy',         'Admin\AdminController@submitPolicy')      ->name('passwordPolicy');
-    Route::get('password-policy',          'Admin\AdminController@passwordPolicy')    ->name('passwordPolicy');
-    Route::post('role-policy',             'Admin\AdminController@submitRoleSettings')->name('roleSettings');
-    Route::get('role-policy',              'Admin\AdminController@roleSettings')      ->name('roleSettings');
+    Route::get('links/show/{id}', 'Admin\AdminController@showLinks')         ->name('user.showLinks');
+    Route::get('links', 'Admin\AdminController@userLinks')         ->name('user.links');
+    Route::post('password-policy', 'Admin\AdminController@submitPolicy')      ->name('passwordPolicy');
+    Route::get('password-policy', 'Admin\AdminController@passwordPolicy')    ->name('passwordPolicy');
+    Route::post('role-policy', 'Admin\AdminController@submitRoleSettings')->name('roleSettings');
+    Route::get('role-policy', 'Admin\AdminController@roleSettings')      ->name('roleSettings');
 
 //