butcherman / Tech_Bench

app/Http/Controllers/TechTipsController.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
             $tipData = TechTips::where('subject', 'like', '%'.$request->tipSearch.'%')
                 ->whereHas('TechTipSystems', function($q) use($request)
                 {
-                   $q->where('sys_id', $request->system);
+                    $q->where('sys_id', $request->system);
                 })
                 ->get();
         }

Braces +5 added lines, -10 removed lines

@@ -60,8 +60,7 @@ 
                    $q->where('sys_id', $request->system);
                 })
                 ->get();
-        }
-        else
+        } else
         {
             $tipData = TechTips::where('subject', 'like', '%'.$request->tipSearch.'%')
                 ->get();
@@ -118,8 +117,7 @@ 
                     'sys_id' => $tag
                 ]);
             }
-        }
-        else
+        } else
         {
             TechTipSystems::create([
                 'tip_id' => $tipID,
@@ -158,8 +156,7 @@ 
         try
         {
             Mail::to($userList)->send(new newTechtip($tipData));
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             report($e);
         }
@@ -285,8 +282,7 @@ 
                     'sys_id' => $tag
                 ]);
             }
-        }
-        else
+        } else
         {
             TechTipSystems::create([
                 'tip_id' => $id,
@@ -308,8 +304,7 @@ 
                         Files::deleteFile($file->file_id);
                     }
                 }
-            }
-            else
+            } else
             {
                 TechTipFiles::where('tip_id', $id)->delete();
             }

Spacing +22 added lines, -22 removed lines

@@ -35,9 +35,9 @@ 
             ->get();
         
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -52,7 +52,7 @@ 
     public function search(Request $request)
     {
         //  Run different request based on if system field is filled out or not
-        if(!empty($request->system))
+        if (!empty($request->system))
         {
             $tipData = TechTips::where('subject', 'like', '%'.$request->tipSearch.'%')
                 ->whereHas('TechTipSystems', function($q) use($request)
@@ -81,9 +81,9 @@ 
             ->get();
         
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -112,10 +112,10 @@ 
         $tipID = $tip->tip_id;
 
         //  Enter all system tags associated with the tip
-        if(is_array($request->sysTags))
+        if (is_array($request->sysTags))
         {
             
-            foreach($request->sysTags as $tag)
+            foreach ($request->sysTags as $tag)
             {
                 TechTipSystems::create([
                     'tip_id' => $tipID,
@@ -132,10 +132,10 @@ 
         }
         
         //  If there are any files, process them
-        if(!empty($request->file))
+        if (!empty($request->file))
         {
             $filePath = config('filesystems.paths.tips').DIRECTORY_SEPARATOR.$tipID;
-            foreach($request->file as $file)
+            foreach ($request->file as $file)
             {
                 //  Clean the file and store it
                 $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());
@@ -163,7 +163,7 @@ 
         {
             Mail::to($userList)->send(new newTechtip($tipData));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             report($e);
         }
@@ -177,7 +177,7 @@ 
     public function details($id, $name)
     {
         $tipData = TechTips::where('tip_id', $id)->with('user')->first();
-        if(empty($tipData))
+        if (empty($tipData))
         {
             Log::warning('User ID-'.Auth::user()->user_id.' tried to access invlaid Tech Tip ID-'.$id.' Name-'.$name);
             return view('err.tipNotFound');
@@ -226,7 +226,7 @@ 
     public function edit($id)
     {
         $tipData = TechTips::find($id);
-        if(empty($tipData))
+        if (empty($tipData))
         {
             return 'tip not found';
         }
@@ -249,9 +249,9 @@ 
             ->get();
         
         $sysArr = [];
-        foreach($systems as $sys)
+        foreach ($systems as $sys)
         {
-            foreach($sys->SystemTypes as $s)
+            foreach ($sys->SystemTypes as $s)
             {
                 $sysArr[$sys->name][$s->sys_id] = $s->name;
             }
@@ -284,9 +284,9 @@ 
         
         //  Enter all system tags associated with the tip after destroying the existing systems
         TechTipSystems::where('tip_id', $id)->delete();
-        if(is_array($request->sysTags))
+        if (is_array($request->sysTags))
         {
-            foreach($request->sysTags as $tag)
+            foreach ($request->sysTags as $tag)
             {
                 TechTipSystems::create([
                     'tip_id' => $id,
@@ -304,13 +304,13 @@ 
         
         //  Determine if any files were removed
         $tipFiles = TechTipFiles::where('tip_id', $id)->get();
-        if(!$tipFiles->isEmpty())
+        if (!$tipFiles->isEmpty())
         {
-            if(!empty($request->existingFile))
+            if (!empty($request->existingFile))
             {
-                foreach($tipFiles as $file)
+                foreach ($tipFiles as $file)
                 {
-                    if(!in_array($file->file_id, $request->existingFile))
+                    if (!in_array($file->file_id, $request->existingFile))
                     {
                         TechTipFiles::where('file_id', $file->file_id)->delete();
                         Files::deleteFile($file->file_id);
@@ -324,10 +324,10 @@ 
         }
         
         //  Process any new files
-        if(!empty($request->file))
+        if (!empty($request->file))
         {
             $filePath = config('filesystems.paths.tips').DIRECTORY_SEPARATOR.$id;
-            foreach($request->file as $file)
+            foreach ($request->file as $file)
             {
                 //  Clean the file and store it
                 $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());

app/Http/Controllers/UserLinksController.php

Indentation +1 added lines, -1 removed lines

@@ -100,4 +100,4 @@
         return $request->all();
     }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -25,12 +25,12 @@ 
         $details = FileLinks::where('link_hash', $id)->first();
         
         //  Verify that the link is valid
-        if(empty($details))
+        if (empty($details))
         {
             return view('links.guest.badLink');
         }
         //  Verify that the link has not expired
-        else if($details->expire <= date('Y-m-d'))
+        else if ($details->expire<=date('Y-m-d'))
         {
             return view('links.guest.expiredLink');
         }
@@ -55,7 +55,7 @@ 
         
         $filePath = config('filesystems.paths.links').DIRECTORY_SEPARATOR.$details->link_id;
 
-        foreach($request->file as $file)
+        foreach ($request->file as $file)
         {
             //  Clean the file and store it
             $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());
@@ -76,7 +76,7 @@ 
                 'upload' => 1
             ]);
             
-            if(!empty($request->note))
+            if (!empty($request->note))
             {
                 FileLinkNotes::create([
                     'link_id' => $details->link_id,
@@ -92,7 +92,7 @@ 
         {
             Mail::to($user)->send(new NewLinkFile($details));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             report($e);
         }

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
         try
         {
             Mail::to($user)->send(new NewLinkFile($details));
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             report($e);
         }

app/Http/Controllers/CustomerFilesController.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     {
         $fileTypes = CustomerFileTypes::all();
         $fTypes = [];
-        foreach($fileTypes as $type)
+        foreach ($fileTypes as $type)
         {
             $fTypes[$type->file_type_id] = $type->description;
         }
@@ -93,7 +93,7 @@ 
         $custFile = CustomerFiles::find($id);
         $fileTypes = CustomerFileTypes::all();
         $fTypes = [];
-        foreach($fileTypes as $type)
+        foreach ($fileTypes as $type)
         {
             $fTypes[$type->file_type_id] = $type->description;
         }

app/Http/Controllers/CustomerContactsController.php

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
         $numberTypes = PhoneNumberType::all();
         
         $numTypes = [];
-        foreach($numberTypes as $type)
+        foreach ($numberTypes as $type)
         {
             $numTypes[$type->phone_type_id] = $type->description;
         }
@@ -49,12 +49,12 @@ 
         
         $contID = $cont->cont_id;
         
-        if(!empty(array_filter($request['phoneNumber'])))
+        if (!empty(array_filter($request['phoneNumber'])))
         {
             $num = count($request['phoneNumber']);
-            for($i=0; $i < $num; $i++)
+            for ($i = 0; $i<$num; $i++)
             {
-                if(!empty($request['phoneNumber'][$i]))
+                if (!empty($request['phoneNumber'][$i]))
                 {
                     CustomerContactPhones::create([
                         'cont_id' => $contID,
@@ -87,7 +87,7 @@ 
         $numberTypes = PhoneNumberType::all();
         
         $numTypes = [];
-        foreach($numberTypes as $type)
+        foreach ($numberTypes as $type)
         {
             $numTypes[$type->phone_type_id] = $type->description;
         }
@@ -113,10 +113,10 @@ 
         
         //  Clear all contact phone numbers and re-enter them
         CustomerContactPhones::where('cont_id', $id)->delete();
-        if(!empty(array_filter($request['phoneNumber'])))
+        if (!empty(array_filter($request['phoneNumber'])))
         {
             $num = count($request['phoneNumber']);
-            for($i=0; $i < $num; $i++)
+            for ($i = 0; $i<$num; $i++)
             {
                 CustomerContactPhones::create([
                     'cont_id'       => $id,
@@ -158,9 +158,9 @@ 
         $vcard->addEmail($contact->email);
         $vcard->addAddress(null, null, $custData->address, $custData->city, $custData->state, $custData->zip, null);
         
-        if(!empty($numbers))
+        if (!empty($numbers))
         {
-            foreach($numbers as $phone)
+            foreach ($numbers as $phone)
             {
                 $vcard->addPhoneNumber($phone->phone_number, $phone->description);
             }

app/Http/Controllers/CustomerDetails.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
         $custDetails = Customers::find($id);
         
         //  Check for empty data set
-        if(empty($custDetails))
+        if (empty($custDetails))
         {
             return view('err.customerNotFound');
         }
@@ -90,7 +90,7 @@ 
         Customers::find($id)->update($request->all());
 
         //  Modify to the new ID number if set
-        if(isset($request->cust_id))
+        if (isset($request->cust_id))
         {
             $id = $request->cust_id;
         }

app/Exceptions/Handler.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public function report(Exception $exception)
     {
-        if(config('app.debug'))
+        if (config('app.debug'))
         {
             parent::report($exception);
         }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
         if(config('app.debug'))
         {
             parent::report($exception);
-        }
-        else
+        } else
         {
             Log::error('['.$exception->getCode().'] "'.$exception->getMessage().'" on line '.$exception->getTrace()[0]['line'].' of file '.$exception->getTrace()[0]['file']);
         }

app/Http/Controllers/UserController.php

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
             if($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
-            }
-            else
+            } else
             {
                 $roleArr[$role->role_id] = $role->name;
             }
@@ -94,8 +93,7 @@ 
         try
         {
             Mail::to($request->email)->send(new InitializeUser($hash, $request->username, $request->first_name.' '.$request->last_name));
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             report($e);
         }
@@ -203,8 +201,7 @@ 
             if($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
-            }
-            else
+            } else
             {
                 $roleArr[$role->role_id] = $role->name;
             }

Indentation +3 added lines, -3 removed lines

@@ -146,7 +146,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),
@@ -187,7 +187,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),
@@ -260,7 +260,7 @@ 
     //  Deactivae an active user
     public function destroy($id)
     {
-         //  Update the user data
+            //  Update the user data
         User::find($id)->update(
         [
             'active'   => 0

Spacing +7 added lines, -7 removed lines

@@ -39,9 +39,9 @@ 
         $roles = Role::all();
         
         $roleArr = [];
-        foreach($roles as $role)
+        foreach ($roles as $role)
         {
-            if($role->role_id == 1 && Auth::user()->role_id != 1)
+            if ($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
             }
@@ -95,7 +95,7 @@ 
         {
             Mail::to($request->email)->send(new InitializeUser($hash, $request->username, $request->first_name.' '.$request->last_name));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             report($e);
         }
@@ -113,7 +113,7 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
         
-        if($user->isEmpty())
+        if ($user->isEmpty())
         {
             return abort(404);
         }
@@ -126,7 +126,7 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if(empty($valid))
+        if (empty($valid))
         {
             Log::notice('Someone tried to access an invalid User Initialization link - '.$hash);
             return abort(404);
@@ -206,9 +206,9 @@ 
         $userRole = DB::select('SELECT `role_id` FROM `user_role` WHERE `user_id` = ?', [$id])[0]->role_id;
         
         $roleArr = [];
-        foreach($roles as $role)
+        foreach ($roles as $role)
         {
-            if($role->role_id == 1 && Auth::user()->role_id != 1)
+            if ($role->role_id == 1 && Auth::user()->role_id != 1)
             {
                 continue;
             }

app/Http/Middleware/CheckPasswordExpire.php

Spacing +1 added lines, -1 removed lines

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

app/Http/Middleware/CheckRole.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function handle($request, Closure $next)
     {
-        if($request->user() === null)
+        if ($request->user() === null)
         {
             Log::alert($request->route().' denied for Guest');
             return response('Insufficient Permissions', 401);
@@ -23,7 +23,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);
         }