@@ -40,7 +40,7 @@ |
||
40 | 40 | 'name' => 'required', |
41 | 41 | 'role' => 'not_in:SUPERADMIN', |
42 | 42 | 'email' => 'required|email|unique:' . config('twill.users_table', 'twill_users') . ',email,' . $this->route('user'), |
43 | - 'verify-code' => function ($attribute, $value, $fail) { |
|
43 | + 'verify-code' => function($attribute, $value, $fail) { |
|
44 | 44 | $user = Auth::guard('twill_users')->user(); |
45 | 45 | $with2faSettings = config('twill.enabled.users-2fa') && $user->id == $this->route('user'); |
46 | 46 |
@@ -64,7 +64,7 @@ |
||
64 | 64 | |
65 | 65 | $this->info(self::SCANNING_BLOCKS); |
66 | 66 | |
67 | - Collection::make($this->filesystem->files($path))->each(function ($viewFile) { |
|
67 | + Collection::make($this->filesystem->files($path))->each(function($viewFile) { |
|
68 | 68 | $blockName = $viewFile->getBasename('.blade.php'); |
69 | 69 | |
70 | 70 | $vueBlockTemplate = $this->viewFactory->make('admin.blocks.' . $blockName, ['renderForBlocks' => true])->render(); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | // TODO: document this and actually think about moving to queuable job after content type updates |
58 | 58 | public function handle() |
59 | 59 | { |
60 | - $this->db->table('mediables')->orderBy('id')->chunk(100, function ($attached_medias) { |
|
60 | + $this->db->table('mediables')->orderBy('id')->chunk(100, function($attached_medias) { |
|
61 | 61 | foreach ($attached_medias as $attached_media) { |
62 | 62 | $uuid = Media::withTrashed()->find($attached_media->media_id, ['uuid'])->uuid; |
63 | 63 |
@@ -31,72 +31,72 @@ |
||
31 | 31 | |
32 | 32 | public function boot() |
33 | 33 | { |
34 | - Gate::define('list', function ($user) { |
|
35 | - return $this->authorize($user, function ($user) { |
|
34 | + Gate::define('list', function($user) { |
|
35 | + return $this->authorize($user, function($user) { |
|
36 | 36 | return $this->userHasRole($user, [UserRole::VIEWONLY, UserRole::PUBLISHER, UserRole::ADMIN]); |
37 | 37 | }); |
38 | 38 | }); |
39 | 39 | |
40 | - Gate::define('edit', function ($user) { |
|
41 | - return $this->authorize($user, function ($user) { |
|
40 | + Gate::define('edit', function($user) { |
|
41 | + return $this->authorize($user, function($user) { |
|
42 | 42 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
43 | 43 | }); |
44 | 44 | }); |
45 | 45 | |
46 | - Gate::define('reorder', function ($user) { |
|
47 | - return $this->authorize($user, function ($user) { |
|
46 | + Gate::define('reorder', function($user) { |
|
47 | + return $this->authorize($user, function($user) { |
|
48 | 48 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
49 | 49 | }); |
50 | 50 | }); |
51 | 51 | |
52 | - Gate::define('publish', function ($user) { |
|
53 | - return $this->authorize($user, function ($user) { |
|
52 | + Gate::define('publish', function($user) { |
|
53 | + return $this->authorize($user, function($user) { |
|
54 | 54 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
55 | 55 | }); |
56 | 56 | }); |
57 | 57 | |
58 | - Gate::define('feature', function ($user) { |
|
59 | - return $this->authorize($user, function ($user) { |
|
58 | + Gate::define('feature', function($user) { |
|
59 | + return $this->authorize($user, function($user) { |
|
60 | 60 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
61 | 61 | }); |
62 | 62 | }); |
63 | 63 | |
64 | - Gate::define('delete', function ($user) { |
|
65 | - return $this->authorize($user, function ($user) { |
|
64 | + Gate::define('delete', function($user) { |
|
65 | + return $this->authorize($user, function($user) { |
|
66 | 66 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
67 | 67 | }); |
68 | 68 | }); |
69 | 69 | |
70 | - Gate::define('upload', function ($user) { |
|
71 | - return $this->authorize($user, function ($user) { |
|
70 | + Gate::define('upload', function($user) { |
|
71 | + return $this->authorize($user, function($user) { |
|
72 | 72 | return $this->userHasRole($user, [UserRole::PUBLISHER, UserRole::ADMIN]); |
73 | 73 | }); |
74 | 74 | }); |
75 | 75 | |
76 | - Gate::define('manage-users', function ($user) { |
|
77 | - return $this->authorize($user, function ($user) { |
|
76 | + Gate::define('manage-users', function($user) { |
|
77 | + return $this->authorize($user, function($user) { |
|
78 | 78 | return $this->userHasRole($user, [UserRole::ADMIN]); |
79 | 79 | }); |
80 | 80 | }); |
81 | 81 | |
82 | 82 | // As an admin, I can edit users, except superadmins |
83 | 83 | // As a non-admin, I can edit myself only |
84 | - Gate::define('edit-user', function ($user, $editedUser = null) { |
|
85 | - return $this->authorize($user, function ($user) use ($editedUser) { |
|
84 | + Gate::define('edit-user', function($user, $editedUser = null) { |
|
85 | + return $this->authorize($user, function($user) use ($editedUser) { |
|
86 | 86 | $editedUserObject = User::find($editedUser); |
87 | 87 | return ($this->userHasRole($user, [UserRole::ADMIN]) || $user->id == $editedUser) |
88 | 88 | && ($editedUserObject ? $editedUserObject->role !== self::SUPERADMIN : true); |
89 | 89 | }); |
90 | 90 | }); |
91 | 91 | |
92 | - Gate::define('publish-user', function ($user) { |
|
93 | - return $this->authorize($user, function ($user) { |
|
92 | + Gate::define('publish-user', function($user) { |
|
93 | + return $this->authorize($user, function($user) { |
|
94 | 94 | $editedUserObject = User::find(request('id')); |
95 | 95 | return $this->userHasRole($user, [UserRole::ADMIN]) && ($editedUserObject ? $user->id !== $editedUserObject->id && $editedUserObject->role !== self::SUPERADMIN : false); |
96 | 96 | }); |
97 | 97 | }); |
98 | 98 | |
99 | - Gate::define('impersonate', function ($user) { |
|
99 | + Gate::define('impersonate', function($user) { |
|
100 | 100 | return $user->role === self::SUPERADMIN; |
101 | 101 | }); |
102 | 102 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function byKey($key, $section = null) |
36 | 36 | { |
37 | - return $this->model->when($section, function ($query) use ($section) { |
|
37 | + return $this->model->when($section, function($query) use ($section) { |
|
38 | 38 | $query->where('section', $section); |
39 | 39 | })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null; |
40 | 40 | } |
@@ -45,15 +45,15 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function getFormFields($section = null) |
47 | 47 | { |
48 | - $settings = $this->model->when($section, function ($query) use ($section) { |
|
48 | + $settings = $this->model->when($section, function($query) use ($section) { |
|
49 | 49 | $query->where('section', $section); |
50 | 50 | })->with('translations', 'medias')->get(); |
51 | 51 | |
52 | - $medias = $settings->mapWithKeys(function ($setting) { |
|
52 | + $medias = $settings->mapWithKeys(function($setting) { |
|
53 | 53 | return [$setting->key => parent::getFormFields($setting)['medias'][$setting->key] ?? null]; |
54 | 54 | })->filter()->toArray(); |
55 | 55 | |
56 | - return $settings->mapWithKeys(function ($setting) { |
|
56 | + return $settings->mapWithKeys(function($setting) { |
|
57 | 57 | $settingValue = []; |
58 | 58 | |
59 | 59 | foreach ($setting->translations as $translation) { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $this->updateOrCreate($section + ['key' => $role], $section + [ |
102 | 102 | 'key' => $role, |
103 | 103 | 'medias' => [ |
104 | - $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) { |
|
104 | + $role => Collection::make($settingsFields['medias'][$role])->map(function($media) { |
|
105 | 105 | return json_decode($media, true); |
106 | 106 | })->values()->filter()->toArray(), |
107 | 107 | ], |
@@ -62,7 +62,7 @@ |
||
62 | 62 | */ |
63 | 63 | public function filter($query, array $scopes = []) |
64 | 64 | { |
65 | - $query->when(isset($scopes['role']), function ($query) use ($scopes) { |
|
65 | + $query->when(isset($scopes['role']), function($query) use ($scopes) { |
|
66 | 66 | $query->where('role', $scopes['role']); |
67 | 67 | }); |
68 | 68 | $query->where('role', '<>', 'SUPERADMIN'); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | $relationRepository = $this->getModelRepository($relation, $model); |
16 | 16 | |
17 | 17 | if (!$keepExisting) { |
18 | - $object->$relation()->each(function ($repeaterElement) { |
|
18 | + $object->$relation()->each(function($repeaterElement) { |
|
19 | 19 | $repeaterElement->forceDelete(); |
20 | 20 | }); |
21 | 21 | } |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | |
113 | 113 | if (isset($relatedItemFormFields['medias'])) { |
114 | 114 | if (config('twill.media_library.translated_form_fields', false)) { |
115 | - Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
116 | - $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) { |
|
115 | + Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) { |
|
116 | + $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) { |
|
117 | 117 | return [ |
118 | 118 | "blocks[$relation-$relationItem->id][$role][$locale]" => $medias, |
119 | 119 | ]; |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | if (isset($relatedItemFormFields['files'])) { |
130 | - Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
131 | - $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) { |
|
130 | + Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) { |
|
131 | + $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) { |
|
132 | 132 | return [ |
133 | 133 | "blocks[$relation-$relationItem->id][$role][$locale]" => $files, |
134 | 134 | ]; |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | |
24 | 24 | $submittedLanguages = Collection::make($fields['languages'] ?? []); |
25 | 25 | |
26 | - $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) { |
|
26 | + $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) { |
|
27 | 27 | return $language['published']; |
28 | 28 | }); |
29 | 29 | |
30 | 30 | foreach ($locales as $index => $locale) { |
31 | - $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) { |
|
31 | + $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) { |
|
32 | 32 | return $lang['value'] == $locale; |
33 | 33 | })); |
34 | 34 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | $fields[$locale] = [ |
40 | 40 | 'active' => $activeField, |
41 | - ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
41 | + ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) { |
|
42 | 42 | $attributeValue = $fields[$attribute] ?? null; |
43 | 43 | |
44 | 44 | // if we are at the last locale, |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | if (property_exists($this->model, 'translatedAttributes')) { |
81 | 81 | $attributes = $this->model->translatedAttributes; |
82 | - $query->whereHas('translations', function ($q) use ($scopes, $attributes) { |
|
82 | + $query->whereHas('translations', function($q) use ($scopes, $attributes) { |
|
83 | 83 | foreach ($attributes as $attribute) { |
84 | 84 | if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) { |
85 | 85 | $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%'); |
@@ -70,11 +70,11 @@ discard block |
||
70 | 70 | |
71 | 71 | $blockRepository->bulkDelete($object->blocks()->pluck('id')->toArray()); |
72 | 72 | |
73 | - $this->getBlocks($object, $fields)->each(function ($block) use ($object, $blockRepository) { |
|
73 | + $this->getBlocks($object, $fields)->each(function($block) use ($object, $blockRepository) { |
|
74 | 74 | |
75 | 75 | $blockCreated = $blockRepository->create($block); |
76 | 76 | |
77 | - $block['blocks']->each(function ($childBlock) use ($blockCreated, $blockRepository) { |
|
77 | + $block['blocks']->each(function($childBlock) use ($blockCreated, $blockRepository) { |
|
78 | 78 | $childBlock['parent_id'] = $blockCreated->id; |
79 | 79 | $blockRepository->create($childBlock); |
80 | 80 | }); |
@@ -173,9 +173,9 @@ discard block |
||
173 | 173 | ]; |
174 | 174 | } |
175 | 175 | |
176 | - $fields['blocksFields'][] = Collection::make($block['content'])->filter(function ($value, $key) { |
|
176 | + $fields['blocksFields'][] = Collection::make($block['content'])->filter(function($value, $key) { |
|
177 | 177 | return $key !== "browsers"; |
178 | - })->map(function ($value, $key) use ($block) { |
|
178 | + })->map(function($value, $key) use ($block) { |
|
179 | 179 | return [ |
180 | 180 | 'name' => "blocks[$block->id][$key]", |
181 | 181 | 'value' => $value, |
@@ -188,15 +188,15 @@ discard block |
||
188 | 188 | |
189 | 189 | if ($medias) { |
190 | 190 | if (config('twill.media_library.translated_form_fields', false)) { |
191 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($mediasByLocale, $locale) use ($block) { |
|
192 | - return Collection::make($mediasByLocale)->mapWithKeys(function ($value, $key) use ($block, $locale) { |
|
191 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($mediasByLocale, $locale) use ($block) { |
|
192 | + return Collection::make($mediasByLocale)->mapWithKeys(function($value, $key) use ($block, $locale) { |
|
193 | 193 | return [ |
194 | 194 | "blocks[$block->id][$key][$locale]" => $value, |
195 | 195 | ]; |
196 | 196 | }); |
197 | 197 | })->filter()->toArray(); |
198 | 198 | } else { |
199 | - $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function ($value, $key) use ($block) { |
|
199 | + $fields['blocksMedias'][] = Collection::make($medias)->mapWithKeys(function($value, $key) use ($block) { |
|
200 | 200 | return [ |
201 | 201 | "blocks[$block->id][$key]" => $value, |
202 | 202 | ]; |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | $files = $blockFormFields['files']; |
208 | 208 | |
209 | 209 | if ($files) { |
210 | - Collection::make($files)->each(function ($rolesWithFiles, $locale) use (&$fields, $block) { |
|
211 | - $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $block) { |
|
210 | + Collection::make($files)->each(function($rolesWithFiles, $locale) use (&$fields, $block) { |
|
211 | + $fields['blocksFiles'][] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $block) { |
|
212 | 212 | return [ |
213 | 213 | "blocks[$block->id][$role][$locale]" => $files, |
214 | 214 | ]; |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | */ |
248 | 248 | protected function getBlockBrowsers($block) |
249 | 249 | { |
250 | - return Collection::make($block['content']['browsers'])->mapWithKeys(function ($ids, $relation) use ($block) { |
|
250 | + return Collection::make($block['content']['browsers'])->mapWithKeys(function($ids, $relation) use ($block) { |
|
251 | 251 | $relationRepository = $this->getModelRepository($relation); |
252 | 252 | $relatedItems = $relationRepository->get([], ['id' => $ids], [], -1); |
253 | 253 | $sortedRelatedItems = array_flip($ids); |
@@ -256,9 +256,9 @@ discard block |
||
256 | 256 | $sortedRelatedItems[$item->id] = $item; |
257 | 257 | } |
258 | 258 | |
259 | - $items = Collection::make(array_values($sortedRelatedItems))->filter(function ($value) { |
|
259 | + $items = Collection::make(array_values($sortedRelatedItems))->filter(function($value) { |
|
260 | 260 | return is_object($value); |
261 | - })->map(function ($relatedElement) use ($relation) { |
|
261 | + })->map(function($relatedElement) use ($relation) { |
|
262 | 262 | return [ |
263 | 263 | 'id' => $relatedElement->id, |
264 | 264 | 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title, |