@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | 'as' => 'admin.', |
| 51 | 51 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
| 52 | 52 | 'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'), |
| 53 | - ], function ($router) { |
|
| 54 | - $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) { |
|
| 53 | + ], function($router) { |
|
| 54 | + $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) { |
|
| 55 | 55 | require base_path('routes/admin.php'); |
| 56 | 56 | }); |
| 57 | 57 | }); |
@@ -64,16 +64,16 @@ discard block |
||
| 64 | 64 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
| 65 | 65 | 'prefix' => rtrim(ltrim(config('twill.admin_app_path'), '/'), '/'), |
| 66 | 66 | ], |
| 67 | - function ($router) { |
|
| 68 | - $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function ($router) { |
|
| 67 | + function($router) { |
|
| 68 | + $router->group(['middleware' => ['twill_auth:twill_users', 'impersonate', 'validateBackHistory']], function($router) { |
|
| 69 | 69 | require __DIR__ . '/../routes/admin.php'; |
| 70 | 70 | }); |
| 71 | 71 | |
| 72 | - $router->group(['middleware' => ['noDebugBar']], function ($router) { |
|
| 72 | + $router->group(['middleware' => ['noDebugBar']], function($router) { |
|
| 73 | 73 | require __DIR__ . '/../routes/auth.php'; |
| 74 | 74 | }); |
| 75 | 75 | |
| 76 | - $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function ($router) { |
|
| 76 | + $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function($router) { |
|
| 77 | 77 | require __DIR__ . '/../routes/templates.php'; |
| 78 | 78 | }); |
| 79 | 79 | } |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | 'domain' => config('app.url'), |
| 86 | 86 | 'middleware' => [config('twill.admin_middleware_group', 'web')], |
| 87 | 87 | ], |
| 88 | - function ($router) { |
|
| 89 | - $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function ($router) { |
|
| 88 | + function($router) { |
|
| 89 | + $router->group(['middleware' => array_merge(['noDebugBar'], ($this->app->environment('production') ? ['twill_auth:twill_users'] : []))], function($router) { |
|
| 90 | 90 | require __DIR__ . '/../routes/templates.php'; |
| 91 | 91 | }); |
| 92 | 92 | } |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | */ |
| 126 | 126 | protected function registerMacros() |
| 127 | 127 | { |
| 128 | - Route::macro('moduleShowWithPreview', function ($moduleName, $routePrefix = null, $controllerName = null) { |
|
| 128 | + Route::macro('moduleShowWithPreview', function($moduleName, $routePrefix = null, $controllerName = null) { |
|
| 129 | 129 | if ($routePrefix === null) { |
| 130 | 130 | $routePrefix = $moduleName; |
| 131 | 131 | } |
@@ -141,12 +141,12 @@ discard block |
||
| 141 | 141 | Route::name($moduleName . '.preview')->get('/admin-preview' . $routePrefix . '{slug}', $controllerName . 'Controller@show')->middleware(['web', 'twill_auth:twill_users', 'can:list']); |
| 142 | 142 | }); |
| 143 | 143 | |
| 144 | - Route::macro('module', function ($slug, $options = [], $resource_options = [], $resource = true) { |
|
| 144 | + Route::macro('module', function($slug, $options = [], $resource_options = [], $resource = true) { |
|
| 145 | 145 | |
| 146 | 146 | $slugs = explode('.', $slug); |
| 147 | 147 | $prefixSlug = str_replace('.', "/", $slug); |
| 148 | 148 | $_slug = Arr::last($slugs); |
| 149 | - $className = implode("", array_map(function ($s) { |
|
| 149 | + $className = implode("", array_map(function($s) { |
|
| 150 | 150 | return ucfirst(Str::singular($s)); |
| 151 | 151 | }, $slugs)); |
| 152 | 152 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | if ($resource) { |
| 195 | 195 | $customRoutePrefix = !empty($groupPrefix) ? "{$groupPrefix}." : ""; |
| 196 | - Route::group(['as' => $customRoutePrefix], function () use ($slug, $className, $resource_options) { |
|
| 196 | + Route::group(['as' => $customRoutePrefix], function() use ($slug, $className, $resource_options) { |
|
| 197 | 197 | Route::resource($slug, "{$className}Controller", $resource_options); |
| 198 | 198 | }); |
| 199 | 199 | } |
@@ -154,7 +154,7 @@ |
||
| 154 | 154 | protected function formData($request) |
| 155 | 155 | { |
| 156 | 156 | $user = $this->authFactory->guard('twill_users')->user(); |
| 157 | - $with2faSettings = $this->config->get('twill.enabled.users-2fa') && $user->id == $request->route('user');; |
|
| 157 | + $with2faSettings = $this->config->get('twill.enabled.users-2fa') && $user->id == $request->route('user'); ; |
|
| 158 | 158 | |
| 159 | 159 | if ($with2faSettings) { |
| 160 | 160 | $google2fa = new Google2FA(); |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | if (config('twill.enabled.media-library')) { |
| 11 | - Route::group(['prefix' => 'media-library', 'as' => 'media-library.'], function () { |
|
| 11 | + Route::group(['prefix' => 'media-library', 'as' => 'media-library.'], function() { |
|
| 12 | 12 | Route::post('sign-s3-upload', ['as' => 'sign-s3-upload', 'uses' => 'MediaLibraryController@signS3Upload']); |
| 13 | 13 | Route::get('sign-azure-upload', ['as' => 'sign-azure-upload', 'uses' => 'MediaLibraryController@signAzureUpload']); |
| 14 | 14 | Route::put('medias/single-update', ['as' => 'medias.single-update', 'uses' => 'MediaLibraryController@singleUpdate']); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | if (config('twill.enabled.file-library')) { |
| 23 | - Route::group(['prefix' => 'file-library', 'as' => 'file-library.'], function () { |
|
| 23 | + Route::group(['prefix' => 'file-library', 'as' => 'file-library.'], function() { |
|
| 24 | 24 | Route::post('sign-s3-upload', ['as' => 'sign-s3-upload', 'uses' => 'FileLibraryController@signS3Upload']); |
| 25 | 25 | Route::get('sign-azure-upload', ['as' => 'sign-azure-upload', 'uses' => 'FileLibraryController@signAzureUpload']); |
| 26 | 26 | Route::put('files/single-update', ['as' => 'files.single-update', 'uses' => 'FileLibraryController@singleUpdate']); |
@@ -36,14 +36,14 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if (config('twill.enabled.buckets')) { |
| 39 | - $bucketsRoutes = config('twill.bucketsRoutes') ?? Collection::make(config('twill.buckets'))->mapWithKeys(function ($bucketSection, $bucketSectionKey) { |
|
| 39 | + $bucketsRoutes = config('twill.bucketsRoutes') ?? Collection::make(config('twill.buckets'))->mapWithKeys(function($bucketSection, $bucketSectionKey) { |
|
| 40 | 40 | return [$bucketSectionKey => 'featured']; |
| 41 | 41 | })->toArray(); |
| 42 | 42 | |
| 43 | 43 | foreach ($bucketsRoutes as $bucketSectionKey => $routePrefix) { |
| 44 | - Route::group(['prefix' => str_replace(".","/",$routePrefix), 'as' => $routePrefix . '.'], function () use ($bucketSectionKey) { |
|
| 44 | + Route::group(['prefix' => str_replace(".", "/", $routePrefix), 'as' => $routePrefix . '.'], function() use ($bucketSectionKey) { |
|
| 45 | 45 | Route::get($bucketSectionKey, ['as' => $bucketSectionKey, 'uses' => 'FeaturedController@index']); |
| 46 | - Route::group(['prefix' => $bucketSectionKey, 'as' => $bucketSectionKey . '.'], function () { |
|
| 46 | + Route::group(['prefix' => $bucketSectionKey, 'as' => $bucketSectionKey . '.'], function() { |
|
| 47 | 47 | Route::post('save', ['as' => 'save', 'uses' => 'FeaturedController@save']); |
| 48 | 48 | }); |
| 49 | 49 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | try { |
| 34 | 34 | $blobUri = $request->input('bloburi'); |
| 35 | 35 | $method = $request->input('_method'); |
| 36 | - $permissions = '' ; |
|
| 36 | + $permissions = ''; |
|
| 37 | 37 | if (strtolower($method) === 'put') { |
| 38 | 38 | $permissions = 'w'; |
| 39 | 39 | } else if (strtolower($method) === 'delete') { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $now = new DateTime("now", new DateTimeZone("UTC")); |
| 49 | 49 | $expire = $now->modify('+15 min'); |
| 50 | 50 | |
| 51 | - $path = $this->config->get('filesystems.disks.' . $disk .'.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
| 51 | + $path = $this->config->get('filesystems.disks.' . $disk . '.container') . str_replace(azureEndpoint($disk), '', $blobUri); |
|
| 52 | 52 | $sasUrl = $blobUri . '?' . $this->blobSharedAccessSignatureHelper->generateBlobServiceSharedAccessSignatureToken('b', $path, $permissions, $expire); |
| 53 | 53 | return $listener->uploadIsSigned($sasUrl, false); |
| 54 | 54 | } catch (\Exception $e) { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $items = $this->getIndexItems($scopes); |
| 100 | 100 | |
| 101 | 101 | return [ |
| 102 | - 'items' => $items->map(function ($item) { |
|
| 102 | + 'items' => $items->map(function($item) { |
|
| 103 | 103 | return $item->toCmsArray(); |
| 104 | 104 | })->toArray(), |
| 105 | 105 | 'maxPage' => $items->lastPage(), |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | { |
| 221 | 221 | $ids = explode(',', $this->request->input('ids')); |
| 222 | 222 | |
| 223 | - $metadatasFromRequest = $this->getExtraMetadatas()->reject(function ($meta) { |
|
| 223 | + $metadatasFromRequest = $this->getExtraMetadatas()->reject(function($meta) { |
|
| 224 | 224 | return is_null($meta); |
| 225 | 225 | })->toArray(); |
| 226 | 226 | |
| 227 | - $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array)$this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
| 227 | + $extraMetadatas = array_diff_key($metadatasFromRequest, array_flip((array) $this->request->get('fieldsRemovedFromBulkEditing', []))); |
|
| 228 | 228 | |
| 229 | 229 | if (in_array('tags', $this->request->get('fieldsRemovedFromBulkEditing', []))) { |
| 230 | 230 | $this->repository->addIgnoreFieldsBeforeSave('bulk_tags'); |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | $items = $this->getIndexItems($scopes); |
| 245 | 245 | |
| 246 | 246 | return $this->responseFactory->json([ |
| 247 | - 'items' => $items->map(function ($item) { |
|
| 247 | + 'items' => $items->map(function($item) { |
|
| 248 | 248 | return $item->toCmsArray(); |
| 249 | 249 | })->toArray(), |
| 250 | 250 | 'tags' => $this->repository->getTagsList(), |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | */ |
| 297 | 297 | private function getExtraMetadatas() |
| 298 | 298 | { |
| 299 | - return Collection::make($this->customFields)->mapWithKeys(function ($field) { |
|
| 299 | + return Collection::make($this->customFields)->mapWithKeys(function($field) { |
|
| 300 | 300 | $fieldInRequest = $this->request->get($field['name']); |
| 301 | 301 | |
| 302 | 302 | if (isset($field['type']) && $field['type'] === 'checkbox') { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $items = $this->getIndexItems($scopes); |
| 93 | 93 | |
| 94 | 94 | return [ |
| 95 | - 'items' => $items->map(function ($item) { |
|
| 95 | + 'items' => $items->map(function($item) { |
|
| 96 | 96 | return $this->buildFile($item); |
| 97 | 97 | })->toArray(), |
| 98 | 98 | 'maxPage' => $items->lastPage(), |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | private function buildFile($item) |
| 109 | 109 | { |
| 110 | 110 | return $item->toCmsArray() + [ |
| 111 | - 'tags' => $item->tags->map(function ($tag) { |
|
| 111 | + 'tags' => $item->tags->map(function($tag) { |
|
| 112 | 112 | return $tag->name; |
| 113 | 113 | }), |
| 114 | 114 | 'deleteUrl' => $item->canDeleteSafely() ? moduleRoute($this->moduleName, $this->routePrefix, 'destroy', $item->id) : null, |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $items = $this->getIndexItems($scopes); |
| 231 | 231 | |
| 232 | 232 | return $this->responseFactory->json([ |
| 233 | - 'items' => $items->map(function ($item) { |
|
| 233 | + 'items' => $items->map(function($item) { |
|
| 234 | 234 | return $this->buildFile($item); |
| 235 | 235 | })->toArray(), |
| 236 | 236 | 'tags' => $this->repository->getTagsList(), |
@@ -51,13 +51,13 @@ |
||
| 51 | 51 | // anonymous functions are used to let configuration dictate |
| 52 | 52 | // the execution of the appropriate implementation |
| 53 | 53 | $endpointByType = [ |
| 54 | - 'local' => function () { |
|
| 54 | + 'local' => function() { |
|
| 55 | 55 | return $this->urlGenerator->route('admin.media-library.medias.store'); |
| 56 | 56 | }, |
| 57 | - 's3' => function () use ($libraryDisk) { |
|
| 57 | + 's3' => function() use ($libraryDisk) { |
|
| 58 | 58 | return s3Endpoint($libraryDisk); |
| 59 | 59 | }, |
| 60 | - 'azure' => function () use ($libraryDisk) { |
|
| 60 | + 'azure' => function() use ($libraryDisk) { |
|
| 61 | 61 | return azureEndpoint($libraryDisk); |
| 62 | 62 | }, |
| 63 | 63 | ]; |
@@ -51,13 +51,13 @@ |
||
| 51 | 51 | // anonymous functions are used to let configuration dictate |
| 52 | 52 | // the execution of the appropriate implementation |
| 53 | 53 | $endpointByType = [ |
| 54 | - 'local' => function () { |
|
| 54 | + 'local' => function() { |
|
| 55 | 55 | return $this->urlGenerator->route('admin.file-library.files.store'); |
| 56 | 56 | }, |
| 57 | - 's3' => function () use ($libraryDisk) { |
|
| 57 | + 's3' => function() use ($libraryDisk) { |
|
| 58 | 58 | return s3Endpoint($libraryDisk); |
| 59 | 59 | }, |
| 60 | - 'azure' => function () use ($libraryDisk) { |
|
| 60 | + 'azure' => function() use ($libraryDisk) { |
|
| 61 | 61 | return azureEndpoint($libraryDisk); |
| 62 | 62 | }, |
| 63 | 63 | ]; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | if ($object->$group) { |
| 39 | 39 | $decoded_fields = json_decode($object->$group, true); |
| 40 | 40 | // In case that some field read the value through $item->$name |
| 41 | - foreach($decoded_fields as $field_name => $field_value) { |
|
| 41 | + foreach ($decoded_fields as $field_name => $field_value) { |
|
| 42 | 42 | $object->setAttribute($field_name, $field_value); |
| 43 | 43 | } |
| 44 | 44 | $fields = array_merge($fields, $decoded_fields); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | protected function handleFieldsGroups($fields) { |
| 52 | 52 | foreach ($this->fieldsGroups as $group => $groupFields) { |
| 53 | - $fields[$group] = json_encode(Arr::where(Arr::only($fields, $groupFields), function ($value, $key) { |
|
| 53 | + $fields[$group] = json_encode(Arr::where(Arr::only($fields, $groupFields), function($value, $key) { |
|
| 54 | 54 | return !empty($value); |
| 55 | 55 | })); |
| 56 | 56 | Arr::forget($fields, $groupFields); |