butcherman / Tech_Bench

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

routes/web.php

Indentation +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 
 
 
- //     //  System custionization settings
+    //     //  System custionization settings
         //     Route::get('system-customization', 'Installer\SettingsController@customizeSystem')->name('customize');
         //     Route::post('system-customization', 'Installer\SettingsController@submitCustomizeSystem')->name('customize');
         //     Route::post('new-logo', 'Installer\SettingsController@submitLogo')->name('submitLogo');

Braces +4 added lines, -8 removed lines

@@ -46,8 +46,7 @@ 
 /*
 *   File Link Routes
 */
-Route::prefix('links')->name('links.')->group(function ()
-{
+Route::prefix('links')->name('links.')->group(function () {
     //  Resource controllers for base access
     Route::resource('data',           'FileLinks\FileLinksController');
     Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
@@ -72,8 +71,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
@@ -99,8 +97,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');
@@ -112,8 +109,7 @@ 
 /*
 *   Administration Routes
 */
-Route::prefix('admin')->name('admin.')->group(function ()
-{
+Route::prefix('admin')->name('admin.')->group(function () {
 
 
 

Spacing +55 added lines, -55 removed lines

@@ -8,8 +8,8 @@ 
 /*
 *   Non user Routes
 */
-Route::get('/',         'Auth\LoginController@showLoginForm')->name('index');
-Route::get('logout',    'Auth\LoginController@logout')       ->name('logout');
+Route::get('/', 'Auth\LoginController@showLoginForm')->name('index');
+Route::get('logout', 'Auth\LoginController@logout')       ->name('logout');
 Route::get('no-script', 'Controller@noScript')               ->name('noscript');
 
 
@@ -21,53 +21,53 @@ 
 /*
 *   Download File Routes
 */
-Route::get('download/{id}/{filename}',    'DownloadController@index')          ->name('download');
+Route::get('download/{id}/{filename}', 'DownloadController@index')          ->name('download');
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
 
 /*
 *   User Settings Routes
 */
-Route::get('account',                   'AccountController@index')         ->name('account');
-Route::post('account',                  'AccountController@submit')        ->name('account');
-Route::put('account',                   'AccountController@notifications') ->name('account');
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
+Route::get('account', 'AccountController@index')         ->name('account');
+Route::post('account', 'AccountController@submit')        ->name('account');
+Route::put('account', 'AccountController@notifications') ->name('account');
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
 
 /*
 *   Basic Logged In Routes
 */
-Route::get('about',                  'DashboardController@about')           ->name('about');
-Route::get('dashboard',              'DashboardController@index')           ->name('dashboard');
-Route::get('notifications',          'DashboardController@getNotifications')->name('getNotifications');
+Route::get('about', 'DashboardController@about')           ->name('about');
+Route::get('dashboard', 'DashboardController@index')           ->name('dashboard');
+Route::get('notifications', 'DashboardController@getNotifications')->name('getNotifications');
 Route::get('mark-notification/{id}', 'DashboardController@markNotification')->name('markNotification');
-Route::delete('notifications/{id}',  'DashboardController@delNotification') ->name('delNotification');
+Route::delete('notifications/{id}', 'DashboardController@delNotification') ->name('delNotification');
 
 /*
 *   File Link Routes
 */
-Route::prefix('links')->name('links.')->group(function ()
+Route::prefix('links')->name('links.')->group(function()
 {
     //  Resource controllers for base access
-    Route::resource('data',           'FileLinks\FileLinksController');
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
+    Route::resource('data', 'FileLinks\FileLinksController');
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
     //  File Link Files
-    Route::resource('files',          'FileLinks\LinkFilesController');
+    Route::resource('files', 'FileLinks\LinkFilesController');
     //  Index landing page
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
 });
 
 /*
 *   Guest File Link Routes
 */
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
-Route::put('file-links/{id}',           'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
 
 /*
 *   Customer Routes
@@ -75,44 +75,44 @@ 
 Route::prefix('customer')->name('customer.')->group(function()
 {
     //  Customer Files
-    Route::resource('files',                   'Customers\CustomerFilesController');
+    Route::resource('files', 'Customers\CustomerFilesController');
     //  Custome Notes
-    Route::get('download-note/{id}',           'DownloadController@downloadCustNote')        ->name('download-note');
-    Route::resource('notes',                   'Customers\CustomerNotesController');
+    Route::get('download-note/{id}', 'DownloadController@downloadCustNote')        ->name('download-note');
+    Route::resource('notes', 'Customers\CustomerNotesController');
     //  Customer Contacts
-    Route::resource('contacts',                'Customers\CustomerContactsController');
+    Route::resource('contacts', 'Customers\CustomerContactsController');
     //  Customer Systems
-    Route::resource('systems',                 'Customers\CustomerSystemsController');
+    Route::resource('systems', 'Customers\CustomerSystemsController');
     //  Customer Details
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')->name('details');
-    Route::resource('id',                      'Customers\CustomerDetailsController');
+    Route::get('id/{id}/{name}', 'Customers\CustomerDetailsController@details')->name('details');
+    Route::resource('id', 'Customers\CustomerDetailsController');
     //  check Id and bookmark customer
     Route::get('toggle-fav/{action}/{custID}', 'Customers\CustomerController@toggleFav')     ->name('toggle-fav');
-    Route::get('check-id/{id}',                'Customers\CustomerController@checkID')       ->name('check-id');
+    Route::get('check-id/{id}', 'Customers\CustomerController@checkID')       ->name('check-id');
     //  Index landing/search page
-    Route::get('search',                       'Customers\CustomerController@search')        ->name('search');
-    Route::get('/',                            'Customers\CustomerController@index')         ->name('index');
+    Route::get('search', 'Customers\CustomerController@search')        ->name('search');
+    Route::get('/', 'Customers\CustomerController@index')         ->name('index');
 });
 
 /*
 *   Tech Tip Routes
 */
-Route::resource('tips',                       'TechTips\TechTipsController');
-Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
+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::resource('comments',               'TechTips\TechTipCommentsController');
-    Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
-    Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
-    Route::post('process-image',              'TechTips\TechTipsController@processImage')->name('processImage');
+    Route::resource('comments', 'TechTips\TechTipCommentsController');
+    Route::get('search', 'TechTips\TechTipsController@search')      ->name('search');
+    Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details')     ->name('details');
+    Route::post('process-image', 'TechTips\TechTipsController@processImage')->name('processImage');
     Route::get('toggle-fav/{action}/{tipID}', 'TechTips\TechTipsController@toggleFav')   ->name('toggle-fav');
-    Route::get('download-tip/{id}',           'DownloadController@downloadTechTip')      ->name('downloadTip');
+    Route::get('download-tip/{id}', 'DownloadController@downloadTechTip')      ->name('downloadTip');
 });
 
 /*
 *   Administration Routes
 */
-Route::prefix('admin')->name('admin.')->group(function ()
+Route::prefix('admin')->name('admin.')->group(function()
 {
 
 
@@ -131,26 +131,26 @@ 
 
     //  Administrative routes for equipment and equipment categories
     Route::resource('categories', 'Installer\CategoriesController');
-    Route::resource('systems',    'Installer\SystemsController');
+    Route::resource('systems', 'Installer\SystemsController');
 
 
 
     //  Administrative routes for users
-    Route::resource('user',                'Admin\UserController');
-    Route::get('user/enable/{id}',         'Admin\UserController@reactivateUser')             ->name('user.reactivate');
-    Route::post('user/change-password',    'Admin\UserController@submitPassword')             ->name('user.changePassword');
+    Route::resource('user', 'Admin\UserController');
+    Route::get('user/enable/{id}', 'Admin\UserController@reactivateUser')             ->name('user.reactivate');
+    Route::post('user/change-password', 'Admin\UserController@submitPassword')             ->name('user.changePassword');
     Route::get('check-user/{name}/{type}', 'Admin\UserController@checkUser')                  ->name('checkUser');
-    Route::get('links/show/{id}',          'Admin\AdminController@showLinks')                 ->name('user.showLinks');
-    Route::get('links',                    'Admin\AdminController@userLinks')                 ->name('user.links');
-    Route::post('password-policy',         'Admin\AdminController@submitPolicy')              ->name('passwordPolicy');
-    Route::get('password-policy',          'Admin\AdminController@passwordPolicy')            ->name('passwordPolicy');
-    Route::post('role-policy',             'Admin\AdminController@submitRoleSettings')        ->name('roleSettings');
-    Route::get('role-policy',              'Admin\AdminController@roleSettings')              ->name('roleSettings');
+    Route::get('links/show/{id}', 'Admin\AdminController@showLinks')                 ->name('user.showLinks');
+    Route::get('links', 'Admin\AdminController@userLinks')                 ->name('user.links');
+    Route::post('password-policy', 'Admin\AdminController@submitPolicy')              ->name('passwordPolicy');
+    Route::get('password-policy', 'Admin\AdminController@passwordPolicy')            ->name('passwordPolicy');
+    Route::post('role-policy', 'Admin\AdminController@submitRoleSettings')        ->name('roleSettings');
+    Route::get('role-policy', 'Admin\AdminController@roleSettings')              ->name('roleSettings');
     //  Tech Benc Settings Routes
-    Route::post('logo',                    'Installer\SettingsController@submitLogo')         ->name('submitLogo');
-    Route::get('logo',                     'Installer\SettingsController@logoSettings')       ->name('logoSettings');
-    Route::post('configuratin',            'Installer\SettingsController@submitConfiguration')->name('submitConfig');
-    Route::get('configuration',            'Installer\SettingsController@configuration')      ->name('config');
+    Route::post('logo', 'Installer\SettingsController@submitLogo')         ->name('submitLogo');
+    Route::get('logo', 'Installer\SettingsController@logoSettings')       ->name('logoSettings');
+    Route::post('configuratin', 'Installer\SettingsController@submitConfiguration')->name('submitConfig');
+    Route::get('configuration', 'Installer\SettingsController@configuration')      ->name('config');
 
     Route::post('email-settings', 'Installer\SettingsController@submitEmailSettings')         ->name('emailSettings');
     Route::put('email-settings', 'Installer\SettingsController@sendTestEmail')                ->name('emailSettings');

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