butcherman / Tech_Bench

database/migrations/2018_12_06_124820_add_password_change_to_users.php

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
      */
     public function up()
     {
-        Schema::table('users', function(Blueprint $table)
-        {
+        Schema::table('users', function(Blueprint $table) {
             $table->timestamp('password_expires')
                 ->nullable()
                 ->after('active');
@@ -41,8 +40,7 @@ 
      */
     public function down()
     {
-        Schema::table('users', function(Blueprint $table)
-        {
+        Schema::table('users', function(Blueprint $table) {
             $table->dropColumn('password_expires');
         });
         

app/Http/Controllers/FileLinks/UserLinksController.php

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
     //  Upload new file
     public function update(Request $request, $id)
-    {        
+    {
         $request->validate(['name' => 'required', 'file' => 'required']);
             
         $details = FileLinks::where('link_hash', $id)->first();

app/Http/Controllers/Admin/UserController.php

Indentation +2 added lines, -2 removed lines

@@ -137,7 +137,7 @@ 
         
         $nextChange = config('users.passExpires') != null ? Carbon::now()->addDays(config('users.passExpires')) : null;
         
-         //  Update the password
+            //  Update the password
         User::find($userData->user_id)->update(
         [
             'password'         => bcrypt($request->newPass),
@@ -269,7 +269,7 @@ 
         
         $nextChange = isset($request->force_change) && $request->force_change == 'on' ? Carbon::now()->subDay() : null;
         
-         //  Update the user data
+            //  Update the user data
         User::find($id)->update(
         [
             'password'         => bcrypt($request->password),

Braces +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
         $roleArr = [];
         foreach($roles as $role)
         {
-            if($role->role_id == 1 && !Auth::user()->hasAnyRole(['installer'])) 
+            if($role->role_id == 1 && !Auth::user()->hasAnyRole(['installer']))
             {
             
                 continue;
@@ -114,7 +114,7 @@ 
     
     //  Submit the initialize user form
     public function submitInitializeUser(Request $request, $hash)
-    {   
+    {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
         if(empty($valid))
@@ -191,7 +191,7 @@ 
         $roleArr = [];
         foreach($roles as $role)
         {
-            if($role->role_id == 1 && !Auth::user()->hasAnyRole(['installer'])) 
+            if($role->role_id == 1 && !Auth::user()->hasAnyRole(['installer']))
             {
                 continue;
             }

app/Http/Middleware/RedirectIfAuthenticated.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (Auth::guard($guard)->check()) {
+        if(Auth::guard($guard)->check()) {
             return redirect('/dashboard');
         }
 

Braces +2 added lines, -1 removed lines

@@ -17,7 +17,8 @@
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (Auth::guard($guard)->check()) {
+        if (Auth::guard($guard)->check())
+        {
             return redirect('/dashboard');
         }
 

app/Http/Middleware/CheckPasswordExpire.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     {
         $user = $request->user();
         
-        if($user->password_expires != NULL)
+        if($user->password_expires != null)
         {
             $passExp = new Carbon(($user->password_expires));
 

app/Http/Middleware/CheckRole.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $actions = $request->route()->getAction();
         $roles   = isset($actions['roles']) ? $actions['roles'] : null;
         
-        if($request->user()->hasAnyRole($roles)  || !$roles)
+        if($request->user()->hasAnyRole($roles) || !$roles)
         {
             return $next($request);
         }

app/Http/Middleware/Authenticate.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if(!$request->expectsJson()) {
             return route('login');
         }
     }

Braces +2 added lines, -1 removed lines

@@ -14,7 +14,8 @@
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if (! $request->expectsJson())
+        {
             return route('login');
         }
     }

app/Files.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             $extension = isset($fileParts['extension']) ? ('.'.$fileParts['extension']) : '';
             
             //  check for matching file names
-            if (preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) 
+            if(preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) 
             {
                 // Have a number; increment it
                 $base = $match[1];
@@ -54,7 +54,7 @@ 
             do 
             {
                 $fileName = $base.'('.++$number.')'.$extension;
-            } while (Storage::exists($path.DIRECTORY_SEPARATOR.$fileName));
+            } while(Storage::exists($path.DIRECTORY_SEPARATOR.$fileName));
         }
         
         return $fileName;

Braces +4 added lines, -4 removed lines

@@ -38,20 +38,20 @@
             $extension = isset($fileParts['extension']) ? ('.'.$fileParts['extension']) : '';
             
             //  check for matching file names
-            if (preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) 
+            if (preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match))
             {
                 // Have a number; increment it
                 $base = $match[1];
                 $number = intVal($match[2]);
-            } 
-            else 
+            }
+            else
             {
                 // No number; add one
                 $base = $fileParts['filename'];
                 $number = 0;
             }
             
-            do 
+            do
             {
                 $fileName = $base.'('.++$number.')'.$extension;
             } while (Storage::exists($path.DIRECTORY_SEPARATOR.$fileName));

app/Notifications/NewFileUpload.php

Indentation +5 added lines, -5 removed lines

@@ -32,8 +32,8 @@ 
             ->action('Click to View Link', 
                 url(route('links.details', 
                 [
-                     'id' => $this->details->link_id, 
-                     'name' => urlencode($this->details->link_name)
+                        'id' => $this->details->link_id, 
+                        'name' => urlencode($this->details->link_name)
                 ])));
     }
 
@@ -44,10 +44,10 @@ 
             'type'    => 'warning',
             'message' => 'New File Uploaded to link - '.$this->details->link_name,
             'link'    => url(route('links.details', 
-                         [
+                            [
                             'id' => $this->details->link_id, 
-                             'name' => urlencode($this->details->link_name)
-                         ]))
+                                'name' => urlencode($this->details->link_name)
+                            ]))
         ];
     }
 }