butcherman / Tech_Bench

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 +13 added lines, -13 removed lines

@@ -29,7 +29,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);
         });
@@ -144,7 +144,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        $route    = '';
+        $route = '';
 
         if($type !== 'inactive')
         {
@@ -168,17 +168,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;
@@ -189,7 +189,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->
@@ -228,7 +228,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);
         }
@@ -271,12 +271,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.';
         }
@@ -289,11 +289,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',

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(UserRolePermissions::class, function () {
+$factory->define(UserRolePermissions::class, function() {
     return [
         //
         'role_id'      => factory(App\UserRoleType::class)->create()->role_id,

app/Http/Controllers/Installer/SystemsController.php

Indentation +5 added lines, -5 removed lines

@@ -209,10 +209,10 @@ 
     }
 
     //  Delete an existing system - note this will fail if the system has any customers or tech tips assigned to it
-   public function destroy($id)
-   {
-       //
-       try {
+    public function destroy($id)
+    {
+        //
+        try {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
@@ -220,5 +220,5 @@ 
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }
-   }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,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);
         });
@@ -120,7 +120,7 @@ 
         $fields = SystemDataFieldTypes::all();
         $cat = SystemCategories::where('name', str_replace('-', ' ', $cat))->first();
 
-        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('installer.newSystem', [
             'cat'      => $cat,
             'dataList' => $fields,
@@ -136,7 +136,7 @@ 
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
-        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('installer.editSystem', [
             'system'   => $system,
             'dataList' => $fields,
@@ -216,7 +216,7 @@ 
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
-        catch (\Illuminate\Database\QueryException $e)
+        catch(\Illuminate\Database\QueryException $e)
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }

Braces +3 added lines, -3 removed lines

@@ -131,8 +131,7 @@ 
     public function edit($id)
     {
         $fields = SystemDataFieldTypes::all();
-        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query)
-        {
+        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) {
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
@@ -212,7 +211,8 @@ 
    public function destroy($id)
    {
        //
-       try {
+       try
+       {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }

app/Http/Middleware/CheckPasswordExpire.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
             if(Auth::user()->password_expires !== null)
             {
                 $passExp = new Carbon((Auth::user()->password_expires));
-                if(Carbon::now() > $passExp )
+                if(Carbon::now() > $passExp)
                 {
                     Log::notice('User ID-'.Auth::user()->user_id.' is being forced to change their password.');
                     $request->session()->flash('change_password', 'change_password');

app/Http/Controllers/Admin/AdminController.php

Spacing +5 added lines, -5 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', [
@@ -88,7 +88,7 @@ 
         )->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
             ]);
@@ -101,9 +101,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');
     }
 
@@ -162,7 +162,7 @@ 
             'name'        => $request->name,
             'description' => $request->description,
         ]);
-        foreach ($request->permissions as $perm)
+        foreach($request->permissions as $perm)
         {
             UserRolePermissions::create([
                 'role_id'      => $role->role_id,

Braces +4 added lines, -5 removed lines

@@ -37,8 +37,7 @@ 
         $userLinks = new UserCollection(
                         User::withCount([
                                 'FileLinks',
-                                'FileLinks as expired_file_links_count' => function($query)
-                                {
+                                'FileLinks as expired_file_links_count' => function($query) {
                                     $query->where('expire', '<', Carbon::now());
                                 }
                             ])
@@ -88,7 +87,8 @@ 
         )->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
             ]);
@@ -110,8 +110,7 @@ 
     public function roleSettings()
     {
         $this->authorize('hasAccess', 'Manage User Roles');
-        $roles = UserRoleType::with(['UserRolePermissions' => function($query)
-        {
+        $roles = UserRoleType::with(['UserRolePermissions' => function($query) {
             $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id');
         }])->get();
         $perms = UserRolePermissionTypes::all();

app/Http/Controllers/Customers/CustomerDetailsController.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         Log::notice('New Customer ID-'.$request->custID.' created by User ID-'.Auth::user()->user_id);
 
-        return response()->json(['success' => true, 'cust_id' => $custData->cust_id ]);
+        return response()->json(['success' => true, 'cust_id' => $custData->cust_id]);
     }
 
     //  Show the customer details
@@ -142,7 +142,7 @@ 
 
         $parentsParent = Customers::find($request->parent_id);
 
-        if ($parentsParent->parent_id)
+        if($parentsParent->parent_id)
         {
             $request->parent_id = $parentsParent->parent_id;
         }