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

@@ -36,9 +36,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;
             }
@@ -53,7 +53,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)
@@ -82,9 +82,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;
             }
@@ -116,9 +116,9 @@ 
         $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,
@@ -135,10 +135,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());
@@ -166,7 +166,7 @@ 
         {
             Mail::to($userList)->send(new newTechtip($tipData));
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             report($e);
         }
@@ -194,7 +194,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('errors.tipNotFound');
@@ -263,7 +263,7 @@ 
     public function edit($id)
     {
         $tipData = TechTips::find($id);
-        if(empty($tipData))
+        if (empty($tipData))
         {
             return 'tip not found';
         }
@@ -281,7 +281,7 @@ 
             ->first();
         
         $tipS = [];
-        foreach($tipSys as $s)
+        foreach ($tipSys as $s)
         {
             $tipS[] = $s->sys_id;
         }
@@ -292,9 +292,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;
             }
@@ -330,9 +330,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,
@@ -350,13 +350,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);
@@ -370,10 +370,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 +6 added lines, -6 removed lines

@@ -27,12 +27,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');
         }
@@ -56,7 +56,7 @@ 
         $details = FileLinks::where('link_hash', $hash)->first();
         
         //  Verify that the link is valid
-        if(empty($details))
+        if (empty($details))
         {
             return abort(404);
         }
@@ -69,7 +69,7 @@ 
         $path = config('filesystems.disks.local.root').DIRECTORY_SEPARATOR;
         
         $zip = Zip::create($path.'download.zip');
-        foreach($files as $file)
+        foreach ($files as $file)
         {
             $zip->add($path.$file->file_link.$file->file_name);
         }
@@ -87,7 +87,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());
@@ -108,7 +108,7 @@ 
                 'upload'   => 1
             ]);
             
-            if(!empty($request->note))
+            if (!empty($request->note))
             {
                 FileLinkNotes::create([
                     'link_id' => $details->link_id,

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/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

@@ -147,7 +147,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),
@@ -188,7 +188,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),
@@ -273,7 +273,7 @@ 
             $linkController->destroy($link->link_id);
         }
         
-         //  Update the user data
+            //  Update the user data
         User::find($id)->update(
         [
             'active'   => 0

Spacing +8 added lines, -8 removed lines

@@ -41,9 +41,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;
             }
@@ -96,7 +96,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);
         }
@@ -114,7 +114,7 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
         
-        if($user->isEmpty())
+        if ($user->isEmpty())
         {
             return abort(404);
         }
@@ -127,7 +127,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);
@@ -207,9 +207,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;
             }
@@ -265,7 +265,7 @@ 
         $linkController = new FileLinksController();        
         $links = FileLinks::where('user_id', $id)->get();
         
-        foreach($links as $link)
+        foreach ($links as $link)
         {
             $linkController->destroy($link->link_id);
         }

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/Console/Commands/BackupApplication.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         $i = 0;
         do
         {
-            if($i)
+            if ($i)
             {
                 $backupName = $backupBase.'('.$i.')';
             }
@@ -48,7 +48,7 @@ 
                 $backupName = $backupBase;
             }
             $i++;
-        } while(Storage::disk('backup')->exists($backupName.'.zip'));
+        } while (Storage::disk('backup')->exists($backupName.'.zip'));
         
         //  Write a file that shows the system version    
         $version = new \PragmaRX\Version\Package\Version();

Braces +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
             if($i)
             {
                 $backupName = $backupBase.'('.$i.')';
-            }
-            else
+            } else
             {
                 $backupName = $backupBase;
             }

app/Http/Controllers/DashboardController.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     public function markNotification($id)
     {
         $notification = Auth::user()->notifications()->where('id', $id)->first();
-        if($notification)
+        if ($notification)
         {
             $notification->delete();
             Log::info('Notification ID-'.$id.' deleted for User ID-'.Auth::user()->user_id);

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         {
             $notification->delete();
             Log::info('Notification ID-'.$id.' deleted for User ID-'.Auth::user()->user_id);
-        }
-        else
+        } else
         {
             Log::notice('Notification ID-'.$id.' not found for user ID-'.Auth::user()->user_id);
         }

app/Http/Controllers/InstallerController.php

Spacing +10 added lines, -10 removed lines

@@ -27,12 +27,12 @@ 
         $cats = SystemCategories::all();
         $sysArr = [];
         //  Populate that list with the matching systems
-        foreach($cats as $cat)
+        foreach ($cats as $cat)
         {
             $systems = SystemTypes::where('cat_id', $cat->cat_id)->get();
-            if(!$systems->isEmpty())
+            if (!$systems->isEmpty())
             {
-                foreach($systems as $sys)
+                foreach ($systems as $sys)
                 {
                     $sysArr[$cat->name][] = $sys->name;
                 }
@@ -67,7 +67,7 @@ 
         
         Log::info('Tech Bench Settings Updated', ['user_id' => Auth::user()->user_id]);
         
-        return redirect()->back()->with('success', 'Tech Bench Successfully Updated');//
+        return redirect()->back()->with('success', 'Tech Bench Successfully Updated'); //
     }
     
     //  Upload and submit a new site logo
@@ -111,7 +111,7 @@ 
             'mail.username'   => $request->username,
         ]);
         
-        if(!empty($request->password))
+        if (!empty($request->password))
         {
             config(['mail.password' => $request->password]);
         }
@@ -123,7 +123,7 @@ 
             Mail::to(Auth::user()->email)->send(new TestEmail());
             return 'success';
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             Log::notice('Test Email Failed.  Message: '.$e);
             $msg = '['.$e->getCode().'] "'.$e->getMessage().'" on line '.$e->getTrace()[0]['line'].' of file '.$e->getTrace()[0]['file'];
@@ -146,13 +146,13 @@ 
         Settings::where('key', 'mail.port')->update(['value' => $request->port]);
         Settings::where('key', 'mail.encryption')->update(['value' => $request->encryption]);
         Settings::where('key', 'mail.username')->update(['value' => $request->username]);
-        if(!empty($request->password))
+        if (!empty($request->password))
         {
             Settings::where('key', 'mail.password')->update(['value' => $request->password]);
         }
          
         Log::info('Email Settings have been changed by User ID-'.Auth::user()->user_id);
-        return redirect()->back()->with('success', 'Tech Bench Successfully Updated');//
+        return redirect()->back()->with('success', 'Tech Bench Successfully Updated'); //
     }
     
     //  User settings form
@@ -174,14 +174,14 @@ 
         
         //  Determine if the password expires field is updated
         $oldExpire = config('users.passExpires');
-        if($request->passExpire != $oldExpire)
+        if ($request->passExpire != $oldExpire)
         {
             //  Update the setting in the database
             Settings::where('key', 'users.passExpires')->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

Braces +3 added lines, -6 removed lines

@@ -36,8 +36,7 @@ 
                 {
                     $sysArr[$cat->name][] = $sys->name;
                 }
-            }
-            else
+            } else
             {
                 $sysArr[$cat->name] = null;
             }
@@ -122,8 +121,7 @@ 
             Log::info('Test Email Successfully Sent to '.Auth::user()->email);
             Mail::to(Auth::user()->email)->send(new TestEmail());
             return 'success';
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             Log::notice('Test Email Failed.  Message: '.$e);
             $msg = '['.$e->getCode().'] "'.$e->getMessage().'" on line '.$e->getTrace()[0]['line'].' of file '.$e->getTrace()[0]['file'];
@@ -186,8 +184,7 @@ 
                 User::whereNotNull('password_expires')->update([
                     'password_expires' => null
                 ]);
-            }
-            else
+            } else
             {
                 $newExpire = Carbon::now()->addDays($request->passExpire);
                 User::whereNull('password_expires')->update([