@@ -52,8 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | static function get($clean = false) |
54 | 54 | { |
55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
56 | - return []; |
|
55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
56 | + return []; |
|
57 | + } |
|
57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
58 | 59 | if ($clean) { |
59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -13,20 +13,22 @@ |
||
13 | 13 | static function genArray($data, $level = 0) |
14 | 14 | { |
15 | 15 | $return = ''; |
16 | - if ($level == 0) |
|
17 | - $return = "["; |
|
16 | + if ($level == 0) { |
|
17 | + $return = "["; |
|
18 | + } |
|
18 | 19 | foreach ($data as $key => $item) { |
19 | 20 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => "; |
20 | - if (!is_array($item)) |
|
21 | - $return .= "'{$item}',"; |
|
22 | - else { |
|
21 | + if (!is_array($item)) { |
|
22 | + $return .= "'{$item}',"; |
|
23 | + } else { |
|
23 | 24 | $return .= "["; |
24 | 25 | $return .= rtrim(self::genArray($item, $level + 1), ','); |
25 | 26 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],"; |
26 | 27 | } |
27 | 28 | } |
28 | - if ($level == 0) |
|
29 | - $return = rtrim($return, ',') . "\n];"; |
|
29 | + if ($level == 0) { |
|
30 | + $return = rtrim($return, ',') . "\n];"; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | return $return; |
32 | 34 | } |
@@ -189,17 +189,20 @@ |
||
189 | 189 | |
190 | 190 | public function get($idn = false, $ltype = 'id') |
191 | 191 | { |
192 | - if (!$idn) |
|
193 | - return false; |
|
192 | + if (!$idn) { |
|
193 | + return false; |
|
194 | + } |
|
194 | 195 | |
195 | - if (is_numeric($idn) && $ltype != 'login') |
|
196 | - $user = Users\User::get($idn, 'id'); |
|
197 | - elseif ($ltype == 'login') |
|
198 | - $user = Users\User::get($idn, 'login'); |
|
199 | - else |
|
200 | - $user = Users\User::get($idn, 'mail'); |
|
201 | - if (!$user) |
|
202 | - return []; |
|
196 | + if (is_numeric($idn) && $ltype != 'login') { |
|
197 | + $user = Users\User::get($idn, 'id'); |
|
198 | + } elseif ($ltype == 'login') { |
|
199 | + $user = Users\User::get($idn, 'login'); |
|
200 | + } else { |
|
201 | + $user = Users\User::get($idn, 'mail'); |
|
202 | + } |
|
203 | + if (!$user) { |
|
204 | + return []; |
|
205 | + } |
|
203 | 206 | |
204 | 207 | return $user; |
205 | 208 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'start' => $pages->params['start'], |
34 | 34 | 'limit' => $pages->params['limit'], |
35 | 35 | ]); |
36 | -foreach ($histories as $history) { |
|
36 | +foreach ($histories as $history) { |
|
37 | 37 | $amount = $history->amount; |
38 | 38 | $table->addRow([ |
39 | 39 | $history->id, |
@@ -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> |
@@ -2,9 +2,9 @@ |
||
2 | 2 | <div class="row"> |
3 | 3 | <div class="col-md-3"> |
4 | 4 | <?php |
5 | - $category = $material->category; |
|
6 | - $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | - ?> |
|
5 | + $category = $material->category; |
|
6 | + $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | + ?> |
|
8 | 8 | </div> |
9 | 9 | <div class="col-md-9"> |
10 | 10 | <div class="content"> |
@@ -14,12 +14,12 @@ |
||
14 | 14 | <span class="caption">Вид:</span> |
15 | 15 | <span class="group"> |
16 | 16 | <?php |
17 | - for ($i = 2; $i < 5; $i++) { |
|
18 | - $curLimit = $limit * $i; |
|
19 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
20 | - echo " <a href='{$path}?{$curQuery}'>{$curLimit}</a> "; |
|
21 | - } |
|
22 | - ?> |
|
17 | + for ($i = 2; $i < 5; $i++) { |
|
18 | + $curLimit = $limit * $i; |
|
19 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
20 | + echo " <a href='{$path}?{$curQuery}'>{$curLimit}</a> "; |
|
21 | + } |
|
22 | + ?> |
|
23 | 23 | </span> |
24 | 24 | <span class="group"> |
25 | 25 | <a href ='#' onclick="inji.onLoad(function () { |