@@ -83,6 +83,9 @@ |
||
83 | 83 | return null; |
84 | 84 | } |
85 | 85 | |
86 | + /** |
|
87 | + * @return string |
|
88 | + */ |
|
86 | 89 | function colName() |
87 | 90 | { |
88 | 91 | return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}][{$this->colName}]"; |
@@ -131,7 +131,7 @@ |
||
131 | 131 | if ($treePath) { |
132 | 132 | $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]); |
133 | 133 | foreach ($categorys as $category) { |
134 | - $href .="/{$category->alias}"; |
|
134 | + $href .= "/{$category->alias}"; |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 | return $href . "/" . ($this->alias ? $this->alias : $this->pk()); |
@@ -136,9 +136,11 @@ discard block |
||
136 | 136 | $param = $material ? 'material_template' : 'template'; |
137 | 137 | if ($this->$param !== 'inherit') { |
138 | 138 | return $this->$param; |
139 | - } elseif ($this->$param == 'inherit' && $this->parent) { |
|
139 | + } |
|
140 | + elseif ($this->$param == 'inherit' && $this->parent) { |
|
140 | 141 | return $this->parent->resolveTemplate($material); |
141 | - } else { |
|
142 | + } |
|
143 | + else { |
|
142 | 144 | return 'current'; |
143 | 145 | } |
144 | 146 | } |
@@ -147,9 +149,11 @@ discard block |
||
147 | 149 | $param = $material ? 'material_viewer' : 'viewer'; |
148 | 150 | if ($this->$param !== 'inherit') { |
149 | 151 | return $this->$param; |
150 | - } elseif ($this->$param == 'inherit' && $this->parent) { |
|
152 | + } |
|
153 | + elseif ($this->$param == 'inherit' && $this->parent) { |
|
151 | 154 | return $this->parent->resolveViewer($material); |
152 | - } else { |
|
155 | + } |
|
156 | + else { |
|
153 | 157 | return $material ? 'default' : 'category'; |
154 | 158 | } |
155 | 159 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | |
5 | 5 | }; |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | |
5 | 5 | $currencies = [ |
6 | 6 | [ |
@@ -43,7 +43,7 @@ |
||
43 | 43 | * |
44 | 44 | * @param string $eventName |
45 | 45 | * @param string $listenCode |
46 | - * @param array|closure $callback |
|
46 | + * @param Closure $callback |
|
47 | 47 | * @param boolean $save |
48 | 48 | */ |
49 | 49 | function listen($eventName, $listenCode, $callback, $save = false) |
@@ -51,7 +51,8 @@ discard block |
||
51 | 51 | $config = Config::custom(App::$primary->path . '/config/events.php'); |
52 | 52 | $config[$eventName][$listenCode] = serialize($callback); |
53 | 53 | Config::save(App::$primary->path . '/config/events.php', $config); |
54 | - } else { |
|
54 | + } |
|
55 | + else { |
|
55 | 56 | $this->_listeners[$eventName][$listenCode] = $callback; |
56 | 57 | } |
57 | 58 | } |
@@ -87,9 +88,11 @@ discard block |
||
87 | 88 | $event['calledBefore'] = $calledBefore; |
88 | 89 | if (is_callable($callback)) { |
89 | 90 | $event['eventObject'] = $callback($event); |
90 | - } elseif (is_array($callback) && isset($callback['callback'])) { |
|
91 | + } |
|
92 | + elseif (is_array($callback) && isset($callback['callback'])) { |
|
91 | 93 | $event['eventObject'] = $callback($event, $callback); |
92 | - } else { |
|
94 | + } |
|
95 | + else { |
|
93 | 96 | $event['eventObject'] = App::$cur->{$callback['module']}->{$callback['method']}($event, $callback); |
94 | 97 | } |
95 | 98 | $calledBefore[$iteration] = $listenCode; |
@@ -15,7 +15,7 @@ |
||
15 | 15 | * |
16 | 16 | * @var Inji |
17 | 17 | */ |
18 | - public static $inst = NULL; |
|
18 | + public static $inst = null; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * Dynamic events listeners |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | //Категории |
5 | 5 | App::$cur->db->createTable('callbacks_category', [ |
6 | 6 | 'category_id' => 'pk', |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | $statuses = [ |
5 | 5 | [ |
6 | 6 | 'name' => 'Онлайн', |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | |
5 | 5 | $groups = [ |
6 | 6 | [ |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function ($step = null, $params = []) { |
|
4 | 4 | |
5 | 5 | }; |
@@ -13,11 +13,11 @@ |
||
13 | 13 | |
14 | 14 | class Mysql extends \Object |
15 | 15 | { |
16 | - public $config = []; // настройки подключения выбраной базы |
|
17 | - public $connect = FALSE; // ярлык соединения с MySQL |
|
18 | - public $encoding = 'utf-8'; // установленная кодировка |
|
19 | - public $db_name = 'test'; // выбраная в данный момент база |
|
20 | - public $table_prefix = 'inji_'; // префикс названий таблиц |
|
16 | + public $config = []; // настройки подключения выбраной базы |
|
17 | + public $connect = FALSE; // ярлык соединения с MySQL |
|
18 | + public $encoding = 'utf-8'; // установленная кодировка |
|
19 | + public $db_name = 'test'; // выбраная в данный момент база |
|
20 | + public $table_prefix = 'inji_'; // префикс названий таблиц |
|
21 | 21 | public $pdo = NULL; |
22 | 22 | public $lastQuery = ''; |
23 | 23 | public $last_error = ''; |
@@ -29,14 +29,18 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function init($connect_options) { |
31 | 31 | extract($connect_options); |
32 | - if (isset($db_name)) |
|
33 | - $this->db_name = $db_name; |
|
34 | - if (isset($encoding)) |
|
35 | - $this->encoding = $encoding; |
|
36 | - if (isset($table_prefix)) |
|
37 | - $this->table_prefix = $table_prefix; |
|
38 | - if (isset($noConnectAbort)) |
|
39 | - $this->noConnectAbort = $noConnectAbort; |
|
32 | + if (isset($db_name)) { |
|
33 | + $this->db_name = $db_name; |
|
34 | + } |
|
35 | + if (isset($encoding)) { |
|
36 | + $this->encoding = $encoding; |
|
37 | + } |
|
38 | + if (isset($table_prefix)) { |
|
39 | + $this->table_prefix = $table_prefix; |
|
40 | + } |
|
41 | + if (isset($noConnectAbort)) { |
|
42 | + $this->noConnectAbort = $noConnectAbort; |
|
43 | + } |
|
40 | 44 | |
41 | 45 | $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding"; |
42 | 46 | $dt = new \DateTime(); |
@@ -52,10 +56,12 @@ discard block |
||
52 | 56 | if ((int) $error[0]) { |
53 | 57 | if ($this->noConnectAbort) { |
54 | 58 | return false; |
55 | - } else { |
|
59 | + } |
|
60 | + else { |
|
56 | 61 | INJI_SYSTEM_ERROR($error[2], true); |
57 | 62 | } |
58 | - } else { |
|
63 | + } |
|
64 | + else { |
|
59 | 65 | $this->connect = true; |
60 | 66 | $query = new Mysql\Query($this); |
61 | 67 | $query->query("SET SQL_BIG_SELECTS=1"); |
@@ -14,11 +14,11 @@ |
||
14 | 14 | class Mysql extends \Object { |
15 | 15 | |
16 | 16 | public $config = []; // настройки подключения выбраной базы |
17 | - public $connect = FALSE; // ярлык соединения с MySQL |
|
17 | + public $connect = false; // ярлык соединения с MySQL |
|
18 | 18 | public $encoding = 'utf-8'; // установленная кодировка |
19 | 19 | public $db_name = 'test'; // выбраная в данный момент база |
20 | 20 | public $table_prefix = 'inji_'; // префикс названий таблиц |
21 | - public $pdo = NULL; |
|
21 | + public $pdo = null; |
|
22 | 22 | public $lastQuery = ''; |
23 | 23 | public $last_error = ''; |
24 | 24 | public $noConnectAbort = false; |