@@ -56,7 +56,7 @@ |
||
| 56 | 56 | $this->categoryAction($category->id); |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | - } elseif(!$material) { |
|
| 59 | + } elseif (!$material) { |
|
| 60 | 60 | $material = Materials\Material::get(1, 'default'); |
| 61 | 61 | } |
| 62 | 62 | if ($material) { |
@@ -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; |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | if (empty($code)) { |
| 7 | 7 | $code = 'main'; |
| 8 | 8 | } |
| 9 | -$childDraws = function($item, $childDraws, $activeFind) { |
|
| 9 | +$childDraws = function ($item, $childDraws, $activeFind) { |
|
| 10 | 10 | if ($item->childs(['order' => ['weight', 'asc']])) { |
| 11 | 11 | echo "<ul class ='list-unstyled'>"; |
| 12 | 12 | foreach ($item->childs(['order' => ['weight', 'asc']]) as $item) { |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | echo "</ul>"; |
| 22 | 22 | } |
| 23 | 23 | }; |
| 24 | -$activeFind = function($item, $activeFind) { |
|
| 24 | +$activeFind = function ($item, $activeFind) { |
|
| 25 | 25 | foreach ($item->childs(['order' => ['weight', 'asc']]) as $item) { |
| 26 | 26 | if (urldecode($_SERVER['REQUEST_URI']) == $item->href) { |
| 27 | 27 | 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; |
@@ -368,7 +368,7 @@ |
||
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]); |
| 371 | - $scan = function($category, $scan) { |
|
| 371 | + $scan = function ($category, $scan) { |
|
| 372 | 372 | $map = []; |
| 373 | 373 | |
| 374 | 374 | foreach ($category->items(['array' => true, 'cols' => ['item_id', 'item_name']]) as $item) { |
@@ -233,7 +233,7 @@ |
||
| 233 | 233 | * Getting items with params |
| 234 | 234 | * |
| 235 | 235 | * @param array $params |
| 236 | - * @return array |
|
| 236 | + * @return Model[] |
|
| 237 | 237 | */ |
| 238 | 238 | public function getItems($params = []) { |
| 239 | 239 | $selectOptions = Ecommerce\OptionsParser::parse($params); |
@@ -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 | } |
@@ -967,12 +967,12 @@ discard block |
||
| 967 | 967 | static::$needJoin = []; |
| 968 | 968 | |
| 969 | 969 | if (!empty($options['limit'])) { |
| 970 | - $limit = (int)$options['limit']; |
|
| 970 | + $limit = (int) $options['limit']; |
|
| 971 | 971 | } else { |
| 972 | 972 | $limit = 0; |
| 973 | 973 | } |
| 974 | 974 | if (!empty($options['start'])) { |
| 975 | - $start = (int)$options['start']; |
|
| 975 | + $start = (int) $options['start']; |
|
| 976 | 976 | } else { |
| 977 | 977 | $start = 0; |
| 978 | 978 | } |
@@ -1261,12 +1261,12 @@ discard block |
||
| 1261 | 1261 | $query->order($options['order']); |
| 1262 | 1262 | } |
| 1263 | 1263 | if (!empty($options['limit'])) { |
| 1264 | - $limit = (int)$options['limit']; |
|
| 1264 | + $limit = (int) $options['limit']; |
|
| 1265 | 1265 | } else { |
| 1266 | 1266 | $limit = 0; |
| 1267 | 1267 | } |
| 1268 | 1268 | if (!empty($options['start'])) { |
| 1269 | - $start = (int)$options['start']; |
|
| 1269 | + $start = (int) $options['start']; |
|
| 1270 | 1270 | } else { |
| 1271 | 1271 | $start = 0; |
| 1272 | 1272 | } |
@@ -1991,13 +1991,13 @@ discard block |
||
| 1991 | 1991 | if (!empty($className::$cols[$shortName])) { |
| 1992 | 1992 | switch ($className::$cols[$shortName]['type']) { |
| 1993 | 1993 | case 'decimal': |
| 1994 | - $value = (float)$value; |
|
| 1994 | + $value = (float) $value; |
|
| 1995 | 1995 | break; |
| 1996 | 1996 | case 'number': |
| 1997 | - $value = (int)$value; |
|
| 1997 | + $value = (int) $value; |
|
| 1998 | 1998 | break; |
| 1999 | 1999 | case 'bool': |
| 2000 | - $value = (bool)$value; |
|
| 2000 | + $value = (bool) $value; |
|
| 2001 | 2001 | break; |
| 2002 | 2002 | } |
| 2003 | 2003 | } |
@@ -31,25 +31,25 @@ |
||
| 31 | 31 | <span class="caption">Вид:</span> |
| 32 | 32 | <span class="group"> |
| 33 | 33 | <?php |
| 34 | - for ($i = 2; $i < 5; $i++) { |
|
| 35 | - $curLimit = $limit * $i; |
|
| 36 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
| 37 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
| 38 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
| 39 | - echo $curLimit; |
|
| 40 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
| 41 | - echo "</a> "; |
|
| 42 | - } |
|
| 43 | - if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
| 44 | - $curLimit = 'all'; |
|
| 45 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
| 46 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
| 47 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
| 48 | - echo 'Все'; |
|
| 49 | - echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
| 50 | - echo "</a> "; |
|
| 51 | - } |
|
| 52 | - ?> |
|
| 34 | + for ($i = 2; $i < 5; $i++) { |
|
| 35 | + $curLimit = $limit * $i; |
|
| 36 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
| 37 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
| 38 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
| 39 | + echo $curLimit; |
|
| 40 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
| 41 | + echo "</a> "; |
|
| 42 | + } |
|
| 43 | + if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
| 44 | + $curLimit = 'all'; |
|
| 45 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
| 46 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
| 47 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
| 48 | + echo 'Все'; |
|
| 49 | + echo!empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
| 50 | + echo "</a> "; |
|
| 51 | + } |
|
| 52 | + ?> |
|
| 53 | 53 | </span> |
| 54 | 54 | <span class="group"> |
| 55 | 55 | <a rel="nofollow" href ='#' onclick="inji.onLoad(function () { |
@@ -17,12 +17,12 @@ |
||
| 17 | 17 | <div class="row"> |
| 18 | 18 | <div class="col-sm-6 ecommerce-showoptions-sort"> |
| 19 | 19 | <span class="caption">Сортировка:</span> |
| 20 | - <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price','asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
| 21 | - <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales','desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
| 20 | + <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['price' => sortToggler('price', 'asc')]])); ?>">По цене<?= sortDirectionIcon('price'); ?></a> |
|
| 21 | + <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['sales' => sortToggler('sales', 'desc')]])); ?>">По популярности<?= sortDirectionIcon('sales'); ?></a> |
|
| 22 | 22 | <?php |
| 23 | 23 | if (!empty(App::$cur->ecommerce->config['isset_sort'])) { |
| 24 | 24 | ?> |
| 25 | - <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset','desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
| 25 | + <a rel="nofollow" href="<?= $path; ?>?<?= http_build_query(array_merge($query, ['sort' => ['isset' => sortToggler('isset', 'desc')]])); ?>">По наличию<?= sortDirectionIcon('isset'); ?></a> |
|
| 26 | 26 | <?php |
| 27 | 27 | } |
| 28 | 28 | ?> |
@@ -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(); |