@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $search = \Apps\ActiveRecord\App::getItem('widget', $controller); |
83 | 83 | |
84 | 84 | // check what we got |
85 | - if (!$search|| (int)$search->id < 1) { |
|
85 | + if (!$search || (int) $search->id < 1) { |
|
86 | 86 | throw new NotFoundException('Widget is not founded'); |
87 | 87 | } |
88 | 88 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | ->first(); |
118 | 118 | |
119 | 119 | // check if widget admin controller exists |
120 | - if (!$record || (int)$record->id < 1) { |
|
120 | + if (!$record || (int) $record->id < 1) { |
|
121 | 121 | throw new ForbiddenException('Widget is not founded'); |
122 | 122 | } |
123 | 123 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $record = new UserRecord(); |
27 | 27 | |
28 | 28 | // set current page num and offset |
29 | - $page = (int)$this->request->query->get('page', 0); |
|
29 | + $page = (int) $this->request->query->get('page', 0); |
|
30 | 30 | $offset = $page * self::ITEM_PER_PAGE; |
31 | 31 | |
32 | 32 | // prepare pagination data |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | <div class="media-left"> |
174 | 174 | <a href="#"> |
175 | 175 | <?php |
176 | - $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg'; |
|
176 | + $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg'; |
|
177 | 177 | if ($comment->user !== null && $comment->user->id > 0) { |
178 | 178 | $commentAva = $comment->user->profile->getAvatarUrl('small'); |
179 | 179 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | </li> |
251 | 251 | <li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>"> |
252 | 252 | <?= Url::a(['#system-dropdown'], |
253 | - '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>', |
|
253 | + '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>', |
|
254 | 254 | [ |
255 | 255 | 'class' => 'nav-container', |
256 | 256 | 'data-toggle' => 'collapse', |
@@ -258,13 +258,13 @@ discard block |
||
258 | 258 | ]) |
259 | 259 | ?> |
260 | 260 | |
261 | - <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown']) |
|
262 | - ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]) |
|
263 | - ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true]) |
|
264 | - ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true]) |
|
265 | - ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true]) |
|
266 | - ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> ' . __('Backup'), 'html' => true]) |
|
267 | - ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true]) |
|
261 | + <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown']) |
|
262 | + ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]) |
|
263 | + ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true]) |
|
264 | + ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true]) |
|
265 | + ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true]) |
|
266 | + ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> '.__('Backup'), 'html' => true]) |
|
267 | + ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true]) |
|
268 | 268 | ->display(); |
269 | 269 | ?> |
270 | 270 | </li> |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | ?> |
283 | 283 | <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? ' active' : null ?>"> |
284 | 284 | <?= Url::a(['#apps-dropdown'], |
285 | - '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>', |
|
285 | + '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>', |
|
286 | 286 | [ |
287 | 287 | 'class' => 'nav-container', |
288 | 288 | 'data-toggle' => 'collapse', |
@@ -291,18 +291,18 @@ discard block |
||
291 | 291 | ?> |
292 | 292 | |
293 | 293 | <?php |
294 | - $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']); |
|
294 | + $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']); |
|
295 | 295 | foreach ($apps as $app) { |
296 | 296 | /** @var \Apps\ActiveRecord\App $app */ |
297 | - $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]); |
|
297 | + $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]); |
|
298 | 298 | } |
299 | - $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']); |
|
299 | + $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']); |
|
300 | 300 | echo $appMenu->display(); |
301 | 301 | ?> |
302 | 302 | </li> |
303 | 303 | <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? ' active' : null ?>"> |
304 | 304 | <?= Url::a(['#widgets-dropdown'], |
305 | - '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>', |
|
305 | + '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>', |
|
306 | 306 | [ |
307 | 307 | 'class' => 'nav-container', |
308 | 308 | 'data-toggle' => 'collapse', |
@@ -311,12 +311,12 @@ discard block |
||
311 | 311 | ?> |
312 | 312 | |
313 | 313 | <?php |
314 | - $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']); |
|
314 | + $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']); |
|
315 | 315 | foreach ($widgets as $widget) { |
316 | 316 | /** @var \Apps\ActiveRecord\App $widget */ |
317 | - $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]); |
|
317 | + $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]); |
|
318 | 318 | } |
319 | - $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']); |
|
319 | + $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']); |
|
320 | 320 | echo $widgetMenu->display(); |
321 | 321 | ?> |
322 | 322 | </li> |
@@ -131,7 +131,8 @@ discard block |
||
131 | 131 | <span class="text-sm">No feedback queries found</span> |
132 | 132 | </div> |
133 | 133 | </div> |
134 | - <?php else: ?> |
|
134 | + <?php else { |
|
135 | + : ?> |
|
135 | 136 | <?php foreach ($features->getFeedback() as $feed): ?> |
136 | 137 | <div class="media"> |
137 | 138 | <div class="media-left"> |
@@ -144,7 +145,9 @@ discard block |
||
144 | 145 | <span class="text-sm"><?= Text::snippet($feed->message, 100) ?></span> |
145 | 146 | </div> |
146 | 147 | </div> |
147 | - <?php endforeach; ?> |
|
148 | + <?php endforeach; |
|
149 | +} |
|
150 | +?> |
|
148 | 151 | <?php endif; ?> |
149 | 152 | </div> |
150 | 153 | |
@@ -166,7 +169,8 @@ discard block |
||
166 | 169 | <span class="text-sm">No comments found</span> |
167 | 170 | </div> |
168 | 171 | </div> |
169 | - <?php else: ?> |
|
172 | + <?php else { |
|
173 | + : ?> |
|
170 | 174 | <?php foreach ($features->getComments() as $comment): ?> |
171 | 175 | <?php /** @var \Apps\ActiveRecord\CommentPost $comment */ ?> |
172 | 176 | <div class="media"> |
@@ -174,6 +178,7 @@ discard block |
||
174 | 178 | <a href="#"> |
175 | 179 | <?php |
176 | 180 | $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg'; |
181 | +} |
|
177 | 182 | if ($comment->user !== null && $comment->user->id > 0) { |
178 | 183 | $commentAva = $comment->user->profile->getAvatarUrl('small'); |
179 | 184 | } |
@@ -219,9 +224,12 @@ discard block |
||
219 | 224 | <?php foreach ($breadcrumbs as $url => $text): ?> |
220 | 225 | <?php if (\Ffcms\Core\Helper\Type\Any::isInt($url)): ?> |
221 | 226 | <?= $text ?> |
222 | - <?php else: ?> |
|
227 | + <?php else { |
|
228 | + : ?> |
|
223 | 229 | <a href="<?= $url ?>"><?= $text ?></a> / |
224 | - <?php endif; ?> |
|
230 | + <?php endif; |
|
231 | +} |
|
232 | +?> |
|
225 | 233 | <?php endforeach; ?> |
226 | 234 | <?php endif; ?> |
227 | 235 | </h2> |
@@ -15,7 +15,7 @@ |
||
15 | 15 | |
16 | 16 | <?php $this->start('body') ?> |
17 | 17 | <h1><?= __('Antivirus scan'); ?></h1> |
18 | -<p><?= __('FFCMS 3 provide a simple signature-based antivirus software') . '. ' . __('Remember! This is just an advisory algorithm!') ?></p> |
|
18 | +<p><?= __('FFCMS 3 provide a simple signature-based antivirus software').'. '.__('Remember! This is just an advisory algorithm!') ?></p> |
|
19 | 19 | |
20 | 20 | <div class="row mb-2"> |
21 | 21 | <div class="col-md-8"> |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | |
32 | 32 | foreach ($widgets as $widget) { |
33 | 33 | $controller = Str::lowerCase($widget->sys_name); |
34 | - $route = $controller . '/index'; |
|
34 | + $route = $controller.'/index'; |
|
35 | 35 | $icoStatus = null; |
36 | 36 | $actions = $this->fetch('widget/_actions', ['controller' => $controller]); |
37 | - if ((bool)$widget->disabled) { |
|
37 | + if ((bool) $widget->disabled) { |
|
38 | 38 | $icoStatus = ' <i class="fa fa-pause" style="color: #ff0000;"></i>'; |
39 | 39 | } elseif (!$widget->checkVersion()) { |
40 | 40 | $icoStatus = ' <i class="fa fa-exclamation-circle" style="color: #ffbd26;"></i>'; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | $table->row([ |
47 | - ['text' => $widget->id . $icoStatus, 'html' => true], |
|
47 | + ['text' => $widget->id.$icoStatus, 'html' => true], |
|
48 | 48 | ['text' => Url::a([$route], $widget->getLocaleName()), 'html' => true], |
49 | 49 | ['text' => $widget->version], |
50 | 50 | ['text' => Date::convertToDatetime($widget->updated_at, Date::FORMAT_TO_HOUR)], |
@@ -57,5 +57,5 @@ discard block |
||
57 | 57 | <?= $table->display() ?> |
58 | 58 | </div> |
59 | 59 | |
60 | -<?= Url::a(['widget/install'], '<i class="fa fa-tasks"></i> ' . __('Install'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
60 | +<?= Url::a(['widget/install'], '<i class="fa fa-tasks"></i> '.__('Install'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
61 | 61 | <?php $this->stop() ?> |
62 | 62 | \ No newline at end of file |
@@ -28,7 +28,7 @@ |
||
28 | 28 | [['text' => __('Name')], ['text' => $widget->getLocaleName()]], |
29 | 29 | [['text' => __('System name')], ['text' => $widget->sys_name]], |
30 | 30 | [['text' => __('Last update')], ['text' => Date::convertToDatetime($widget->updated_at, Date::FORMAT_TO_SECONDS)]], |
31 | - [['text' => __('Status')], ['text' => !(bool)$widget->disabled ? 'On' : 'Off'], 'properties' => ['class' => !(bool)$widget->disabled ? 'alert-success' : 'alert-danger']] |
|
31 | + [['text' => __('Status')], ['text' => !(bool) $widget->disabled ? 'On' : 'Off'], 'properties' => ['class' => !(bool) $widget->disabled ? 'alert-success' : 'alert-danger']] |
|
32 | 32 | ])->display() ?> |
33 | 33 | </div> |
34 | 34 |
@@ -4,6 +4,6 @@ |
||
4 | 4 | |
5 | 5 | ?> |
6 | 6 | <?php if (isset($controller)): ?> |
7 | - <a href="<?= Url::to($controller . '/index') ?>"><i class="fa fa-cogs"></i></a> |
|
7 | + <a href="<?= Url::to($controller.'/index') ?>"><i class="fa fa-cogs"></i></a> |
|
8 | 8 | <a href="<?= Url::to('widget/turn', [$controller]) ?>"><i class="fa fa-power-off"></i></a> |
9 | 9 | <?php endif; ?> |
10 | 10 | \ No newline at end of file |
@@ -43,10 +43,10 @@ |
||
43 | 43 | ['text' => $user->login], |
44 | 44 | ['text' => $user->role->name], |
45 | 45 | ['text' => Date::convertToDatetime($user->created_at, Date::FORMAT_TO_DAY)], |
46 | - ['text' => Url::a(['user/update', [$user->id]], '<i class="fa fa-pencil fa-lg"></i>', ['html' => true]) . |
|
46 | + ['text' => Url::a(['user/update', [$user->id]], '<i class="fa fa-pencil fa-lg"></i>', ['html' => true]). |
|
47 | 47 | Url::a(['user/delete', [$user->id]], ' <i class="fa fa-trash-o fa-lg"></i>', ['html' => true]), |
48 | 48 | 'properties' => ['class' => 'text-center'], 'html' => true], |
49 | - 'properties' => ['class' => 'checkbox-row' . ($user->approve_token != '0' ? ' bg-warning' : null)] |
|
49 | + 'properties' => ['class' => 'checkbox-row'.($user->approve_token != '0' ? ' bg-warning' : null)] |
|
50 | 50 | |
51 | 51 | ]); |
52 | 52 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | ?> |
32 | 32 | |
33 | 33 | <?php |
34 | -foreach($records as $role) { |
|
34 | +foreach ($records as $role) { |
|
35 | 35 | $permissions = explode(';', $role->permissions); |
36 | 36 | $permissionsLabel = null; |
37 | 37 | foreach ($permissions as $perm) { |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } else { |
44 | 44 | $labelMark = 'badge-secondary'; |
45 | 45 | } |
46 | - $permissionsLabel .= '<span class="badge ' . $labelMark . '">' . $perm . '</span> '; |
|
46 | + $permissionsLabel .= '<span class="badge '.$labelMark.'">'.$perm.'</span> '; |
|
47 | 47 | } |
48 | 48 | $table->row([ |
49 | 49 | ['text' => $role->name], |