@@ -12,9 +12,9 @@ |
||
| 12 | 12 | <div class ="category-materials"> |
| 13 | 13 | <div class ="row"> |
| 14 | 14 | <?php |
| 15 | - $i = 0; |
|
| 16 | - foreach ($materials as $material) { |
|
| 17 | - ?> |
|
| 15 | + $i = 0; |
|
| 16 | + foreach ($materials as $material) { |
|
| 17 | + ?> |
|
| 18 | 18 | <div class = "col-sm-6 category-material"> |
| 19 | 19 | <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a> |
| 20 | 20 | <div class="category-material-preview"><?= $material->preview; ?></div> |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'up' => function() { |
|
| 4 | + 'up' => function () { |
|
| 5 | 5 | Materials\Material::createCol('date_publish'); |
| 6 | 6 | foreach (Materials\Material::getList() as $material) { |
| 7 | 7 | $material->date_publish = $material->date_create; |
@@ -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 | } |
@@ -1023,12 +1023,12 @@ discard block |
||
| 1023 | 1023 | } |
| 1024 | 1024 | static::$relJoins = []; |
| 1025 | 1025 | if (!empty($options['limit'])) { |
| 1026 | - $limit = (int)$options['limit']; |
|
| 1026 | + $limit = (int) $options['limit']; |
|
| 1027 | 1027 | } else { |
| 1028 | 1028 | $limit = 0; |
| 1029 | 1029 | } |
| 1030 | 1030 | if (!empty($options['start'])) { |
| 1031 | - $start = (int)$options['start']; |
|
| 1031 | + $start = (int) $options['start']; |
|
| 1032 | 1032 | } else { |
| 1033 | 1033 | $start = 0; |
| 1034 | 1034 | } |
@@ -1134,12 +1134,12 @@ discard block |
||
| 1134 | 1134 | $query->order($options['order']); |
| 1135 | 1135 | } |
| 1136 | 1136 | if (!empty($options['limit'])) { |
| 1137 | - $limit = (int)$options['limit']; |
|
| 1137 | + $limit = (int) $options['limit']; |
|
| 1138 | 1138 | } else { |
| 1139 | 1139 | $limit = 0; |
| 1140 | 1140 | } |
| 1141 | 1141 | if (!empty($options['start'])) { |
| 1142 | - $start = (int)$options['start']; |
|
| 1142 | + $start = (int) $options['start']; |
|
| 1143 | 1143 | } else { |
| 1144 | 1144 | $start = 0; |
| 1145 | 1145 | } |
@@ -1858,13 +1858,13 @@ discard block |
||
| 1858 | 1858 | if (!empty($className::$cols[$shortName])) { |
| 1859 | 1859 | switch ($className::$cols[$shortName]['type']) { |
| 1860 | 1860 | case 'decimal': |
| 1861 | - $value = (float)$value; |
|
| 1861 | + $value = (float) $value; |
|
| 1862 | 1862 | break; |
| 1863 | 1863 | case 'number': |
| 1864 | - $value = (int)$value; |
|
| 1864 | + $value = (int) $value; |
|
| 1865 | 1865 | break; |
| 1866 | 1866 | case 'bool': |
| 1867 | - $value = (bool)$value; |
|
| 1867 | + $value = (bool) $value; |
|
| 1868 | 1868 | break; |
| 1869 | 1869 | } |
| 1870 | 1870 | } |
@@ -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(); |
@@ -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); |