@@ -31,8 +31,7 @@ |
||
| 31 | 31 | $result = self::where('name', $name)->first(); |
| 32 | 32 | if(!empty($result)){ |
| 33 | 33 | return $result->value; |
| 34 | - } |
|
| 35 | - else{ |
|
| 34 | + } else{ |
|
| 36 | 35 | return null; |
| 37 | 36 | } |
| 38 | 37 | } |
@@ -27,12 +27,12 @@ discard block |
||
| 27 | 27 | * @param $name |
| 28 | 28 | * @return |null |
| 29 | 29 | */ |
| 30 | - public static function getByName($name){ |
|
| 30 | + public static function getByName($name) { |
|
| 31 | 31 | $result = self::where('name', $name)->first(); |
| 32 | - if(!empty($result)){ |
|
| 32 | + if (!empty($result)) { |
|
| 33 | 33 | return $result->value; |
| 34 | 34 | } |
| 35 | - else{ |
|
| 35 | + else { |
|
| 36 | 36 | return null; |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | * |
| 62 | 62 | * @var array |
| 63 | 63 | */ |
| 64 | - protected $fillable = ['name', 'value', 'description']; |
|
| 64 | + protected $fillable = [ 'name', 'value', 'description' ]; |
|
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | 67 | * Columns to exclude from index |
| 68 | 68 | * |
| 69 | 69 | * @var array |
| 70 | 70 | */ |
| 71 | - protected $excludedFromIndex = []; |
|
| 71 | + protected $excludedFromIndex = [ ]; |
|
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | 74 | * Fields to search in fulltext mode |
@@ -202,8 +202,7 @@ discard block |
||
| 202 | 202 | if ($this->paginateRows == NULL) { |
| 203 | 203 | |
| 204 | 204 | return env('ADMIN_PAGINATE', 10); |
| 205 | - } |
|
| 206 | - else{ |
|
| 205 | + } else{ |
|
| 207 | 206 | |
| 208 | 207 | return $this->paginateRows; |
| 209 | 208 | } |
@@ -281,8 +280,7 @@ discard block |
||
| 281 | 280 | */ |
| 282 | 281 | if(method_exists($arResults, 'getMedia')){ |
| 283 | 282 | $media = $arResults->getMedia(); |
| 284 | - } |
|
| 285 | - else{ |
|
| 283 | + } else{ |
|
| 286 | 284 | $media = null; |
| 287 | 285 | } |
| 288 | 286 | |
@@ -292,8 +290,7 @@ discard block |
||
| 292 | 290 | */ |
| 293 | 291 | if(empty($this->customView['index']) == TRUE){ |
| 294 | 292 | $view = $this->moduleBasicTemplatePath . '.index'; |
| 295 | - } |
|
| 296 | - else{ |
|
| 293 | + } else{ |
|
| 297 | 294 | $view = $this->customView; |
| 298 | 295 | } |
| 299 | 296 | |
@@ -315,8 +312,7 @@ discard block |
||
| 315 | 312 | */ |
| 316 | 313 | if(empty($this->customView['index']) == TRUE){ |
| 317 | 314 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
| 318 | - } |
|
| 319 | - else{ |
|
| 315 | + } else{ |
|
| 320 | 316 | $view = $this->customView; |
| 321 | 317 | } |
| 322 | 318 | |
@@ -365,16 +361,14 @@ discard block |
||
| 365 | 361 | if(in_array($name, $this->dateTimeLocalFields)){ |
| 366 | 362 | |
| 367 | 363 | $object->{$name} = str_replace('T', ' ', $request->input($name)). ':00'; |
| 368 | - } |
|
| 369 | - else { |
|
| 364 | + } else { |
|
| 370 | 365 | |
| 371 | 366 | /** |
| 372 | 367 | * Change to null if needed |
| 373 | 368 | */ |
| 374 | 369 | if(strlen($request->$name) < 1){ |
| 375 | 370 | $object->{$name} = null; |
| 376 | - } |
|
| 377 | - else { |
|
| 371 | + } else { |
|
| 378 | 372 | $object->{$name} = $request->input($name); |
| 379 | 373 | } |
| 380 | 374 | } |
@@ -407,8 +401,7 @@ discard block |
||
| 407 | 401 | */ |
| 408 | 402 | if(!empty($request->custom_route)){ |
| 409 | 403 | return redirect($request->custom_route); |
| 410 | - } |
|
| 411 | - else { |
|
| 404 | + } else { |
|
| 412 | 405 | return redirect(route($this->moduleBasicRoute . '.index')); |
| 413 | 406 | } |
| 414 | 407 | } |
@@ -447,8 +440,7 @@ discard block |
||
| 447 | 440 | */ |
| 448 | 441 | if(empty($this->customView['index']) == TRUE){ |
| 449 | 442 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
| 450 | - } |
|
| 451 | - else{ |
|
| 443 | + } else{ |
|
| 452 | 444 | $view = $this->customView; |
| 453 | 445 | } |
| 454 | 446 | |
@@ -525,8 +517,7 @@ discard block |
||
| 525 | 517 | */ |
| 526 | 518 | if(in_array($name, $this->binaryFields)){ |
| 527 | 519 | |
| 528 | - } |
|
| 529 | - else{ |
|
| 520 | + } else{ |
|
| 530 | 521 | |
| 531 | 522 | /** |
| 532 | 523 | * Empty exception |
@@ -539,13 +530,10 @@ discard block |
||
| 539 | 530 | if(in_array($name, $this->dateTimeLocalFields)){ |
| 540 | 531 | |
| 541 | 532 | $arResults->$name = str_replace('T', ' ', $request->input($name)). ':00'; |
| 542 | - } |
|
| 543 | - else { |
|
| 533 | + } else { |
|
| 544 | 534 | $arResults->$name = $request->input($name); |
| 545 | 535 | } |
| 546 | - } |
|
| 547 | - |
|
| 548 | - else{ |
|
| 536 | + } else{ |
|
| 549 | 537 | |
| 550 | 538 | /** |
| 551 | 539 | * Numeric zero ? |
@@ -553,9 +541,7 @@ discard block |
||
| 553 | 541 | if(isset($request->$name) && is_numeric($request->input($name)) == TRUE){ |
| 554 | 542 | |
| 555 | 543 | $arResults->$name = $request->input($name); |
| 556 | - } |
|
| 557 | - |
|
| 558 | - else{ |
|
| 544 | + } else{ |
|
| 559 | 545 | $arResults->$name = NULL; |
| 560 | 546 | } |
| 561 | 547 | } |
@@ -580,8 +566,7 @@ discard block |
||
| 580 | 566 | |
| 581 | 567 | if (empty($request->$value) == FALSE) { |
| 582 | 568 | $arResults->$value = $request->$value; |
| 583 | - } |
|
| 584 | - else{ |
|
| 569 | + } else{ |
|
| 585 | 570 | $arResults->$value = NULL; |
| 586 | 571 | } |
| 587 | 572 | } |
@@ -602,8 +587,7 @@ discard block |
||
| 602 | 587 | */ |
| 603 | 588 | if(!empty($request->custom_route)){ |
| 604 | 589 | return redirect($request->custom_route); |
| 605 | - } |
|
| 606 | - else { |
|
| 590 | + } else { |
|
| 607 | 591 | return redirect(route($this->moduleBasicRoute . '.index')); |
| 608 | 592 | } |
| 609 | 593 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | use App\Transaction; |
| 26 | 26 | use App\User; |
| 27 | 27 | |
| 28 | -class AdminModuleController extends Controller{ |
|
| 28 | +class AdminModuleController extends Controller { |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Module name |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * Module name for blade |
| 145 | 145 | */ |
| 146 | 146 | $temp = explode('.', $this->moduleBasicRoute); |
| 147 | - View::share('moduleNameBlade', strtolower($temp[0] . "_module_" . $temp[1])); |
|
| 147 | + View::share('moduleNameBlade', strtolower($temp[ 0 ] . "_module_" . $temp[ 1 ])); |
|
| 148 | 148 | |
| 149 | 149 | } |
| 150 | 150 | |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * |
| 154 | 154 | * @param $request |
| 155 | 155 | */ |
| 156 | - protected function afterStore($request, $model){ |
|
| 156 | + protected function afterStore($request, $model) { |
|
| 157 | 157 | |
| 158 | 158 | } |
| 159 | 159 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | * |
| 163 | 163 | * @param $request |
| 164 | 164 | */ |
| 165 | - protected function afterUpdate($request, $model){ |
|
| 165 | + protected function afterUpdate($request, $model) { |
|
| 166 | 166 | |
| 167 | 167 | } |
| 168 | 168 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | * @param $amount |
| 176 | 176 | */ |
| 177 | 177 | protected function _saveTransation($status_id = 1, $user_id, $amount, |
| 178 | - $campaign_id = null, $payment_id = null, $recommendation_id = null){ |
|
| 178 | + $campaign_id = null, $payment_id = null, $recommendation_id = null) { |
|
| 179 | 179 | |
| 180 | 180 | /** |
| 181 | 181 | * Save transaction |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | * @param boolean $update |
| 206 | 206 | * @return boolean |
| 207 | 207 | */ |
| 208 | - public function saveMediaToStorage($object, $request, $update = FALSE){ |
|
| 208 | + public function saveMediaToStorage($object, $request, $update = FALSE) { |
|
| 209 | 209 | |
| 210 | 210 | return FALSE; |
| 211 | 211 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | return env('ADMIN_PAGINATE', 10); |
| 223 | 223 | } |
| 224 | - else{ |
|
| 224 | + else { |
|
| 225 | 225 | |
| 226 | 226 | return $this->paginateRows; |
| 227 | 227 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @param object $object |
| 234 | 234 | * @param Request $request |
| 235 | 235 | */ |
| 236 | - public function associateRelationships($object, Request $request){ |
|
| 236 | + public function associateRelationships($object, Request $request) { |
|
| 237 | 237 | |
| 238 | 238 | } |
| 239 | 239 | |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | * @param object $object |
| 244 | 244 | * @param Request $request |
| 245 | 245 | */ |
| 246 | - public function associateRelationshipsWithID($object, Request $request){ |
|
| 246 | + public function associateRelationshipsWithID($object, Request $request) { |
|
| 247 | 247 | |
| 248 | 248 | } |
| 249 | 249 | |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | * |
| 253 | 253 | * @param object $object |
| 254 | 254 | */ |
| 255 | - public function resetCache($object){ |
|
| 255 | + public function resetCache($object) { |
|
| 256 | 256 | |
| 257 | 257 | } |
| 258 | 258 | |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | * @param $arResult |
| 263 | 263 | * @return mixed |
| 264 | 264 | */ |
| 265 | - public function changeEditResultField($arResult){ |
|
| 265 | + public function changeEditResultField($arResult) { |
|
| 266 | 266 | return $arResult; |
| 267 | 267 | } |
| 268 | 268 | |
@@ -297,10 +297,10 @@ discard block |
||
| 297 | 297 | /** |
| 298 | 298 | * Get media |
| 299 | 299 | */ |
| 300 | - if(method_exists($arResults, 'getMedia')){ |
|
| 300 | + if (method_exists($arResults, 'getMedia')) { |
|
| 301 | 301 | $media = $arResults->getMedia(); |
| 302 | 302 | } |
| 303 | - else{ |
|
| 303 | + else { |
|
| 304 | 304 | $media = null; |
| 305 | 305 | } |
| 306 | 306 | |
@@ -308,17 +308,17 @@ discard block |
||
| 308 | 308 | /** |
| 309 | 309 | * Choose the view |
| 310 | 310 | */ |
| 311 | - if(empty($this->customView['index']) == TRUE){ |
|
| 311 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
| 312 | 312 | $view = $this->moduleBasicTemplatePath . '.index'; |
| 313 | 313 | } |
| 314 | - else{ |
|
| 314 | + else { |
|
| 315 | 315 | $view = $this->customView; |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | /** |
| 319 | 319 | * Return page |
| 320 | 320 | */ |
| 321 | - return view($view, ['results' => $arResults, 'media' => $media]); |
|
| 321 | + return view($view, [ 'results' => $arResults, 'media' => $media ]); |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
@@ -331,10 +331,10 @@ discard block |
||
| 331 | 331 | /** |
| 332 | 332 | * Choose the view |
| 333 | 333 | */ |
| 334 | - if(empty($this->customView['index']) == TRUE){ |
|
| 334 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
| 335 | 335 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
| 336 | 336 | } |
| 337 | - else{ |
|
| 337 | + else { |
|
| 338 | 338 | $view = $this->customView; |
| 339 | 339 | } |
| 340 | 340 | |
@@ -356,8 +356,8 @@ discard block |
||
| 356 | 356 | * Change the validation array |
| 357 | 357 | */ |
| 358 | 358 | foreach ($this->arValidationArray as $name => $value) { |
| 359 | - if(strpos($this->arValidationArray[$name], 'unique') > 0){ |
|
| 360 | - $this->arValidationArray[$name] = $value . ',NULL,id,deleted_at,NULL'; |
|
| 359 | + if (strpos($this->arValidationArray[ $name ], 'unique') > 0) { |
|
| 360 | + $this->arValidationArray[ $name ] = $value . ',NULL,id,deleted_at,NULL'; |
|
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | |
@@ -380,16 +380,16 @@ discard block |
||
| 380 | 380 | /** |
| 381 | 381 | * Datetime |
| 382 | 382 | */ |
| 383 | - if(in_array($name, $this->dateTimeLocalFields)){ |
|
| 383 | + if (in_array($name, $this->dateTimeLocalFields)) { |
|
| 384 | 384 | |
| 385 | - $object->{$name} = str_replace('T', ' ', $request->input($name)). ':00'; |
|
| 385 | + $object->{$name} = str_replace('T', ' ', $request->input($name)) . ':00'; |
|
| 386 | 386 | } |
| 387 | 387 | else { |
| 388 | 388 | |
| 389 | 389 | /** |
| 390 | 390 | * Change to null if needed |
| 391 | 391 | */ |
| 392 | - if(strlen($request->$name) < 1){ |
|
| 392 | + if (strlen($request->$name) < 1) { |
|
| 393 | 393 | $object->{$name} = null; |
| 394 | 394 | } |
| 395 | 395 | else { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | /** |
| 429 | 429 | * Redirect to index |
| 430 | 430 | */ |
| 431 | - if(!empty($request->custom_route)){ |
|
| 431 | + if (!empty($request->custom_route)) { |
|
| 432 | 432 | return redirect($request->custom_route); |
| 433 | 433 | } |
| 434 | 434 | else { |
@@ -457,21 +457,21 @@ discard block |
||
| 457 | 457 | */ |
| 458 | 458 | if (empty($arResults)) { |
| 459 | 459 | |
| 460 | - return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors(['edit' => trans('validation.row_not_exist')]); |
|
| 460 | + return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors([ 'edit' => trans('validation.row_not_exist') ]); |
|
| 461 | 461 | } |
| 462 | 462 | |
| 463 | 463 | /** |
| 464 | 464 | * Set the put method for update |
| 465 | 465 | */ |
| 466 | - $arResults['_method'] = 'PUT'; |
|
| 466 | + $arResults[ '_method' ] = 'PUT'; |
|
| 467 | 467 | |
| 468 | 468 | /** |
| 469 | 469 | * Choose the view |
| 470 | 470 | */ |
| 471 | - if(empty($this->customView['index']) == TRUE){ |
|
| 471 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
| 472 | 472 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
| 473 | 473 | } |
| 474 | - else{ |
|
| 474 | + else { |
|
| 475 | 475 | $view = $this->customView; |
| 476 | 476 | } |
| 477 | 477 | |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | /** |
| 481 | 481 | * Return page |
| 482 | 482 | */ |
| 483 | - return view($view, ['results' => $arResults]); |
|
| 483 | + return view($view, [ 'results' => $arResults ]); |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | /** |
@@ -508,8 +508,8 @@ discard block |
||
| 508 | 508 | */ |
| 509 | 509 | foreach ($this->arValidationArray as $name => $value) { |
| 510 | 510 | |
| 511 | - if(strpos($this->arValidationArray[$name], 'unique') > 0){ |
|
| 512 | - $this->arValidationArray[$name] = $value . ','.$id.',id,deleted_at,NULL'; |
|
| 511 | + if (strpos($this->arValidationArray[ $name ], 'unique') > 0) { |
|
| 512 | + $this->arValidationArray[ $name ] = $value . ',' . $id . ',id,deleted_at,NULL'; |
|
| 513 | 513 | } |
| 514 | 514 | } |
| 515 | 515 | |
@@ -529,7 +529,7 @@ discard block |
||
| 529 | 529 | */ |
| 530 | 530 | if ($arResults == FALSE) { |
| 531 | 531 | |
| 532 | - return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors(['edit' => trans('validation.row_not_exist')]); |
|
| 532 | + return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors([ 'edit' => trans('validation.row_not_exist') ]); |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | /** |
@@ -546,10 +546,10 @@ discard block |
||
| 546 | 546 | * Binary fields will not be updated if empty |
| 547 | 547 | * |
| 548 | 548 | */ |
| 549 | - if(in_array($name, $this->binaryFields)){ |
|
| 549 | + if (in_array($name, $this->binaryFields)) { |
|
| 550 | 550 | |
| 551 | 551 | } |
| 552 | - else{ |
|
| 552 | + else { |
|
| 553 | 553 | |
| 554 | 554 | /** |
| 555 | 555 | * Empty exception |
@@ -559,26 +559,26 @@ discard block |
||
| 559 | 559 | /** |
| 560 | 560 | * Datetime |
| 561 | 561 | */ |
| 562 | - if(in_array($name, $this->dateTimeLocalFields)){ |
|
| 562 | + if (in_array($name, $this->dateTimeLocalFields)) { |
|
| 563 | 563 | |
| 564 | - $arResults->$name = str_replace('T', ' ', $request->input($name)). ':00'; |
|
| 564 | + $arResults->$name = str_replace('T', ' ', $request->input($name)) . ':00'; |
|
| 565 | 565 | } |
| 566 | 566 | else { |
| 567 | 567 | $arResults->$name = $request->input($name); |
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | |
| 571 | - else{ |
|
| 571 | + else { |
|
| 572 | 572 | |
| 573 | 573 | /** |
| 574 | 574 | * Numeric zero ? |
| 575 | 575 | */ |
| 576 | - if(isset($request->$name) && is_numeric($request->input($name)) == TRUE){ |
|
| 576 | + if (isset($request->$name) && is_numeric($request->input($name)) == TRUE) { |
|
| 577 | 577 | |
| 578 | 578 | $arResults->$name = $request->input($name); |
| 579 | 579 | } |
| 580 | 580 | |
| 581 | - else{ |
|
| 581 | + else { |
|
| 582 | 582 | $arResults->$name = NULL; |
| 583 | 583 | } |
| 584 | 584 | } |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | /** |
| 597 | 597 | * Save media to storage |
| 598 | 598 | */ |
| 599 | - if($this->saveMediaToStorage($arResults, $request, TRUE) == TRUE){ |
|
| 599 | + if ($this->saveMediaToStorage($arResults, $request, TRUE) == TRUE) { |
|
| 600 | 600 | |
| 601 | 601 | // Update binary fields |
| 602 | 602 | foreach ($this->binaryFields as $name => $value) { |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | if (empty($request->$value) == FALSE) { |
| 605 | 605 | $arResults->$value = $request->$value; |
| 606 | 606 | } |
| 607 | - else{ |
|
| 607 | + else { |
|
| 608 | 608 | $arResults->$value = NULL; |
| 609 | 609 | } |
| 610 | 610 | } |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | /** |
| 629 | 629 | * Redirect to index |
| 630 | 630 | */ |
| 631 | - if(!empty($request->custom_route)){ |
|
| 631 | + if (!empty($request->custom_route)) { |
|
| 632 | 632 | return redirect($request->custom_route); |
| 633 | 633 | } |
| 634 | 634 | else { |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | public function boot() |
| 16 | 16 | { |
| 17 | 17 | // |
| 18 | - require_once app_path().'/Http/Helpers.php'; |
|
| 18 | + require_once app_path() . '/Http/Helpers.php'; |
|
| 19 | 19 | Paginator::useBootstrap(); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | |
| 41 | 41 | 'api' => [ |
| 42 | 42 | // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, |
| 43 | - \Illuminate\Routing\Middleware\ThrottleRequests::class.':api', |
|
| 43 | + \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api', |
|
| 44 | 44 | \Illuminate\Routing\Middleware\SubstituteBindings::class, |
| 45 | 45 | ], |
| 46 | 46 | ]; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | * @var array |
| 15 | 15 | */ |
| 16 | 16 | protected $middleware = [ |
| 17 | - \App\Http\Middleware\TrustProxies::class, |
|
| 17 | + \App\Http\Middleware\TrustProxies::class, |
|
| 18 | 18 | \Illuminate\Http\Middleware\HandleCors::class, |
| 19 | 19 | \App\Http\Middleware\PreventRequestsDuringMaintenance::class, |
| 20 | 20 | \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected $middlewareGroups = [ |
| 31 | 31 | 'web' => [ |
| 32 | - \App\Http\Middleware\EncryptCookies::class, |
|
| 32 | + \App\Http\Middleware\EncryptCookies::class, |
|
| 33 | 33 | \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, |
| 34 | 34 | \Illuminate\Session\Middleware\StartSession::class, |
| 35 | 35 | \Illuminate\View\Middleware\ShareErrorsFromSession::class, |
| 36 | 36 | \App\Http\Middleware\VerifyCsrfToken::class, |
| 37 | 37 | \Illuminate\Routing\Middleware\SubstituteBindings::class, |
| 38 | - //\App\Http\Middleware\RedirectToHttps::class, |
|
| 38 | + //\App\Http\Middleware\RedirectToHttps::class, |
|
| 39 | 39 | ], |
| 40 | 40 | |
| 41 | 41 | 'api' => [ |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * @var array |
| 54 | 54 | */ |
| 55 | 55 | protected $routeMiddleware = [ |
| 56 | - 'auth' => \App\Http\Middleware\Authenticate::class, |
|
| 56 | + 'auth' => \App\Http\Middleware\Authenticate::class, |
|
| 57 | 57 | 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, |
| 58 | 58 | 'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class, |
| 59 | 59 | 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @var array |
| 48 | 48 | */ |
| 49 | - protected $fillable = ['name', 'description', 'color']; |
|
| 49 | + protected $fillable = [ 'name', 'description', 'color' ]; |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Columns to exclude from index |
| 53 | 53 | * |
| 54 | 54 | * @var array |
| 55 | 55 | */ |
| 56 | - protected $excludedFromIndex = []; |
|
| 56 | + protected $excludedFromIndex = [ ]; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Fields to search in fulltext mode |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return object |
| 90 | 90 | */ |
| 91 | - public function images(){ |
|
| 91 | + public function images() { |
|
| 92 | 92 | |
| 93 | 93 | return $this->hasMany('App\Image', 'imagecategory_id'); |
| 94 | 94 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @param query $query@ |
| 100 | 100 | * @return query |
| 101 | 101 | */ |
| 102 | - public function scopeRelationships($query){ |
|
| 102 | + public function scopeRelationships($query) { |
|
| 103 | 103 | |
| 104 | 104 | return $query->with('images'); |
| 105 | 105 | } |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @var array |
| 48 | 48 | */ |
| 49 | - protected $fillable = ['name', 'description', 'color']; |
|
| 49 | + protected $fillable = [ 'name', 'description', 'color' ]; |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Columns to exclude from index |
| 53 | 53 | * |
| 54 | 54 | * @var array |
| 55 | 55 | */ |
| 56 | - protected $excludedFromIndex = []; |
|
| 56 | + protected $excludedFromIndex = [ ]; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Fields to search in fulltext mode |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return object |
| 90 | 90 | */ |
| 91 | - public function adverts(){ |
|
| 91 | + public function adverts() { |
|
| 92 | 92 | |
| 93 | 93 | return $this->belongsToMany('App\Advert', 'advert_advertlocation', 'advert_id', 'advertlocation_id'); |
| 94 | 94 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @param type $query |
| 100 | 100 | * @return object |
| 101 | 101 | */ |
| 102 | - public function scopeRelationships($query){ |
|
| 102 | + public function scopeRelationships($query) { |
|
| 103 | 103 | |
| 104 | 104 | return $query->with('adverts'); |
| 105 | 105 | } |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @var array |
| 48 | 48 | */ |
| 49 | - protected $fillable = ['name', 'color']; |
|
| 49 | + protected $fillable = [ 'name', 'color' ]; |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Columns to exclude from index |
| 53 | 53 | * |
| 54 | 54 | * @var array |
| 55 | 55 | */ |
| 56 | - protected $excludedFromIndex = []; |
|
| 56 | + protected $excludedFromIndex = [ ]; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Fields to search in fulltext mode |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * |
| 85 | 85 | * @return object |
| 86 | 86 | */ |
| 87 | - public function comments(){ |
|
| 87 | + public function comments() { |
|
| 88 | 88 | |
| 89 | 89 | return $this->hasMany('App\Comment', 'commentstatus_id'); |
| 90 | 90 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @param query $query |
| 96 | 96 | * @return query |
| 97 | 97 | */ |
| 98 | - public function scopeRelationships($query){ |
|
| 98 | + public function scopeRelationships($query) { |
|
| 99 | 99 | |
| 100 | 100 | return $query->with('comments'); |
| 101 | 101 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @var array |
| 46 | 46 | */ |
| 47 | - protected $fillable = ['name']; |
|
| 47 | + protected $fillable = [ 'name' ]; |
|
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * Fields to search in fulltext mode |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * @return object |
| 76 | 76 | */ |
| 77 | - public function users(){ |
|
| 77 | + public function users() { |
|
| 78 | 78 | |
| 79 | 79 | return $this->hasMany('App\User', 'usergroup_id'); |
| 80 | 80 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * @param query $query |
| 86 | 86 | * @return query |
| 87 | 87 | */ |
| 88 | - public function scopeRelationships($query){ |
|
| 88 | + public function scopeRelationships($query) { |
|
| 89 | 89 | |
| 90 | 90 | return $query->with('users'); |
| 91 | 91 | } |
@@ -45,15 +45,15 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @var array |
| 47 | 47 | */ |
| 48 | - protected $fillable = ['name', 'author_name', 'meta_title', 'meta_description', |
|
| 49 | - 'meta_keywords', 'text', 'url', 'image_id', 'user_id', 'published_at']; |
|
| 48 | + protected $fillable = [ 'name', 'author_name', 'meta_title', 'meta_description', |
|
| 49 | + 'meta_keywords', 'text', 'url', 'image_id', 'user_id', 'published_at' ]; |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * Columns to exclude from index |
| 53 | 53 | * |
| 54 | 54 | * @var array |
| 55 | 55 | */ |
| 56 | - protected $excludedFromIndex = []; |
|
| 56 | + protected $excludedFromIndex = [ ]; |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * Fields to search in fulltext mode |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * |
| 89 | 89 | * @return object |
| 90 | 90 | */ |
| 91 | - public function images(){ |
|
| 91 | + public function images() { |
|
| 92 | 92 | |
| 93 | 93 | return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', |
| 94 | 94 | 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * |
| 102 | 102 | * @return object |
| 103 | 103 | */ |
| 104 | - public function pagecategories(){ |
|
| 104 | + public function pagecategories() { |
|
| 105 | 105 | |
| 106 | 106 | return $this->belongsToMany('App\PageCategory', 'page_pagecategory', 'page_id', 'pagecategory_id'); |
| 107 | 107 | } |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * |
| 112 | 112 | * @return object |
| 113 | 113 | */ |
| 114 | - public function comments(){ |
|
| 114 | + public function comments() { |
|
| 115 | 115 | |
| 116 | 116 | return $this->hasMany('App\Comment', 'page_id'); |
| 117 | 117 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * |
| 122 | 122 | * @return object |
| 123 | 123 | */ |
| 124 | - public function users(){ |
|
| 124 | + public function users() { |
|
| 125 | 125 | |
| 126 | 126 | return $this->belongsTo('App\User', 'user_id'); |
| 127 | 127 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | * @param query $query |
| 133 | 133 | * @return query |
| 134 | 134 | */ |
| 135 | - public function scopeRelationships($query){ |
|
| 135 | + public function scopeRelationships($query) { |
|
| 136 | 136 | |
| 137 | 137 | return $query->with('images', 'images.imagecategories', 'pagecategories', 'users'); |
| 138 | 138 | } |