@@ -49,8 +49,9 @@ |
||
49 | 49 | * @return array |
50 | 50 | */ |
51 | 51 | public static function get($clean = false) { |
52 | - if (empty($_SESSION['_INJI_MSG'])) |
|
53 | - return []; |
|
52 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
53 | + return []; |
|
54 | + } |
|
54 | 55 | $msgs = $_SESSION['_INJI_MSG']; |
55 | 56 | if ($clean) { |
56 | 57 | $_SESSION['_INJI_MSG'] = []; |
@@ -37,7 +37,7 @@ |
||
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | -require_once( INJI_SYSTEM_DIR . '/init.php' ); |
|
40 | +require_once(INJI_SYSTEM_DIR . '/init.php'); |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * System error messages |
@@ -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; |
@@ -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', |
@@ -1,15 +1,15 @@ |
||
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 | - $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), array_slice(scandir(App::$primary->path . '/modules'), 2)); |
|
7 | - foreach ($systemModules as $module) { |
|
8 | - $info = Module::getInfo($module); |
|
9 | - if (!$info || isset($modules[$module])) { |
|
10 | - continue; |
|
11 | - } |
|
12 | - ?> |
|
4 | + $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
5 | + $modules = array_flip(Module::getInstalled(App::$cur)); |
|
6 | + $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), array_slice(scandir(App::$primary->path . '/modules'), 2)); |
|
7 | + foreach ($systemModules as $module) { |
|
8 | + $info = Module::getInfo($module); |
|
9 | + if (!$info || isset($modules[$module])) { |
|
10 | + continue; |
|
11 | + } |
|
12 | + ?> |
|
13 | 13 | <div class ="form-group"> |
14 | 14 | <div class="checkbox"> |
15 | 15 | <label> |
@@ -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; |