@@ -39,18 +39,18 @@ discard block |
||
39 | 39 | { |
40 | 40 | // get configs |
41 | 41 | $configs = $this->getConfigs(); |
42 | - if (!App::$User->isAuth() && !(bool)$configs['guestAdd']) { |
|
42 | + if (!App::$User->isAuth() && !(bool) $configs['guestAdd']) { |
|
43 | 43 | throw new ForbiddenException(__('Feedback available only for authorized users')); |
44 | 44 | } |
45 | 45 | |
46 | 46 | // initialize model |
47 | - $model = new FormFeedbackAdd((bool)$configs['useCaptcha']); |
|
47 | + $model = new FormFeedbackAdd((bool) $configs['useCaptcha']); |
|
48 | 48 | if ($model->send()) { |
49 | 49 | if ($model->validate()) { |
50 | 50 | // if validation is passed save data to db and get row |
51 | 51 | $record = $model->make(); |
52 | 52 | App::$Session->getFlashBag()->add('success', __('Your message was added successful')); |
53 | - $this->response->redirect('feedback/read/' . $record->id . '/' . $record->hash); |
|
53 | + $this->response->redirect('feedback/read/'.$record->id.'/'.$record->hash); |
|
54 | 54 | } else { |
55 | 55 | App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below')); |
56 | 56 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | // render output view |
60 | 60 | return $this->view->render('feedback/create', [ |
61 | 61 | 'model' => $model, |
62 | - 'useCaptcha' => (bool)$configs['useCaptcha'] |
|
62 | + 'useCaptcha' => (bool) $configs['useCaptcha'] |
|
63 | 63 | ]); |
64 | 64 | } |
65 | 65 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | $model = null; |
92 | 92 | // check if feedback post is not closed for answers |
93 | - if (!(bool)$recordPost->closed) { |
|
93 | + if (!(bool) $recordPost->closed) { |
|
94 | 94 | // init new answer add model |
95 | 95 | $model = new FormAnswerAdd($recordPost); |
96 | 96 | // if answer is sender lets try to make it model |
@@ -133,10 +133,10 @@ discard block |
||
133 | 133 | // check if action is submited |
134 | 134 | if ($this->request->request->get('closeRequest', false)) { |
135 | 135 | // if created by authorized user |
136 | - if ((int)$record->user_id > 0) { |
|
136 | + if ((int) $record->user_id > 0) { |
|
137 | 137 | $user = App::$User->identity(); |
138 | 138 | // button is pressed not by request creator |
139 | - if (!$user || $user->getId() !== (int)$record->user_id) { |
|
139 | + if (!$user || $user->getId() !== (int) $record->user_id) { |
|
140 | 140 | throw new ForbiddenException(__('This feedback request was created by another user')); |
141 | 141 | } |
142 | 142 | } |
@@ -147,11 +147,11 @@ discard block |
||
147 | 147 | |
148 | 148 | // add notification and redirect |
149 | 149 | App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!')); |
150 | - $this->response->redirect('feedback/read/' . $id . '/' . $hash); |
|
150 | + $this->response->redirect('feedback/read/'.$id.'/'.$hash); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | return $this->view->render('feedback/close', [ |
154 | - 'id' => (int)$id, |
|
154 | + 'id' => (int) $id, |
|
155 | 155 | 'hash' => $hash |
156 | 156 | ]); |
157 | 157 | } |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | public function actionList(): ?string |
165 | 165 | { |
166 | 166 | // set current page and offset |
167 | - $page = (int)$this->request->query->get('page'); |
|
167 | + $page = (int) $this->request->query->get('page'); |
|
168 | 168 | $offset = $page * self::ITEM_PER_PAGE; |
169 | 169 | |
170 | 170 | // check if user is authorized or throw exception |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | <?php if (\App::$Debug): ?> |
28 | 28 | <?= \App::$Debug->renderHead() ?> |
29 | 29 | <?php endif; ?> |
30 | - <?php if (!isset($fullgrid)){ $fullgrid = false; } ?> |
|
30 | + <?php if (!isset($fullgrid)) { $fullgrid = false; } ?> |
|
31 | 31 | </head> |
32 | 32 | <body class="bg-light"> |
33 | 33 | |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | |
42 | 42 | if (\App::$User->isAuth()) { |
43 | 43 | $userId = \App::$User->identity()->getId(); |
44 | - $navbar->menu('right', ['text' => __('Account') . ' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [ |
|
44 | + $navbar->menu('right', ['text' => __('Account').' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [ |
|
45 | 45 | ['text' => __('My profile'), 'link' => ['profile/show', [$userId]]], |
46 | - ['text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true], |
|
46 | + ['text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true], |
|
47 | 47 | ['text' => __('Feed'), 'link' => ['profile/feed'], 'class' => 'dropdown-item'], |
48 | - ['text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true], |
|
48 | + ['text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true], |
|
49 | 49 | ['text' => __('Settings'), 'link' => ['profile/settings'], 'class' => 'dropdown-item'], |
50 | 50 | ], 'properties' => ['html' => true]]); |
51 | 51 | if (\App::$User->identity()->role->can('Admin/Main/Index')) { |
52 | - $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl . '/admin']); |
|
52 | + $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl.'/admin']); |
|
53 | 53 | } |
54 | 54 | $navbar->menu('right', ['text' => __('Logout'), 'link' => ['user/logout']]); |
55 | 55 | } else { |
@@ -51,7 +51,7 @@ |
||
51 | 51 | <h3><?= __('Directories and files') ?></h3> |
52 | 52 | <?php |
53 | 53 | foreach ($check->chmodCheck as $dir => $status) { |
54 | - echo $this->bootstrap()->badge(($status ? 'success' : 'danger'), $dir) . " "; |
|
54 | + echo $this->bootstrap()->badge(($status ? 'success' : 'danger'), $dir)." "; |
|
55 | 55 | } |
56 | 56 | ?> |
57 | 57 | <hr /> |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | 'roots' => [ |
46 | 46 | [ |
47 | 47 | 'driver' => 'LocalFileSystem', |
48 | - 'path' => root . '/upload/', |
|
49 | - 'URL' => App::$Alias->scriptUrl . '/upload/' |
|
48 | + 'path' => root.'/upload/', |
|
49 | + 'URL' => App::$Alias->scriptUrl.'/upload/' |
|
50 | 50 | ] |
51 | 51 | ] |
52 | 52 | ])); |
@@ -111,9 +111,9 @@ discard block |
||
111 | 111 | { |
112 | 112 | $this->setJsonHeader(); |
113 | 113 | // get ffcms news if cache is not available |
114 | - $cache = App::$Cache->getItem('download.ffcms.api.news.' . $this->lang); |
|
114 | + $cache = App::$Cache->getItem('download.ffcms.api.news.'.$this->lang); |
|
115 | 115 | if (!$cache->isHit()) { |
116 | - $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang=' . $this->lang)) |
|
116 | + $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang='.$this->lang)) |
|
117 | 117 | ->expiresAfter(1440); |
118 | 118 | } |
119 | 119 | return $cache->get(); |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | if (Any::isArray($route)) { |
38 | 38 | foreach ($route as $source => $target) { |
39 | 39 | $alias->row([ |
40 | - ['text' => '<span class="badge badge-primary">' . $source . '</span> ' . |
|
41 | - '→ ' . |
|
42 | - '<span class="badge badge-secondary">' . $target . '</span>', 'html' => true], |
|
40 | + ['text' => '<span class="badge badge-primary">'.$source.'</span> '. |
|
41 | + '→ '. |
|
42 | + '<span class="badge badge-secondary">'.$target.'</span>', 'html' => true], |
|
43 | 43 | ['text' => $env], |
44 | 44 | ['text' => Url::a( |
45 | 45 | ['main/deleteroute', null, ['type' => 'Alias', 'loader' => $env, 'path' => $source]], |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | if (Any::isArray($route)) { |
72 | 72 | foreach ($route as $source => $target) { |
73 | 73 | $dynamic->row([ |
74 | - ['text' => '<span class="badge badge-primary">' . $source . '</span> ' . |
|
75 | - '→ ' . |
|
76 | - '<span class="badge badge-secondary">' . $target . '</span>', 'html' => true], |
|
74 | + ['text' => '<span class="badge badge-primary">'.$source.'</span> '. |
|
75 | + '→ '. |
|
76 | + '<span class="badge badge-secondary">'.$target.'</span>', 'html' => true], |
|
77 | 77 | ['text' => $env], |
78 | 78 | ['text' => Url::a( |
79 | 79 | ['main/deleteroute', null, ['type' => 'Callback', 'loader' => $env, 'path' => $source]], |
@@ -92,6 +92,6 @@ discard block |
||
92 | 92 | </div> |
93 | 93 | <?php if (!$aliasExist && !$callbackExist): ?> |
94 | 94 | <p class="alert alert-warning"><?= __('Custom routes is not yet found') ?></p> |
95 | -<?php endif ;?> |
|
96 | -<?= Url::a(['main/addroute'], '<i class="fa fa-plus"></i> ' . __('New route'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
95 | +<?php endif; ?> |
|
96 | +<?= Url::a(['main/addroute'], '<i class="fa fa-plus"></i> '.__('New route'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
97 | 97 | <?php $this->stop() ?> |
@@ -64,7 +64,10 @@ |
||
64 | 64 | echo $form->button()->submit(__('Download update'), ['class' => 'btn btn-primary']); |
65 | 65 | echo $form->stop(); |
66 | 66 | ?> |
67 | -<?php else: ?> |
|
67 | +<?php else { |
|
68 | + : ?> |
|
68 | 69 | <p class="alert alert-success"><?= __('Your system is up to date. No updates is available') ?></p> |
69 | -<?php endif; ?> |
|
70 | +<?php endif; |
|
71 | +} |
|
72 | +?> |
|
70 | 73 | <?php $this->stop() ?> |
@@ -5,6 +5,6 @@ |
||
5 | 5 | |
6 | 6 | ?> |
7 | 7 | <?php if (isset($controller)): ?> |
8 | - <a href="<?= Url::to($controller . '/index') ?>"><i class="fa fa-cogs"></i></a> |
|
8 | + <a href="<?= Url::to($controller.'/index') ?>"><i class="fa fa-cogs"></i></a> |
|
9 | 9 | <a href="<?= Url::to('application/turn', [$controller]) ?>"><i class="fa fa-power-off"></i></a> |
10 | 10 | <?php endif; ?> |
11 | 11 | \ No newline at end of file |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | continue; |
37 | 37 | } |
38 | 38 | $controller = Str::lowerCase($app->sys_name); |
39 | - $route = $controller . '/index'; |
|
39 | + $route = $controller.'/index'; |
|
40 | 40 | $icoStatus = null; |
41 | 41 | $actions = $this->fetch('application/_actions', ['controller' => $controller]); |
42 | 42 | // set action icons based on app status |
43 | - if ((bool)$app->disabled) { |
|
43 | + if ((bool) $app->disabled) { |
|
44 | 44 | $icoStatus = ' <i class="fa fa-pause" style="color: #ff0000;"></i>'; |
45 | 45 | } elseif (!$app->checkVersion()) { |
46 | 46 | $icoStatus = ' <i class="fa fa-exclamation-circle" style="color: #ffbd26;"></i>'; |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | $table->row([ |
53 | - ['text' => $app->id . $icoStatus, 'html' => true], |
|
53 | + ['text' => $app->id.$icoStatus, 'html' => true], |
|
54 | 54 | ['text' => Url::a([$route], $app->getLocaleName()), 'html' => true], |
55 | - ['text' => '<a target="_blank" href="' . \App::$Alias->scriptUrl . '/' . Str::lowerCase($route) . '">' . $route . '</a>', 'html' => true], |
|
55 | + ['text' => '<a target="_blank" href="'.\App::$Alias->scriptUrl.'/'.Str::lowerCase($route).'">'.$route.'</a>', 'html' => true], |
|
56 | 56 | ['text' => $app->version], |
57 | 57 | ['text' => Date::convertToDatetime($app->updated_at, Date::FORMAT_TO_HOUR)], |
58 | 58 | ['text' => $actions, 'html' => true] |
@@ -63,5 +63,5 @@ discard block |
||
63 | 63 | <div class="table-responsive"> |
64 | 64 | <?= $table->display() ?> |
65 | 65 | </div> |
66 | -<?= Url::a(['application/install'], '<i class="fa fa-tasks"></i> ' . __('Install app'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
66 | +<?= Url::a(['application/install'], '<i class="fa fa-tasks"></i> '.__('Install app'), ['class' => 'btn btn-primary', 'html' => true]) ?> |
|
67 | 67 | <?php $this->stop() ?> |
68 | 68 | \ No newline at end of file |
@@ -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"> |