Passed
Push — dev5 ( 671e66...a3bb6d )
by Ron
06:57
created
app/Http/Controllers/DownloadController.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             $user = \Request::ip();
43 43
         }
44 44
 
45
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user);
45
+        Log::debug('Route '.Route::currentRouteName().' visited by '.$user);
46 46
 
47 47
         //  Check that the file exists before allowing it to be downloaded
48 48
         if(!empty($fileData) && Storage::exists($fileData->file_link.$fileData->file_name))
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
     public function archiveFiles(Request $request)
60 60
     {
61 61
         //  Debug Data
62
-        if (Auth::user()) {
62
+        if(Auth::user()) {
63 63
             $user = Auth::user()->full_name;
64 64
         } else {
65 65
             $user = \Request::ip();
66 66
         }
67
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user.'  Request Data:', $request->toArray());
67
+        Log::debug('Route '.Route::currentRouteName().' visited by '.$user.'  Request Data:', $request->toArray());
68 68
 
69 69
         //  Validate the array
70 70
         $request->validate([
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     public function downloadArchive($fileName)
108 108
     {
109 109
         //  Debug Data
110
-        if (Auth::user()) {
110
+        if(Auth::user()) {
111 111
             $user = Auth::user()->full_name;
112 112
         } else {
113 113
             $user = \Request::ip();
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     {
131 131
         //  Debug Data
132 132
         $this->middleware('auth');
133
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
133
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
134 134
 
135 135
         $note = CustomerNotes::find($id);
136 136
         $cust = Customers::find($note->cust_id);
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     {
151 151
         //  Debug Data
152 152
         $this->middleware('auth');
153
-        Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . Auth::user()->full_name);
153
+        Log::debug('Route '.Route::currentRouteName().' visited by '.Auth::user()->full_name);
154 154
 
155 155
         //  TODO - Makt this a better looking pdf
156 156
         $tip = TechTips::where('tip_id', $id)->with('User')->with('SystemTypes')->first();
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -59,9 +59,12 @@  discard block
 block discarded – undo
59 59
     public function archiveFiles(Request $request)
60 60
     {
61 61
         //  Debug Data
62
-        if (Auth::user()) {
62
+        if (Auth::user())
63
+        {
63 64
             $user = Auth::user()->full_name;
64
-        } else {
65
+        }
66
+        else
67
+        {
65 68
             $user = \Request::ip();
66 69
         }
67 70
         Log::debug('Route ' . Route::currentRouteName() . ' visited by ' . $user.'  Request Data:', $request->toArray());
@@ -107,9 +110,12 @@  discard block
 block discarded – undo
107 110
     public function downloadArchive($fileName)
108 111
     {
109 112
         //  Debug Data
110
-        if (Auth::user()) {
113
+        if (Auth::user())
114
+        {
111 115
             $user = Auth::user()->full_name;
112
-        } else {
116
+        }
117
+        else
118
+        {
113 119
             $user = \Request::ip();
114 120
         }
115 121
         Log::debug('Route '.Route::currentRouteName().' visited by '.$user);
Please login to merge, or discard this patch.
app/Console/Commands/updateRun.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
             }
98 98
         }
99 99
 
100
-        if (empty($updateList)) {
100
+        if(empty($updateList)) {
101 101
             $this->error('No updates have been loaded to the system');
102 102
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
103 103
             return false;
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
             $anticipate = [];
112 112
             foreach($updateList as $key => $up)
113 113
             {
114
-                $opt = $key+1;
114
+                $opt = $key + 1;
115 115
                 $anticipate[$opt] = $up;
116 116
                 $this->line('['.$opt.'] '.$up);
117 117
             }
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
         $fileParts = pathinfo($file);
132 132
         $folder = $fileParts['filename'];
133 133
 
134
-        $zip = Zip::open(config('filesystems.disks.staging.root') .
135
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR . $file);
134
+        $zip = Zip::open(config('filesystems.disks.staging.root').
135
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.$file);
136 136
 
137
-        $zip->extract(config('filesystems.disks.staging.root') .
138
-            DIRECTORY_SEPARATOR . 'updates' . DIRECTORY_SEPARATOR .'tmp');
137
+        $zip->extract(config('filesystems.disks.staging.root').
138
+            DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp');
139 139
 
140
-        $verFile = fopen(config('filesystems.disks.staging.root') .
140
+        $verFile = fopen(config('filesystems.disks.staging.root').
141 141
             DIRECTORY_SEPARATOR.'updates'.DIRECTORY_SEPARATOR.'tmp'.
142 142
             DIRECTORY_SEPARATOR.$folder.DIRECTORY_SEPARATOR.'config'.
143 143
             DIRECTORY_SEPARATOR.'version.yml', 'r');
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,8 @@
 block discarded – undo
97 97
             }
98 98
         }
99 99
 
100
-        if (empty($updateList)) {
100
+        if (empty($updateList))
101
+        {
101 102
             $this->error('No updates have been loaded to the system');
102 103
             $this->error('Please upload update package to the Storage/Staging/Updates folder');
103 104
             return false;
Please login to merge, or discard this patch.
routes/web.php 1 patch
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -8,62 +8,62 @@  discard block
 block discarded – undo
8 8
 /*
9 9
 *   Non user Routes
10 10
 */
11
-Route::get('/',                    'Auth\LoginController@showLoginForm')                ->name('index');
12
-Route::get('logout',               'Auth\LoginController@logout')                       ->name('logout');
13
-Route::get('no-script',            'Controller@noScript')                               ->name('noscript');
14
-Route::get('finish-setup/{hash}',  'Auth\InitializeUserController@initializeUser')      ->name('initialize');
11
+Route::get('/', 'Auth\LoginController@showLoginForm')                ->name('index');
12
+Route::get('logout', 'Auth\LoginController@logout')                       ->name('logout');
13
+Route::get('no-script', 'Controller@noScript')                               ->name('noscript');
14
+Route::get('finish-setup/{hash}', 'Auth\InitializeUserController@initializeUser')      ->name('initialize');
15 15
 Route::post('finish-setup/{hash}', 'Auth\InitializeUserController@submitInitializeUser')->name('initialize');
16 16
 
17 17
 /*
18 18
 *   Download File Routes
19 19
 */
20
-Route::get('download/{id}/{filename}',    'DownloadController@index')          ->name('download');
20
+Route::get('download/{id}/{filename}', 'DownloadController@index')          ->name('download');
21 21
 Route::get('download-archive/{filename}', 'DownloadController@downloadArchive')->name('downloadArchive');
22
-Route::put('download-archive',            'DownloadController@archiveFiles')   ->name('archiveFiles');
22
+Route::put('download-archive', 'DownloadController@archiveFiles')   ->name('archiveFiles');
23 23
 
24 24
 /*
25 25
 *   User Settings Routes
26 26
 */
27
-Route::get('account',                   'AccountController@index')         ->name('account');
28
-Route::post('account',                  'AccountController@submit')        ->name('account');
29
-Route::put('account',                   'AccountController@notifications') ->name('account');
30
-Route::get('/account/change-password',  'AccountController@changePassword')->name('changePassword');
27
+Route::get('account', 'AccountController@index')         ->name('account');
28
+Route::post('account', 'AccountController@submit')        ->name('account');
29
+Route::put('account', 'AccountController@notifications') ->name('account');
30
+Route::get('/account/change-password', 'AccountController@changePassword')->name('changePassword');
31 31
 Route::post('/account/change-password', 'AccountController@submitPassword')->name('changePassword');
32 32
 
33 33
 /*
34 34
 *   Basic Logged In Routes
35 35
 */
36
-Route::get('about',                  'DashboardController@about')           ->name('about');
37
-Route::get('dashboard',              'DashboardController@index')           ->name('dashboard');
38
-Route::get('notifications',          'DashboardController@getNotifications')->name('getNotifications');
36
+Route::get('about', 'DashboardController@about')           ->name('about');
37
+Route::get('dashboard', 'DashboardController@index')           ->name('dashboard');
38
+Route::get('notifications', 'DashboardController@getNotifications')->name('getNotifications');
39 39
 Route::get('mark-notification/{id}', 'DashboardController@markNotification')->name('markNotification');
40
-Route::delete('notifications/{id}',  'DashboardController@delNotification') ->name('delNotification');
40
+Route::delete('notifications/{id}', 'DashboardController@delNotification') ->name('delNotification');
41 41
 
42 42
 /*
43 43
 *   File Link Routes
44 44
 */
45
-Route::prefix('links')->name('links.')->group(function ()
45
+Route::prefix('links')->name('links.')->group(function()
46 46
 {
47 47
     //  Resource controllers for base access
48
-    Route::resource('data',           'FileLinks\FileLinksController');
49
-    Route::get('new',                 'FileLinks\FileLinksController@create')     ->name('new');
50
-    Route::get('find/{id}',           'FileLinks\FileLinksController@find')       ->name('user');
48
+    Route::resource('data', 'FileLinks\FileLinksController');
49
+    Route::get('new', 'FileLinks\FileLinksController@create')     ->name('new');
50
+    Route::get('find/{id}', 'FileLinks\FileLinksController@find')       ->name('user');
51 51
     Route::get('details/{id}/{name}', 'FileLinks\FileLinksController@details')    ->name('details');
52
-    Route::get('disable/{id}',        'FileLinks\FileLinksController@disableLink')->name('disable');
52
+    Route::get('disable/{id}', 'FileLinks\FileLinksController@disableLink')->name('disable');
53 53
     //  File Link Files
54
-    Route::resource('files',          'FileLinks\LinkFilesController');
54
+    Route::resource('files', 'FileLinks\LinkFilesController');
55 55
     //  Index landing page
56
-    Route::get('/',                   'FileLinks\FileLinksController@index')      ->name('index');
56
+    Route::get('/', 'FileLinks\FileLinksController@index')      ->name('index');
57 57
 });
58 58
 
59 59
 /*
60 60
 *   Guest File Link Routes
61 61
 */
62 62
 Route::get('file-links/{id}/get-files', 'FileLinks\GuestLinksController@getFiles')->name('file-links.getFiles');
63
-Route::put('file-links/{id}',           'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
64
-Route::post('file-links/{id}',          'FileLinks\GuestLinksController@update')  ->name('file-links.show');
65
-Route::get('file-links/{id}',           'FileLinks\GuestLinksController@show')    ->name('file-links.show');
66
-Route::get('file-links',                'FileLinks\GuestLinksController@index')   ->name('file-links.index');
63
+Route::put('file-links/{id}', 'FileLinks\GuestLinksController@notify')  ->name('file-links.show');
64
+Route::post('file-links/{id}', 'FileLinks\GuestLinksController@update')  ->name('file-links.show');
65
+Route::get('file-links/{id}', 'FileLinks\GuestLinksController@show')    ->name('file-links.show');
66
+Route::get('file-links', 'FileLinks\GuestLinksController@index')   ->name('file-links.index');
67 67
 
68 68
 /*
69 69
 *   Customer Routes
@@ -71,90 +71,90 @@  discard block
 block discarded – undo
71 71
 Route::prefix('customer')->name('customer.')->group(function()
72 72
 {
73 73
     //  Customer Files
74
-    Route::resource('files',                   'Customers\CustomerFilesController');
74
+    Route::resource('files', 'Customers\CustomerFilesController');
75 75
     //  Custome Notes
76
-    Route::get('download-note/{id}',           'DownloadController@downloadCustNote')             ->name('download-note');
77
-    Route::resource('notes',                   'Customers\CustomerNotesController');
76
+    Route::get('download-note/{id}', 'DownloadController@downloadCustNote')             ->name('download-note');
77
+    Route::resource('notes', 'Customers\CustomerNotesController');
78 78
     //  Customer Contacts
79
-    Route::resource('contacts',                'Customers\CustomerContactsController');
79
+    Route::resource('contacts', 'Customers\CustomerContactsController');
80 80
     //  Customer Systems
81
-    Route::resource('systems',                 'Customers\CustomerSystemsController');
81
+    Route::resource('systems', 'Customers\CustomerSystemsController');
82 82
     //  Customer Details
83
-    Route::get('link-parent/{id}',             'Customers\CustomerDetailsController@removeParent')->name('removeParent');
84
-    Route::post('link-parent',                 'Customers\CustomerDetailsController@linkParent')  ->name('linkParent');
85
-    Route::get('id/{id}/{name}',               'Customers\CustomerDetailsController@details')     ->name('details');
86
-    Route::resource('id',                      'Customers\CustomerDetailsController');
83
+    Route::get('link-parent/{id}', 'Customers\CustomerDetailsController@removeParent')->name('removeParent');
84
+    Route::post('link-parent', 'Customers\CustomerDetailsController@linkParent')  ->name('linkParent');
85
+    Route::get('id/{id}/{name}', 'Customers\CustomerDetailsController@details')     ->name('details');
86
+    Route::resource('id', 'Customers\CustomerDetailsController');
87 87
     //  check Id and bookmark customer
88 88
     Route::get('toggle-fav/{action}/{custID}', 'Customers\CustomerController@toggleFav')          ->name('toggle-fav');
89
-    Route::get('check-id/{id}',                'Customers\CustomerController@checkID')            ->name('check-id');
89
+    Route::get('check-id/{id}', 'Customers\CustomerController@checkID')            ->name('check-id');
90 90
     //  Index landing/search page
91
-    Route::get('search',                       'Customers\CustomerController@search')             ->name('search');
92
-    Route::get('/',                            'Customers\CustomerController@index')              ->name('index');
91
+    Route::get('search', 'Customers\CustomerController@search')             ->name('search');
92
+    Route::get('/', 'Customers\CustomerController@index')              ->name('index');
93 93
 });
94 94
 
95 95
 /*
96 96
 *   Tech Tip Routes
97 97
 */
98
-Route::resource('tips',                       'TechTips\TechTipsController');
99
-Route::post('submit-edit/{id}',               'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
98
+Route::resource('tips', 'TechTips\TechTipsController');
99
+Route::post('submit-edit/{id}', 'TechTips\TechTipsController@update')      ->name('tips.submit-edit');
100 100
 Route::prefix('tip')->name('tip.')->group(function()
101 101
 {
102
-    Route::resource('comments',               'TechTips\TechTipCommentsController');
103
-    Route::get('search',                      'TechTips\TechTipsController@search')      ->name('search');
104
-    Route::get('details/{id}/{name}',         'TechTips\TechTipsController@details')     ->name('details');
105
-    Route::post('process-image',              'TechTips\TechTipsController@processImage')->name('processImage');
102
+    Route::resource('comments', 'TechTips\TechTipCommentsController');
103
+    Route::get('search', 'TechTips\TechTipsController@search')      ->name('search');
104
+    Route::get('details/{id}/{name}', 'TechTips\TechTipsController@details')     ->name('details');
105
+    Route::post('process-image', 'TechTips\TechTipsController@processImage')->name('processImage');
106 106
     Route::get('toggle-fav/{action}/{tipID}', 'TechTips\TechTipsController@toggleFav')   ->name('toggle-fav');
107
-    Route::get('download-tip/{id}',           'DownloadController@downloadTechTip')      ->name('downloadTip');
107
+    Route::get('download-tip/{id}', 'DownloadController@downloadTechTip')      ->name('downloadTip');
108 108
 });
109 109
 
110 110
 /*
111 111
 *   Administration Routes
112 112
 */
113
-Route::prefix('admin')->name('admin.')->group(function ()
113
+Route::prefix('admin')->name('admin.')->group(function()
114 114
 {
115 115
     //  Routes for Tech Bench Add-ons
116 116
     Route::prefix('modules')->name('module.')->group(function()
117 117
     {
118 118
         Route::delete('delete-staged/{name}', 'Installer\ModuleController@delStaged') ->name('deleteStaged');
119
-        Route::post('upload',                 'Installer\ModuleController@upload')    ->name('upload');
120
-        Route::get('activate/{name}',         'Installer\ModuleController@activate')  ->name('activate');
121
-        Route::get('disable/{name}',          'Installer\ModuleController@disable')   ->name('disable');
122
-        Route::get('enable/{name}',           'Installer\ModuleController@enable')    ->name('enable');
123
-        Route::get('get-active',              'Installer\ModuleController@getEnabled')->name('getEnabled');
124
-        Route::get('get-staged',              'Installer\ModuleController@getStaged') ->name('getStaged');
125
-        Route::get('/',                       'Installer\ModuleController@index')     ->name('index');
119
+        Route::post('upload', 'Installer\ModuleController@upload')    ->name('upload');
120
+        Route::get('activate/{name}', 'Installer\ModuleController@activate')  ->name('activate');
121
+        Route::get('disable/{name}', 'Installer\ModuleController@disable')   ->name('disable');
122
+        Route::get('enable/{name}', 'Installer\ModuleController@enable')    ->name('enable');
123
+        Route::get('get-active', 'Installer\ModuleController@getEnabled')->name('getEnabled');
124
+        Route::get('get-staged', 'Installer\ModuleController@getStaged') ->name('getStaged');
125
+        Route::get('/', 'Installer\ModuleController@index')     ->name('index');
126 126
     });
127 127
     //  Administrative routes for equipment and equipment categories
128
-    Route::resource('categories',          'Installer\CategoriesController');
129
-    Route::resource('systems',             'Installer\SystemsController');
128
+    Route::resource('categories', 'Installer\CategoriesController');
129
+    Route::resource('systems', 'Installer\SystemsController');
130 130
     //  Administrative routes for users
131
-    Route::resource('user',                'Admin\UserController');
132
-    Route::get('user/enable/{id}',         'Admin\UserController@reactivateUser')             ->name('user.reactivate');
133
-    Route::post('user/change-password',    'Admin\UserController@submitPassword')             ->name('user.changePassword');
131
+    Route::resource('user', 'Admin\UserController');
132
+    Route::get('user/enable/{id}', 'Admin\UserController@reactivateUser')             ->name('user.reactivate');
133
+    Route::post('user/change-password', 'Admin\UserController@submitPassword')             ->name('user.changePassword');
134 134
     Route::get('check-user/{name}/{type}', 'Admin\UserController@checkUser')                  ->name('checkUser');
135
-    Route::get('links/show/{id}',          'Admin\AdminController@showLinks')                 ->name('user.showLinks');
136
-    Route::get('links',                    'Admin\AdminController@userLinks')                 ->name('user.links');
137
-    Route::post('password-policy',         'Admin\AdminController@submitPolicy')              ->name('passwordPolicy');
138
-    Route::get('password-policy',          'Admin\AdminController@passwordPolicy')            ->name('passwordPolicy');
139
-    Route::post('role-policy',             'Admin\AdminController@submitRoleSettings')        ->name('roleSettings');
140
-    Route::get('role-policy',              'Admin\AdminController@roleSettings')              ->name('roleSettings');
135
+    Route::get('links/show/{id}', 'Admin\AdminController@showLinks')                 ->name('user.showLinks');
136
+    Route::get('links', 'Admin\AdminController@userLinks')                 ->name('user.links');
137
+    Route::post('password-policy', 'Admin\AdminController@submitPolicy')              ->name('passwordPolicy');
138
+    Route::get('password-policy', 'Admin\AdminController@passwordPolicy')            ->name('passwordPolicy');
139
+    Route::post('role-policy', 'Admin\AdminController@submitRoleSettings')        ->name('roleSettings');
140
+    Route::get('role-policy', 'Admin\AdminController@roleSettings')              ->name('roleSettings');
141 141
     //  Tech Bench Settings Routes
142
-    Route::post('logo',                    'Installer\SettingsController@submitLogo')         ->name('submitLogo');
143
-    Route::get('logo',                     'Installer\SettingsController@logoSettings')       ->name('logoSettings');
144
-    Route::post('configuratin',            'Installer\SettingsController@submitConfiguration')->name('submitConfig');
145
-    Route::get('configuration',            'Installer\SettingsController@configuration')      ->name('config');
146
-    Route::post('email-settings',          'Installer\SettingsController@submitEmailSettings')->name('emailSettings');
147
-    Route::put('email-settings',           'Installer\SettingsController@sendTestEmail')      ->name('emailSettings');
148
-    Route::get('email-settings',           'Installer\SettingsController@emailSettings')      ->name('emailSettings');
142
+    Route::post('logo', 'Installer\SettingsController@submitLogo')         ->name('submitLogo');
143
+    Route::get('logo', 'Installer\SettingsController@logoSettings')       ->name('logoSettings');
144
+    Route::post('configuratin', 'Installer\SettingsController@submitConfiguration')->name('submitConfig');
145
+    Route::get('configuration', 'Installer\SettingsController@configuration')      ->name('config');
146
+    Route::post('email-settings', 'Installer\SettingsController@submitEmailSettings')->name('emailSettings');
147
+    Route::put('email-settings', 'Installer\SettingsController@sendTestEmail')      ->name('emailSettings');
148
+    Route::get('email-settings', 'Installer\SettingsController@emailSettings')      ->name('emailSettings');
149 149
     //  Tech Bench Backup Routes
150
-    Route::get('backups/download/{name}',  'Installer\SettingsController@downloadBackup')     ->name('downloadBackup');
151
-    Route::get('backups/delete/{name}',    'Installer\SettingsController@delBackup')          ->name('delBackup');
152
-    Route::get('backups/run',              'Installer\SettingsController@runBackup')          ->name('runBackup');
153
-    Route::get('backups/get',              'Installer\SettingsController@getBackups')         ->name('getBackups');
154
-    Route::get('backups',                  'Installer\SettingsController@backupsIndex')       ->name('backups');
150
+    Route::get('backups/download/{name}', 'Installer\SettingsController@downloadBackup')     ->name('downloadBackup');
151
+    Route::get('backups/delete/{name}', 'Installer\SettingsController@delBackup')          ->name('delBackup');
152
+    Route::get('backups/run', 'Installer\SettingsController@runBackup')          ->name('runBackup');
153
+    Route::get('backups/get', 'Installer\SettingsController@getBackups')         ->name('getBackups');
154
+    Route::get('backups', 'Installer\SettingsController@backupsIndex')       ->name('backups');
155 155
     //  Tech Bench Updates Routs
156 156
 
157 157
     Route::get('updates', 'Installer\UpdateController@index')->name('updates');
158 158
     //  Admin index route
159
-    Route::get('/',                        'Admin\AdminController@index')                     ->name('index');
159
+    Route::get('/', 'Admin\AdminController@index')                     ->name('index');
160 160
 });
Please login to merge, or discard this patch.