@@ -66,6 +66,9 @@ |
||
66 | 66 | ] |
67 | 67 | ]); |
68 | 68 | ?> |
69 | -<?php else: ?> |
|
69 | +<?php else { |
|
70 | + : ?> |
|
70 | 71 | <p>No additional fields is added!</p> |
71 | -<?php endif; ?> |
|
72 | 72 | \ No newline at end of file |
73 | +<?php endif; |
|
74 | +} |
|
75 | +?> |
|
73 | 76 | \ No newline at end of file |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | <hr /> |
24 | 24 | <div class="row"> |
25 | 25 | <div class="col-md-12"> |
26 | - <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add field'), ['class' => 'btn btn-primary pull-right']) ?> |
|
26 | + <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> '.__('Add field'), ['class' => 'btn btn-primary pull-right']) ?> |
|
27 | 27 | </div> |
28 | 28 | </div> |
29 | 29 | <?php if ($records->count() > 0): |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | $items[] = [ |
39 | 39 | ['text' => $row->id], |
40 | 40 | ['text' => Serialize::getDecodeLocale($row->name)], |
41 | - ['text' => '<span class="' . $labelClass . '">' . $row->type . '</span>', 'html' => true], |
|
42 | - ['text' => '<code>' . ($row->reg_cond == 0 ? '!' : null) . 'preg_match("' . $row->reg_exp . '", input)' . '</code>', 'html' => true], |
|
41 | + ['text' => '<span class="'.$labelClass.'">'.$row->type.'</span>', 'html' => true], |
|
42 | + ['text' => '<code>'.($row->reg_cond == 0 ? '!' : null).'preg_match("'.$row->reg_exp.'", input)'.'</code>', 'html' => true], |
|
43 | 43 | [ |
44 | - 'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]) . |
|
44 | + 'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]). |
|
45 | 45 | Url::link(['profile/fielddelete', $row->id], '<i class="fa fa-trash-o fa-lg"></i>', ['html' => true]), |
46 | 46 | 'html' => true, |
47 | 47 | 'property' => ['class' => 'text-center'] |
@@ -9,4 +9,4 @@ |
||
9 | 9 | ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']], |
10 | 10 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']] |
11 | 11 | ] |
12 | -]);?> |
|
13 | 12 | \ No newline at end of file |
13 | +]); ?> |
|
14 | 14 | \ No newline at end of file |
@@ -109,13 +109,16 @@ |
||
109 | 109 | <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?> |
110 | 110 | <?php if (Obj::isLikeInt($bUrl)): // only text ?> |
111 | 111 | <li class="active"><?= \App::$Security->strip_tags($bText) ?></li> |
112 | - <?php else: ?> |
|
112 | + <?php else { |
|
113 | + : ?> |
|
113 | 114 | <li> |
114 | 115 | <a href="<?= \App::$Security->strip_tags($bUrl) ?>"> |
115 | 116 | <?= \App::$Security->strip_tags($bText) ?> |
116 | 117 | </a> |
117 | 118 | </li> |
118 | - <?php endif; ?> |
|
119 | + <?php endif; |
|
120 | +} |
|
121 | +?> |
|
119 | 122 | <?php endforeach; ?> |
120 | 123 | </ol> |
121 | 124 | <?php endif; ?> |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | <?php |
19 | 19 | $customCssCode = \App::$View->showPlainCode('css'); |
20 | 20 | if ($customCssCode !== null) { |
21 | - echo '<style>' . $customCssCode . '</style>'; |
|
21 | + echo '<style>'.$customCssCode.'</style>'; |
|
22 | 22 | } ?> |
23 | 23 | <script> |
24 | 24 | window.jQ = []; |
@@ -38,18 +38,18 @@ discard block |
||
38 | 38 | if (\App::$User->isAuth()) { |
39 | 39 | $userId = \App::$User->identity()->getId(); |
40 | 40 | $accountPanel = [ |
41 | - ['type' => 'link', 'link' => ['profile/show', $userId], 'text' => '<i class="fa fa-user"></i> ' . __('Profile'), 'html' => true, '!secure' => true], |
|
42 | - ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true, '!secure' => true], |
|
43 | - ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-secret"></i> ' . __('Logout'), 'html' => true, '!secure' => true] |
|
41 | + ['type' => 'link', 'link' => ['profile/show', $userId], 'text' => '<i class="fa fa-user"></i> '.__('Profile'), 'html' => true, '!secure' => true], |
|
42 | + ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true, '!secure' => true], |
|
43 | + ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-secret"></i> '.__('Logout'), 'html' => true, '!secure' => true] |
|
44 | 44 | ]; |
45 | 45 | |
46 | 46 | if (\App::$User->identity()->getRole()->can('Admin/Main/Index')) { |
47 | - $accountPanel[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl . '/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'html' => true, '!secure' => true]; |
|
47 | + $accountPanel[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl.'/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'html' => true, '!secure' => true]; |
|
48 | 48 | } |
49 | 49 | } else { |
50 | 50 | $accountPanel = [ |
51 | - ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> ' . __('Sign in'), 'html' => true, '!secure' => true], |
|
52 | - ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> ' . __('Sign up'), 'html' => true, '!secure' => true] |
|
51 | + ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> '.__('Sign in'), 'html' => true, '!secure' => true], |
|
52 | + ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> '.__('Sign up'), 'html' => true, '!secure' => true] |
|
53 | 53 | ]; |
54 | 54 | } |
55 | 55 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | echo $body; |
138 | 138 | } else { |
139 | 139 | \App::$Response->setStatusCode(404); |
140 | - echo '<p>' . __('Page is not founded!') . '</p>'; |
|
140 | + echo '<p>'.__('Page is not founded!').'</p>'; |
|
141 | 141 | } |
142 | 142 | ?> |
143 | 143 | </div> |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | <?php |
198 | 198 | $customJsCode = \App::$View->showPlainCode('js'); |
199 | 199 | if ($customJsCode !== null) { |
200 | - echo '<script>' . $customJsCode . '</script>'; |
|
200 | + echo '<script>'.$customJsCode.'</script>'; |
|
201 | 201 | } |
202 | 202 | // render google analytics code here |
203 | 203 | echo \App::$View->render('blocks/googleanalytics'); |
@@ -59,7 +59,8 @@ discard block |
||
59 | 59 | </a> |
60 | 60 | </div> |
61 | 61 | </div> |
62 | - <?php else: ?> |
|
62 | + <?php else { |
|
63 | + : ?> |
|
63 | 64 | <div class="row"> |
64 | 65 | <div class="col-md-8" style="padding-right: 0;"> |
65 | 66 | <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>"> |
@@ -76,7 +77,9 @@ discard block |
||
76 | 77 | <a href="javascript:void(0);" class="btn btn-block btn-danger" id="reduceRating">-</a> |
77 | 78 | </div> |
78 | 79 | </div> |
79 | - <?php endif; ?> |
|
80 | + <?php endif; |
|
81 | +} |
|
82 | +?> |
|
80 | 83 | <?php endif; ?> |
81 | 84 | <?php |
82 | 85 | $userMenu = null; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $name = __('No name'); |
27 | 27 | } |
28 | 28 | |
29 | -$this->title = __('Profile') . ': ' . $name; |
|
29 | +$this->title = __('Profile').': '.$name; |
|
30 | 30 | |
31 | 31 | $this->breadcrumbs = [ |
32 | 32 | Url::to('/') => __('Home'), |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | <?php |
47 | 47 | if ($ratingOn): |
48 | 48 | $rateClass = 'btn-default'; |
49 | - $rateValue = (int)$user->getProfile()->rating; |
|
49 | + $rateValue = (int) $user->getProfile()->rating; |
|
50 | 50 | if ($user->getProfile()->rating > 0) { |
51 | 51 | $rateClass = 'btn-info'; |
52 | 52 | } elseif ($user->getProfile()->rating < 0) { |
@@ -84,19 +84,19 @@ discard block |
||
84 | 84 | $userMenu = null; |
85 | 85 | if (true === $isSelf) { |
86 | 86 | $userMenu = [ |
87 | - ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true], |
|
88 | - ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
89 | - ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true] |
|
87 | + ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true], |
|
88 | + ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
89 | + ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true] |
|
90 | 90 | ]; |
91 | 91 | } elseif (\App::$User->isAuth()) { |
92 | 92 | $userMenu = [ |
93 | 93 | [ |
94 | 94 | 'type' => 'link', 'link' => Url::to('profile/messages', null, null, ['newdialog' => $user->id]), |
95 | - 'text' => '<i class="fa fa-pencil-square-o"></i> ' . __('Write message'), 'html' => true |
|
95 | + 'text' => '<i class="fa fa-pencil-square-o"></i> '.__('Write message'), 'html' => true |
|
96 | 96 | ], |
97 | 97 | [ |
98 | 98 | 'type' => 'link', 'link' => Url::to('profile/ignore', null, null, ['id' => $user->id]), |
99 | - 'text' => '<i class="fa fa-user-times"></i> ' . __('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
99 | + 'text' => '<i class="fa fa-user-times"></i> '.__('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
100 | 100 | ] |
101 | 101 | ]; |
102 | 102 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | foreach ($hobbyArray as $item) { |
173 | 173 | $item = \App::$Security->strip_tags($item); |
174 | 174 | if ($item !== null && Str::length($item) > 1) { |
175 | - echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']) . ' '; |
|
175 | + echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']).' '; |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | ?> |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | <?= $form->field('message', 'textarea', ['class' => 'form-control']); ?> |
219 | 219 | <div class="text-right"><?= $form->submitButton(__('Send'), ['class' => 'btn btn-default']); ?></div> |
220 | 220 | <?= $form->finish(); ?> |
221 | - <?php \App::$Alias->addPlainCode('js', "$('#" . $wall->getFormName() . "').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?> |
|
221 | + <?php \App::$Alias->addPlainCode('js', "$('#".$wall->getFormName()."').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?> |
|
222 | 222 | <?php endif; ?> |
223 | 223 | <?php |
224 | 224 | if ($wallRecords !== null): |
@@ -229,8 +229,7 @@ discard block |
||
229 | 229 | continue; |
230 | 230 | } |
231 | 231 | $referNickname = ($referObject->getProfile()->nick == null ? |
232 | - __('No name') . ' <sup>id' . $referObject->getId() . '</sup>' : |
|
233 | - \App::$Security->strip_tags($referObject->getProfile()->nick)); |
|
232 | + __('No name').' <sup>id'.$referObject->getId().'</sup>' : \App::$Security->strip_tags($referObject->getProfile()->nick)); |
|
234 | 233 | ?> |
235 | 234 | <div class="row object-lightborder" id="wall-post-<?= $post->id ?>"> |
236 | 235 | <div class="col-md-2"> |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return array ( |
|
3 | +return array( |
|
4 | 4 | 0 => 'global/write', |
5 | 5 | 1 => 'global/modify', |
6 | 6 | 2 => 'global/file', |
@@ -1,41 +1,41 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return array ( |
4 | - 0 => 'global/write', |
|
5 | - 1 => 'global/modify', |
|
6 | - 2 => 'global/file', |
|
7 | - 3 => 'global/all', |
|
8 | - 4 => 'Admin/Application/Index', |
|
9 | - 5 => 'Admin/Application/Turn', |
|
10 | - 6 => 'Admin/Content/Index', |
|
11 | - 7 => 'Admin/Content/Update', |
|
12 | - 8 => 'Admin/Content/Delete', |
|
13 | - 9 => 'Admin/Content/Restore', |
|
14 | - 10 => 'Admin/Content/Clear', |
|
15 | - 11 => 'Admin/Content/Categories', |
|
16 | - 12 => 'Admin/Content/Categorydelete', |
|
17 | - 13 => 'Admin/Content/Categoryupdate', |
|
18 | - 14 => 'Admin/Content/Settings', |
|
19 | - 15 => 'Admin/Main/Index', |
|
20 | - 16 => 'Admin/Main/Settings', |
|
21 | - 17 => 'Admin/Main/Files', |
|
22 | - 18 => 'Admin/Main/Antivirus', |
|
23 | - 19 => 'Admin/Main/Debugcookie', |
|
24 | - 20 => 'Admin/Main/Routing', |
|
25 | - 21 => 'Admin/Main/Addroute', |
|
26 | - 22 => 'Admin/Main/Deleteroute', |
|
27 | - 23 => 'Admin/Profile/Index', |
|
28 | - 24 => 'Admin/Profile/Delete', |
|
29 | - 25 => 'Admin/Profile/Update', |
|
30 | - 26 => 'Admin/Profile/Fieldlist', |
|
31 | - 27 => 'Admin/Profile/Fieldupdate', |
|
32 | - 28 => 'Admin/Profile/Fielddelete', |
|
33 | - 29 => 'Admin/Profile/Settings', |
|
34 | - 30 => 'Admin/User/Index', |
|
35 | - 31 => 'Admin/User/Update', |
|
36 | - 32 => 'Admin/User/Delete', |
|
37 | - 33 => 'Admin/User/Grouplist', |
|
38 | - 34 => 'Admin/User/GroupUpdate', |
|
39 | - 35 => 'Admin/User/Settings', |
|
40 | - 36 => 'Admin/User/Invite', |
|
4 | + 0 => 'global/write', |
|
5 | + 1 => 'global/modify', |
|
6 | + 2 => 'global/file', |
|
7 | + 3 => 'global/all', |
|
8 | + 4 => 'Admin/Application/Index', |
|
9 | + 5 => 'Admin/Application/Turn', |
|
10 | + 6 => 'Admin/Content/Index', |
|
11 | + 7 => 'Admin/Content/Update', |
|
12 | + 8 => 'Admin/Content/Delete', |
|
13 | + 9 => 'Admin/Content/Restore', |
|
14 | + 10 => 'Admin/Content/Clear', |
|
15 | + 11 => 'Admin/Content/Categories', |
|
16 | + 12 => 'Admin/Content/Categorydelete', |
|
17 | + 13 => 'Admin/Content/Categoryupdate', |
|
18 | + 14 => 'Admin/Content/Settings', |
|
19 | + 15 => 'Admin/Main/Index', |
|
20 | + 16 => 'Admin/Main/Settings', |
|
21 | + 17 => 'Admin/Main/Files', |
|
22 | + 18 => 'Admin/Main/Antivirus', |
|
23 | + 19 => 'Admin/Main/Debugcookie', |
|
24 | + 20 => 'Admin/Main/Routing', |
|
25 | + 21 => 'Admin/Main/Addroute', |
|
26 | + 22 => 'Admin/Main/Deleteroute', |
|
27 | + 23 => 'Admin/Profile/Index', |
|
28 | + 24 => 'Admin/Profile/Delete', |
|
29 | + 25 => 'Admin/Profile/Update', |
|
30 | + 26 => 'Admin/Profile/Fieldlist', |
|
31 | + 27 => 'Admin/Profile/Fieldupdate', |
|
32 | + 28 => 'Admin/Profile/Fielddelete', |
|
33 | + 29 => 'Admin/Profile/Settings', |
|
34 | + 30 => 'Admin/User/Index', |
|
35 | + 31 => 'Admin/User/Update', |
|
36 | + 32 => 'Admin/User/Delete', |
|
37 | + 33 => 'Admin/User/Grouplist', |
|
38 | + 34 => 'Admin/User/GroupUpdate', |
|
39 | + 35 => 'Admin/User/Settings', |
|
40 | + 36 => 'Admin/User/Invite', |
|
41 | 41 | ); |
42 | 42 | \ No newline at end of file |
@@ -14,8 +14,9 @@ |
||
14 | 14 | |
15 | 15 | public function init() |
16 | 16 | { |
17 | - if ($this->message === null) |
|
18 | - $this->message = 'Hello, world'; |
|
17 | + if ($this->message === null) { |
|
18 | + $this->message = 'Hello, world'; |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | public function display() |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | public $captcha; |
18 | 18 | |
19 | 19 | /** |
20 | - * Labels |
|
21 | - */ |
|
20 | + * Labels |
|
21 | + */ |
|
22 | 22 | public function labels() |
23 | 23 | { |
24 | 24 | return [ |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | - * Validation rules |
|
32 | - */ |
|
31 | + * Validation rules |
|
32 | + */ |
|
33 | 33 | public function rules() |
34 | 34 | { |
35 | 35 | return [ |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | const COMPRESS_QUALITY = 90; |
17 | 17 | |
18 | 18 | /** |
19 | - * Example of usage magic labels for future form helper usage |
|
20 | - */ |
|
19 | + * Example of usage magic labels for future form helper usage |
|
20 | + */ |
|
21 | 21 | public function labels() |
22 | 22 | { |
23 | 23 | return [ |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
29 | - * Example of usage magic rules for future usage in condition $model->validate() |
|
30 | - */ |
|
29 | + * Example of usage magic rules for future usage in condition $model->validate() |
|
30 | + */ |
|
31 | 31 | public function rules() |
32 | 32 | { |
33 | 33 | return [ |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | public $captcha; |
18 | 18 | |
19 | 19 | /** |
20 | - * Labels |
|
21 | - */ |
|
20 | + * Labels |
|
21 | + */ |
|
22 | 22 | public function labels() |
23 | 23 | { |
24 | 24 | return [ |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
31 | - * Validation rules |
|
32 | - */ |
|
31 | + * Validation rules |
|
32 | + */ |
|
33 | 33 | public function rules() |
34 | 34 | { |
35 | 35 | return [ |