@@ -15,7 +15,7 @@ |
||
| 15 | 15 | public function boot() |
| 16 | 16 | { |
| 17 | 17 | $this->app['view']->addNamespace('CbModulesGen', __DIR__.'/views'); |
| 18 | - $this->loadRoutesFrom( __DIR__.'/module_generator_routes.php'); |
|
| 18 | + $this->loadRoutesFrom(__DIR__.'/module_generator_routes.php'); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | $this->table = 'cms_moduls'; |
| 18 | 18 | $this->primary_key = 'id'; |
| 19 | - $this->title_field = 'name' ; |
|
| 19 | + $this->title_field = 'name'; |
|
| 20 | 20 | $this->limit = 100; |
| 21 | 21 | $this->button_add = false; |
| 22 | 22 | $this->button_export = false; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $this->orderby = ['is_protected' => 'asc', 'name' => 'asc']; |
| 29 | 29 | |
| 30 | 30 | $this->col = []; |
| 31 | - $this->col[] = ['label' => 'name', 'name' => 'name' ]; |
|
| 31 | + $this->col[] = ['label' => 'name', 'name' => 'name']; |
|
| 32 | 32 | $this->col[] = ['label' => "Table", 'name' => "table_name"]; |
| 33 | 33 | $this->col[] = ['label' => "Path", 'name' => "path"]; |
| 34 | 34 | $this->col[] = ['label' => "Controller", 'name' => "controller"]; |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | $this->form[] = ['label' => 'Controller', 'name' => 'controller', 'type' => 'text', 'placeholder' => '(Optional) Auto Generated']; |
| 251 | 251 | |
| 252 | 252 | if (in_array(CRUDBooster::getCurrentMethod(), ['getAdd', 'postAddSave'])) { |
| 253 | - return ; |
|
| 253 | + return; |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | $this->form[] = [ |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | 16 | $this->app['view']->addNamespace('CbFileManager', __DIR__.'/views'); |
| 17 | - $this->loadRoutesFrom( __DIR__.'/file_manager_routes.php'); |
|
| 17 | + $this->loadRoutesFrom(__DIR__.'/file_manager_routes.php'); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -47,14 +47,14 @@ |
||
| 47 | 47 | $allowedExtension = explode(',', strtolower(cbConfig('UPLOAD_TYPES'))); |
| 48 | 48 | $path = request('path') ? base64_decode(request('path')) : 'uploads'; |
| 49 | 49 | $file = Request::file('userfile'); |
| 50 | - if (! $file) { |
|
| 50 | + if (!$file) { |
|
| 51 | 51 | return null; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | $fileName = $file->getClientOriginalName(); |
| 55 | 55 | $isAllowed = in_array($file->getClientOriginalExtension(), $allowedExtension); |
| 56 | 56 | |
| 57 | - if (! $isAllowed) { |
|
| 57 | + if (!$isAllowed) { |
|
| 58 | 58 | backWithMsg('The file '.$fileName.' type is not allowed!', 'warning'); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | $namespace = '\crocodicstudio\crudbooster\controllers'; |
| 6 | 6 | /* ROUTER FOR UPLOADS */ |
| 7 | -Route::group(['middleware' => ['web'], 'namespace' => $namespace], function () { |
|
| 7 | +Route::group(['middleware' => ['web'], 'namespace' => $namespace], function() { |
|
| 8 | 8 | Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']); |
| 9 | 9 | }); |
| 10 | 10 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'middleware' => ['web', CBBackend::class], |
| 14 | 14 | 'prefix' => cbAdminPath(), |
| 15 | 15 | 'namespace' => ctrlNamespace(), |
| 16 | -], function () { |
|
| 16 | +], function() { |
|
| 17 | 17 | CRUDBooster::routeController('users', 'AdminUsersController'); |
| 18 | 18 | try { |
| 19 | 19 | $modules = DB::table('cms_moduls')->where('path', '!=', '')->where('controller', '!=', '')->where('is_protected', 0)->get(); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | /* ROUTER FOR BACKEND CRUDBOOSTER */ |
| 28 | 28 | Route::group([ |
| 29 | - 'middleware' => ['web', CBBackend::class], 'prefix' => cbAdminPath(), 'namespace' => $namespace,], function () use ($namespace){ |
|
| 29 | + 'middleware' => ['web', CBBackend::class], 'prefix' => cbAdminPath(), 'namespace' => $namespace, ], function() use ($namespace){ |
|
| 30 | 30 | CRUDBooster::routeController('notifications', 'AdminNotificationsController', $namespace); |
| 31 | 31 | }); |
| 32 | 32 | |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
| 35 | 35 | 'prefix' => cbAdminPath(), |
| 36 | 36 | 'namespace' => $namespace, |
| 37 | -], function () { |
|
| 38 | - Route::post('{module}/do-upload-import-data', ['uses' => 'FileController@uploadImportData', 'as' => 'UploadImportData',]); |
|
| 39 | - Route::post('{module}/upload-summernote', ['uses' => 'FileController@uploadSummernote', 'as' => 'UploadImportData',]); |
|
| 40 | - Route::post('{module}/upload-file', ['uses' => 'FileController@uploadFile', 'as' => 'UploadImportData',]); |
|
| 41 | - Route::post('{module}/done-import', ['uses' => 'FileController@doneImport', 'as' => 'doneImportData',]); |
|
| 37 | +], function() { |
|
| 38 | + Route::post('{module}/do-upload-import-data', ['uses' => 'FileController@uploadImportData', 'as' => 'UploadImportData', ]); |
|
| 39 | + Route::post('{module}/upload-summernote', ['uses' => 'FileController@uploadSummernote', 'as' => 'UploadImportData', ]); |
|
| 40 | + Route::post('{module}/upload-file', ['uses' => 'FileController@uploadFile', 'as' => 'UploadImportData', ]); |
|
| 41 | + Route::post('{module}/done-import', ['uses' => 'FileController@doneImport', 'as' => 'doneImportData', ]); |
|
| 42 | 42 | }); |
| 43 | 43 | |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | |
| 24 | 24 | if (in_array($type, ['unique', 'exists'])) { |
| 25 | 25 | $format_validation[] = $this->existOrUnique($config, $type); |
| 26 | - } elseif (in_array($type, ['date_format','digits_between', 'in', 'mimes', 'min', 'max', 'not_in'])) { |
|
| 26 | + } elseif (in_array($type, ['date_format', 'digits_between', 'in', 'mimes', 'min', 'max', 'not_in'])) { |
|
| 27 | 27 | $format_validation[] = $type.':'.$config; |
| 28 | - } elseif (! in_array($type, $typeExcept)) { |
|
| 28 | + } elseif (!in_array($type, $typeExcept)) { |
|
| 29 | 29 | $format_validation[] = $type; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | public function uploadSummernote() |
| 18 | 18 | { |
| 19 | - echo asset(app( FileUploader::class)->uploadFile('userfile')); |
|
| 19 | + echo asset(app(FileUploader::class)->uploadFile('userfile')); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public function uploadFile() |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | $import = app(IndexImport::class); |
| 30 | 30 | //$this->cbLoader(); |
| 31 | - if (! Request::hasFile('userfile')) { |
|
| 31 | + if (!Request::hasFile('userfile')) { |
|
| 32 | 32 | return redirect()->back(); |
| 33 | 33 | } |
| 34 | 34 | $file = Request::file('userfile'); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $fullStoragePath = storage_path('app/'.$fullFilePath); |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - if (! Storage::exists($fullFilePath)) { |
|
| 54 | + if (!Storage::exists($fullFilePath)) { |
|
| 55 | 55 | abort(404); |
| 56 | 56 | } |
| 57 | 57 | $hasImageExtension = $this->isImage($fullStoragePath); |
@@ -86,12 +86,12 @@ discard block |
||
| 86 | 86 | { |
| 87 | 87 | $w = request('w', cbConfig('DEFAULT_THUMBNAIL_WIDTH', 300)); |
| 88 | 88 | $h = request('h', $w); |
| 89 | - $imgRaw = Image::cache(function ($image) use ($fullStoragePath, $w, $h) { |
|
| 89 | + $imgRaw = Image::cache(function($image) use ($fullStoragePath, $w, $h) { |
|
| 90 | 90 | $im = $image->make($fullStoragePath); |
| 91 | - if (! $w) { |
|
| 91 | + if (!$w) { |
|
| 92 | 92 | return $im; |
| 93 | 93 | } |
| 94 | - if (! $h) { |
|
| 94 | + if (!$h) { |
|
| 95 | 95 | $im->fit($w); |
| 96 | 96 | } else { |
| 97 | 97 | $im->fit($w, $h); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | { |
| 112 | 112 | $extension = strtolower(File::extension($fullStoragePath)); |
| 113 | 113 | |
| 114 | - return FieldDetector::isWithin($extension, 'IMAGE_EXTENSIONS');; |
|
| 114 | + return FieldDetector::isWithin($extension, 'IMAGE_EXTENSIONS'); ; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | private function guardView($request) |
| 61 | 61 | { |
| 62 | - if ($request->is($this->url.'*') && ! CRUDBooster::canView()) { |
|
| 62 | + if ($request->is($this->url.'*') && !CRUDBooster::canView()) { |
|
| 63 | 63 | $this->stopIllegalAction('view'); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | private function guardCreate($request) |
| 71 | 71 | { |
| 72 | - if ($request->is($this->url.'/add*') && ! CRUDBooster::canCreate()) { |
|
| 72 | + if ($request->is($this->url.'/add*') && !CRUDBooster::canCreate()) { |
|
| 73 | 73 | $this->stopIllegalAction('add'); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | private function guardUpdate($request) |
| 81 | 81 | { |
| 82 | - if ($request->is($this->url.'/edit*') && ! CRUDBooster::canUpdate()) { |
|
| 82 | + if ($request->is($this->url.'/edit*') && !CRUDBooster::canUpdate()) { |
|
| 83 | 83 | $this->stopIllegalAction('edit'); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | private function guardDelete($request) |
| 91 | 91 | { |
| 92 | - if ($request->is($this->url.'/delete*') && ! CRUDBooster::canDelete()) { |
|
| 92 | + if ($request->is($this->url.'/delete*') && !CRUDBooster::canDelete()) { |
|
| 93 | 93 | $this->stopIllegalAction('delete'); |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | */ |
| 100 | 100 | private function guardRead($request) |
| 101 | 101 | { |
| 102 | - if ($request->is($this->url.'/detail*') && ! CRUDBooster::canRead()) { |
|
| 102 | + if ($request->is($this->url.'/detail*') && !CRUDBooster::canRead()) { |
|
| 103 | 103 | $this->stopIllegalAction('view'); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | */ |
| 117 | 117 | private function tokenMissMatchDevice($senderToken, $userAgent, $serverToken) |
| 118 | 118 | { |
| 119 | - if (! Cache::has($senderToken) || Cache::get($senderToken) == $userAgent) { |
|
| 119 | + if (!Cache::has($senderToken) || Cache::get($senderToken) == $userAgent) { |
|
| 120 | 120 | return; |
| 121 | 121 | } |
| 122 | 122 | $result = []; |