@@ -52,7 +52,7 @@ |
||
52 | 52 | public function save() |
53 | 53 | { |
54 | 54 | // check if target is myself or always exist in block list |
55 | - if ($this->_user->getId() === (int)$this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
55 | + if ($this->_user->getId() === (int) $this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
56 | 56 | return false; |
57 | 57 | } |
58 | 58 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | [['text' => __('Name')], ['text' => $app->getLocaleName()]], |
32 | 32 | [['text' => __('System name')], ['text' => $app->sys_name]], |
33 | 33 | [['text' => __('Last update')], ['text' => Date::convertToDatetime($app->updated_at, DATE::FORMAT_TO_SECONDS)]], |
34 | - [['text' => __('Status')], ['text' => ((int)$app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int)$app->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
34 | + [['text' => __('Status')], ['text' => ((int) $app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' => ((int) $app->disabled === 0) ? 'alert-success' : 'alert-danger']] |
|
35 | 35 | ] |
36 | 36 | ] |
37 | 37 | ]); ?> |
@@ -188,13 +188,16 @@ |
||
188 | 188 | <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?> |
189 | 189 | <?php if (Obj::isLikeInt($bUrl)): // only text ?> |
190 | 190 | <li class="active"><?= \App::$Security->strip_tags($bText) ?></li> |
191 | - <?php else: ?> |
|
191 | + <?php else { |
|
192 | + : ?> |
|
192 | 193 | <li> |
193 | 194 | <a href="<?= \App::$Security->strip_tags($bUrl) ?>"> |
194 | 195 | <?= \App::$Security->strip_tags($bText) ?> |
195 | 196 | </a> |
196 | 197 | </li> |
197 | - <?php endif; ?> |
|
198 | + <?php endif; |
|
199 | +} |
|
200 | +?> |
|
198 | 201 | <?php endforeach; ?> |
199 | 202 | </ol> |
200 | 203 | <?php endif; ?> |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | <?php |
23 | 23 | $customCssCode = \App::$View->showPlainCode('css'); |
24 | 24 | if ($customCssCode !== null) { |
25 | - echo '<style>' . $customCssCode . '</style>'; |
|
25 | + echo '<style>'.$customCssCode.'</style>'; |
|
26 | 26 | } ?> |
27 | 27 | <script> |
28 | 28 | window.jQ = []; |
@@ -130,11 +130,11 @@ discard block |
||
130 | 130 | 'type' => 'ul', |
131 | 131 | 'property' => ['class' => 'nav nav-second-level'], |
132 | 132 | 'items' => [ |
133 | - ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true], |
|
134 | - ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true], |
|
135 | - ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true], |
|
136 | - ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true], |
|
137 | - ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true] |
|
133 | + ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true], |
|
134 | + ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true], |
|
135 | + ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true], |
|
136 | + ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true], |
|
137 | + ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true] |
|
138 | 138 | ] |
139 | 139 | ]) ?> |
140 | 140 | <!-- /.nav-second-level --> |
@@ -154,22 +154,22 @@ discard block |
||
154 | 154 | foreach ($extTable as $item) { |
155 | 155 | $menuItem = [ |
156 | 156 | 'type' => 'link', |
157 | - 'link' => [Str::lowerCase($item->sys_name) . '/index'], |
|
158 | - 'text' => $item->getLocaleName() . (!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null), |
|
157 | + 'link' => [Str::lowerCase($item->sys_name).'/index'], |
|
158 | + 'text' => $item->getLocaleName().(!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null), |
|
159 | 159 | 'html' => true |
160 | 160 | ]; |
161 | 161 | if ($item->type === 'app') { |
162 | 162 | $appControllers[] = $item->sys_name; |
163 | 163 | $appMenuItems[] = $menuItem; |
164 | - } elseif($item->type === 'widget') { |
|
164 | + } elseif ($item->type === 'widget') { |
|
165 | 165 | $widgetControllers[] = $item->sys_name; |
166 | 166 | $widgetMenuItems[] = $menuItem; |
167 | 167 | } |
168 | 168 | } |
169 | 169 | |
170 | - $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps') . '...']; |
|
170 | + $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps').'...']; |
|
171 | 171 | $appControllers[] = 'Application'; |
172 | - $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets') . '...']; |
|
172 | + $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets').'...']; |
|
173 | 173 | $widgetControllers[] = 'Widget'; |
174 | 174 | ?> |
175 | 175 | <li<?= Arr::in(\App::$Request->getController(), $appControllers) ? ' class="active"' : null ?>> |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | echo $body; |
231 | 231 | } else { |
232 | 232 | \App::$Response->setStatusCode(404); |
233 | - echo '<p>' . __('Page is not founded!') . '</p>'; |
|
233 | + echo '<p>'.__('Page is not founded!').'</p>'; |
|
234 | 234 | } |
235 | 235 | ?> |
236 | 236 | </article> |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | <?php |
262 | 262 | $customJsCode = \App::$View->showPlainCode('js'); |
263 | 263 | if ($customJsCode !== null) { |
264 | - echo '<script>' . $customJsCode . '</script>'; |
|
264 | + echo '<script>'.$customJsCode.'</script>'; |
|
265 | 265 | } |
266 | 266 | ?> |
267 | 267 | </body> |
@@ -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; ?> |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | <?php |
24 | 24 | $customCssCode = \App::$View->showPlainCode('css'); |
25 | 25 | if ($customCssCode !== null) { |
26 | - echo '<style>' . $customCssCode . '</style>'; |
|
26 | + echo '<style>'.$customCssCode.'</style>'; |
|
27 | 27 | } ?> |
28 | 28 | <script> |
29 | 29 | window.jQ = []; |
@@ -40,32 +40,32 @@ discard block |
||
40 | 40 | if (\App::$User->isAuth()) { |
41 | 41 | $userId = \App::$User->identity()->getId(); |
42 | 42 | // show 'add content' button if current controller is Content and user add is enabled |
43 | - if (\App::$Request->getController() === 'Content' && (bool)AppRecord::getConfig('app', 'Content', 'userAdd')) { |
|
44 | - $items[] = ['type' => 'link', 'link' => ['content/update'], 'text' => '<i class="fa fa-plus"></i> ' . __('Add content'), 'html' => true, 'position' => 'right']; |
|
43 | + if (\App::$Request->getController() === 'Content' && (bool) AppRecord::getConfig('app', 'Content', 'userAdd')) { |
|
44 | + $items[] = ['type' => 'link', 'link' => ['content/update'], 'text' => '<i class="fa fa-plus"></i> '.__('Add content'), 'html' => true, 'position' => 'right']; |
|
45 | 45 | } |
46 | 46 | $accountDropdown[] = ['link' => ['profile/show', $userId], 'text' => __('My profile')]; |
47 | - $accountDropdown[] = ['link' => ['profile/messages'], 'text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'html' => true, '!secure' => true]; |
|
48 | - $accountDropdown[] = ['link' => ['profile/notifications'], 'text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'html' => true, '!secure' => true]; |
|
49 | - if ((bool)AppRecord::getConfig('app', 'Content', 'userAdd')) { |
|
47 | + $accountDropdown[] = ['link' => ['profile/messages'], 'text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'html' => true, '!secure' => true]; |
|
48 | + $accountDropdown[] = ['link' => ['profile/notifications'], 'text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'html' => true, '!secure' => true]; |
|
49 | + if ((bool) AppRecord::getConfig('app', 'Content', 'userAdd')) { |
|
50 | 50 | $accountDropdown[] = ['link' => ['content/my'], 'text' => __('My content')]; |
51 | 51 | } |
52 | 52 | $accountDropdown[] = ['link' => ['profile/settings'], 'text' => __('Settings')]; |
53 | 53 | |
54 | 54 | $items[] = [ |
55 | 55 | 'type' => 'dropdown', |
56 | - 'text' => '<i class="fa fa-user"></i> ' . __('Account') . ' <span class="badge" id="summary-count-block">0</span>', |
|
56 | + 'text' => '<i class="fa fa-user"></i> '.__('Account').' <span class="badge" id="summary-count-block">0</span>', |
|
57 | 57 | 'html' => true, |
58 | 58 | '!secure' => true, |
59 | 59 | 'position' => 'right', |
60 | 60 | 'items' => $accountDropdown |
61 | 61 | ]; |
62 | 62 | if (\App::$User->identity()->getRole()->can('Admin/Main/Index')) { |
63 | - $items[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl . '/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'position' => 'right', 'html' => true]; |
|
63 | + $items[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl.'/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'position' => 'right', 'html' => true]; |
|
64 | 64 | } |
65 | - $items[] = ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-times"></i> ' . __('Logout'), 'html' => true, 'position' => 'right']; |
|
65 | + $items[] = ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-times"></i> '.__('Logout'), 'html' => true, 'position' => 'right']; |
|
66 | 66 | } else { |
67 | - $items[] = ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> ' . __('Sign in'), 'position' => 'right', 'html' => true]; |
|
68 | - $items[] = ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> ' . __('Sign up'), 'position' => 'right', 'html' => true]; |
|
67 | + $items[] = ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> '.__('Sign in'), 'position' => 'right', 'html' => true]; |
|
68 | + $items[] = ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> '.__('Sign up'), 'position' => 'right', 'html' => true]; |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | echo Navbar::display([ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | 'container' => 'container', |
76 | 76 | 'collapseId' => 'collapse-object', |
77 | 77 | 'items' => $items |
78 | -]);?> |
|
78 | +]); ?> |
|
79 | 79 | </header> |
80 | 80 | |
81 | 81 | <div class="container body-container"> |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | echo $body; |
151 | 151 | } else { |
152 | 152 | \App::$Response->setStatusCode(404); |
153 | - echo '<p>' . __('Page is not founded!') . '</p>'; |
|
153 | + echo '<p>'.__('Page is not founded!').'</p>'; |
|
154 | 154 | } |
155 | 155 | ?> |
156 | 156 | </div> |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | <?php |
244 | 244 | $customJsCode = \App::$View->showPlainCode('js'); |
245 | 245 | if ($customJsCode !== null) { |
246 | - echo '<script>' . $customJsCode . '</script>'; |
|
246 | + echo '<script>'.$customJsCode.'</script>'; |
|
247 | 247 | } |
248 | 248 | // render google analytics code here |
249 | 249 | 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; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $name = __('No name'); |
28 | 28 | } |
29 | 29 | |
30 | -$this->title = __('Profile') . ': ' . $name; |
|
30 | +$this->title = __('Profile').': '.$name; |
|
31 | 31 | |
32 | 32 | $this->breadcrumbs = [ |
33 | 33 | Url::to('/') => __('Home'), |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | <?php |
48 | 48 | if ($ratingOn): |
49 | 49 | $rateClass = 'btn-default'; |
50 | - $rateValue = (int)$user->getProfile()->rating; |
|
50 | + $rateValue = (int) $user->getProfile()->rating; |
|
51 | 51 | if ($user->getProfile()->rating > 0) { |
52 | 52 | $rateClass = 'btn-info'; |
53 | 53 | } elseif ($user->getProfile()->rating < 0) { |
@@ -85,19 +85,19 @@ discard block |
||
85 | 85 | $userMenu = null; |
86 | 86 | if (true === $isSelf) { |
87 | 87 | $userMenu = [ |
88 | - ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true], |
|
89 | - ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
90 | - ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true] |
|
88 | + ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true], |
|
89 | + ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
90 | + ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true] |
|
91 | 91 | ]; |
92 | 92 | } elseif (\App::$User->isAuth()) { |
93 | 93 | $userMenu = [ |
94 | 94 | [ |
95 | 95 | 'type' => 'link', 'link' => Url::to('profile/messages', null, null, ['newdialog' => $user->id]), |
96 | - 'text' => '<i class="fa fa-pencil-square-o"></i> ' . __('Write message'), 'html' => true |
|
96 | + 'text' => '<i class="fa fa-pencil-square-o"></i> '.__('Write message'), 'html' => true |
|
97 | 97 | ], |
98 | 98 | [ |
99 | 99 | 'type' => 'link', 'link' => Url::to('profile/ignore', null, null, ['id' => $user->id]), |
100 | - 'text' => '<i class="fa fa-user-times"></i> ' . __('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
100 | + 'text' => '<i class="fa fa-user-times"></i> '.__('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
101 | 101 | ] |
102 | 102 | ]; |
103 | 103 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | foreach ($hobbyArray as $item) { |
174 | 174 | $item = \App::$Security->strip_tags($item); |
175 | 175 | if ($item !== null && Str::length($item) > 1) { |
176 | - echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']) . ' '; |
|
176 | + echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']).' '; |
|
177 | 177 | } |
178 | 178 | } |
179 | 179 | ?> |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | <?= $form->field('message', 'textarea', ['class' => 'form-control']); ?> |
220 | 220 | <div class="text-right"><?= $form->submitButton(__('Send'), ['class' => 'btn btn-default']); ?></div> |
221 | 221 | <?= $form->finish(); ?> |
222 | - <?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 | + <?php \App::$Alias->addPlainCode('js', "$('#".$wall->getFormName()."').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?> |
|
223 | 223 | <?php endif; ?> |
224 | 224 | <?php |
225 | 225 | if ($wallRecords !== null): |
@@ -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', |
@@ -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() |