butcherman / Tech_Bench

app/Http/Controllers/TechTips/TechTipsController.php

Spacing +23 added lines, -23 removed lines

@@ -51,7 +51,7 @@ 
         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')
@@ -60,21 +60,21 @@ 
             );
         } else {
             $article = isset($request->search['articleType']) ? true : false;
-            $system  = isset($request->search['systemType'])  ? true : false;
+            $system  = isset($request->search['systemType']) ? true : false;
             //  Search paramaters, filter results
             $tips = new TechTipsCollection(
                 TechTips::orderBy('created_at', 'DESC')
                     //  Search by id or a phrase in the title or description
-                    ->where(function ($query) use ($request) {
-                        $query->where('subject', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('tip_id', 'like', '%' . $request->search['searchText'] . '%')
-                            ->orWhere('description', 'like', '%' . $request->search['searchText'] . '%');
+                    ->where(function($query) use ($request) {
+                        $query->where('subject', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('tip_id', 'like', '%'.$request->search['searchText'].'%')
+                            ->orWhere('description', 'like', '%'.$request->search['searchText'].'%');
                     })
-                    ->when($article, function ($query) use ($request) {
+                    ->when($article, function($query) use ($request) {
                         $query->whereIn('tip_type_id', $request->search['articleType']);
                     })
-                    ->when($system, function ($query) use ($request) {
-                        $query->whereHas('SystemTypes', function ($query) use ($request) {
+                    ->when($system, function($query) use ($request) {
+                        $query->whereHas('SystemTypes', function($query) use ($request) {
                             $query->whereIn('system_types.sys_id', $request->search['systemType']);
                         });
                     })
@@ -146,7 +146,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile());
 
             return 'uploaded successfully';
@@ -155,8 +155,8 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true
@@ -195,7 +195,7 @@ 
         }
 
         //  Log stored file
-        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath . DIRECTORY_SEPARATOR . $fileName]);
+        Log::info('File Stored', ['file_id' => $fileID, 'file_path' => $filePath.DIRECTORY_SEPARATOR.$fileName]);
         return $fileID;
     }
 
@@ -263,7 +263,7 @@ 
     //  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 +293,7 @@ 
     //  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,
@@ -306,7 +306,7 @@ 
                 break;
         }
 
-        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('Tech Tip Bookmark Updated.', [
             'user_id' => Auth::user()->user_id,
             'tip_id' => $id,
@@ -321,7 +321,7 @@ 
         $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');
         }
 
@@ -329,7 +329,7 @@ 
         $systemsArr = new SystemCategoriesCollection(SystemCategories::with('SystemTypes')->get());
         $files = TechTipFiles::where('tip_id', $id)->with('Files')->get();
 
-        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('tips.editTip', [
             'tipTypes' => $typesArr,
             'sysTypes' => $systemsArr,
@@ -353,9 +353,9 @@ 
         $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);
+            Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
             return response()->json(['tip_id' => $id]);
         }
 
@@ -363,7 +363,7 @@ 
         $save = $receiver->receive();
 
         //  See if the uploade has finished
-        if ($save->isFinished()) {
+        if($save->isFinished()) {
             $this->saveFile($save->getFile(), $id);
 
             return 'uploaded successfully';
@@ -372,8 +372,8 @@ 
         //  Get the current progress
         $handler = $save->handler();
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('File being uploaded.  Percentage done - ' . $handler->getPercentageDone());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('File being uploaded.  Percentage done - '.$handler->getPercentageDone());
         return response()->json([
             'done'   => $handler->getPercentageDone(),
             'status' => true

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/factories/UserRoleTypeFactory.php

Spacing +1 added lines, -1 removed lines

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

database/migrations/2019_11_30_195059_create_user_role_permissions_table.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     public function up()
     {
-        Schema::create('user_role_permissions', function (Blueprint $table) {
+        Schema::create('user_role_permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('role_id')->unsigned();
             $table->integer('perm_type_id')->unsigned();

database/migrations/2019_11_30_195012_create_user_role_types_table.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
      */
     public function up()
     {
-        Schema::create('user_role_types', function (Blueprint $table) {
+        Schema::create('user_role_types', function(Blueprint $table) {
             $table->increments('role_id');
             $table->text('name');
             $table->text('description');
@@ -26,10 +26,10 @@ 
 
         //  Insert default data
         DB::table('user_role_types')->insert([
-            ['role_id' => 1, 'name' => 'Installer',     'description' => 'All Access Administrator',    'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 2, 'name' => 'Administrator', 'description' => 'System Administrator',        'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 3, 'name' => 'Reports',       'description' => 'User who can run reports',    'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['role_id' => 4, 'name' => 'Tech',          'description' => 'Standard User',               'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 1, 'name' => 'Installer', 'description' => 'All Access Administrator', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 2, 'name' => 'Administrator', 'description' => 'System Administrator', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 3, 'name' => 'Reports', 'description' => 'User who can run reports', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['role_id' => 4, 'name' => 'Tech', 'description' => 'Standard User', 'allow_edit' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
         ]);
 
         //  Update the users table to include the 'user_role' column

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

database/migrations/2019_11_30_195040_create_user_role_permission_types_table.php

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
      */
     public function up()
     {
-        Schema::create('user_role_permission_types', function (Blueprint $table) {
+        Schema::create('user_role_permission_types', function(Blueprint $table) {
             $table->increments('perm_type_id');
             $table->text('description');
             $table->timestamps();
@@ -23,17 +23,17 @@ 
 
         //  Insert default data
         DB::table('user_role_permission_types')->insert([
-            ['perm_type_id' => 1,  'description' => 'Manage Users',        'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 2,  'description' => 'Manage User Roles',   'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 3,  'description' => 'Run Reports',         'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 4,  'description' => 'Add Customer',        'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 5,  'description' => 'Manage Customers',    'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 6,  'description' => 'Deactivate Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 7,  'description' => 'Use File Links',      'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 8,  'description' => 'Create Tech Tip',     'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 9,  'description' => 'Edit Tech Tip',       'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 10, 'description' => 'Delete Tech Tip',     'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
-            ['perm_type_id' => 11, 'description' => 'Manage Equipment',    'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 1, 'description' => 'Manage Users', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 2, 'description' => 'Manage User Roles', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 3, 'description' => 'Run Reports', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 4, 'description' => 'Add Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 5, 'description' => 'Manage Customers', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 6, 'description' => 'Deactivate Customer', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 7, 'description' => 'Use File Links', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 8, 'description' => 'Create Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 9, 'description' => 'Edit Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 10, 'description' => 'Delete Tech Tip', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
+            ['perm_type_id' => 11, 'description' => 'Manage Equipment', 'created_at' => Carbon::now(), 'updated_at' => Carbon::now()],
         ]);
     }
 

app/Policies/GatePolicy.php

Spacing +5 added lines, -5 removed lines

@@ -36,13 +36,13 @@ 
     //  Determine if a user can see the Administration Nav Link
     public function seeAdminLink(User $user)
     {
-        if ($this->isInstaller($user))
+        if($this->isInstaller($user))
         {
             return true;
         }
 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
-            ->whereHas('UserRolePermissionTypes', function ($query) {
+            ->whereHas('UserRolePermissionTypes', function($query) {
                 $query->where('description', 'Manage Users')
                     ->orWhere('description', 'Manage User Roles')
                     ->orWhere('description', 'Manage Customers')
@@ -53,7 +53,7 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'false' : 'true';
-        \Log::debug('User ' . $user->full_name . ' is trying to access admin link.  Result - ' . $allow);
+        \Log::debug('User '.$user->full_name.' is trying to access admin link.  Result - '.$allow);
 
         return  $data->isEmpty() ? false : true;
     }
@@ -68,7 +68,7 @@ 
         }
 
         $data = UserRolePermissions::with('UserRolePermissionTypes')
-            ->whereHas('UserRolePermissionTypes', function ($query) use ($task) {
+            ->whereHas('UserRolePermissionTypes', function($query) use ($task) {
                 $query->where('description', $task);
             })
             ->where('role_id', $user->role_id)
@@ -76,7 +76,7 @@ 
             ->get();
 
         $allow = $data->isEmpty() ? 'false' : 'true';
-        \Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - ' . $allow);
+        \Log::debug('User '.$user->full_name.' is trying to access '.$task.'.  Result - '.$allow);
 
         return  $data->isEmpty() ? false : true;
     }

app/Http/Controllers/AccountController.php

Spacing +10 added lines, -10 removed lines

@@ -135,14 +135,14 @@ 
         //  Validate the hash token
         $user = UserInitialize::where('token', $hash)->get();
 
-        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);
+        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);
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited.');
-        Log::debug('Link Hash -' . $hash);
+        Log::debug('Route '.Route::currentRouteName().' visited.');
+        Log::debug('Link Hash -'.$hash);
         return view('account.initializeUser', ['hash' => $hash]);
     }
 
@@ -151,9 +151,9 @@ 
     {
         //  Verify that the link matches the assigned email address
         $valid = UserInitialize::where('token', $hash)->first();
-        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);
+        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);
         }
 
@@ -186,8 +186,8 @@ 
         Auth::loginUsingID($userData->user_id);
 
         //  Redirect the user to the dashboard
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by User ID-' . Auth::user()->user_id);
-        Log::debug('Initialize Data - ' . $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by User ID-'.Auth::user()->user_id);
+        Log::debug('Initialize Data - '.$request->toArray());
         Log::notice('User has setup account', ['user_id' => $userData->user_id]);
         return redirect(route('dashboard'));
     }

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

database/migrations/2018_05_31_001549_create_tech_tip_comments_table.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
             $table->longText('comment');
             $table->timestamps();
             $table->foreign('tip_id')->references('tip_id')->on('tech_tips')->onUpdate('cascade')->onDelete('cascade');
-            $table->foreign('user_id')->references('user_id')->on('users')->onUpdate('cascade');  //  TODO - add this key in v5 updates if it does not exist
+            $table->foreign('user_id')->references('user_id')->on('users')->onUpdate('cascade'); //  TODO - add this key in v5 updates if it does not exist
         });
     }
 

database/seeds/UserTableSeeder.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
     public function run()
     {
         //  Create the test users - note, none are installers - permissions are assigned randomly
-        factory(App\User::class, 15)->create()->each(function($user)
-        {
+        factory(App\User::class, 15)->create()->each(function($user) {
             // $user->UserPermissions()->save(factory(App\UserPermissions::class)->create(['user_id' => $user->user_id]));
         });
     }