@@ -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 | } |
@@ -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(); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | ini_set('memory_limit', '2000M'); |
| 15 | 15 | ignore_user_abort(true); |
| 16 | 16 | set_time_limit(0); |
| 17 | - $reExchange = Exchange1c\Exchange::get((int)$_GET['item_pk']); |
|
| 17 | + $reExchange = Exchange1c\Exchange::get((int) $_GET['item_pk']); |
|
| 18 | 18 | |
| 19 | 19 | $exchange = new \Exchange1c\Exchange(); |
| 20 | 20 | $exchange->type = $reExchange->type; |
@@ -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' => '', |