@@ -1,28 +1,28 @@ |
||
1 | 1 | <ul class="<?= $class; ?>"><?php |
2 | - if ($pagesInstance->params['page'] > 1) { |
|
3 | - $getArr['page'] = $pagesInstance->params['page'] - 1; |
|
4 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>←</a></li>"; |
|
5 | - } |
|
2 | + if ($pagesInstance->params['page'] > 1) { |
|
3 | + $getArr['page'] = $pagesInstance->params['page'] - 1; |
|
4 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>←</a></li>"; |
|
5 | + } |
|
6 | 6 | |
7 | - for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
|
8 | - if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
9 | - echo '<li '; |
|
10 | - if ($pagesInstance->params['page'] == $i) |
|
11 | - echo 'class = "active"'; |
|
12 | - echo ">"; |
|
13 | - $getArr['page'] = $i; |
|
14 | - echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
|
15 | - } |
|
16 | - elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
17 | - $getArr['page'] = round($pagesInstance->params['page'] / 2); |
|
18 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
19 | - } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
20 | - $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
|
21 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
22 | - } |
|
23 | - } |
|
24 | - if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) { |
|
25 | - $getArr['page'] = $pagesInstance->params['page'] + 1; |
|
26 | - echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>→</a></li>"; |
|
27 | - } |
|
28 | - ?></ul> |
|
29 | 7 | \ No newline at end of file |
8 | + for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
|
9 | + if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
10 | + echo '<li '; |
|
11 | + if ($pagesInstance->params['page'] == $i) |
|
12 | + echo 'class = "active"'; |
|
13 | + echo ">"; |
|
14 | + $getArr['page'] = $i; |
|
15 | + echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
|
16 | + } |
|
17 | + elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
18 | + $getArr['page'] = round($pagesInstance->params['page'] / 2); |
|
19 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
20 | + } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
|
21 | + $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page']; |
|
22 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
|
23 | + } |
|
24 | + } |
|
25 | + if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) { |
|
26 | + $getArr['page'] = $pagesInstance->params['page'] + 1; |
|
27 | + echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>→</a></li>"; |
|
28 | + } |
|
29 | + ?></ul> |
|
30 | 30 | \ No newline at end of file |
@@ -5,7 +5,7 @@ |
||
5 | 5 | } |
6 | 6 | |
7 | 7 | for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
8 | - if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
8 | + if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
9 | 9 | echo '<li '; |
10 | 10 | if ($pagesInstance->params['page'] == $i) |
11 | 11 | echo 'class = "active"'; |
@@ -7,13 +7,13 @@ |
||
7 | 7 | for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
8 | 8 | if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
9 | 9 | echo '<li '; |
10 | - if ($pagesInstance->params['page'] == $i) |
|
11 | - echo 'class = "active"'; |
|
10 | + if ($pagesInstance->params['page'] == $i) { |
|
11 | + echo 'class = "active"'; |
|
12 | + } |
|
12 | 13 | echo ">"; |
13 | 14 | $getArr['page'] = $i; |
14 | 15 | echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>"; |
15 | - } |
|
16 | - elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
16 | + } elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) { |
|
17 | 17 | $getArr['page'] = round($pagesInstance->params['page'] / 2); |
18 | 18 | echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>"; |
19 | 19 | } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) { |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $text = ''; |
44 | 44 | foreach ($form->inputs as $input) { |
45 | 45 | if (isset($inputs['input' . $input->id])) { |
46 | - $text .="<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
46 | + $text .= "<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | if ($text) { |
@@ -16,8 +16,9 @@ |
||
16 | 16 | if (!empty($_POST['UserForms'])) { |
17 | 17 | foreach ($_POST['UserForms'] as $form_id => $inputs) { |
18 | 18 | $form = \UserForms\Form::get((int) $form_id); |
19 | - if (!$form) |
|
20 | - continue; |
|
19 | + if (!$form) { |
|
20 | + continue; |
|
21 | + } |
|
21 | 22 | $formRecive = new \UserForms\Recive(); |
22 | 23 | $formRecive->user_id = (int) \Users\User::$cur->id; |
23 | 24 | $formRecive->form_id = (int) $form_id; |
@@ -296,7 +296,7 @@ |
||
296 | 296 | $to = $user_mail; |
297 | 297 | $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME); |
298 | 298 | $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass; |
299 | - $text .='<br />'; |
|
299 | + $text .= '<br />'; |
|
300 | 300 | $text .= '<br />'; |
301 | 301 | $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>'; |
302 | 302 | Tools::sendMail($from, $to, $subject, $text); |
@@ -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 | } |
@@ -116,6 +116,9 @@ discard block |
||
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | + /** |
|
120 | + * @param string $user_mail |
|
121 | + */ |
|
119 | 122 | public function passre($user_mail) { |
120 | 123 | $user = $this->get($user_mail, 'mail'); |
121 | 124 | if (!$user) { |
@@ -400,6 +403,9 @@ discard block |
||
400 | 403 | return $return; |
401 | 404 | } |
402 | 405 | |
406 | + /** |
|
407 | + * @param integer $cat_id |
|
408 | + */ |
|
403 | 409 | public function addUserActivity($user_id, $cat_id, $text = '') { |
404 | 410 | $ua = new Users\Activity([ |
405 | 411 | 'user_id' => $user_id, |
@@ -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 | App::$cur->db->createTable('notifications_notification', [ |
5 | 5 | 'notification_id' => 'pk', |
6 | 6 | 'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL', |
@@ -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 | ] |
@@ -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'); |
@@ -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) { |