@@ -14,7 +14,8 @@ |
||
14 | 14 | // This file allows us to emulate Apache's "mod_rewrite" functionality from the |
15 | 15 | // built-in PHP web server. This provides a convenient way to test a Laravel |
16 | 16 | // application without having installed a "real" web server software here. |
17 | -if($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) { |
|
17 | +if($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) |
|
18 | +{ |
|
18 | 19 | return false; |
19 | 20 | } |
20 | 21 |
@@ -14,7 +14,8 @@ |
||
14 | 14 | */ |
15 | 15 | protected function redirectTo($request) |
16 | 16 | { |
17 | - if(!$request->expectsJson()) { |
|
17 | + if(!$request->expectsJson()) |
|
18 | + { |
|
18 | 19 | return route('login'); |
19 | 20 | } |
20 | 21 | } |
@@ -17,7 +17,8 @@ |
||
17 | 17 | */ |
18 | 18 | public function handle($request, Closure $next, $guard = null) |
19 | 19 | { |
20 | - if(Auth::guard($guard)->check()) { |
|
20 | + if(Auth::guard($guard)->check()) |
|
21 | + { |
|
21 | 22 | return redirect('/dashboard'); |
22 | 23 | } |
23 | 24 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @return void |
35 | 35 | */ |
36 | 36 | public function report(Exception $exception) |
37 | - { |
|
37 | + { |
|
38 | 38 | // if(config('app.stack_trace')) |
39 | 39 | // { |
40 | 40 | // parent::report($exception); |
@@ -15,7 +15,7 @@ |
||
15 | 15 | use Illuminate\Support\Facades\Route; |
16 | 16 | |
17 | 17 | class CustomerSystemsController extends Controller |
18 | -{ |
|
18 | +{ |
|
19 | 19 | use SystemsTrait; |
20 | 20 | |
21 | 21 | public function __construct() |
@@ -79,8 +79,7 @@ discard block |
||
79 | 79 | // Add the 'documentation' column in the tech_tips table |
80 | 80 | if(!Schema::hasColumn('tech_tips', 'documentation')) |
81 | 81 | { |
82 | - Schema::table('tech_tips', function(Blueprint $table) |
|
83 | - { |
|
82 | + Schema::table('tech_tips', function(Blueprint $table) { |
|
84 | 83 | $table->boolean('documentation')->default(0)->nullable()->after('public'); |
85 | 84 | }); |
86 | 85 | |
@@ -113,8 +112,7 @@ discard block |
||
113 | 112 | // Add the 'is_installer' column in the users table |
114 | 113 | if(!Schema::hasColumn('users', 'is_installer')) |
115 | 114 | { |
116 | - Schema::table('users', function(Blueprint $table) |
|
117 | - { |
|
115 | + Schema::table('users', function(Blueprint $table) { |
|
118 | 116 | $table->boolean('is_installer')->default(0)->after('active'); |
119 | 117 | }); |
120 | 118 | |
@@ -198,8 +196,7 @@ discard block |
||
198 | 196 | ]); |
199 | 197 | } |
200 | 198 | } |
201 | - Schema::table('user_role', function(Blueprint $table) |
|
202 | - { |
|
199 | + Schema::table('user_role', function(Blueprint $table) { |
|
203 | 200 | $table->dropForeign(['user_id']); |
204 | 201 | $table->dropForeign(['role_id']); |
205 | 202 | }); |
@@ -211,8 +208,7 @@ discard block |
||
211 | 208 | // Remove the system_files and system_file_types table |
212 | 209 | if(Schema::hasTable('system_files')) |
213 | 210 | { |
214 | - Schema::table('system_files', function(Blueprint $table) |
|
215 | - { |
|
211 | + Schema::table('system_files', function(Blueprint $table) { |
|
216 | 212 | $table->dropForeign(['sys_id']); |
217 | 213 | $table->dropForeign(['type_id']); |
218 | 214 | $table->dropForeign(['file_id']); |
@@ -230,7 +226,7 @@ discard block |
||
230 | 226 | * @return void |
231 | 227 | */ |
232 | 228 | public function down() |
233 | - { |
|
229 | + { |
|
234 | 230 | if(Schema::hasColumn('file_links', 'cust_id')) |
235 | 231 | { |
236 | 232 | Schema::table('file_links', function(Blueprint $table) { |
@@ -248,8 +244,7 @@ discard block |
||
248 | 244 | |
249 | 245 | if(Schema::hasColumn('tech_tips', 'documentation')) |
250 | 246 | { |
251 | - Schema::table('tech_tips', function(Blueprint $table) |
|
252 | - { |
|
247 | + Schema::table('tech_tips', function(Blueprint $table) { |
|
253 | 248 | $table->dropColumn('documentation'); |
254 | 249 | }); |
255 | 250 | } |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | $extension = isset($fileParts['extension']) ? ('.'.$fileParts['extension']) : ''; |
41 | 41 | |
42 | 42 | // Look to see if a number is already appended to a file. (example - file(1).pdf) |
43 | - if(preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) |
|
43 | + if(preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) |
|
44 | 44 | { |
45 | 45 | // Has a number, increment it |
46 | 46 | $base = $match[1]; |
47 | 47 | $number = intVal($match[2]); |
48 | - } |
|
49 | - else |
|
48 | + } |
|
49 | + else |
|
50 | 50 | { |
51 | 51 | // No number, add one |
52 | 52 | $base = $fileParts['filename']; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | // Increase the number until one that is not in use is found |
57 | - do |
|
57 | + do |
|
58 | 58 | { |
59 | 59 | $fileName = $base.'('.++$number.')'.$extension; |
60 | 60 | } while(Storage::exists($path.DIRECTORY_SEPARATOR.$fileName)); |