@@ -41,7 +41,7 @@ |
||
41 | 41 | public function __construct() |
42 | 42 | { |
43 | 43 | if ($config = config()->loadFile('database', true)) { |
44 | - if ( ! empty($config[ 'default' ][ 'hostname' ]) AND ! empty($config[ 'default' ][ 'username' ])) { |
|
44 | + if ( ! empty($config['default']['hostname']) AND ! empty($config['default']['username'])) { |
|
45 | 45 | |
46 | 46 | if (profiler() !== false) { |
47 | 47 | profiler()->watch('Starting Database Service'); |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function offsetExists($offset) |
105 | 105 | { |
106 | - return isset($GLOBALS[ $offset ]); |
|
106 | + return isset($GLOBALS[$offset]); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | // ------------------------------------------------------------------------ |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function &__get($offset) |
122 | 122 | { |
123 | - return $GLOBALS[ $offset ]; |
|
123 | + return $GLOBALS[$offset]; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | // ------------------------------------------------------------------------ |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function offsetSet($offset, $value) |
180 | 180 | { |
181 | - $GLOBALS[ $offset ] = $value; |
|
181 | + $GLOBALS[$offset] = $value; |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | // ------------------------------------------------------------------------ |
@@ -233,8 +233,8 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function offsetUnset($offset) |
235 | 235 | { |
236 | - if (isset($GLOBALS[ $offset ])) { |
|
237 | - unset($GLOBALS[ $offset ]); |
|
236 | + if (isset($GLOBALS[$offset])) { |
|
237 | + unset($GLOBALS[$offset]); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | |
@@ -435,6 +435,6 @@ discard block |
||
435 | 435 | */ |
436 | 436 | public function offsetGet($offset) |
437 | 437 | { |
438 | - return (isset($GLOBALS[ $offset ])) ? $GLOBALS[ $offset ] : false; |
|
438 | + return (isset($GLOBALS[$offset])) ? $GLOBALS[$offset] : false; |
|
439 | 439 | } |
440 | 440 | } |
441 | 441 | \ No newline at end of file |
@@ -45,7 +45,7 @@ |
||
45 | 45 | PATH_APP . 'Config' . DIRECTORY_SEPARATOR, |
46 | 46 | ]; |
47 | 47 | |
48 | - if(null !== o2system()->modules) { |
|
48 | + if (null !== o2system()->modules) { |
|
49 | 49 | $configDirs = modules()->getDirs('Config', true); |
50 | 50 | } |
51 | 51 |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function offsetExists($offset) |
105 | 105 | { |
106 | - return isset($_ENV[ $offset ]); |
|
106 | + return isset($_ENV[$offset]); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | // ------------------------------------------------------------------------ |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function &__get($offset) |
122 | 122 | { |
123 | - return $_ENV[ $offset ]; |
|
123 | + return $_ENV[$offset]; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | // ------------------------------------------------------------------------ |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function offsetSet($offset, $value) |
180 | 180 | { |
181 | - $_ENV[ $offset ] = $value; |
|
181 | + $_ENV[$offset] = $value; |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | // ------------------------------------------------------------------------ |
@@ -233,8 +233,8 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function offsetUnset($offset) |
235 | 235 | { |
236 | - if (isset($_ENV[ $offset ])) { |
|
237 | - unset($_ENV[ $offset ]); |
|
236 | + if (isset($_ENV[$offset])) { |
|
237 | + unset($_ENV[$offset]); |
|
238 | 238 | } |
239 | 239 | } |
240 | 240 | |
@@ -435,6 +435,6 @@ discard block |
||
435 | 435 | */ |
436 | 436 | public function offsetGet($offset) |
437 | 437 | { |
438 | - return (isset($_ENV[ $offset ])) ? $_ENV[ $offset ] : false; |
|
438 | + return (isset($_ENV[$offset])) ? $_ENV[$offset] : false; |
|
439 | 439 | } |
440 | 440 | } |
441 | 441 | \ No newline at end of file |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | { |
227 | 227 | $this->config = array_merge($this->config, $config); |
228 | 228 | |
229 | - if ($this->config[ 'responsive' ]) { |
|
229 | + if ($this->config['responsive']) { |
|
230 | 230 | $this->responsive(); |
231 | 231 | } |
232 | 232 | |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | |
283 | 283 | foreach ($columns as $key => $column) { |
284 | 284 | $column = array_merge($defaultColumn, $column); |
285 | - $this->columns[ $key ] = $column; |
|
285 | + $this->columns[$key] = $column; |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | $this->setAppendColumns(); |
@@ -357,8 +357,8 @@ discard block |
||
357 | 357 | ]; |
358 | 358 | |
359 | 359 | foreach ($prependColumns as $key => $column) { |
360 | - if ($this->config[ $key ] === true) { |
|
361 | - $this->columns[ $key ] = $column; |
|
360 | + if ($this->config[$key] === true) { |
|
361 | + $this->columns[$key] = $column; |
|
362 | 362 | } |
363 | 363 | } |
364 | 364 | } |
@@ -435,8 +435,8 @@ discard block |
||
435 | 435 | ]; |
436 | 436 | |
437 | 437 | foreach ($appendColumns as $key => $column) { |
438 | - if ($this->config[ $key ] === true) { |
|
439 | - $this->columns[ $key ] = $column; |
|
438 | + if ($this->config[$key] === true) { |
|
439 | + $this->columns[$key] = $column; |
|
440 | 440 | } |
441 | 441 | } |
442 | 442 | } |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | */ |
499 | 499 | public function render() |
500 | 500 | { |
501 | - if ($this->config[ 'ordering' ]) { |
|
501 | + if ($this->config['ordering']) { |
|
502 | 502 | $this->attributes->addAttributeClass('table-ordering'); |
503 | 503 | } |
504 | 504 | |
@@ -509,15 +509,15 @@ discard block |
||
509 | 509 | |
510 | 510 | $th = $tr->createColumn('th'); |
511 | 511 | |
512 | - $column[ 'attr' ][ 'data-column' ] = $key; |
|
512 | + $column['attr']['data-column'] = $key; |
|
513 | 513 | |
514 | - foreach ($column[ 'attr' ] as $name => $value) { |
|
514 | + foreach ($column['attr'] as $name => $value) { |
|
515 | 515 | if ( ! empty($value)) { |
516 | 516 | $th->attributes->addAttribute($name, $value); |
517 | 517 | } |
518 | 518 | } |
519 | 519 | |
520 | - if ($column[ 'sorting' ] === true) { |
|
520 | + if ($column['sorting'] === true) { |
|
521 | 521 | $icon = new Ui\Contents\Icon('fa fa-sort'); |
522 | 522 | $icon->attributes->addAttributeClass(['text-muted', 'float-right', 'mt-1']); |
523 | 523 | |
@@ -526,11 +526,11 @@ discard block |
||
526 | 526 | $th->childNodes->push($icon); |
527 | 527 | } |
528 | 528 | |
529 | - if ($column[ 'show' ] === false) { |
|
529 | + if ($column['show'] === false) { |
|
530 | 530 | $th->attributes->addAttributeClass('hidden'); |
531 | 531 | } |
532 | 532 | |
533 | - $th->textContent->push(language()->getLine($column[ 'label' ])); |
|
533 | + $th->textContent->push(language()->getLine($column['label'])); |
|
534 | 534 | } |
535 | 535 | |
536 | 536 | // Render tbody |
@@ -538,8 +538,8 @@ discard block |
||
538 | 538 | $totalEntries = $this->rows->count(); |
539 | 539 | $totalRows = $this->rows->countAll(); |
540 | 540 | $currentPage = input()->get('page') ? input()->get('page') : 1; |
541 | - $startNumber = $currentPage == 1 ? 1 : $currentPage * $this->config[ 'entries' ][ 'minimum' ]; |
|
542 | - $totalPages = round($totalRows / $this->config[ 'entries' ][ 'minimum' ]); |
|
541 | + $startNumber = $currentPage == 1 ? 1 : $currentPage * $this->config['entries']['minimum']; |
|
542 | + $totalPages = round($totalRows / $this->config['entries']['minimum']); |
|
543 | 543 | $totalPages = $totalPages == 0 && $totalRows > 0 ? 1 : $totalPages; |
544 | 544 | |
545 | 545 | $i = $startNumber; |
@@ -550,18 +550,18 @@ discard block |
||
550 | 550 | |
551 | 551 | foreach ($this->columns as $key => $column) { |
552 | 552 | |
553 | - $column[ 'key' ] = $key; |
|
553 | + $column['key'] = $key; |
|
554 | 554 | $td = $tr->createColumn(); |
555 | 555 | |
556 | - $column[ 'attr' ][ 'data-column' ] = $key; |
|
556 | + $column['attr']['data-column'] = $key; |
|
557 | 557 | |
558 | - foreach ($column[ 'attr' ] as $name => $value) { |
|
558 | + foreach ($column['attr'] as $name => $value) { |
|
559 | 559 | if ( ! empty($value)) { |
560 | 560 | $td->attributes->addAttribute($name, $value); |
561 | 561 | } |
562 | 562 | } |
563 | 563 | |
564 | - if ($column[ 'show' ] === false) { |
|
564 | + if ($column['show'] === false) { |
|
565 | 565 | $td->attributes->addAttributeClass('hidden'); |
566 | 566 | } |
567 | 567 | |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | $totalPages = 0; |
581 | 581 | } |
582 | 582 | |
583 | - $showEntries = input()->get('entries') ? input()->get('entries') : $this->config[ 'entries' ][ 'minimum' ]; |
|
583 | + $showEntries = input()->get('entries') ? input()->get('entries') : $this->config['entries']['minimum']; |
|
584 | 584 | |
585 | 585 | // Build table card |
586 | 586 | $card = new Ui\Components\Card(); |
@@ -593,33 +593,33 @@ discard block |
||
593 | 593 | |
594 | 594 | $buttons = new Ui\Components\Buttons\Group(); |
595 | 595 | foreach ($this->tools as $key => $tool) { |
596 | - if ($tool[ 'show' ] === false) { |
|
596 | + if ($tool['show'] === false) { |
|
597 | 597 | continue; |
598 | 598 | } |
599 | 599 | |
600 | - if ($tool[ 'label' ] === true) { |
|
600 | + if ($tool['label'] === true) { |
|
601 | 601 | $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
602 | - if ( ! empty($tool[ 'icon' ])) { |
|
603 | - $button->setIcon($tool[ 'icon' ]); |
|
602 | + if ( ! empty($tool['icon'])) { |
|
603 | + $button->setIcon($tool['icon']); |
|
604 | 604 | } |
605 | 605 | } else { |
606 | - $button = $buttons->createButton(new Ui\Contents\Icon($tool[ 'icon' ])); |
|
606 | + $button = $buttons->createButton(new Ui\Contents\Icon($tool['icon'])); |
|
607 | 607 | $button->attributes->addAttribute('data-toggle', 'tooltip'); |
608 | 608 | $button->attributes->addAttribute('title', |
609 | 609 | language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
610 | 610 | } |
611 | 611 | |
612 | - if ( ! empty($tool[ 'href' ])) { |
|
613 | - $tool[ 'data-url' ] = $tool[ 'href' ]; |
|
612 | + if ( ! empty($tool['href'])) { |
|
613 | + $tool['data-url'] = $tool['href']; |
|
614 | 614 | } |
615 | 615 | |
616 | - if (isset($tool[ 'attr' ])) { |
|
617 | - foreach ($tool[ 'attr' ] as $name => $value) { |
|
616 | + if (isset($tool['attr'])) { |
|
617 | + foreach ($tool['attr'] as $name => $value) { |
|
618 | 618 | $button->attributes->addAttribute($name, $value); |
619 | 619 | } |
620 | 620 | } |
621 | 621 | |
622 | - $button->setContextualClass($tool[ 'contextual' ]); |
|
622 | + $button->setContextualClass($tool['contextual']); |
|
623 | 623 | $button->smallSize(); |
624 | 624 | $button->attributes->addAttribute('data-action', $key); |
625 | 625 | } |
@@ -634,33 +634,33 @@ discard block |
||
634 | 634 | |
635 | 635 | $buttons = new Ui\Components\Buttons\Group(); |
636 | 636 | foreach ($this->options as $key => $option) { |
637 | - if ($option[ 'show' ] === false) { |
|
637 | + if ($option['show'] === false) { |
|
638 | 638 | continue; |
639 | 639 | } |
640 | 640 | |
641 | - if ($option[ 'label' ] === true) { |
|
641 | + if ($option['label'] === true) { |
|
642 | 642 | $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
643 | - if ( ! empty($option[ 'icon' ])) { |
|
644 | - $button->setIcon($option[ 'icon' ]); |
|
643 | + if ( ! empty($option['icon'])) { |
|
644 | + $button->setIcon($option['icon']); |
|
645 | 645 | } |
646 | 646 | } else { |
647 | - $button = $buttons->createButton(new Ui\Contents\Icon($option[ 'icon' ])); |
|
647 | + $button = $buttons->createButton(new Ui\Contents\Icon($option['icon'])); |
|
648 | 648 | $button->attributes->addAttribute('data-toggle', 'tooltip'); |
649 | 649 | $button->attributes->addAttribute('title', |
650 | 650 | language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
651 | 651 | } |
652 | 652 | |
653 | - if ( ! empty($option[ 'href' ])) { |
|
654 | - $option[ 'data-url' ] = $option[ 'href' ]; |
|
653 | + if ( ! empty($option['href'])) { |
|
654 | + $option['data-url'] = $option['href']; |
|
655 | 655 | } |
656 | 656 | |
657 | - if (isset($option[ 'attr' ])) { |
|
658 | - foreach ($option[ 'attr' ] as $name => $value) { |
|
657 | + if (isset($option['attr'])) { |
|
658 | + foreach ($option['attr'] as $name => $value) { |
|
659 | 659 | $button->attributes->addAttribute($name, $value); |
660 | 660 | } |
661 | 661 | } |
662 | 662 | |
663 | - $button->setContextualClass($option[ 'contextual' ]); |
|
663 | + $button->setContextualClass($option['contextual']); |
|
664 | 664 | $button->smallSize(); |
665 | 665 | $button->attributes->addAttribute('data-action', $key); |
666 | 666 | } |
@@ -695,10 +695,10 @@ discard block |
||
695 | 695 | $inputGroup->childNodes->push($addOn); |
696 | 696 | |
697 | 697 | $options = []; |
698 | - foreach (range((int)$this->config[ 'entries' ][ 'minimum' ], (int)$this->config[ 'entries' ][ 'maximum' ], |
|
699 | - (int)$this->config[ 'entries' ][ 'step' ]) as $entries |
|
698 | + foreach (range((int)$this->config['entries']['minimum'], (int)$this->config['entries']['maximum'], |
|
699 | + (int)$this->config['entries']['step']) as $entries |
|
700 | 700 | ) { |
701 | - $options[ $entries ] = $entries; |
|
701 | + $options[$entries] = $entries; |
|
702 | 702 | } |
703 | 703 | |
704 | 704 | $columnsDropdown = new Ui\Components\Dropdown(language()->getLine('TABLE_LABEL_COLUMNS')); |
@@ -706,13 +706,13 @@ discard block |
||
706 | 706 | |
707 | 707 | foreach ($this->columns as $key => $column) { |
708 | 708 | |
709 | - if ($column[ 'hiding' ] === false) { |
|
709 | + if ($column['hiding'] === false) { |
|
710 | 710 | continue; |
711 | 711 | } |
712 | 712 | |
713 | 713 | $label = new Ui\Components\Form\Elements\Label(); |
714 | 714 | $label->attributes->addAttributeClass('form-check-label'); |
715 | - $label->textContent->push(language()->getLine($column[ 'label' ])); |
|
715 | + $label->textContent->push(language()->getLine($column['label'])); |
|
716 | 716 | |
717 | 717 | $checkbox = new Ui\Components\Form\Elements\Input([ |
718 | 718 | 'type' => 'checkbox', |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | |
724 | 724 | $checkbox->attributes->removeAttributeClass('form-control'); |
725 | 725 | |
726 | - if ($column[ 'show' ] === true) { |
|
726 | + if ($column['show'] === true) { |
|
727 | 727 | $checkbox->attributes->addAttribute('checked', 'checked'); |
728 | 728 | } |
729 | 729 | |
@@ -778,33 +778,33 @@ discard block |
||
778 | 778 | */ |
779 | 779 | protected function renderBodyColumn($td, array $column, Result\Row $row) |
780 | 780 | { |
781 | - switch ($column[ 'format' ]) { |
|
781 | + switch ($column['format']) { |
|
782 | 782 | default: |
783 | - if (is_callable($column[ 'format' ])) { |
|
784 | - if (is_array($column[ 'field' ])) { |
|
785 | - foreach ($column[ 'field' ] as $field) { |
|
786 | - $args[ $field ] = $row->offsetGet($field); |
|
783 | + if (is_callable($column['format'])) { |
|
784 | + if (is_array($column['field'])) { |
|
785 | + foreach ($column['field'] as $field) { |
|
786 | + $args[$field] = $row->offsetGet($field); |
|
787 | 787 | } |
788 | - $textContent = call_user_func_array($column[ 'format' ], $args); |
|
789 | - } elseif ($row->offsetExists($column[ 'field' ])) { |
|
790 | - $textContent = call_user_func_array($column[ 'format' ], |
|
791 | - [$row->offsetGet($column[ 'field' ])]); |
|
788 | + $textContent = call_user_func_array($column['format'], $args); |
|
789 | + } elseif ($row->offsetExists($column['field'])) { |
|
790 | + $textContent = call_user_func_array($column['format'], |
|
791 | + [$row->offsetGet($column['field'])]); |
|
792 | 792 | } |
793 | 793 | |
794 | 794 | $td->textContent->push($textContent); |
795 | 795 | |
796 | - } elseif (strpos($column[ 'format' ], '{{') !== false) { |
|
797 | - $textContent = str_replace(['{{', '}}'], '', $column[ 'format' ]); |
|
798 | - if (is_array($column[ 'field' ])) { |
|
799 | - foreach ($column[ 'field' ] as $field) { |
|
796 | + } elseif (strpos($column['format'], '{{') !== false) { |
|
797 | + $textContent = str_replace(['{{', '}}'], '', $column['format']); |
|
798 | + if (is_array($column['field'])) { |
|
799 | + foreach ($column['field'] as $field) { |
|
800 | 800 | if ($row->offsetExists($field)) { |
801 | 801 | $textContent = str_replace('$' . $field, $row->offsetGet($field), $textContent); |
802 | 802 | } else { |
803 | 803 | $textContent = str_replace('$' . $field, '', $textContent); |
804 | 804 | } |
805 | 805 | } |
806 | - } elseif ($row->offsetExists($column[ 'field' ])) { |
|
807 | - $textContent = str_replace('$' . $column[ 'field' ], $row->offsetGet($column[ 'field' ]), |
|
806 | + } elseif ($row->offsetExists($column['field'])) { |
|
807 | + $textContent = str_replace('$' . $column['field'], $row->offsetGet($column['field']), |
|
808 | 808 | $textContent); |
809 | 809 | } |
810 | 810 | |
@@ -824,18 +824,18 @@ discard block |
||
824 | 824 | case 'text': |
825 | 825 | case 'price': |
826 | 826 | case 'number': |
827 | - if ($row->offsetExists($column[ 'field' ])) { |
|
828 | - $td->textContent->push($row->offsetGet($column[ 'field' ])); |
|
827 | + if ($row->offsetExists($column['field'])) { |
|
828 | + $td->textContent->push($row->offsetGet($column['field'])); |
|
829 | 829 | } |
830 | 830 | break; |
831 | 831 | case 'date': |
832 | - if ($row->offsetExists($column[ 'field' ])) { |
|
832 | + if ($row->offsetExists($column['field'])) { |
|
833 | 833 | print_out('date'); |
834 | 834 | } |
835 | 835 | break; |
836 | 836 | |
837 | 837 | case 'status': |
838 | - if ($row->offsetExists($column[ 'field' ])) { |
|
838 | + if ($row->offsetExists($column['field'])) { |
|
839 | 839 | $options = [ |
840 | 840 | 'PUBLISH' => 'success', |
841 | 841 | 'UNPUBLISH' => 'warning', |
@@ -845,8 +845,8 @@ discard block |
||
845 | 845 | ]; |
846 | 846 | |
847 | 847 | $badge = new Ui\Components\Badge( |
848 | - language()->getLine('TABLE_OPTION_' . $row->offsetGet($column[ 'field' ])), |
|
849 | - $options[ $row->offsetGet($column[ 'field' ]) ] |
|
848 | + language()->getLine('TABLE_OPTION_' . $row->offsetGet($column['field'])), |
|
849 | + $options[$row->offsetGet($column['field'])] |
|
850 | 850 | ); |
851 | 851 | |
852 | 852 | $td->childNodes->push($badge); |
@@ -860,29 +860,29 @@ discard block |
||
860 | 860 | |
861 | 861 | foreach ($this->actions as $key => $action) { |
862 | 862 | |
863 | - if ($action[ 'show' ] === false) { |
|
863 | + if ($action['show'] === false) { |
|
864 | 864 | continue; |
865 | 865 | } |
866 | 866 | |
867 | - if ($action[ 'label' ] === true) { |
|
867 | + if ($action['label'] === true) { |
|
868 | 868 | $button = $buttons->createButton(language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
869 | - if ( ! empty($action[ 'icon' ])) { |
|
870 | - $button->setIcon($action[ 'icon' ]); |
|
869 | + if ( ! empty($action['icon'])) { |
|
870 | + $button->setIcon($action['icon']); |
|
871 | 871 | } |
872 | 872 | } else { |
873 | - $button = $buttons->createButton(new Ui\Contents\Icon($action[ 'icon' ])); |
|
873 | + $button = $buttons->createButton(new Ui\Contents\Icon($action['icon'])); |
|
874 | 874 | $button->attributes->addAttribute('data-toggle', 'tooltip'); |
875 | 875 | $button->attributes->addAttribute('title', |
876 | 876 | language()->getLine('TABLE_BUTTON_' . strtoupper($key))); |
877 | 877 | } |
878 | 878 | |
879 | - if (isset($action[ 'attr' ])) { |
|
880 | - foreach ($action[ 'attr' ] as $name => $value) { |
|
879 | + if (isset($action['attr'])) { |
|
880 | + foreach ($action['attr'] as $name => $value) { |
|
881 | 881 | $button->attributes->addAttribute($name, $value); |
882 | 882 | } |
883 | 883 | } |
884 | 884 | |
885 | - $button->setContextualClass($action[ 'contextual' ]); |
|
885 | + $button->setContextualClass($action['contextual']); |
|
886 | 886 | $button->smallSize(); |
887 | 887 | $button->attributes->addAttribute('data-action', $key); |
888 | 888 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | */ |
78 | 78 | public function setIndicators(Indicators &$indicators) |
79 | 79 | { |
80 | - $this->indicators =& $indicators; |
|
80 | + $this->indicators = & $indicators; |
|
81 | 81 | |
82 | 82 | return $this; |
83 | 83 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function __construct() |
31 | 31 | { |
32 | - if (empty($_SESSION[ 'o2system' ][ 'cart' ])) { |
|
33 | - $_SESSION[ 'o2system' ][ 'cart' ] = []; |
|
32 | + if (empty($_SESSION['o2system']['cart'])) { |
|
33 | + $_SESSION['o2system']['cart'] = []; |
|
34 | 34 | } |
35 | 35 | |
36 | - $this->storage =& $_SESSION[ 'o2system' ][ 'cart' ]; |
|
36 | + $this->storage = & $_SESSION['o2system']['cart']; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | // ------------------------------------------------------------------------ |
@@ -56,29 +56,29 @@ discard block |
||
56 | 56 | ], $item); |
57 | 57 | |
58 | 58 | // set sku |
59 | - $sku = empty($item[ 'sku' ]) ? $item[ 'id' ] : $item[ 'sku' ]; |
|
59 | + $sku = empty($item['sku']) ? $item['id'] : $item['sku']; |
|
60 | 60 | |
61 | 61 | // set sub-total |
62 | - $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ]; |
|
63 | - $item[ 'subTotal' ][ 'discount' ] = 0; |
|
62 | + $item['subTotal']['price'] = $item['price'] * $item['quantity']; |
|
63 | + $item['subTotal']['discount'] = 0; |
|
64 | 64 | |
65 | - if (is_numeric($item[ 'discount' ])) { |
|
66 | - $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] - $item[ 'discount' ]; |
|
67 | - } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '+') !== false) { |
|
68 | - $discounts = explode('+', $item[ 'discount' ]); |
|
65 | + if (is_numeric($item['discount'])) { |
|
66 | + $item['subTotal']['discount'] = $item['subTotal']['price'] - $item['discount']; |
|
67 | + } elseif (is_string($item['discount']) && strpos($item['discount'], '+') !== false) { |
|
68 | + $discounts = explode('+', $item['discount']); |
|
69 | 69 | if (count($discounts)) { |
70 | - $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval(reset($discounts)) / 100); |
|
70 | + $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval(reset($discounts)) / 100); |
|
71 | 71 | foreach (array_slice($discounts, 1) as $discount) { |
72 | - $item[ 'subTotal' ][ 'discount' ] += $item[ 'subTotal' ][ 'discount' ] * (intval($discount) / 100); |
|
72 | + $item['subTotal']['discount'] += $item['subTotal']['discount'] * (intval($discount) / 100); |
|
73 | 73 | } |
74 | 74 | } |
75 | - } elseif (is_string($item[ 'discount' ]) && strpos($item[ 'discount' ], '%') !== false) { |
|
76 | - $item[ 'subTotal' ][ 'discount' ] = $item[ 'subTotal' ][ 'price' ] * (intval($item[ 'discount' ]) / 100); |
|
75 | + } elseif (is_string($item['discount']) && strpos($item['discount'], '%') !== false) { |
|
76 | + $item['subTotal']['discount'] = $item['subTotal']['price'] * (intval($item['discount']) / 100); |
|
77 | 77 | } |
78 | 78 | |
79 | - $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ]; |
|
79 | + $item['subTotal']['weight'] = $item['weight'] * $item['quantity']; |
|
80 | 80 | |
81 | - $this->storage[ $sku ] = $item; |
|
81 | + $this->storage[$sku] = $item; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | // ------------------------------------------------------------------------ |
@@ -97,10 +97,10 @@ discard block |
||
97 | 97 | $item = array_merge($this->offsetGet($sku), $item); |
98 | 98 | |
99 | 99 | // update sub-total |
100 | - $item[ 'subTotal' ][ 'price' ] = $item[ 'price' ] * $item[ 'quantity' ]; |
|
101 | - $item[ 'subTotal' ][ 'weight' ] = $item[ 'weight' ] * $item[ 'quantity' ]; |
|
100 | + $item['subTotal']['price'] = $item['price'] * $item['quantity']; |
|
101 | + $item['subTotal']['weight'] = $item['weight'] * $item['quantity']; |
|
102 | 102 | |
103 | - $this->storage[ $sku ] = $item; |
|
103 | + $this->storage[$sku] = $item; |
|
104 | 104 | |
105 | 105 | return true; |
106 | 106 | } |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | |
122 | 122 | if ($this->count()) { |
123 | 123 | foreach ($this->storage as $id => $item) { |
124 | - if (isset($item[ 'subTotal' ][ 'weight' ])) { |
|
125 | - $totalWeight += (int)$item[ 'weight' ]; |
|
124 | + if (isset($item['subTotal']['weight'])) { |
|
125 | + $totalWeight += (int)$item['weight']; |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | } |
@@ -143,8 +143,8 @@ discard block |
||
143 | 143 | |
144 | 144 | if ($this->count()) { |
145 | 145 | foreach ($this->storage as $id => $item) { |
146 | - if (isset($item[ 'subTotal' ][ 'price' ])) { |
|
147 | - $totalPrice += (int)$item[ 'price' ]; |
|
146 | + if (isset($item['subTotal']['price'])) { |
|
147 | + $totalPrice += (int)$item['price']; |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function destroy() |
161 | 161 | { |
162 | - unset($_SESSION[ 'o2system' ][ 'cart' ]); |
|
162 | + unset($_SESSION['o2system']['cart']); |
|
163 | 163 | parent::destroy(); |
164 | 164 | } |
165 | 165 | } |
166 | 166 | \ No newline at end of file |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | $packageJsonFile = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $packageJsonFile); |
104 | 104 | $packageJsonFileInfo = pathinfo($packageJsonFile); |
105 | 105 | |
106 | - if ($packageJsonFileInfo[ 'filename' ] === 'language') { |
|
106 | + if ($packageJsonFileInfo['filename'] === 'language') { |
|
107 | 107 | if (is_cli()) { |
108 | 108 | output()->verbose( |
109 | 109 | (new Format()) |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | ); |
127 | 127 | } |
128 | 128 | |
129 | - $registry[ $package->getDirName() ] = $package; |
|
129 | + $registry[$package->getDirName()] = $package; |
|
130 | 130 | } elseif (is_cli()) { |
131 | 131 | output()->verbose( |
132 | 132 | (new Format()) |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | { |
171 | 171 | if (isset($package)) { |
172 | 172 | if ($this->registered($package)) { |
173 | - return $this->registry[ $package ]; |
|
173 | + return $this->registry[$package]; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | return false; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function registered($package) |
192 | 192 | { |
193 | - return isset($this->registry[ $package ]); |
|
193 | + return isset($this->registry[$package]); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | // ------------------------------------------------------------------------ |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | |
78 | 78 | if (empty($where)) { |
79 | 79 | if (empty($this->primaryKeys)) { |
80 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
80 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
81 | 81 | } else { |
82 | 82 | foreach ($this->primaryKeys as $primaryKey) { |
83 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
83 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | } |
@@ -153,11 +153,11 @@ discard block |
||
153 | 153 | |
154 | 154 | $where = []; |
155 | 155 | if (empty($this->primaryKeys)) { |
156 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
157 | - $this->qb->where($primaryKey, $sets[ $primaryKey ]); |
|
156 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
157 | + $this->qb->where($primaryKey, $sets[$primaryKey]); |
|
158 | 158 | } else { |
159 | 159 | foreach ($this->primaryKeys as $primaryKey) { |
160 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
160 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
161 | 161 | } |
162 | 162 | } |
163 | 163 | |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $affectedRows = []; |
201 | 201 | |
202 | 202 | foreach ($ids as $id) { |
203 | - $affectedRows[ $id ] = $this->trash($id); |
|
203 | + $affectedRows[$id] = $this->trash($id); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | return $affectedRows; |
@@ -225,19 +225,19 @@ discard block |
||
225 | 225 | $where = []; |
226 | 226 | |
227 | 227 | if (empty($this->primaryKeys)) { |
228 | - $where[ $primaryKey ] = $id; |
|
229 | - $sets[ $primaryKey ] = $id; |
|
228 | + $where[$primaryKey] = $id; |
|
229 | + $sets[$primaryKey] = $id; |
|
230 | 230 | } elseif (is_array($id)) { |
231 | 231 | foreach ($this->primaryKeys as $primaryKey) { |
232 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
233 | - $sets[ $primaryKey ] = $id[ $primaryKey ]; |
|
232 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
233 | + $sets[$primaryKey] = $id[$primaryKey]; |
|
234 | 234 | } |
235 | 235 | } else { |
236 | 236 | foreach ($this->primaryKeys as $primaryKey) { |
237 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
237 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
238 | 238 | } |
239 | 239 | |
240 | - $sets[ reset($this->primaryKeys) ] = $id; |
|
240 | + $sets[reset($this->primaryKeys)] = $id; |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | // Reset Primary Keys |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $affectedRows = []; |
278 | 278 | |
279 | 279 | foreach ($ids as $id) { |
280 | - $affectedRows[ $id ] = $this->trashBy($id, $where, $collection); |
|
280 | + $affectedRows[$id] = $this->trashBy($id, $where, $collection); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | return $affectedRows; |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $affectedRows = []; |
312 | 312 | |
313 | 313 | foreach ($ids as $id) { |
314 | - $affectedRows[ $id ] = $this->delete($id, $force, $collection); |
|
314 | + $affectedRows[$id] = $this->delete($id, $force, $collection); |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | return $affectedRows; |
@@ -335,13 +335,13 @@ discard block |
||
335 | 335 | |
336 | 336 | $where = []; |
337 | 337 | if (empty($this->primaryKeys)) { |
338 | - $where[ $primaryKey ] = $id; |
|
338 | + $where[$primaryKey] = $id; |
|
339 | 339 | } elseif (is_array($id)) { |
340 | 340 | foreach ($this->primaryKeys as $primaryKey) { |
341 | - $where[ $primaryKey ] = $id[ $primaryKey ]; |
|
341 | + $where[$primaryKey] = $id[$primaryKey]; |
|
342 | 342 | } |
343 | 343 | } else { |
344 | - $where[ reset($this->primaryKeys) ] = $id; |
|
344 | + $where[reset($this->primaryKeys)] = $id; |
|
345 | 345 | } |
346 | 346 | |
347 | 347 | // Reset Primary Keys |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | $affectedRows = []; |
378 | 378 | |
379 | 379 | foreach ($ids as $id) { |
380 | - $affectedRows[ $id ] = $this->deleteBy($id, $where, $force, $collection); |
|
380 | + $affectedRows[$id] = $this->deleteBy($id, $where, $force, $collection); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | return $affectedRows; |
@@ -425,19 +425,19 @@ discard block |
||
425 | 425 | $where = []; |
426 | 426 | |
427 | 427 | if (empty($this->primaryKeys)) { |
428 | - $where[ $primaryKey ] = $id; |
|
429 | - $sets[ $primaryKey ] = $id; |
|
428 | + $where[$primaryKey] = $id; |
|
429 | + $sets[$primaryKey] = $id; |
|
430 | 430 | } elseif (is_array($id)) { |
431 | 431 | foreach ($this->primaryKeys as $primaryKey) { |
432 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
433 | - $sets[ $primaryKey ] = $id[ $primaryKey ]; |
|
432 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
433 | + $sets[$primaryKey] = $id[$primaryKey]; |
|
434 | 434 | } |
435 | 435 | } else { |
436 | 436 | foreach ($this->primaryKeys as $primaryKey) { |
437 | - $where[ $primaryKey ] = $sets[ $primaryKey ]; |
|
437 | + $where[$primaryKey] = $sets[$primaryKey]; |
|
438 | 438 | } |
439 | 439 | |
440 | - $sets[ reset($this->primaryKeys) ] = $id; |
|
440 | + $sets[reset($this->primaryKeys)] = $id; |
|
441 | 441 | } |
442 | 442 | |
443 | 443 | // Reset Primary Keys |
@@ -516,7 +516,7 @@ discard block |
||
516 | 516 | $affectedRows = []; |
517 | 517 | |
518 | 518 | foreach ($ids as $id) { |
519 | - $affectedRows[ $id ] = $this->publish($id, $collection); |
|
519 | + $affectedRows[$id] = $this->publish($id, $collection); |
|
520 | 520 | } |
521 | 521 | |
522 | 522 | return $affectedRows; |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | $affectedRows = []; |
549 | 549 | |
550 | 550 | foreach ($ids as $id) { |
551 | - $affectedRows[ $id ] = $this->publishBy($id, $where, $collection); |
|
551 | + $affectedRows[$id] = $this->publishBy($id, $where, $collection); |
|
552 | 552 | } |
553 | 553 | |
554 | 554 | return $affectedRows; |