butcherman / Tech_Bench

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);

app/Http/Controllers/Admin/UserController.php

Spacing +3 added lines, -3 removed lines

@@ -28,8 +28,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);
         });
@@ -98,7 +98,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',

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
         });
     }