@@ -64,7 +64,7 @@ |
||
64 | 64 | 'type' => 'many', |
65 | 65 | 'model' => 'Menu\Item', |
66 | 66 | 'col' => 'Menu_id', |
67 | - 'where'=>[['parent_id',0]] |
|
67 | + 'where'=>[['parent_id', 0]] |
|
68 | 68 | ], |
69 | 69 | 'group' => [ |
70 | 70 | 'col' => 'group_id', |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | $code = 'main'; |
7 | 7 | } |
8 | 8 | $uid = Tools::randomString(); |
9 | -$childDraws = function($item, $childDraws, $uid, $activeFind) { |
|
9 | +$childDraws = function ($item, $childDraws, $uid, $activeFind) { |
|
10 | 10 | if ($item->childs(['order' => ['weight', 'asc']])) { |
11 | 11 | echo "<ul class ='dropdown-menu'>"; |
12 | 12 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | echo "</ul>"; |
24 | 24 | } |
25 | 25 | }; |
26 | -$activeFind = function($item, $activeFind) { |
|
26 | +$activeFind = function ($item, $activeFind) { |
|
27 | 27 | foreach ($item->childs(['order' => ['weight', 'asc']]) as $item) { |
28 | 28 | if (urldecode($_SERVER['REQUEST_URI']) == $item->href) { |
29 | 29 | return true; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | |
33 | 33 | |
34 | 34 | $options = []; |
35 | - $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id],'key'=>'item_option_id']); |
|
35 | + $itemParams = \Ecommerce\Item\Param::getList(['where' => ['item_id', $this->model->id], 'key'=>'item_option_id']); |
|
36 | 36 | foreach ($this->object->object->params as $param) { |
37 | 37 | if ($param->type == 'paramValue' && isset($itemParams[$param->value])) { |
38 | 38 | $options[$param->value] = $itemParams[$param->value]->value; |
@@ -1958,7 +1958,7 @@ |
||
1958 | 1958 | } |
1959 | 1959 | } |
1960 | 1960 | if (!$params) { |
1961 | - return FALSE; |
|
1961 | + return false; |
|
1962 | 1962 | } |
1963 | 1963 | return new $model($params); |
1964 | 1964 | } |
@@ -168,7 +168,6 @@ discard block |
||
168 | 168 | * @param Model $item |
169 | 169 | * @param string $colName |
170 | 170 | * @param boolean $manageHref |
171 | - * @param array $params |
|
172 | 171 | * @return string |
173 | 172 | */ |
174 | 173 | public static function resloveTypeValue($item, $colName, $manageHref = false, $colInfo = []) { |
@@ -794,7 +793,7 @@ discard block |
||
794 | 793 | /** |
795 | 794 | * return relations list |
796 | 795 | * |
797 | - * @return array |
|
796 | + * @return string |
|
798 | 797 | */ |
799 | 798 | public static function relations() { |
800 | 799 | return []; |
@@ -513,13 +513,13 @@ |
||
513 | 513 | case 'to': |
514 | 514 | $relCol = $relations[$rel]['col']; |
515 | 515 | static::fixPrefix($relCol); |
516 | - $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol, 'left','']; |
|
516 | + $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol, 'left', '']; |
|
517 | 517 | break; |
518 | 518 | case 'one': |
519 | 519 | case 'many': |
520 | 520 | $relCol = $relations[$rel]['col']; |
521 | 521 | $relations[$rel]['model']::fixPrefix($relCol); |
522 | - $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol, 'left','']; |
|
522 | + $rootModel::$relJoins[$joinName] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol, 'left', '']; |
|
523 | 523 | break; |
524 | 524 | } |
525 | 525 | $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | class ServerController extends Controller { |
12 | 12 | function csrfAction($key = '') { |
13 | 13 | $result = new \Server\Result(); |
14 | - $key = (string)$key; |
|
14 | + $key = (string) $key; |
|
15 | 15 | if (!$key) { |
16 | 16 | $result->success = false; |
17 | 17 | return $result->send(); |
@@ -27,6 +27,9 @@ |
||
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param \Model[] $params |
|
32 | + */ |
|
30 | 33 | private function parseData(&$data, $params) { |
31 | 34 | $objectParamValue = [ |
32 | 35 | 'col' => '', |
@@ -21,7 +21,7 @@ |
||
21 | 21 | $inputOptions = [ |
22 | 22 | 'value' => $this->value(), |
23 | 23 | 'disabled' => $this->readOnly(), |
24 | - 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName)?$this->modelName:$this->activeForm->modelName, $inputName) |
|
24 | + 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName) |
|
25 | 25 | ]; |
26 | 26 | $modelName = ''; |
27 | 27 | switch ($inputParams['source']) { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | 'label' => 'Комментарий', |
67 | 67 | ], |
68 | 68 | ] |
69 | - ],], |
|
69 | + ], ], |
|
70 | 70 | ] |
71 | 71 | ]; |
72 | 72 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | public function diff($amount, $comment = '') { |
88 | - $amount = (float)$amount; |
|
88 | + $amount = (float) $amount; |
|
89 | 89 | $query = \App::$cur->db->newQuery(); |
90 | 90 | $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id; |
91 | 91 | $query->query($string); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | public function showAmount() { |
106 | 106 | switch ($this->currency->round_type) { |
107 | 107 | case 'floor': |
108 | - $dif = (float)('1' . str_repeat('0', $this->currency->round_precision)); |
|
108 | + $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision)); |
|
109 | 109 | return floor($this->amount * $dif) / $dif; |
110 | 110 | default: |
111 | 111 | return $this->amount; |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <h1>Установка модулей</h1> |
2 | 2 | <form> |
3 | 3 | <?php |
4 | - $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
5 | - $modules = array_flip(Module::getInstalled(App::$cur)); |
|
6 | - if (file_exists(App::$primary->path . '/modules')) { |
|
7 | - $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
8 | - } |
|
9 | - else { |
|
10 | - $appModules=[]; |
|
11 | - } |
|
12 | - $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
13 | - foreach ($systemModules as $module) { |
|
14 | - $info = Module::getInfo($module); |
|
15 | - if (!$info || isset($modules[$module])) { |
|
16 | - continue; |
|
17 | - } |
|
18 | - ?> |
|
4 | + $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
5 | + $modules = array_flip(Module::getInstalled(App::$cur)); |
|
6 | + if (file_exists(App::$primary->path . '/modules')) { |
|
7 | + $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
8 | + } |
|
9 | + else { |
|
10 | + $appModules=[]; |
|
11 | + } |
|
12 | + $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
13 | + foreach ($systemModules as $module) { |
|
14 | + $info = Module::getInfo($module); |
|
15 | + if (!$info || isset($modules[$module])) { |
|
16 | + continue; |
|
17 | + } |
|
18 | + ?> |
|
19 | 19 | <div class ="form-group"> |
20 | 20 | <div class="checkbox"> |
21 | 21 | <label> |
@@ -7,7 +7,7 @@ |
||
7 | 7 | $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
8 | 8 | } |
9 | 9 | else { |
10 | - $appModules=[]; |
|
10 | + $appModules = []; |
|
11 | 11 | } |
12 | 12 | $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
13 | 13 | foreach ($systemModules as $module) { |
@@ -5,8 +5,7 @@ |
||
5 | 5 | $modules = array_flip(Module::getInstalled(App::$cur)); |
6 | 6 | if (file_exists(App::$primary->path . '/modules')) { |
7 | 7 | $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
8 | - } |
|
9 | - else { |
|
8 | + } else { |
|
10 | 9 | $appModules=[]; |
11 | 10 | } |
12 | 11 | $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |