@@ -11,15 +11,15 @@ |
||
11 | 11 | } |
12 | 12 | $title = Text::snippet($title, 50); |
13 | 13 | $date = Date::humanize($record->created_at); |
14 | - $categoryUrl = \App::$Alias->baseUrl . '/content/list/' . $record->cpath; |
|
15 | - $categoryLink = '<a href="' . $categoryUrl . '">' . \App::$Translate->getLocaleText($record->ctitle) . '</a>'; |
|
16 | - $newsLink = \App::$Alias->baseUrl . '/content/read/' . $record->cpath; |
|
17 | - $newsLink = rtrim($newsLink, '/') . '/' . $record->path; |
|
14 | + $categoryUrl = \App::$Alias->baseUrl.'/content/list/'.$record->cpath; |
|
15 | + $categoryLink = '<a href="'.$categoryUrl.'">'.\App::$Translate->getLocaleText($record->ctitle).'</a>'; |
|
16 | + $newsLink = \App::$Alias->baseUrl.'/content/read/'.$record->cpath; |
|
17 | + $newsLink = rtrim($newsLink, '/').'/'.$record->path; |
|
18 | 18 | |
19 | 19 | echo '<div class="row"><div class="col-md-12">'; |
20 | - echo '<a href="' . $newsLink . '">→ ' . $title . '</a><br />'; |
|
21 | - echo '<small class="float-left">' . $categoryLink . '</small>'; |
|
22 | - echo '<small class="float-right text-secondary">' . $date . '</small>'; |
|
20 | + echo '<a href="'.$newsLink.'">→ '.$title.'</a><br />'; |
|
21 | + echo '<small class="float-left">'.$categoryLink.'</small>'; |
|
22 | + echo '<small class="float-right text-secondary">'.$date.'</small>'; |
|
23 | 23 | echo '</div></div>'; |
24 | 24 | echo '<hr class="pretty" />'; |
25 | 25 | } |
@@ -99,9 +99,9 @@ |
||
99 | 99 | |
100 | 100 | // add notification msg |
101 | 101 | $targetId = $this->_post->user_id; |
102 | - if ($targetId !== null && (int)$targetId > 0 && $targetId !== $this->_userId) { |
|
102 | + if ($targetId !== null && (int) $targetId > 0 && $targetId !== $this->_userId) { |
|
103 | 103 | $notify = new EntityAddNotification($targetId); |
104 | - $uri = '/feedback/read/' . $this->_post->id . '/' . $this->_post->hash . '#feedback-answer-' . $record->id; |
|
104 | + $uri = '/feedback/read/'.$this->_post->id.'/'.$this->_post->hash.'#feedback-answer-'.$record->id; |
|
105 | 105 | $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [ |
106 | 106 | 'snippet' => Text::snippet($this->message, 50), |
107 | 107 | 'post' => Text::snippet($this->_post->message, 50) |
@@ -18,9 +18,12 @@ |
||
18 | 18 | <h1><?= __('Feedback') ?></h1> |
19 | 19 | <?php if (\App::$User->isAuth()): ?> |
20 | 20 | <?= $this->insert('feedback/_authTabs') ?> |
21 | -<?php else: ?> |
|
21 | +<?php else { |
|
22 | + : ?> |
|
22 | 23 | <hr /> |
23 | -<?php endif; ?> |
|
24 | +<?php endif; |
|
25 | +} |
|
26 | +?> |
|
24 | 27 | |
25 | 28 | <?php $form = $this->form($model) ?> |
26 | 29 | <?= $form->start() ?> |
@@ -46,9 +46,8 @@ |
||
46 | 46 | ['text' => $item->id], |
47 | 47 | ['text' => Url::a(['feedback/read', [$item->id, $item->hash]], Text::cut($item->message, 0, 40)), 'html' => true], |
48 | 48 | ['text' => |
49 | - (int)$item->closed === 1 ? |
|
50 | - '<span class="badge badge-danger">' . __('Closed') . '</span>' : |
|
51 | - '<span class="badge badge-success">' . __('Opened') . '</span>', |
|
49 | + (int) $item->closed === 1 ? |
|
50 | + '<span class="badge badge-danger">'.__('Closed').'</span>' : '<span class="badge badge-success">'.__('Opened').'</span>', |
|
52 | 51 | 'html' => true, '!secure' => true], |
53 | 52 | ['text' => $item->answers()->count()], |
54 | 53 | ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)], |
@@ -30,7 +30,7 @@ |
||
30 | 30 | if (!(bool)$post->closed && \App::$User->isAuth()) { |
31 | 31 | $user = App::$User->identity(); |
32 | 32 | if ((int)$user->getId() === (int)$post->user_id) { |
33 | - echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']); |
|
33 | + echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']); |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | ?> |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | <?php endif; ?> |
28 | 28 | |
29 | 29 | <?php |
30 | -if (!(bool)$post->closed && \App::$User->isAuth()) { |
|
30 | +if (!(bool) $post->closed && \App::$User->isAuth()) { |
|
31 | 31 | $user = App::$User->identity(); |
32 | - if ((int)$user->getId() === (int)$post->user_id) { |
|
32 | + if ((int) $user->getId() === (int) $post->user_id) { |
|
33 | 33 | echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']); |
34 | 34 | } |
35 | 35 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | </div> |
51 | 51 | <h3><?= __('Answers') ?></h3> |
52 | 52 | <hr /> |
53 | -<?php if (!(bool)$post->readed && (!$answers || $answers->count() < 1)): ?> |
|
53 | +<?php if (!(bool) $post->readed && (!$answers || $answers->count() < 1)): ?> |
|
54 | 54 | <?= $this->bootstrap()->alert('warning', __('This message is not properly readed by website administrators')) ?> |
55 | 55 | <?php endif; ?> |
56 | 56 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | <div class="row" id="feedback-answer-<?= $answer->id ?>"> |
60 | 60 | <div class="col-md-12"> |
61 | 61 | <div class="card"> |
62 | - <div class="card-header<?= (bool)$answer->is_admin ? ' bg-success' : null ?>"> |
|
62 | + <div class="card-header<?= (bool) $answer->is_admin ? ' bg-success' : null ?>"> |
|
63 | 63 | <strong><?= $answer->name ?> (<?= $answer->email ?>)</strong>, |
64 | 64 | <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
65 | 65 | </div> |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | <?php endif; ?> |
74 | 74 | |
75 | 75 | <br /> |
76 | -<?php if (!(bool)$post->closed && $model): ?> |
|
76 | +<?php if (!(bool) $post->closed && $model): ?> |
|
77 | 77 | <h3><?= __('Add answer') ?></h3> |
78 | 78 | <?php $form = $this->form($model) ?> |
79 | 79 | <?= $form->start() ?> |
@@ -22,9 +22,12 @@ discard block |
||
22 | 22 | <h1><?= __('Feedback message #%id%', ['id' => $post->id]) ?></h1> |
23 | 23 | <?php if (\App::$User->isAuth()): ?> |
24 | 24 | <?= $this->insert('feedback/_authTabs') ?> |
25 | -<?php else: ?> |
|
25 | +<?php else { |
|
26 | + : ?> |
|
26 | 27 | <hr /> |
27 | -<?php endif; ?> |
|
28 | +<?php endif; |
|
29 | +} |
|
30 | +?> |
|
28 | 31 | |
29 | 32 | <?php |
30 | 33 | if (!(bool)$post->closed && \App::$User->isAuth()) { |
@@ -85,8 +88,11 @@ discard block |
||
85 | 88 | <?= $form->button()->submit(__('Add'), ['class' => 'btn btn-primary']) ?> |
86 | 89 | |
87 | 90 | <?= $form->stop() ?> |
88 | -<?php else: ?> |
|
91 | +<?php else { |
|
92 | + : ?> |
|
89 | 93 | <?= $this->bootstrap()->alert('danger', __('This request is closed! No answers is allowed')) ?> |
90 | -<?php endif; ?> |
|
94 | +<?php endif; |
|
95 | +} |
|
96 | +?> |
|
91 | 97 | |
92 | 98 | <?php $this->stop() ?> |
@@ -33,7 +33,7 @@ |
||
33 | 33 | <tbody> |
34 | 34 | <tr> |
35 | 35 | <td align="left" style="font-family:Helvetica Neue,Arial,Helvetica,sans-serif;padding-left:9px;font-size:14px;"> |
36 | - <a href="<?= \App::$Alias->scriptUrl ?>/feedback/read/<?= $record->id . '/' . $record->hash ?>"> |
|
36 | + <a href="<?= \App::$Alias->scriptUrl ?>/feedback/read/<?= $record->id.'/'.$record->hash ?>"> |
|
37 | 37 | <?= __('View request') ?> |
38 | 38 | </a> |
39 | 39 | </td> |
@@ -7,5 +7,5 @@ |
||
7 | 7 | ?> |
8 | 8 | |
9 | 9 | <?php foreach ($records as $row) { |
10 | - echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']) . ' '; |
|
10 | + echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']).' '; |
|
11 | 11 | } |
12 | 12 | \ No newline at end of file |
@@ -43,7 +43,7 @@ |
||
43 | 43 | <div class="col-md-12"> |
44 | 44 | <div class="search-result"> |
45 | 45 | <div class="h4"> |
46 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"><?= $model->highlightText($item['title'], 'span', ['class' => 'search-highlight']) ?></a> |
|
46 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"><?= $model->highlightText($item['title'], 'span', ['class' => 'search-highlight']) ?></a> |
|
47 | 47 | <small class="float-right text-secondary"><?= $item['date'] ?></small> |
48 | 48 | </div> |
49 | 49 | <small><?= $model->highlightText($item['snippet'], 'span', ['class' => 'search-highlight']) ?>...</small> |
@@ -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 |