@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Group |
|
4 | - * |
|
5 | - * @author Alexey Krupskiy <[email protected]> |
|
6 | - * @link http://inji.ru/ |
|
7 | - * @copyright 2015 Alexey Krupskiy |
|
8 | - * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
9 | - */ |
|
3 | + * Group |
|
4 | + * |
|
5 | + * @author Alexey Krupskiy <[email protected]> |
|
6 | + * @link http://inji.ru/ |
|
7 | + * @copyright 2015 Alexey Krupskiy |
|
8 | + * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
9 | + */ |
|
10 | 10 | namespace Users; |
11 | 11 | |
12 | 12 | class Group extends \Model |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'role_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'role'], |
38 | 38 | 'admin_text' => ['type' => 'html'], |
39 | 39 | 'activation' => ['type' => 'text'], |
40 | - 'blocked' => ['type' => 'bool',], |
|
40 | + 'blocked' => ['type' => 'bool', ], |
|
41 | 41 | 'date_last_active' => ['type' => 'dateTime'], |
42 | 42 | 'date_create' => ['type' => 'dateTime'] |
43 | 43 | ]; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ] |
101 | 101 | ], |
102 | 102 | 'map' => [ |
103 | - ['login', 'mail',], |
|
103 | + ['login', 'mail', ], |
|
104 | 104 | ['group_id', 'role_id'], |
105 | 105 | ['userSearch', 'blocked'], |
106 | 106 | ['pass'], |
@@ -97,13 +97,13 @@ |
||
97 | 97 | if ($this->first_name . $this->last_name . $this->middle_name) { |
98 | 98 | $name = ''; |
99 | 99 | if ($this->first_name) { |
100 | - $name.=$this->first_name; |
|
100 | + $name .= $this->first_name; |
|
101 | 101 | } |
102 | 102 | if ($this->middle_name) { |
103 | - $name.=($name ? ' ' : '') . $this->middle_name; |
|
103 | + $name .= ($name ? ' ' : '') . $this->middle_name; |
|
104 | 104 | } |
105 | 105 | if ($this->last_name) { |
106 | - $name.=($name ? ' ' : '') . $this->last_name; |
|
106 | + $name .= ($name ? ' ' : '') . $this->last_name; |
|
107 | 107 | } |
108 | 108 | return $name; |
109 | 109 | } else { |
@@ -45,7 +45,7 @@ |
||
45 | 45 | static $forms = [ |
46 | 46 | 'manager' => [ |
47 | 47 | 'map' => [ |
48 | - ['code', 'type',], |
|
48 | + ['code', 'type', ], |
|
49 | 49 | ['user_id'], |
50 | 50 | ['limit', 'count'], |
51 | 51 | ] |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -if(!Users\Social::getList(['where' => ['active', 1]])){ |
|
2 | +if (!Users\Social::getList(['where' => ['active', 1]])) { |
|
3 | 3 | return false; |
4 | 4 | } |
5 | 5 | return [ |
@@ -2,7 +2,7 @@ |
||
2 | 2 | if (!empty($_POST['partnerInvite']['email'])) { |
3 | 3 | $title = ''; |
4 | 4 | if (!empty($_POST['partnerInvite']['name'])) { |
5 | - $title .='Ув. ' . htmlspecialchars($_POST['partnerInvite']['name']) . '. '; |
|
5 | + $title .= 'Ув. ' . htmlspecialchars($_POST['partnerInvite']['name']) . '. '; |
|
6 | 6 | } |
7 | 7 | if (!filter_var($_POST['partnerInvite']['email'], FILTER_VALIDATE_EMAIL)) { |
8 | 8 | Tools::redirect(null, 'Вы ввели не корректный E-mail', 'danger'); |
@@ -11,13 +11,14 @@ |
||
11 | 11 | '', |
12 | 12 | '' |
13 | 13 | ]); |
14 | -if (!empty($templates['app']['installed'])) |
|
14 | +if (!empty($templates['app']['installed'])) { |
|
15 | 15 | foreach ($templates['app']['installed'] as $template => $name) { |
16 | 16 | $table->addRow([ |
17 | 17 | $name, |
18 | 18 | (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию', |
19 | 19 | '<a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>' |
20 | 20 | ]); |
21 | +} |
|
21 | 22 | } |
22 | 23 | $table->draw(); |
23 | 24 | ?> |
24 | 25 | \ No newline at end of file |
@@ -36,8 +36,9 @@ |
||
36 | 36 | $params = json_decode($widget->widget_params, true); |
37 | 37 | if ($params) { |
38 | 38 | foreach ($params as $param) { |
39 | - if (!isset($widgetCode[$i])) |
|
40 | - break; |
|
39 | + if (!isset($widgetCode[$i])) { |
|
40 | + break; |
|
41 | + } |
|
41 | 42 | if ($param['type'] == 'select') { |
42 | 43 | $item = $param['model']::get($widgetCode[$i++]); |
43 | 44 | if ($item) { |
@@ -35,10 +35,11 @@ |
||
35 | 35 | ?> |
36 | 36 | </select> |
37 | 37 | <?php |
38 | -if (false) |
|
38 | +if (false) { |
|
39 | 39 | foreach ($widgets as $widget) { |
40 | 40 | if ($widget->widget_params) { |
41 | 41 | $params = json_decode($widget->widget_params, true); |
42 | +} |
|
42 | 43 | if ($params) { |
43 | 44 | echo "<div id = 'params{$widget->widget_id}' class = 'widgetParams' style='display:none;'>"; |
44 | 45 | echo "<h3>Параметры</h3>"; |