butcherman / Tech_Bench

app/Http/Controllers/FileLinks/GuestLinksController.php

Spacing +4 added lines, -4 removed lines

@@ -51,11 +51,11 @@ 
 
         if($files == 0 && $details->allow_upload === 'No')
         {
-            Log::warning('Visitor ' . \Request::ip() . ' visited a link that they cannot do anything with.  Hash - ' . $id);
+            Log::warning('Visitor '.\Request::ip().' visited a link that they cannot do anything with.  Hash - '.$id);
             return view('links.guestDeadLink');
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by IP Address ' . \Request::ip());
+        Log::debug('Route '.Route::currentRouteName().' visited by IP Address '.\Request::ip());
         return view('links.guestDetails', [
             'hash'    => $id,
             'details' => $details,
@@ -67,7 +67,7 @@ 
     //  Get the guest available files for the link
     public function getFiles($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by IP Address ' . \Request::ip());
+        Log::debug('Route '.Route::currentRouteName().' visited by IP Address '.\Request::ip());
         $linkID = FileLinks::where('link_hash', $id)->first()->link_id;
 
         $files = new FileLinkFilesCollection(
@@ -84,7 +84,7 @@ 
     //  Upload new file
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by IP Address ' . \Request::ip().'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by IP Address '.\Request::ip().'. Submitted Data - ', $request->toArray());
         $request->validate(['name' => 'required', 'file' => 'required']);
 
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));

app/Http/Controllers/FileLinks/FileLinksController.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
     //  Ajax call to show the links for a specific user
     public function find($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         //  Verify if the user is trying to pull their own links
         if($id == 0)
@@ -55,7 +55,7 @@ 
             $id = Auth::user()->user_id;
         }
         //  If the user is trying to pull someone elses links, they must be able to manage users
-        else if ($id != Auth::user()->user_id)
+        else if($id != Auth::user()->user_id)
         {
             $this->authorize('hasAccess', 'manage_users');
         }
@@ -72,14 +72,14 @@ 
     //  Create a new file link form
     public function create()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return view('links.newLink');
     }
 
     //  Submit the new file link form
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'name'       => 'required',
@@ -153,7 +153,7 @@ 
     //  Create the new file link
     private function createLink($data)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $data->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $data->toArray());
 
         //  Generate a random hash to use as the file link and make sure it is not already in use
         do
@@ -181,7 +181,7 @@ 
     //  Save a file attached to the link
     private function saveFile(UploadedFile $file)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $filePath = config('filesystems.paths.links').DIRECTORY_SEPARATOR.'_tmp';
 
@@ -209,7 +209,7 @@ 
     //  Show details about a file link
     public function details($id, /** @scrutinizer ignore-unused */ $name)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         //  Verify that the link is a valid link
         $linkData = FileLinks::find($id);
@@ -234,14 +234,14 @@ 
     {
         $linkData = new FileLinksResource(FileLinks::find($id));
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return $linkData;
     }
 
     //  Update the link's details
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'name'       => 'required',
@@ -271,7 +271,7 @@ 
         ]);
 
         Log::info('User '.Auth::user()->full_name.' disabled link ID - '.$id);
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return response()->json(['success' => true]);
     }
 
@@ -294,7 +294,7 @@ 
 
         FileLinks::find($id)->delete();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::info('File link deleted by '.Auth::user()->full_name, ['link_id' => $id, 'user_id' => Auth::user()->user_id]);
 
         return response()->json([

app/Http/Controllers/FileLinks/LinkFilesController.php

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     //  Add a file to the file link
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'linkID' => 'required|exists:file_links,link_id'
@@ -98,14 +98,14 @@ 
             ->get()
         );
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         return $files;
     }
 
     //  Move a file to a customer file
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'fileID'   => 'required',
@@ -166,7 +166,7 @@ 
         //  Delete the file from the folder (not, will not delete if in use elsewhere)
         Files::deleteFile($fileID);
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::info('File ID-'.$fileData->file_id.' deleted for Link ID-'.$fileData->link_id.' by '.Auth::user()->user_id);
         return response()->json(['success' => true]);
     }

app/Http/Controllers/Admin/UserController.php

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,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);
         });
@@ -37,7 +37,7 @@ 
         $userList = User::with('LastUserLogin')->get()->makeVisible('user_id');
         $route    = 'admin.user.edit';
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('User list:', $userList->toArray());
         return view('admin.userIndex', [
             'userList' => $userList,
@@ -48,7 +48,7 @@ 
     //  Check if a username is in use
     public function checkUser($username, $type)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', ['username' => $username, 'type' => $type]);
         $user = User::where($type, $username)->first();
 
         if(!$user)
@@ -91,7 +91,7 @@ 
             }
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::debug('Role data: ', $roleArr);
         return view('admin.newUser', [
             'roles' => $roleArr
@@ -101,7 +101,7 @@ 
     //  Submit the Add User form
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
         //  Validate the new user form
         $request->validate([
             'role'       => 'required|numeric|exists:user_role_types,role_id',
@@ -145,7 +145,7 @@ 
     //  List all inactive users
     public function show($type)
     {
-        $route    = '';
+        $route = '';
 
         if($type !== 'inactive')
         {
@@ -156,7 +156,7 @@ 
                 ->makeVisible('user_id'));
                 // dd($userList);
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         return view('admin.userDeleted', [
             'userList' => $userList,
@@ -171,10 +171,10 @@ 
         $roles = UserRoleType::all();
         $user  = new UserResource(User::findOrFail($id));
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         //  Make sure that the user is not trying to edit someone with more permissions
-        if ($user->role_id < Auth::user()->role_id)
+        if($user->role_id < Auth::user()->role_id)
         {
             Log::warning('User '.Auth::user()->full_name.' tried to update a user that has more permissions than they do.  This request was denied.');
             return abort(403);
@@ -182,10 +182,10 @@ 
 
         //  Good to go - get role information
         $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;
@@ -208,7 +208,7 @@ 
     //  Reactivate a disabled user
     public function reactivateUser($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         User::withTrashed()->where('user_id', $id)->restore();
 
         Log::info('User ID '.$id.' reactivated by '.Auth::user()->full_name);
@@ -220,7 +220,7 @@ 
     //  Submit the update user form
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data:', $request->toArray());
         $request->validate([
             'username'   => [
                                 'required',
@@ -238,7 +238,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);
         }
@@ -260,7 +260,7 @@ 
     //  Submit the change password form
     public function submitPassword(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $request->validate([
             'password' => 'required|string|min:6|confirmed',
@@ -279,12 +279,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.';
         }
@@ -297,10 +297,10 @@ 
                 'password_expires' => $nextChange
             ]);
             $success = true;
-            $reason  = 'Password for ' . $user->full_name . ' successfully reset.';
+            $reason  = 'Password for '.$user->full_name.' successfully reset.';
         }
 
-        Log::info('User ID-' . $request->user_id . ' password chagned by ' . Auth::user()->Full_name, [
+        Log::info('User ID-'.$request->user_id.' password chagned by '.Auth::user()->Full_name, [
             'success' => $success,
             'reason'  => $reason,
         ]);
@@ -343,7 +343,7 @@ 
             $reason  = 'User '.$user->full_name.' successfully deactivated.';
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         Log::notice('User ID-'.$id.' disabled by '.Auth::user()->full_name, [
             'success' => $success,
             'reason'  => $reason,

app/Http/Controllers/TechTips/TechTipCommentsController.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
     //  Add a new Tech Tip Comment
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'comment' => 'required',
@@ -48,7 +48,7 @@ 
     //  Retrieve the comments for a tech tip
     public function show($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         return TechTipComments::where('tip_id', $id)->with('user')->get();
     }
@@ -56,7 +56,7 @@ 
     //  Delete a comment
     public function destroy($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         TechTipComments::find($id)->delete();
 

app/Http/Controllers/TechTips/TechTipsController.php

Spacing +29 added lines, -29 removed lines

@@ -37,7 +37,7 @@ 
     //  Tech Tips landing page
     public function index()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $tipTypes = new TechTipTypesCollection(TechTipTypes::all());
         $sysList  = new CategoriesCollection(SystemCategories::with('SystemTypes')->with('SystemTypes.SystemDataFields.SystemDataFieldTypes')->get());
@@ -50,10 +50,10 @@ 
     //  Search for an existing tip - If no paramaters, return all tips
     public function search(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         //  See if there are any search paramaters entered
-        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
+        if(!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
             //  No search paramaters, send all tech tips
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
@@ -62,21 +62,21 @@ 
             );
         } else {
             $article = isset($request->search['articleType']) ? true : false;
-            $system  = isset($request->search['systemType'])  ? true : false;
+            $system  = isset($request->search['systemType']) ? true : false;
             //  Search paramaters, filter results
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
                     //  Search by id or a phrase in the title or description
-                    ->where(function ($query) use ($request) {
-                        $query->where('subject', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('tip_id', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('description', 'like', '%' . $request->search['searchText'] . '%');
+                    ->where(function($query) use ($request) {
+                        $query->where('subject', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('tip_id', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('description', 'like', '%'.$request->search['searchText'].'%');
                     })
-                    ->when($article, function ($query) use ($request) {
+                    ->when($article, function($query) use ($request) {
                         $query->whereIn('tip_type_id', $request->search['articleType']);
                     })
-                    ->when($system, function ($query) use ($request) {
-                        $query->whereHas('SystemTypes', function ($query) use ($request) {
+                    ->when($system, function($query) use ($request) {
+                        $query->whereHas('SystemTypes', function($query) use ($request) {
                             $query->whereIn('system_types.sys_id', $request->search['systemType']);
                         });
                     })
@@ -91,7 +91,7 @@ 
     //  Process an image that is attached to a tech tip
     public function processImage(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $this->authorize('hasAccess', 'Create Tech Tip');
 
@@ -110,7 +110,7 @@ 
     //  Create a new Tech Tip form
     public function create()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
         $this->authorize('hasAccess', 'Create Tech Tip');
 
         $typesArr   = new TechTipTypesCollection(TechTipTypes::all());
@@ -126,7 +126,7 @@ 
     //  Submit the form to create a new tech tip
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $this->authorize('hasAccess', 'Create Tech Tip');
 
@@ -151,7 +151,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -160,7 +160,7 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true
@@ -199,7 +199,7 @@ 
         }
 
         //  Log stored file
-        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath . DIRECTORY_SEPARATOR . $fileName]);
+        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath.DIRECTORY_SEPARATOR.$fileName]);
         return $fileID;
     }
 
@@ -267,7 +267,7 @@ 
     //  Details controller - will move to the show controller with just the tech tip id
     public function details($id, $subject)
     {
-        if (session()->has('newTipFile')) {
+        if(session()->has('newTipFile')) {
             session()->forget('newTipFile');
         }
 
@@ -277,7 +277,7 @@ 
     //  Show the details about the tech tip
     public function show($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->first();
 
@@ -299,9 +299,9 @@ 
     //  Add or remove this tip as a favorite of the user
     public function toggleFav($action, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
-        switch ($action) {
+        switch($action) {
             case 'add':
                 TechTipFavs::create([
                     'user_id' => Auth::user()->user_id,
@@ -325,12 +325,12 @@ 
     //  Edit an existing tech tip
     public function edit($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $this->authorize('hasAccess', 'Edit Tech Tip');
         $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->with('TechTipTypes')->first();
 
-        if (!$tipData) {
+        if(!$tipData) {
             return view('tips.tipNotFound');
         }
 
@@ -349,7 +349,7 @@ 
     //  Store the edited Tech Tip
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $this->authorize('hasAccess', 'Edit Tech Tip');
 
@@ -363,9 +363,9 @@ 
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));
 
         //  Verify if there is a file to be processed or not
-        if ($receiver->isUploaded() === false || $request->_completed) {
+        if($receiver->isUploaded() === false || $request->_completed) {
             $this->storeUpdatedTip($request, $id);
-            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 response()->json(['tip_id' => $id]);
         }
 
@@ -373,7 +373,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile(), $id);
 
             return 'uploaded successfully';
@@ -382,7 +382,7 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true
@@ -450,7 +450,7 @@ 
     //  Soft delet the Tech Tip
     public function destroy($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $this->authorize('hasAccess', 'Delete Tech Tip');
 

Braces +18 added lines, -10 removed lines

@@ -53,14 +53,17 @@ 
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         //  See if there are any search paramaters entered
-        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType'])) {
+        if (!$request->search['searchText'] && !isset($request->search['articleType']) && !isset($request->search['systemType']))
+        {
             //  No search paramaters, send all tech tips
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
                     ->with('SystemTypes')
                     ->paginate($request->pagination['perPage'])
             );
-        } else {
+        }
+        else
+        {
             $article = isset($request->search['articleType']) ? true : false;
             $system  = isset($request->search['systemType'])  ? true : false;
             //  Search paramaters, filter results
@@ -151,7 +154,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -252,8 +256,7 @@ 
         if(!$tipData->supressEmail)
         {
             $details = TechTips::find($tipID);
-            $users = User::whereHas('UserSettings', function($query)
-            {
+            $users = User::whereHas('UserSettings', function($query) {
                 $query->where('em_tech_tip', 1);
             })->get();
 
@@ -267,7 +270,8 @@ 
     //  Details controller - will move to the show controller with just the tech tip id
     public function details($id, $subject)
     {
-        if (session()->has('newTipFile')) {
+        if (session()->has('newTipFile'))
+        {
             session()->forget('newTipFile');
         }
 
@@ -301,7 +305,8 @@ 
     {
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
 
-        switch ($action) {
+        switch ($action)
+        {
             case 'add':
                 TechTipFavs::create([
                     'user_id' => Auth::user()->user_id,
@@ -330,7 +335,8 @@ 
         $this->authorize('hasAccess', 'Edit Tech Tip');
         $tipData = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->with('TechTipTypes')->first();
 
-        if (!$tipData) {
+        if (!$tipData)
+        {
             return view('tips.tipNotFound');
         }
 
@@ -363,7 +369,8 @@ 
         $receiver = new FileReceiver('file', $request, HandlerFactory::classFromRequest($request));
 
         //  Verify if there is a file to be processed or not
-        if ($receiver->isUploaded() === false || $request->_completed) {
+        if ($receiver->isUploaded() === false || $request->_completed)
+        {
             $this->storeUpdatedTip($request, $id);
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             return response()->json(['tip_id' => $id]);
@@ -373,7 +380,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile(), $id);
 
             return 'uploaded successfully';

app/Http/Controllers/Installer/CategoriesController.php

Spacing +5 added lines, -5 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);
         });
@@ -35,7 +35,7 @@ 
     //  Store the new category form
     public function store(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'name' => 'required|string|unique:system_categories|regex:/^[a-zA-Z0-9_ ]*$/'
@@ -53,7 +53,7 @@ 
     //  Submit the Edit Category form
     public function update(Request $request, $id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'name' => [
@@ -75,14 +75,14 @@ 
     //  Delete an existing category - note this will fail if the category has systems assigned to it
     public function destroy($id)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         try {
             SystemCategories::find($id)->delete();
             Log::notice('Category ID '.$id.' deleted by '.Auth::user()->full_name);
             return response()->json(['success' => true, 'reason' => 'Category Successfully Deleted']);
         }
-        catch (\Illuminate\Database\QueryException $e)
+        catch(\Illuminate\Database\QueryException $e)
         {
             Log::warning('User '.Auth::user()->full_name.' tried to delete category ID '.$id.' but was unable to since it is still in use.');
             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 @@
     {
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
 
-        try {
+        try
+        {
             SystemCategories::find($id)->delete();
             Log::notice('Category ID '.$id.' deleted by '.Auth::user()->full_name);
             return response()->json(['success' => true, 'reason' => 'Category Successfully Deleted']);

app/Http/Controllers/Installer/SettingsController.php

Spacing +18 added lines, -18 removed lines

@@ -26,14 +26,14 @@ 
     //  Bring up the change logo form
     public function logoSettings()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         return view('installer.logoSettings');
     }
     //  Submit the new company logo
     public function submitLogo(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'file' => 'mimes:jpeg,bmp,png,jpg,gif'
@@ -45,17 +45,17 @@ 
 
         Settings::firstOrCreate(
             ['key'   => 'app.logo'],
-            ['key'   => 'app.logo', 'value' => '/storage/img/' . $fileName]
-        )->update(['value' => '/storage/img/' . $fileName]);
+            ['key'   => 'app.logo', 'value' => '/storage/img/'.$fileName]
+        )->update(['value' => '/storage/img/'.$fileName]);
 
-        Log::notice('A new company logo has been uploaded by ' . Auth::user()->full_name);
+        Log::notice('A new company logo has been uploaded by '.Auth::user()->full_name);
 
-        return response()->json(['url' => '/storage/img/' . $fileName]);
+        return response()->json(['url' => '/storage/img/'.$fileName]);
     }
 
     public function configuration()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $settings = collect([
             // 'url'      => config('app.url'),
@@ -71,7 +71,7 @@ 
 
     public function submitConfiguration(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'timezone' => 'required',
@@ -80,14 +80,14 @@ 
         ]);
 
         //  Update the site timezone
-        if (config('app.timezone') !== $request->timezone) {
+        if(config('app.timezone') !== $request->timezone) {
             Settings::firstOrCreate(
                 ['key'   => 'app.timezone'],
                 ['key'   => 'app.timezone', 'value' => $request->timezone]
             )->update(['value' => $request->timezone]);
         }
         //  Update the maximum file upload size
-        if (config('filesystems.paths.max_size') !== $request->filesize) {
+        if(config('filesystems.paths.max_size') !== $request->filesize) {
             Settings::firstOrCreate(
                 ['key'   => 'filesystems.paths.max_size'],
                 ['key'   => 'filesystems.paths.max_size', 'value' => $request->filesize]
@@ -101,7 +101,7 @@ 
     //  System backups index page
     public function backupsIndex()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         return view('installer.backupsIndex');
     }
@@ -109,7 +109,7 @@ 
     //  Retrieve the list of backups
     public function getBackups()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $backups = Storage::disk('backup')->files();
         $buArray = [];
@@ -133,7 +133,7 @@ 
     //  Delete a backup
     public function delBackup($name)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         Storage::disk('backup')->delete($name);
 
@@ -144,7 +144,7 @@ 
     //  Download a backup
     public function downloadBackup($name)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         if(Storage::disk('backup')->exists($name))
         {
@@ -159,7 +159,7 @@ 
     //  Create a new backup
     public function runBackup()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         Artisan::call('tb-backup:run');
 
@@ -175,7 +175,7 @@ 
     //  Email Settings form
     public function emailSettings()
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $settings = collect([
             'host'       => config('mail.host'),
@@ -194,7 +194,7 @@ 
     //  Send a test email
     public function sendTestEmail(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         //  TODO - fix this and make it work
         return response()->json(['success' => false]);
@@ -257,7 +257,7 @@ 
     //  Submit the test email form
     public function submitEmailSettings(Request $request)
     {
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name.'. Submitted Data - ', $request->toArray());
 
         $request->validate([
             'host'       => 'required',

app/Policies/GatePolicy.php

Spacing +7 added lines, -7 removed lines

@@ -37,13 +37,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')
@@ -54,7 +54,7 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'Denied' : 'Allowed';
-        Log::debug('User ' . $user->full_name . ' is trying to see admin link.  Result - ' . $allow);
+        Log::debug('User '.$user->full_name.' is trying to see admin link.  Result - '.$allow);
 
         return  $data->isEmpty() ? false : true;
     }
@@ -69,7 +69,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)
@@ -77,10 +77,10 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'false' : 'true';
-        Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - ' . $allow);
-        if ($allow === 'Denied')
+        Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - '.$allow);
+        if($allow === 'Denied')
         {
-            Log::alert('User ' . $user->full_name . ' was denied from accessing '.$task.' link.');
+            Log::alert('User '.$user->full_name.' was denied from accessing '.$task.' link.');
         }
 
         return  $data->isEmpty() ? false : true;