butcherman / Tech_Bench

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

app/Http/Controllers/FileLinksController.php

Spacing +8 added lines, -8 removed lines

@@ -40,7 +40,7 @@ 
         {
             $hash = strtolower(str_random(15));
             $dup = FileLinks::where('link_hash', $hash)->get()->count();
-        }while($dup != 0);
+        } while ($dup != 0);
         
         //  Create the new file link
         $link = FileLinks::create([
@@ -53,10 +53,10 @@ 
         $linkID = $link->link_id;
         
         //  If there are any files, process them
-        if(!empty($request->file))
+        if (!empty($request->file))
         {
             $filePath = config('filesystems.paths.links').DIRECTORY_SEPARATOR.$linkID;
-            foreach($request->file as $file)
+            foreach ($request->file as $file)
             {
                 //  Clean the file and store it
                 $fileName = Files::cleanFilename($filePath, $file->getClientOriginalName());
@@ -105,7 +105,7 @@ 
     {
         $linkData = FileLinks::find($id);
         
-        if(empty($linkData))
+        if (empty($linkData))
         {
             return view('links.badLink');
         }
@@ -118,7 +118,7 @@ 
     //  Get the files for the link
     public function getFiles($type, $linkID)
     {
-        switch($type)
+        switch ($type)
         {
             case 'down':
                 $files = FileLInkFiles::where('link_id', $linkID)
@@ -153,7 +153,7 @@ 
     public function submitAddFile($id, Request $request)
     {
         $filePath = config('filesystems.paths.links').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());
@@ -226,9 +226,9 @@ 
     {
         //  Remove the file from database
         $data = FileLinkFiles::where('link_id', $id)->get();
-        if(!$data->isEmpty())
+        if (!$data->isEmpty())
         {
-            foreach($data as $file)
+            foreach ($data as $file)
             {
                 $fileID = $file->file_id;
                 $file->delete();

app/Http/Controllers/TechTipsController.php

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/SystemController.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     {
         //  Make sure that the category is valid
         $valid = SystemCategories::where('name', $cat)->get();
-        if($valid->isEmpty())
+        if ($valid->isEmpty())
         {
             Log::warning('User '.Auth::user()->user_id.' tried to visit invalid category '.$cat);
             return view('err.badCategory');
@@ -58,7 +58,7 @@ 
         //  Make sure that the system is valid
         $sys = urldecode($sys);
         $valid = SystemTypes::where('name', $sys)->first();
-        if(empty($valid))
+        if (empty($valid))
         {
             Log::warning('User '.Auth::user()->user_id.' tried to visit invalid system - '.$sys.' for category '.$cat);
             return view('err.badSystem');

app/Http/Controllers/UserController.php

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/Controllers/InstallerController.php

Spacing +22 added lines, -22 removed lines

@@ -31,12 +31,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;
                 }
@@ -71,7 +71,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
@@ -115,7 +115,7 @@ 
             'mail.username'   => $request->username,
         ]);
         
-        if(!empty($request->password))
+        if (!empty($request->password))
         {
             config(['mail.password' => $request->password]);
         }
@@ -127,7 +127,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'];
@@ -150,13 +150,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
@@ -178,14 +178,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
@@ -250,13 +250,13 @@ 
         $sysID = $sysData->sys_id;
         $i = 0;
         
-        foreach($request->custField as $field)
+        foreach ($request->custField as $field)
         {
-            if(!empty($field))
+            if (!empty($field))
             {
                 $id = SystemCustDataTypes::where('name', $field)->first();
 
-                if(is_null($id))
+                if (is_null($id))
                 {
                     $newField = SystemCustDataTypes::create([
                         'name' => $field
@@ -280,7 +280,7 @@ 
         
         Log::info('New System Created', ['cat_id' => $request->catName, 'sys_name' => $request->name, 'user_id' => Auth::user()->user_id]);
         
-        return redirect()->back()->with('success', 'System Successfully Added');//
+        return redirect()->back()->with('success', 'System Successfully Added'); //
     }
     
     //  Form to edit an existing system
@@ -307,7 +307,7 @@ 
         $sysName = SystemTypes::find($sysID)->name;
         
         //  Change the name of the system if it has been modified
-        if($sysName !== $request->name)
+        if ($sysName !== $request->name)
         {
             SystemTypes::find($sysID)->update([
                 'name' => $request->name
@@ -320,19 +320,19 @@ 
             ->get();
         
         $i = 0;
-        foreach($request->custField as $field)
+        foreach ($request->custField as $field)
         {
             $found = false;
-            if(!empty($field))
+            if (!empty($field))
             {
                 //  Check if the field already exists
-                foreach($dataType as $type)
+                foreach ($dataType as $type)
                 {
-                    if($type->name === $field)
+                    if ($type->name === $field)
                     {
                         $found = true;
                         //  See if the order has changed
-                        if($type->order != $i)
+                        if ($type->order != $i)
                         {
                             SystemCustDataFields::find($type->field_id)->update(
                             [
@@ -342,11 +342,11 @@ 
                     }
                 }
                 //  If the field does not exist, create it
-                if(!$found)
+                if (!$found)
                 {
                     $id = SystemCustDataTypes::where('name', $field)->first();
 
-                    if(is_null($id))
+                    if (is_null($id))
                     {
                         $newField = SystemCustDataTypes::create([
                             'name' => $field

Braces +5 added lines, -10 removed lines

@@ -40,8 +40,7 @@ 
                 {
                     $sysArr[$cat->name][] = $sys->name;
                 }
-            }
-            else
+            } else
             {
                 $sysArr[$cat->name] = null;
             }
@@ -126,8 +125,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'];
@@ -190,8 +188,7 @@ 
                 User::whereNotNull('password_expires')->update([
                     'password_expires' => null
                 ]);
-            }
-            else
+            } else
             {
                 $newExpire = Carbon::now()->addDays($request->passExpire);
                 User::whereNull('password_expires')->update([
@@ -262,8 +259,7 @@ 
                         'name' => $field
                     ]);
                     $id = $newField->data_type_id;
-                }
-                else
+                } else
                 {
                     $id = $id->data_type_id;
                 }
@@ -352,8 +348,7 @@ 
                             'name' => $field
                         ]);
                         $id = $newField->data_type_id;
-                    }
-                    else
+                    } else
                     {
                         $id = $id->data_type_id;
                     }