butcherman / Tech_Bench

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