butcherman / Tech_Bench

database/migrations/2019_11_30_215206_updates_for_version_5_0.php

Spacing +6 added lines, -6 removed lines

@@ -65,8 +65,8 @@ 
     private function updatePhoneIcons()
     {
         $newIcons = [
-            ['description' => 'Home',   'icon_class' => 'ti-home'],
-            ['description' => 'Work',   'icon_class' => 'ti-briefcase'],
+            ['description' => 'Home', 'icon_class' => 'ti-home'],
+            ['description' => 'Work', 'icon_class' => 'ti-briefcase'],
             ['description' => 'Mobile', 'icon_class' => 'ti-mobile'],
         ];
 
@@ -98,7 +98,7 @@ 
         {
             if(!Schema::hasColumn('users', 'role_id'))
             {
-                Schema::table('users', function (Blueprint $table) {
+                Schema::table('users', function(Blueprint $table) {
                     $table->integer('role_id')->after('user_id')->unsigned()->default(4);
                     $table->foreign('role_id')->references('role_id')->on('user_role_descriptions')->onUpdate('cascade');
                 });
@@ -325,8 +325,8 @@ 
     //  Add soft deletes to tech tips table to prevent accidental deletes
     private function addSoftDeleteToTechTips()
     {
-        if (!Schema::hasColumn('tech_tips', 'deleted_at')) {
-            Schema::table('tech_tips', function (Blueprint $table) {
+        if(!Schema::hasColumn('tech_tips', 'deleted_at')) {
+            Schema::table('tech_tips', function(Blueprint $table) {
                 $table->softDeletes()->after('description');
             });
         }
@@ -344,7 +344,7 @@ 
             //  Migrate over all deactivated users
             DB::update('UPDATE `users` SET `deleted_at` = "'.Carbon::now().'" WHERE `active` = 0');
             //  Remove the Active column
-            Schema::table('users', function (Blueprint $table) {
+            Schema::table('users', function(Blueprint $table) {
                 $table->dropColumn('active');
             });
         }

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

database/factories/UserRolePermissionTypesFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\UserRolePermissionTypes;
 use Faker\Generator as Faker;
 
-$factory->define(UserRolePermissionTypes::class, function (Faker $faker) {
+$factory->define(UserRolePermissionTypes::class, function(Faker $faker) {
     return [
         //
         'description' => $faker->words(2, true),

database/factories/UserRolePermissionsFactory.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use App\UserRolePermissions;
 use Faker\Generator as Faker;
 
-$factory->define(UserRolePermissions::class, function () {
+$factory->define(UserRolePermissions::class, function() {
     return [
         //
         'role_id'      => factory(App\UserRoleType::class)->create()->role_id,

app/Http/Controllers/Installer/SystemsController.php

Indentation +5 added lines, -5 removed lines

@@ -209,10 +209,10 @@ 
     }
 
     //  Delete an existing system - note this will fail if the system has any customers or tech tips assigned to it
-   public function destroy($id)
-   {
-       //
-       try {
+    public function destroy($id)
+    {
+        //
+        try {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
@@ -220,5 +220,5 @@ 
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }
-   }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,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);
         });
@@ -120,7 +120,7 @@ 
         $fields = SystemDataFieldTypes::all();
         $cat = SystemCategories::where('name', str_replace('-', ' ', $cat))->first();
 
-        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 view('installer.newSystem', [
             'cat'      => $cat,
             'dataList' => $fields,
@@ -136,7 +136,7 @@ 
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
-        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 view('installer.editSystem', [
             'system'   => $system,
             'dataList' => $fields,
@@ -216,7 +216,7 @@ 
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }
-        catch (\Illuminate\Database\QueryException $e)
+        catch(\Illuminate\Database\QueryException $e)
         {
             return response()->json(['success' => false, 'reason' => 'Cannot delete this equipment.  It has Customers or Tech Tips assigned to it.  Please delete those first.']);
         }

Braces +3 added lines, -3 removed lines

@@ -131,8 +131,7 @@ 
     public function edit($id)
     {
         $fields = SystemDataFieldTypes::all();
-        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query)
-        {
+        $system = SystemTypes::where('sys_id', $id)->with(['SystemDataFields' => function($query) {
             $query->join('system_data_field_types', 'system_data_fields.data_type_id', '=', 'system_data_field_types.data_type_id');
         }])->withCount('SystemDataFields')->first();
 
@@ -212,7 +211,8 @@ 
    public function destroy($id)
    {
        //
-       try {
+       try
+       {
             SystemTypes::find($id)->delete();
             return response()->json(['success' => true, 'reason' => 'Equipment Successfully Deleted']);
         }

app/Http/Controllers/Installer/SettingsController.php

Spacing +7 added lines, -7 removed lines

@@ -39,14 +39,14 @@ 
 
         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::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);
         Log::debug('Submitted Data - ', $request->toArray());
-        Log::notice('A new company logo has been uploaded by User ID-' . Auth::user()->user_id);
+        Log::notice('A new company logo has been uploaded by User ID-'.Auth::user()->user_id);
 
-        return response()->json(['url' => '/storage/img/' . $fileName]);
+        return response()->json(['url' => '/storage/img/'.$fileName]);
     }
 
     public function configuration()
@@ -81,14 +81,14 @@ 
             )->update(['value' => $request->url]);
         }
         //  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]

Braces +4 added lines, -2 removed lines

@@ -81,14 +81,16 @@
             )->update(['value' => $request->url]);
         }
         //  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]

app/Http/Middleware/CheckPasswordExpire.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
             if(Auth::user()->password_expires !== null)
             {
                 $passExp = new Carbon((Auth::user()->password_expires));
-                if(Carbon::now() > $passExp )
+                if(Carbon::now() > $passExp)
                 {
                     Log::notice('User ID-'.Auth::user()->user_id.' is being forced to change their password.');
                     $request->session()->flash('change_password', 'change_password');

app/Http/Controllers/Admin/AdminController.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
     //  Show the links for the selected user
     public function showLinks($id)
     {
-        $user     = User::find($id);
+        $user = User::find($id);
 
         Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
         return view('admin.linkDetails', [
@@ -88,7 +88,7 @@ 
         )->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
             ]);
@@ -101,9 +101,9 @@ 
             ]);
         }
 
-        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);
         Log::debug('Submitted Data - ', $request->toArray());
-        Log::notice('User Settings have been changed by User ID-' . Auth::user()->user_id);
+        Log::notice('User Settings have been changed by User ID-'.Auth::user()->user_id);
         return redirect()->back()->with('success', 'User Security Updated');
     }
 
@@ -162,7 +162,7 @@ 
             'name'        => $request->name,
             'description' => $request->description,
         ]);
-        foreach ($request->permissions as $perm)
+        foreach($request->permissions as $perm)
         {
             UserRolePermissions::create([
                 'role_id'      => $role->role_id,

Braces +4 added lines, -5 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());
                                 }
                             ])
@@ -88,7 +87,8 @@ 
         )->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
             ]);
@@ -110,8 +110,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();