butcherman / Tech_Bench

app/Http/Middleware/RedirectIfAuthenticated.php

Braces +2 added lines, -1 removed lines

@@ -17,7 +17,8 @@
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if(Auth::guard($guard)->check()) {
+        if(Auth::guard($guard)->check())
+        {
             return redirect('/dashboard');
         }
 

app/Http/Controllers/Customers/CustomerController.php

Braces +3 added lines, -6 removed lines

@@ -47,8 +47,7 @@ 
             $searchResults = new CustomersCollection(
                 Customers::orderBy($request->sortField, $request->sortType)
                     //  Search the name, dba name, and cust id columns
-                    ->where(function($query) use ($request)
-                    {
+                    ->where(function($query) use ($request) {
                         $query->where('name', 'like', '%' . $request->name . '%')
                             ->orWhere('cust_id', 'like', '%' . $request->name . '%')
                             ->orWhere('dba_name', 'like', '%' . $request->name . '%');
@@ -58,10 +57,8 @@ 
                     //  Include the customers systems
                     ->with('CustomerSystems.SystemTypes')
                     //  If the system field is present - search for system type
-                    ->when($request->system, function($query) use ($request)
-                    {
-                        $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request)
-                        {
+                    ->when($request->system, function($query) use ($request) {
+                        $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) {
                             $query->where('sys_id', $request->system);
                         });
                     })

routes/web.php

Braces +2 added lines, -4 removed lines

@@ -62,8 +62,7 @@ 
 /*
 *   Customer Routes
 */
-Route::prefix('customer')->name('customer.')->group(function()
-{
+Route::prefix('customer')->name('customer.')->group(function() {
     //  Customer Files
     Route::resource('files',                   'Customers\CustomerFilesController');
     //  Custome Notes
@@ -89,8 +88,7 @@ 
 */
 Route::resource('tips',                       'TechTips\TechTipsController');
 Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
-Route::prefix('tip')->name('tip.')->group(function()
-{
+Route::prefix('tip')->name('tip.')->group(function() {
     Route::resource('comments',               'TechTips\TechTipCommentsController');
     Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
     Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');

database/migrations/2019_11_30_195012_create_user_role_types_table.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         //  Update the users table to include the 'user_role' column
         if(!Schema::hasColumn('users', 'role_id'))
         {
-            Schema::table('users', function(Blueprint $table)
-            {
+            Schema::table('users', function(Blueprint $table) {
                 $table->integer('role_id')->unsigned()->after('user_id')->default(4);
                 $table->foreign('role_id')->references('role_id')->on('user_role_types')->onUpdate('cascade');
             });

app/Http/Controllers/AccountController.php

Braces +4 added lines, -2 removed lines

@@ -135,7 +135,8 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        if ($user->isEmpty()) {
+        if ($user->isEmpty())
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to access invalid initialize hash - ' . $hash);
             return abort(404);
@@ -151,7 +152,8 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        if (empty($valid)) {
+        if (empty($valid))
+        {
             Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
             Log::warning('Visitor at IP Address ' . \Request::ip() . ' tried to submit an invalid User Initialization link - ' . $hash);
             return abort(404);

app/Http/Controllers/Admin/AdminController.php

Braces +6 added lines, -6 removed lines

@@ -37,8 +37,7 @@ 
         $userLinks = new UserCollection(
                         User::withCount([
                                 'FileLinks',
-                                'FileLinks as expired_file_links_count' => function($query)
-                                {
+                                'FileLinks as expired_file_links_count' => function($query) {
                                     $query->where('expire', '<', Carbon::now());
                                 }
                             ])
@@ -84,13 +83,15 @@ 
 
         //  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
                 ]);
@@ -113,8 +114,7 @@ 
     public function roleSettings()
     {
         $this->authorize('hasAccess', 'Manage User Roles');
-        $roles = UserRoleType::with(['UserRolePermissions' => function($query)
-        {
+        $roles = UserRoleType::with(['UserRolePermissions' => function($query) {
             $query->join('user_role_permission_types', 'user_role_permission_types.perm_type_id', '=', 'user_role_permissions.perm_type_id');
         }])->get();
         $perms = UserRolePermissionTypes::all();

app/Http/Controllers/Admin/UserController.php

Braces +16 added lines, -7 removed lines

@@ -181,12 +181,18 @@ 
 
         //  Good to go - update user password
         $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 {
+            }
+            else
+            {
                 // $roleArr[$role->role_id] = $role->name;
                 $roleArr[] = [
                     'value' => $role->role_id,
@@ -275,17 +281,20 @@ 
         $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.';
         }
         //  Good to go - update user password
-        else {
+        else
+        {
             //  Update the user data
             $user->update(
             [

app/Http/Controllers/TechTips/TechTipsController.php

Braces +18 added lines, -10 removed lines

@@ -51,14 +51,17 @@ 
         Log::debug('request 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
@@ -146,7 +149,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -248,8 +252,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();
 
@@ -263,7 +266,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');
         }
 
@@ -293,7 +297,8 @@ 
     //  Add or remove this tip as a favorite of the user
     public function toggleFav($action, $id)
     {
-        switch ($action) {
+        switch ($action)
+        {
             case 'add':
                 TechTipFavs::create([
                     'user_id' => Auth::user()->user_id,
@@ -321,7 +326,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');
         }
 
@@ -353,7 +359,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]);
@@ -363,7 +370,8 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if ($save->isFinished())
+        {
             $this->saveFile($save->getFile(), $id);
 
             return 'uploaded successfully';

database/migrations/2019_11_30_215206_updates_for_version_5_0.php

Braces +23 added lines, -13 removed lines

@@ -82,7 +82,8 @@ 
     //  Added the ability to set an expiration date for user passwords - will force them to change after this expires
     private function addPasswordExpiresColumn()
     {
-        if(!Schema::hasColumn('users', 'password_expires')) {
+        if(!Schema::hasColumn('users', 'password_expires'))
+        {
             Schema::table('users', function(Blueprint $table) {
                 $table->timestamp('password_expires')
                     ->nullable()
@@ -118,7 +119,8 @@ 
     //  Added a 'hidden' attribute to system customer data types to allow passwords to not be viewed unless clicked or focus
     private function addHiddenColumn()
     {
-        if(!Schema::hasColumn('system_data_field_types', 'hidden')) {
+        if(!Schema::hasColumn('system_data_field_types', 'hidden'))
+        {
             Schema::table('system_cust_data_types', function(Blueprint $table) {
                 $table->boolean('hidden')
                     ->default(0)
@@ -130,7 +132,8 @@ 
     //  Update the File links table - add cust_id and note column
     private function addColumnsToFileLinksTable()
     {
-        if(!Schema::hasColumn('file_links', 'cust_id')) {
+        if(!Schema::hasColumn('file_links', 'cust_id'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->integer('cust_id')
                     ->unsigned()
@@ -139,7 +142,8 @@ 
                 $table->foreign('cust_id')->references('cust_id')->on('customers')->onUpdate('cascade')->onDelete('cascade');
             });
         }
-        if(!Schema::hasColumn('file_links', 'note')) {
+        if(!Schema::hasColumn('file_links', 'note'))
+        {
             Schema::table('file_links', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -147,7 +151,8 @@ 
             });
             //  Migrate the instructions from the old table to the new column
             $instructions = DB::select('SELECT * FROM `file_link_instructions`');
-            foreach($instructions as $ins) {
+            foreach($instructions as $ins)
+            {
                 FileLinks::find($ins->link_id)->update([
                     'note' => $ins->instruction
                 ]);
@@ -158,7 +163,8 @@ 
     //  Add Notes column to the file links files table
     private function addNotesColumnToFileLinkFiles()
     {
-        if(!Schema::hasColumn('file_link_files', 'note')) {
+        if(!Schema::hasColumn('file_link_files', 'note'))
+        {
             Schema::table('file_link_files', function(Blueprint $table) {
                 $table->longText('note')
                     ->nullable()
@@ -166,7 +172,8 @@ 
             });
             //  Migrate the existing notes to the new table
             $notes = DB::select('SELECT * FROM `file_link_notes`');
-            foreach($notes as $note) {
+            foreach($notes as $note)
+            {
                 FileLinkFiles::where('file_id', $note->file_id)->update([
                     'note' => $note->note
                 ]);
@@ -177,7 +184,8 @@ 
     //  Add the documentation column to the tech tips table
     private function migrateSystemDocumentation()
     {
-        if(!Schema::hasColumn('tech_tips', 'tip_type_id')) {
+        if(!Schema::hasColumn('tech_tips', 'tip_type_id'))
+        {
             Schema::table('tech_tips', function(Blueprint $table) {
                 $table->bigInteger('tip_type_id')->unsigned()->after('public')->default(1);
                 $table->foreign('tip_type_id')->references('tip_type_id')->on('tech_tip_types')->onUpdate('cascade');
@@ -185,7 +193,8 @@ 
 
             //  Move all of the system files over to the tech tips table
             $sysFiles = DB::select('SELECT * FROM `system_files`');
-            foreach($sysFiles as $sysFile) {
+            foreach($sysFiles as $sysFile)
+            {
                 $newTip = TechTips::create([
                     'user_id'       => $sysFile->user_id,
                     'public'        => 0,
@@ -279,7 +288,8 @@ 
     //  Remove the system files and system file types table
     private function removeSystemFilesTables()
     {
-        if(Schema::hasTable('system_files')) {
+        if(Schema::hasTable('system_files'))
+        {
             Schema::table('system_files', function(Blueprint $table) {
                 $table->dropForeign(['sys_id']);
                 $table->dropForeign(['type_id']);
@@ -325,7 +335,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
+        if (!Schema::hasColumn('tech_tips', 'deleted_at'))
+        {
             Schema::table('tech_tips', function (Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
@@ -337,8 +348,7 @@ 
     {
         if(!Schema::hasColumn('users', 'deleted_at'))
         {
-            Schema::table('users', function(Blueprint $table)
-            {
+            Schema::table('users', function(Blueprint $table) {
                 $table->softDeletes()->after('password_expires');
             });
             //  Migrate over all deactivated users