butcherman / Tech_Bench

database/migrations/2019_11_30_195059_create_user_role_permissions_table.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     public function up()
     {
-        Schema::create('user_role_permissions', function (Blueprint $table) {
+        Schema::create('user_role_permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('role_id')->unsigned();
             $table->integer('perm_type_id')->unsigned();

database/migrations/2019_11_30_195012_create_user_role_types_table.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function up()
     {
-        Schema::create('user_role_types', function (Blueprint $table) {
+        Schema::create('user_role_types', function(Blueprint $table) {
             $table->increments('role_id');
             $table->text('name');
             $table->text('description');
@@ -26,10 +26,10 @@ 
 
         //  Insert default data
         DB::table('user_role_types')->insert([
-            ['role_id' => 1, 'name' => 'Installer',     'description' => 'All Access Administrator',    'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 2, 'name' => 'Administrator', 'description' => 'System Administrator',        'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 3, 'name' => 'Reports',       'description' => 'User who can run reports',    'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 4, 'name' => 'Tech',          'description' => 'Standard User',               'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 1, 'name' => 'Installer', 'description' => 'All Access Administrator', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 2, 'name' => 'Administrator', 'description' => 'System Administrator', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 3, 'name' => 'Reports', 'description' => 'User who can run reports', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 4, 'name' => 'Tech', 'description' => 'Standard User', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
         ]);
 
         //  Update the users table to include the 'user_role' column

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         //  Update the users table to include the 'user_role' column
         if(!Schema::hasColumn('users', 'role_id'))
         {
-            Schema::table('users', function(Blueprint $table)
-            {
+            Schema::table('users', function(Blueprint $table) {
                 $table->integer('role_id')->unsigned()->after('user_id')->default(4);
                 $table->foreign('role_id')->references('role_id')->on('user_role_types')->onUpdate('cascade');
             });

database/migrations/2019_11_30_195040_create_user_role_permission_types_table.php

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function up()
     {
-        Schema::create('user_role_permission_types', function (Blueprint $table) {
+        Schema::create('user_role_permission_types', function(Blueprint $table) {
             $table->increments('perm_type_id');
             $table->text('description');
             $table->timestamps();
@@ -23,17 +23,17 @@ 
 
         //  Insert default data
         DB::table('user_role_permission_types')->insert([
-            ['perm_type_id' => 1,  'description' => 'Manage Users',        'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 2,  'description' => 'Manage User Roles',   'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 3,  'description' => 'Run Reports',         'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 4,  'description' => 'Add Customer',        'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 5,  'description' => 'Manage Customers',    'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 6,  'description' => 'Deactivate Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 7,  'description' => 'Use File Links',      'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 8,  'description' => 'Create Tech Tip',     'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 9,  'description' => 'Edit Tech Tip',       'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 10, 'description' => 'Delete Tech Tip',     'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 11, 'description' => 'Manage Equipment',    'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 1, 'description' => 'Manage Users', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 2, 'description' => 'Manage User Roles', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 3, 'description' => 'Run Reports', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 4, 'description' => 'Add Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 5, 'description' => 'Manage Customers', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 6, 'description' => 'Deactivate Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 7, 'description' => 'Use File Links', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 8, 'description' => 'Create Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 9, 'description' => 'Edit Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 10, 'description' => 'Delete Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 11, 'description' => 'Manage Equipment', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
         ]);
     }
 

app/Policies/GatePolicy.php

Spacing +5 added lines, -5 removed lines

@@ -36,13 +36,13 @@ 
     //  Determine if a user can see the Administration Nav Link
     public function seeAdminLink(User $user)
     {
-        if ($this->isInstaller($user))
+        if($this->isInstaller($user))
         {
             return true;
         }
 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
-            ->whereHas('UserRolePermissionTypes', function ($query) {
+            ->whereHas('UserRolePermissionTypes', function($query) {
                 $query->where('description', 'Manage Users')
                     ->orWhere('description', 'Manage User Roles')
                     ->orWhere('description', 'Manage Customers')
@@ -53,7 +53,7 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'false' : 'true';
-        \Log::debug('User ' . $user->full_name . ' is trying to access admin link.  Result - ' . $allow);
+        \Log::debug('User '.$user->full_name.' is trying to access admin link.  Result - '.$allow);
 
         return  $data->isEmpty() ? false : true;
     }
@@ -68,7 +68,7 @@ 
         }
 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
-            ->whereHas('UserRolePermissionTypes', function ($query) use ($task) {
+            ->whereHas('UserRolePermissionTypes', function($query) use ($task) {
                 $query->where('description', $task);
             })
             ->where('role_id', $user->role_id)
@@ -76,7 +76,7 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'false' : 'true';
-        \Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - ' . $allow);
+        \Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - '.$allow);
 
         return  $data->isEmpty() ? false : true;
     }

app/Http/Controllers/AccountController.php

Spacing +10 added lines, -10 removed lines

@@ -135,14 +135,14 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        if ($user->isEmpty()) {
-            Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-            Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash);
+        if($user->isEmpty()) {
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+            Log::warning('Visitor at IP Address '.\Request::ip().' tried to access invalid initialize hash - '.$hash);
             return abort(404);
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited.');
-        Log::debug('Link Hash -' . $hash);
+        Log::debug('Route '.Route::currentRouteName().' visited.');
+        Log::debug('Link Hash -'.$hash);
         return view('account.initializeUser', ['hash' => $hash]);
     }
 
@@ -151,9 +151,9 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if (empty($valid)) {
-            Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-            Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash);
+        if(empty($valid)) {
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+            Log::warning('Visitor at IP Address '.\Request::ip().' tried to submit an invalid User Initialization link - '.$hash);
             return abort(404);
         }
 
@@ -186,8 +186,8 @@ 
         Auth::loginUsingID($userData->user_id);
 
         //  Redirect the user to the dashboard
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('Initialize Data - ' . $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('Initialize Data - '.$request->toArray());
         Log::notice('User has setup account', ['user_id' => $userData->user_id]);
         return redirect(route('dashboard'));
     }

Braces +4 added lines, -2 removed lines

@@ -135,7 +135,8 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        if ($user->isEmpty()) {
+        if ($user->isEmpty())
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash);
             return abort(404);
@@ -151,7 +152,8 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if (empty($valid)) {
+        if (empty($valid))
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash);
             return abort(404);

database/migrations/2018_05_31_001549_create_tech_tip_comments_table.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             $table->longText('comment');
             $table->timestamps();
             $table->foreign('tip_id')->references('tip_id')->on('tech_tips')->onUpdate('cascade')->onDelete('cascade');
-            $table->foreign('user_id')->references('user_id')->on('users')->onUpdate('cascade');  //  TODO - add this key in v5 updates if it does not exist
+            $table->foreign('user_id')->references('user_id')->on('users')->onUpdate('cascade'); //  TODO - add this key in v5 updates if it does not exist
         });
     }
 

app/Http/Controllers/Admin/UserController.php

Braces +16 added lines, -7 removed lines

@@ -181,12 +181,18 @@ 
 
         //  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 {
+            }
+            else
+            {
                 // $roleArr[$role->role_id] = $role->name;
                 $roleArr[] = [
                     'value' => $role->role_id,
@@ -275,17 +281,20 @@ 
         $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.';
         }
         //  Good to go - update user password
-        else {
+        else
+        {
             //  Update the user data
             $user->update(
             [

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct()
     {
         $this->middleware('auth')->except('initializeUser', 'submitInitializeUser');
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->authorize('hasAccess', 'Manage Users');
             return $next($request);
         });
@@ -39,12 +39,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,
@@ -106,7 +106,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',
@@ -147,7 +147,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        $route    = '';
+        $route = '';
 
         if($type !== 'inactive')
         {
@@ -171,17 +171,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;
@@ -192,7 +192,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->
@@ -231,7 +231,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);
         }
@@ -274,12 +274,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.';
         }
@@ -292,11 +292,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.']);
         }

Braces +2 added lines, -1 removed lines

@@ -77,7 +77,8 @@
     //  Delete an existing category - note this will fail if the category has systems assigned to it
     public function destroy($id)
     {
-        try {
+        try
+        {
             SystemCategories::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Category Successfully Deleted']);
         }

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',