We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $otherButtons = collect([]); |
| 26 | 26 | |
| 27 | 27 | // we get the buttons that belong to the specified stack |
| 28 | - $stackButtons = $this->buttons()->reject(function ($item) use ($stack, $otherButtons) { |
|
| 28 | + $stackButtons = $this->buttons()->reject(function($item) use ($stack, $otherButtons) { |
|
| 29 | 29 | if ($item->stack != $stack) { |
| 30 | 30 | // if the button does not belong to this stack we just add it for merging later |
| 31 | 31 | $otherButtons->push($item); |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | }); |
| 38 | 38 | |
| 39 | 39 | // we parse the ordered buttons |
| 40 | - collect($order)->each(function ($btnKey) use ($newButtons, $stackButtons) { |
|
| 41 | - if (! $button = $stackButtons->where('name', $btnKey)->first()) { |
|
| 40 | + collect($order)->each(function($btnKey) use ($newButtons, $stackButtons) { |
|
| 41 | + if (!$button = $stackButtons->where('name', $btnKey)->first()) { |
|
| 42 | 42 | abort(500, 'Button name [«'.$btnKey.'»] not found.'); |
| 43 | 43 | } |
| 44 | 44 | $newButtons->push($button); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // we add the remaining buttons to the end of the ordered ones |
| 49 | 49 | if (count($newButtons) < count($stackButtons)) { |
| 50 | 50 | foreach ($stackButtons as $button) { |
| 51 | - if (! $newButtons->where('name', $button->name)->first()) { |
|
| 51 | + if (!$newButtons->where('name', $button->name)->first()) { |
|
| 52 | 52 | $newButtons->push($button); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | $button = $this->buttons()->firstWhere('name', $name); |
| 116 | 116 | |
| 117 | - if (! $button) { |
|
| 117 | + if (!$button) { |
|
| 118 | 118 | abort(500, 'CRUD Button "'.$name.'" not found. Please check the button exists before you modify it.'); |
| 119 | 119 | } |
| 120 | 120 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function removeButton($name, $stack = null) |
| 137 | 137 | { |
| 138 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($name, $stack) { |
|
| 138 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($name, $stack) { |
|
| 139 | 139 | return $stack == null ? $button->name == $name : ($button->stack == $stack) && ($button->name == $name); |
| 140 | 140 | })); |
| 141 | 141 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function removeButtons($names, $stack = null) |
| 148 | 148 | { |
| 149 | - if (! empty($names)) { |
|
| 149 | + if (!empty($names)) { |
|
| 150 | 150 | foreach ($names as $name) { |
| 151 | 151 | $this->removeButton($name, $stack); |
| 152 | 152 | } |
@@ -160,14 +160,14 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | public function removeAllButtonsFromStack($stack) |
| 162 | 162 | { |
| 163 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($stack) { |
|
| 163 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($stack) { |
|
| 164 | 164 | return $button->stack == $stack; |
| 165 | 165 | })); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | public function removeButtonFromStack($name, $stack) |
| 169 | 169 | { |
| 170 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($name, $stack) { |
|
| 170 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($name, $stack) { |
|
| 171 | 171 | return $button->name == $name && $button->stack == $stack; |
| 172 | 172 | })); |
| 173 | 173 | } |
@@ -185,15 +185,15 @@ discard block |
||
| 185 | 185 | $destinationButton = $this->firstButtonWhere('name', $destination); |
| 186 | 186 | $destinationKey = $this->getButtonKey($destination); |
| 187 | 187 | $newDestinationKey = ($where == 'before' ? $destinationKey : $destinationKey + 1); |
| 188 | - $newButtons = $this->buttons()->filter(function ($value, $key) use ($target) { |
|
| 188 | + $newButtons = $this->buttons()->filter(function($value, $key) use ($target) { |
|
| 189 | 189 | return $value->name != $target; |
| 190 | 190 | }); |
| 191 | 191 | |
| 192 | - if (! $targetButton) { |
|
| 192 | + if (!$targetButton) { |
|
| 193 | 193 | return; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - if (! $destinationButton) { |
|
| 196 | + if (!$destinationButton) { |
|
| 197 | 197 | return; |
| 198 | 198 | } |
| 199 | 199 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $lastSlice = $newButtons->slice($newDestinationKey, null); |
| 202 | 202 | |
| 203 | 203 | $newButtons = $firstSlice->push($targetButton); |
| 204 | - $lastSlice->each(function ($item, $key) use ($newButtons) { |
|
| 204 | + $lastSlice->each(function($item, $key) use ($newButtons) { |
|
| 205 | 205 | $newButtons->push($item); |
| 206 | 206 | }); |
| 207 | 207 | |
@@ -388,7 +388,7 @@ |
||
| 388 | 388 | { |
| 389 | 389 | $itemExists = $this->collection()->contains('name', $this->name); |
| 390 | 390 | |
| 391 | - if (! $itemExists) { |
|
| 391 | + if (!$itemExists) { |
|
| 392 | 392 | if ($this->position == 'beginning') { |
| 393 | 393 | $this->collection()->prepend($this); |
| 394 | 394 | } else { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | foreach ($fields as &$field) { |
| 54 | 54 | // set the value |
| 55 | - if (! isset($field['value'])) { |
|
| 55 | + if (!isset($field['value'])) { |
|
| 56 | 56 | if (isset($field['subfields'])) { |
| 57 | 57 | $field['value'] = []; |
| 58 | 58 | foreach ($field['subfields'] as $subfield) { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | // always have a hidden input for the entry id |
| 68 | - if (! array_key_exists('id', $fields)) { |
|
| 68 | + if (!array_key_exists('id', $fields)) { |
|
| 69 | 69 | $fields['id'] = [ |
| 70 | 70 | 'name' => $entry->getKeyName(), |
| 71 | 71 | 'value' => $entry->getKey(), |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | $relation_array = explode('.', $relational_entity); |
| 93 | 93 | |
| 94 | - $relatedModel = $relatedModel = array_reduce(array_splice($relation_array, 0, -1), function ($obj, $method) { |
|
| 94 | + $relatedModel = $relatedModel = array_reduce(array_splice($relation_array, 0, -1), function($obj, $method) { |
|
| 95 | 95 | return $obj->{$method} ? $obj->{$method} : $obj; |
| 96 | 96 | }, $model); |
| 97 | 97 | |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | */ |
| 72 | 72 | private function getLastLineNumberThatContains($needle, $haystack) |
| 73 | 73 | { |
| 74 | - $matchingLines = array_filter($haystack, function ($k) use ($needle) { |
|
| 74 | + $matchingLines = array_filter($haystack, function($k) use ($needle) { |
|
| 75 | 75 | return strpos($k, $needle) !== false; |
| 76 | 76 | }); |
| 77 | 77 | |
@@ -101,11 +101,11 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public function setModel($model_namespace) |
| 103 | 103 | { |
| 104 | - if (! class_exists($model_namespace)) { |
|
| 104 | + if (!class_exists($model_namespace)) { |
|
| 105 | 105 | throw new \Exception('The model does not exist.', 500); |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - if (! method_exists($model_namespace, 'hasCrudTrait')) { |
|
| 108 | + if (!method_exists($model_namespace, 'hasCrudTrait')) { |
|
| 109 | 109 | throw new \Exception('Please use CrudTrait on the model.', 500); |
| 110 | 110 | } |
| 111 | 111 | |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | { |
| 169 | 169 | $complete_route = $route.'.index'; |
| 170 | 170 | |
| 171 | - if (! \Route::has($complete_route)) { |
|
| 171 | + if (!\Route::has($complete_route)) { |
|
| 172 | 172 | throw new \Exception('There are no routes for this route name.', 404); |
| 173 | 173 | } |
| 174 | 174 | |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | */ |
| 270 | 270 | public function getFirstOfItsTypeInArray($type, $array) |
| 271 | 271 | { |
| 272 | - return Arr::first($array, function ($item) use ($type) { |
|
| 272 | + return Arr::first($array, function($item) use ($type) { |
|
| 273 | 273 | return $item['type'] == $type; |
| 274 | 274 | }); |
| 275 | 275 | } |
@@ -286,8 +286,8 @@ discard block |
||
| 286 | 286 | |
| 287 | 287 | public function sync($type, $fields, $attributes) |
| 288 | 288 | { |
| 289 | - if (! empty($this->{$type})) { |
|
| 290 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
| 289 | + if (!empty($this->{$type})) { |
|
| 290 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
| 291 | 291 | if (in_array($field['name'], (array) $fields)) { |
| 292 | 292 | $field = array_merge($field, $attributes); |
| 293 | 293 | } |
@@ -318,15 +318,15 @@ discard block |
||
| 318 | 318 | { |
| 319 | 319 | $relationArray = explode('.', $relationString); |
| 320 | 320 | |
| 321 | - if (! isset($length)) { |
|
| 321 | + if (!isset($length)) { |
|
| 322 | 322 | $length = count($relationArray); |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - if (! isset($model)) { |
|
| 325 | + if (!isset($model)) { |
|
| 326 | 326 | $model = $this->model; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | - $result = array_reduce(array_splice($relationArray, 0, $length), function ($obj, $method) { |
|
| 329 | + $result = array_reduce(array_splice($relationArray, 0, $length), function($obj, $method) { |
|
| 330 | 330 | try { |
| 331 | 331 | $result = $obj->$method(); |
| 332 | 332 | |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | if (is_array($entries)) { |
| 363 | 363 | //if attribute does not exist in main array we have more than one entry OR the attribute |
| 364 | 364 | //is an acessor that is not in $appends property of model. |
| 365 | - if (! isset($entries[$attribute])) { |
|
| 365 | + if (!isset($entries[$attribute])) { |
|
| 366 | 366 | //we first check if we don't have the attribute because it's and acessor that is not in appends. |
| 367 | 367 | if ($model_instance->hasGetMutator($attribute) && isset($entries[$modelKey])) { |
| 368 | 368 | $entry_in_database = $model_instance->find($entries[$modelKey]); |
@@ -402,21 +402,21 @@ discard block |
||
| 402 | 402 | */ |
| 403 | 403 | public function parseTranslatableAttributes($model, $attribute, $value) |
| 404 | 404 | { |
| 405 | - if (! method_exists($model, 'isTranslatableAttribute')) { |
|
| 405 | + if (!method_exists($model, 'isTranslatableAttribute')) { |
|
| 406 | 406 | return $value; |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - if (! $model->isTranslatableAttribute($attribute)) { |
|
| 409 | + if (!$model->isTranslatableAttribute($attribute)) { |
|
| 410 | 410 | return $value; |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - if (! is_array($value)) { |
|
| 413 | + if (!is_array($value)) { |
|
| 414 | 414 | $decodedAttribute = json_decode($value, true); |
| 415 | 415 | } else { |
| 416 | 416 | $decodedAttribute = $value; |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | - if (is_array($decodedAttribute) && ! empty($decodedAttribute)) { |
|
| 419 | + if (is_array($decodedAttribute) && !empty($decodedAttribute)) { |
|
| 420 | 420 | if (isset($decodedAttribute[app()->getLocale()])) { |
| 421 | 421 | return $decodedAttribute[app()->getLocale()]; |
| 422 | 422 | } else { |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | $relation = $model->{$firstRelationName}; |
| 444 | 444 | |
| 445 | 445 | $results = []; |
| 446 | - if (! is_null($relation)) { |
|
| 446 | + if (!is_null($relation)) { |
|
| 447 | 447 | if ($relation instanceof Collection) { |
| 448 | 448 | $currentResults = $relation->all(); |
| 449 | 449 | } elseif (is_array($relation)) { |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | |
| 457 | 457 | array_shift($relationArray); |
| 458 | 458 | |
| 459 | - if (! empty($relationArray)) { |
|
| 459 | + if (!empty($relationArray)) { |
|
| 460 | 460 | foreach ($currentResults as $currentResult) { |
| 461 | 461 | $results = array_merge_recursive($results, $this->getRelatedEntries($currentResult, implode('.', $relationArray))); |
| 462 | 462 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | </div> |
| 47 | 47 | <div class="col-sm-9"> |
| 48 | 48 | <!-- external link input --> |
| 49 | - <div class="page_or_link_value page_or_link_external_link <?php if (! isset($entry) || $entry->$entry_type != 'external_link') { |
|
| 49 | + <div class="page_or_link_value page_or_link_external_link <?php if (!isset($entry) || $entry->$entry_type != 'external_link') { |
|
| 50 | 50 | echo 'd-none'; |
| 51 | 51 | } ?>"> |
| 52 | 52 | <input |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | > |
| 66 | 66 | </div> |
| 67 | 67 | <!-- internal link input --> |
| 68 | - <div class="page_or_link_value page_or_link_internal_link <?php if (! isset($entry) || $entry->$entry_type != 'internal_link') { |
|
| 68 | + <div class="page_or_link_value page_or_link_internal_link <?php if (!isset($entry) || $entry->$entry_type != 'internal_link') { |
|
| 69 | 69 | echo 'd-none'; |
| 70 | 70 | } ?>"> |
| 71 | 71 | <input |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $this->enableFilters(); |
| 73 | 73 | |
| 74 | 74 | // check if another filter with the same name exists |
| 75 | - if (! isset($options['name'])) { |
|
| 75 | + if (!isset($options['name'])) { |
|
| 76 | 76 | abort(500, 'All your filters need names.'); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $unappliedFilters = $this->filters()->where('applied', false); |
| 122 | 122 | if ($unappliedFilters->count()) { |
| 123 | - $unappliedFilters->each(function ($filter) { |
|
| 123 | + $unappliedFilters->each(function($filter) { |
|
| 124 | 124 | $filter->apply(); |
| 125 | 125 | }); |
| 126 | 126 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | { |
| 171 | 171 | $filter = $this->filters()->firstWhere('name', $name); |
| 172 | 172 | |
| 173 | - if (! $filter) { |
|
| 173 | + if (!$filter) { |
|
| 174 | 174 | abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.'); |
| 175 | 175 | } |
| 176 | 176 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | public function replaceFilter($name, $newFilter) |
| 187 | 187 | { |
| 188 | - $newFilters = $this->filters()->map(function ($filter, $key) use ($name, $newFilter) { |
|
| 188 | + $newFilters = $this->filters()->map(function($filter, $key) use ($name, $newFilter) { |
|
| 189 | 189 | if ($filter->name != $name) { |
| 190 | 190 | return $filter; |
| 191 | 191 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | public function removeFilter($name) |
| 200 | 200 | { |
| 201 | - $strippedCollection = $this->filters()->reject(function ($filter) use ($name) { |
|
| 201 | + $strippedCollection = $this->filters()->reject(function($filter) use ($name) { |
|
| 202 | 202 | return $filter->name == $name; |
| 203 | 203 | }); |
| 204 | 204 | |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | */ |
| 242 | 242 | public function makeFirstFilter() |
| 243 | 243 | { |
| 244 | - if (! $this->filters()) { |
|
| 244 | + if (!$this->filters()) { |
|
| 245 | 245 | return false; |
| 246 | 246 | } |
| 247 | 247 | |
@@ -271,15 +271,15 @@ discard block |
||
| 271 | 271 | $destinationFilter = $this->firstFilterWhere('name', $destination); |
| 272 | 272 | $destinationKey = $this->getFilterKey($destination); |
| 273 | 273 | $newDestinationKey = ($where == 'before' ? $destinationKey : $destinationKey + 1); |
| 274 | - $newFilters = $this->filters()->filter(function ($value, $key) use ($target) { |
|
| 274 | + $newFilters = $this->filters()->filter(function($value, $key) use ($target) { |
|
| 275 | 275 | return $value->name != $target; |
| 276 | 276 | }); |
| 277 | 277 | |
| 278 | - if (! $targetFilter) { |
|
| 278 | + if (!$targetFilter) { |
|
| 279 | 279 | return; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - if (! $destinationFilter) { |
|
| 282 | + if (!$destinationFilter) { |
|
| 283 | 283 | return; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | $lastSlice = $newFilters->slice($newDestinationKey, null); |
| 288 | 288 | |
| 289 | 289 | $newFilters = $firstSlice->push($targetFilter); |
| 290 | - $lastSlice->each(function ($item, $key) use ($newFilters) { |
|
| 290 | + $lastSlice->each(function($item, $key) use ($newFilters) { |
|
| 291 | 291 | $newFilters->push($item); |
| 292 | 292 | }); |
| 293 | 293 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $higherAction = $this->getSaveActionByOrder(1); |
| 29 | 29 | |
| 30 | 30 | //if there is an higher action and that action is not the backpack default higher one `save_and_back` we return it. |
| 31 | - if (! empty($higherAction) && key($higherAction) !== 'save_and_back') { |
|
| 31 | + if (!empty($higherAction) && key($higherAction) !== 'save_and_back') { |
|
| 32 | 32 | return key($higherAction); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function getSaveActionByOrder($order) |
| 49 | 49 | { |
| 50 | - return array_filter($this->getOperationSetting('save_actions'), function ($arr) use ($order) { |
|
| 50 | + return array_filter($this->getOperationSetting('save_actions'), function($arr) use ($order) { |
|
| 51 | 51 | return $arr['order'] == $order; |
| 52 | 52 | }); |
| 53 | 53 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $orderCounter = $this->getOperationSetting('save_actions') !== null ? (count($this->getOperationSetting('save_actions')) + 1) : 1; |
| 82 | 82 | //check for some mandatory fields |
| 83 | 83 | $saveAction['name'] ?? abort(500, 'Please define save action name.'); |
| 84 | - $saveAction['redirect'] = $saveAction['redirect'] ?? function ($crud, $request, $itemId) { |
|
| 84 | + $saveAction['redirect'] = $saveAction['redirect'] ?? function($crud, $request, $itemId) { |
|
| 85 | 85 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
| 86 | 86 | }; |
| 87 | 87 | $saveAction['visible'] = $saveAction['visible'] ?? true; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | $actions = $this->getOperationSetting('save_actions') ?? []; |
| 92 | 92 | |
| 93 | - if (! in_array($saveAction['name'], $actions)) { |
|
| 93 | + if (!in_array($saveAction['name'], $actions)) { |
|
| 94 | 94 | $actions[$saveAction['name']] = $saveAction; |
| 95 | 95 | } |
| 96 | 96 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | public function orderSaveAction(string $saveAction, int $wantedOrder) |
| 108 | 108 | { |
| 109 | 109 | $actions = $this->getOperationSetting('save_actions') ?? []; |
| 110 | - if (! empty($actions)) { |
|
| 110 | + if (!empty($actions)) { |
|
| 111 | 111 | $replaceOrder = isset($actions[$saveAction]) ? $actions[$saveAction]['order'] : count($actions) + 1; |
| 112 | 112 | |
| 113 | 113 | foreach ($actions as $key => $sv) { |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | public function orderSaveActions(array $saveActions) |
| 202 | 202 | { |
| 203 | 203 | foreach ($saveActions as $sv => $order) { |
| 204 | - if (! is_int($order)) { |
|
| 204 | + if (!is_int($order)) { |
|
| 205 | 205 | $this->orderSaveAction($order, $sv + 1); |
| 206 | 206 | } else { |
| 207 | 207 | $this->orderSaveAction($sv, $order); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | { |
| 219 | 219 | $actions = $this->getOperationSetting('save_actions') ?? []; |
| 220 | 220 | |
| 221 | - uasort($actions, function ($a, $b) { |
|
| 221 | + uasort($actions, function($a, $b) { |
|
| 222 | 222 | return $a['order'] <=> $b['order']; |
| 223 | 223 | }); |
| 224 | 224 | |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - return array_filter($actions, function ($action) { |
|
| 243 | + return array_filter($actions, function($action) { |
|
| 244 | 244 | return $action['visible'] == true; |
| 245 | 245 | }, ARRAY_FILTER_USE_BOTH); |
| 246 | 246 | } |
@@ -304,8 +304,7 @@ discard block |
||
| 304 | 304 | */ |
| 305 | 305 | public function setSaveAction($forceSaveAction = null) |
| 306 | 306 | { |
| 307 | - $saveAction = $forceSaveAction ?: |
|
| 308 | - \Request::input('save_action', $this->getFallBackSaveAction()); |
|
| 307 | + $saveAction = $forceSaveAction ?: \Request::input('save_action', $this->getFallBackSaveAction()); |
|
| 309 | 308 | |
| 310 | 309 | $showBubble = $this->getOperationSetting('showSaveActionChange') ?? config('backpack.crud.operations.'.$this->getCurrentOperation().'.showSaveActionChange') ?? true; |
| 311 | 310 | |
@@ -373,20 +372,20 @@ discard block |
||
| 373 | 372 | $defaultSaveActions = [ |
| 374 | 373 | [ |
| 375 | 374 | 'name' => 'save_and_back', |
| 376 | - 'visible' => function ($crud) { |
|
| 375 | + 'visible' => function($crud) { |
|
| 377 | 376 | return $crud->hasAccess('list'); |
| 378 | 377 | }, |
| 379 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
| 378 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
| 380 | 379 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
| 381 | 380 | }, |
| 382 | 381 | 'button_text' => trans('backpack::crud.save_action_save_and_back'), |
| 383 | 382 | ], |
| 384 | 383 | [ |
| 385 | 384 | 'name' => 'save_and_edit', |
| 386 | - 'visible' => function ($crud) { |
|
| 385 | + 'visible' => function($crud) { |
|
| 387 | 386 | return $crud->hasAccess('update'); |
| 388 | 387 | }, |
| 389 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
| 388 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
| 390 | 389 | $itemId = $itemId ?: $request->input('id'); |
| 391 | 390 | $redirectUrl = $crud->route.'/'.$itemId.'/edit'; |
| 392 | 391 | if ($request->has('locale')) { |
@@ -398,17 +397,17 @@ discard block |
||
| 398 | 397 | |
| 399 | 398 | return $redirectUrl; |
| 400 | 399 | }, |
| 401 | - 'referrer_url' => function ($crud, $request, $itemId) { |
|
| 400 | + 'referrer_url' => function($crud, $request, $itemId) { |
|
| 402 | 401 | return url($crud->route.'/'.$itemId.'/edit'); |
| 403 | 402 | }, |
| 404 | 403 | 'button_text' => trans('backpack::crud.save_action_save_and_edit'), |
| 405 | 404 | ], |
| 406 | 405 | [ |
| 407 | 406 | 'name' => 'save_and_new', |
| 408 | - 'visible' => function ($crud) { |
|
| 407 | + 'visible' => function($crud) { |
|
| 409 | 408 | return $crud->hasAccess('create'); |
| 410 | 409 | }, |
| 411 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
| 410 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
| 412 | 411 | return $this->route.'/create'; |
| 413 | 412 | }, |
| 414 | 413 | 'button_text' => trans('backpack::crud.save_action_save_and_new'), |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | return; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - if (! $this->validCode(config('backpack.base.license_code'))) { |
|
| 31 | + if (!$this->validCode(config('backpack.base.license_code'))) { |
|
| 32 | 32 | \Alert::add('warning', "<strong>You're using unlicensed software.</strong> Please ask your web developer to <a target='_blank' class='alert-link text-white' href='http://backpackforlaravel.com'>purchase a license code</a> to hide this message."); |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -46,6 +46,6 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | private function validCode($j) |
| 48 | 48 | { |
| 49 | - $k = str_replace('-', '', $j); $s = substr($k, 0, 8); $c = substr($k, 8, 2); $a = substr($k, 10, 2); $l = substr($k, 12, 2); $p = substr($k, 14, 2); $n = substr($k, 16, 2); $m = substr($k, 18, 2); $z = substr($k, 20, 24); $w = 'ADEFHKLMVWXYZ146'; $x = $s; for ($i = 0; $i < strlen($w); $i++) { $r = $w[$i]; $x = str_replace($r, '-', $x); } $x = str_replace('-', '', $x); if ($x != '') { return false; } if (substr_count($j, '-') != 5) { return false; } $e = substr(hexdec(hash('crc32b', substr($k, 0, 20))), -4); if ($z !== $e) { return false; } $o = strrev(substr(preg_replace('/[0-9]+/', '', strtoupper(sha1($a.'sand('.$s.')'.$n.'tos()'))), 2, 2)); if ($m !== $o) { return false; } $o2 = substr(((int)preg_replace('/[^0-9]/','', $s.$c)==0 ? 8310 : (int)preg_replace('/[^0-9]/','', $s.$c) )*9971, -2);if ($a !== $o2) {return false;} return true; |
|
| 49 | + $k = str_replace('-', '', $j); $s = substr($k, 0, 8); $c = substr($k, 8, 2); $a = substr($k, 10, 2); $l = substr($k, 12, 2); $p = substr($k, 14, 2); $n = substr($k, 16, 2); $m = substr($k, 18, 2); $z = substr($k, 20, 24); $w = 'ADEFHKLMVWXYZ146'; $x = $s; for ($i = 0; $i < strlen($w); $i++) { $r = $w[$i]; $x = str_replace($r, '-', $x); } $x = str_replace('-', '', $x); if ($x != '') { return false; } if (substr_count($j, '-') != 5) { return false; } $e = substr(hexdec(hash('crc32b', substr($k, 0, 20))), -4); if ($z !== $e) { return false; } $o = strrev(substr(preg_replace('/[0-9]+/', '', strtoupper(sha1($a.'sand('.$s.')'.$n.'tos()'))), 2, 2)); if ($m !== $o) { return false; } $o2 = substr(((int) preg_replace('/[^0-9]/', '', $s.$c) == 0 ? 8310 : (int) preg_replace('/[^0-9]/', '', $s.$c)) * 9971, -2); if ($a !== $o2) {return false; } return true; |
|
| 50 | 50 | } |
| 51 | 51 | } |