@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function($step = NULL, $params = []) { |
|
3 | +return function($step = null, $params = []) { |
|
4 | 4 | $options = ['max_height' => 1200, 'max_width' => 1200]; |
5 | 5 | $types = [ |
6 | 6 | [ |
@@ -13,12 +13,12 @@ |
||
13 | 13 | |
14 | 14 | class Reader extends \Object { |
15 | 15 | |
16 | - public $data = NULL; |
|
16 | + public $data = null; |
|
17 | 17 | public $source = ''; |
18 | 18 | |
19 | 19 | public function loadData($source = '') { |
20 | 20 | $this->source = $source; |
21 | - return FALSE; |
|
21 | + return false; |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function readPath($path = '/') { |
@@ -145,7 +145,7 @@ |
||
145 | 145 | $auth_key = md5($config['appId'] . '_' . $viewer_id . '_' . $config['secret']); |
146 | 146 | |
147 | 147 | if ($auth_key !== $get_auth_key) { |
148 | - return FALSE; |
|
148 | + return false; |
|
149 | 149 | } |
150 | 150 | $userQuery = [ |
151 | 151 | 'user_id' => $viewer_id, |
@@ -138,13 +138,13 @@ |
||
138 | 138 | $userId = (int) $userId; |
139 | 139 | $result = new \Server\Result(); |
140 | 140 | if (!$userId) { |
141 | - $result->success = FALSE; |
|
141 | + $result->success = false; |
|
142 | 142 | $result->content = 'Не указан пользователь'; |
143 | 143 | $result->send(); |
144 | 144 | } |
145 | 145 | $partners = App::$cur->users->getUserPartners(Users\User::$cur, 8); |
146 | 146 | if (empty($partners['users'][$userId])) { |
147 | - $result->success = FALSE; |
|
147 | + $result->success = false; |
|
148 | 148 | $result->content = 'Этот пользователь не находится в вашей структуре'; |
149 | 149 | $result->send(); |
150 | 150 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | public function checkAccess($element, $user = null) { |
30 | - $access = NULL; |
|
30 | + $access = null; |
|
31 | 31 | foreach ($this->accessCheckers as $getter) { |
32 | 32 | foreach ($getter['classes'] as $className) { |
33 | 33 | if ($element instanceof $className) { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } elseif (!$path) { |
70 | 70 | return $array; |
71 | 71 | } else { |
72 | - return NULL; |
|
72 | + return null; |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 |
@@ -17,15 +17,15 @@ |
||
17 | 17 | if (!empty($request[$this->colName]['pass']) && !empty($request[$this->colName]['pass'])) { |
18 | 18 | if (empty($request[$this->colName]['pass'])) { |
19 | 19 | \Msg::add('Вы не ввели пароль в первое поле', 'danger'); |
20 | - return FALSE; |
|
20 | + return false; |
|
21 | 21 | } |
22 | 22 | if (empty($request[$this->colName]['repeat'])) { |
23 | 23 | \Msg::add('Вы не ввели пароль во второе поле', 'danger'); |
24 | - return FALSE; |
|
24 | + return false; |
|
25 | 25 | } |
26 | 26 | if ($request[$this->colName]['pass'] != $request[$this->colName]['repeat']) { |
27 | 27 | \Msg::add('Введенные пароли не совпадают', 'danger'); |
28 | - return FALSE; |
|
28 | + return false; |
|
29 | 29 | } |
30 | 30 | $this->activeForm->model->{$this->colName} = \App::$cur->users->hashpass($request[$this->colName]['pass']); |
31 | 31 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | return [ |
12 | 12 | 'classes' => ['Ui\DataManager'], |
13 | 13 | 'get' => function($element) { |
14 | -$access = NULL; |
|
14 | +$access = null; |
|
15 | 15 | $path = [ |
16 | 16 | 'models', |
17 | 17 | $element->modelName, |
@@ -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; |
@@ -28,14 +28,14 @@ |
||
28 | 28 | public function reciverAction($system = '', $status = '') { |
29 | 29 | $postData = []; |
30 | 30 | foreach ($_POST as $key => $text) { |
31 | - if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), TRUE)) { |
|
31 | + if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), true)) { |
|
32 | 32 | $postData[$key] = iconv('Windows-1251', 'UTF-8', $text); |
33 | 33 | } else { |
34 | 34 | $postData[$key] = $text; |
35 | 35 | } |
36 | 36 | } |
37 | 37 | foreach ($_GET as $key => $text) { |
38 | - if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), TRUE)) { |
|
38 | + if (!is_array($text) && !mb_detect_encoding($text, array('UTF-8'), true)) { |
|
39 | 39 | $postData[$key] = iconv('Windows-1251', 'UTF-8', $text); |
40 | 40 | } else { |
41 | 41 | $postData[$key] = $text; |