butcherman / Tech_Bench

app/Http/Controllers/DownloadController.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
             $user = \Request::ip();
         }
 
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.$user);
 
         //  Check that the file exists before allowing it to be downloaded
         if(!empty($fileData) && Storage::exists($fileData->file_link.$fileData->file_name))
@@ -59,12 +59,12 @@ 
     public function archiveFiles(Request $request)
     {
         //  Debug Data
-        if (Auth::user()) {
+        if(Auth::user()) {
             $user = Auth::user()->full_name;
         } else {
             $user = \Request::ip();
         }
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user.'  Request Data:', $request->toArray());
+        Log::debug('Route '.Route::currentRouteName().' visited by '.$user.'  Request Data:', $request->toArray());
 
         //  Validate the array
         $request->validate([
@@ -107,7 +107,7 @@ 
     public function downloadArchive($fileName)
     {
         //  Debug Data
-        if (Auth::user()) {
+        if(Auth::user()) {
             $user = Auth::user()->full_name;
         } else {
             $user = \Request::ip();
@@ -130,7 +130,7 @@ 
     {
         //  Debug Data
         $this->middleware('auth');
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         $note = CustomerNotes::find($id);
         $cust = Customers::find($note->cust_id);
@@ -150,7 +150,7 @@ 
     {
         //  Debug Data
         $this->middleware('auth');
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
 
         //  TODO - Makt this a better looking pdf
         $tip = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->first();

Braces +10 added lines, -4 removed lines

@@ -59,9 +59,12 @@ 
     public function archiveFiles(Request $request)
     {
         //  Debug Data
-        if (Auth::user()) {
+        if (Auth::user())
+        {
             $user = Auth::user()->full_name;
-        } else {
+        }
+        else
+        {
             $user = \Request::ip();
         }
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user.'  Request Data:', $request->toArray());
@@ -107,9 +110,12 @@ 
     public function downloadArchive($fileName)
     {
         //  Debug Data
-        if (Auth::user()) {
+        if (Auth::user())
+        {
             $user = Auth::user()->full_name;
-        } else {
+        }
+        else
+        {
             $user = \Request::ip();
         }
         Log::debug('Route '.Route::currentRouteName().' visited by '.$user);

app/Console/Commands/updateRun.php

Spacing +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
             }
         }
 
-        if (empty($updateList)) {
+        if(empty($updateList)) {
             $this->error('No updates have been loaded to the system');
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
             return false;
@@ -111,7 +111,7 @@ 
             $anticipate = [];
             foreach($updateList as $key => $up)
             {
-                $opt = $key+1;
+                $opt = $key + 1;
                 $anticipate[$opt] = $up;
                 $this->line('['.$opt.'] '.$up);
             }
@@ -131,13 +131,13 @@ 
         $fileParts = pathinfo($file);
         $folder = $fileParts['filename'];
 
-        $zip = Zip::open(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $file);
+        $zip = Zip::open(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$file);
 
-        $zip->extract(config('filesystems.disks.staging.root') .
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR .'tmp');
+        $zip->extract(config('filesystems.disks.staging.root').
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp');
 
-        $verFile = fopen(config('filesystems.disks.staging.root') .
+        $verFile = fopen(config('filesystems.disks.staging.root').
             DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
             DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR.'config'.
             DIRECTORY_SEPARATOR.'version.yml', 'r');

Braces +2 added lines, -1 removed lines

@@ -97,7 +97,8 @@
             }
         }
 
-        if (empty($updateList)) {
+        if (empty($updateList))
+        {
             $this->error('No updates have been loaded to the system');
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
             return false;

routes/web.php

Spacing +76 added lines, -76 removed lines

@@ -8,62 +8,62 @@ 
 /*
 *   Non user Routes
 */
-Route::get('/',                    'Auth\LoginController@showLoginForm')                ->name('index');
-Route::get('logout',               'Auth\LoginController@logout')                       ->name('logout');
-Route::get('no-script',            'Controller@noScript')                               ->name('noscript');
-Route::get('finish-setup/{hash}',  'Auth\InitializeUserController@initializeUser')      ->name('initialize');
+Route::get('/', 'Auth\LoginController@showLoginForm')                ->name('index');
+Route::get('logout', 'Auth\LoginController@logout')                       ->name('logout');
+Route::get('no-script', 'Controller@noScript')                               ->name('noscript');
+Route::get('finish-setup/{hash}', 'Auth\InitializeUserController@initializeUser')      ->name('initialize');
 Route::post('finish-setup/{hash}', 'Auth\InitializeUserController@submitInitializeUser')->name('initialize');
 
 /*
 *   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
@@ -71,90 +71,90 @@ 
 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('link-parent/{id}',             'Customers\CustomerDetailsController@removeParent')->name('removeParent');
-    Route::post('link-parent',                 'Customers\CustomerDetailsController@linkParent')  ->name('linkParent');
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')     ->name('details');
-    Route::resource('id',                      'Customers\CustomerDetailsController');
+    Route::get('link-parent/{id}', 'Customers\CustomerDetailsController@removeParent')->name('removeParent');
+    Route::post('link-parent', 'Customers\CustomerDetailsController@linkParent')  ->name('linkParent');
+    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()
 {
     //  Routes for Tech Bench Add-ons
     Route::prefix('modules')->name('module.')->group(function()
     {
         Route::delete('delete-staged/{name}', 'Installer\ModuleController@delStaged') ->name('deleteStaged');
-        Route::post('upload',                 'Installer\ModuleController@upload')    ->name('upload');
-        Route::get('activate/{name}',         'Installer\ModuleController@activate')  ->name('activate');
-        Route::get('disable/{name}',          'Installer\ModuleController@disable')   ->name('disable');
-        Route::get('enable/{name}',           'Installer\ModuleController@enable')    ->name('enable');
-        Route::get('get-active',              'Installer\ModuleController@getEnabled')->name('getEnabled');
-        Route::get('get-staged',              'Installer\ModuleController@getStaged') ->name('getStaged');
-        Route::get('/',                       'Installer\ModuleController@index')     ->name('index');
+        Route::post('upload', 'Installer\ModuleController@upload')    ->name('upload');
+        Route::get('activate/{name}', 'Installer\ModuleController@activate')  ->name('activate');
+        Route::get('disable/{name}', 'Installer\ModuleController@disable')   ->name('disable');
+        Route::get('enable/{name}', 'Installer\ModuleController@enable')    ->name('enable');
+        Route::get('get-active', 'Installer\ModuleController@getEnabled')->name('getEnabled');
+        Route::get('get-staged', 'Installer\ModuleController@getStaged') ->name('getStaged');
+        Route::get('/', 'Installer\ModuleController@index')     ->name('index');
     });
     //  Administrative routes for equipment and equipment categories
-    Route::resource('categories',          'Installer\CategoriesController');
-    Route::resource('systems',             'Installer\SystemsController');
+    Route::resource('categories', 'Installer\CategoriesController');
+    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 Bench 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('email-settings',          'Installer\SettingsController@submitEmailSettings')->name('emailSettings');
-    Route::put('email-settings',           'Installer\SettingsController@sendTestEmail')      ->name('emailSettings');
-    Route::get('email-settings',           'Installer\SettingsController@emailSettings')      ->name('emailSettings');
+    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');
+    Route::get('email-settings', 'Installer\SettingsController@emailSettings')      ->name('emailSettings');
     //  Tech Bench Backup Routes
-    Route::get('backups/download/{name}',  'Installer\SettingsController@downloadBackup')     ->name('downloadBackup');
-    Route::get('backups/delete/{name}',    'Installer\SettingsController@delBackup')          ->name('delBackup');
-    Route::get('backups/run',              'Installer\SettingsController@runBackup')          ->name('runBackup');
-    Route::get('backups/get',              'Installer\SettingsController@getBackups')         ->name('getBackups');
-    Route::get('backups',                  'Installer\SettingsController@backupsIndex')       ->name('backups');
+    Route::get('backups/download/{name}', 'Installer\SettingsController@downloadBackup')     ->name('downloadBackup');
+    Route::get('backups/delete/{name}', 'Installer\SettingsController@delBackup')          ->name('delBackup');
+    Route::get('backups/run', 'Installer\SettingsController@runBackup')          ->name('runBackup');
+    Route::get('backups/get', 'Installer\SettingsController@getBackups')         ->name('getBackups');
+    Route::get('backups', 'Installer\SettingsController@backupsIndex')       ->name('backups');
     //  Tech Bench Updates Routs
 
     Route::get('updates', 'Installer\UpdateController@index')->name('updates');
     //  Admin index route
-    Route::get('/',                        'Admin\AdminController@index')                     ->name('index');
+    Route::get('/', 'Admin\AdminController@index')                     ->name('index');
 });