@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Ffcms\Core\Helper\Date; |
|
4 | 3 | use Ffcms\Core\Helper\HTML\Form; |
5 | -use Ffcms\Core\Helper\HTML\Table; |
|
6 | 4 | use Ffcms\Core\Helper\Url; |
7 | 5 | |
8 | 6 | /** @var \Apps\Model\Admin\Feedback\FormUpdate $model */ |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | - * Labels for display form |
|
51 | - */ |
|
50 | + * Labels for display form |
|
51 | + */ |
|
52 | 52 | public function labels() |
53 | 53 | { |
54 | 54 | return [ |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
62 | - * Form validation rules |
|
63 | - */ |
|
62 | + * Form validation rules |
|
63 | + */ |
|
64 | 64 | public function rules() |
65 | 65 | { |
66 | 66 | return [ |
@@ -25,7 +25,7 @@ |
||
25 | 25 | |
26 | 26 | /** |
27 | 27 | * FormAnswerAdd constructor. Pass active record of comment post and user id |
28 | - * @param $recordPost |
|
28 | + * @param \Ffcms\Core\Arch\ActiveModel $recordPost |
|
29 | 29 | * @param int $userId |
30 | 30 | */ |
31 | 31 | public function __construct($recordPost, $userId = 0) |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | public function __construct($recordPost, $userId = 0) |
32 | 32 | { |
33 | 33 | $this->_post = $recordPost; |
34 | - $this->_userId = (int)$userId; |
|
34 | + $this->_userId = (int) $userId; |
|
35 | 35 | parent::__construct(); |
36 | 36 | } |
37 | 37 | |
@@ -96,10 +96,10 @@ discard block |
||
96 | 96 | |
97 | 97 | // add notification msg |
98 | 98 | $targetId = $this->_post->user_id; |
99 | - if ($targetId !== null && (int)$targetId > 0 && $targetId !== $this->_userId) { |
|
99 | + if ($targetId !== null && (int) $targetId > 0 && $targetId !== $this->_userId) { |
|
100 | 100 | $notify = new EntityAddNotification($targetId); |
101 | - $uri = '/feedback/read/' . $this->_post->id . '/' . $this->_post->hash . '#feedback-answer-' . $record->id; |
|
102 | - $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [ |
|
101 | + $uri = '/feedback/read/'.$this->_post->id.'/'.$this->_post->hash.'#feedback-answer-'.$record->id; |
|
102 | + $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [ |
|
103 | 103 | 'snippet' => Text::snippet(App::$Security->strip_tags($this->message), 50), |
104 | 104 | 'post' => Text::snippet(App::$Security->strip_tags($this->_post->message), 50) |
105 | 105 | ]); |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | |
27 | 27 | |
28 | 28 | /** |
29 | - * Set user data if he is logged in |
|
30 | - */ |
|
29 | + * Set user data if he is logged in |
|
30 | + */ |
|
31 | 31 | public function before() |
32 | 32 | { |
33 | 33 | if (App::$User->isAuth()) { |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * Labels to display form |
|
42 | - */ |
|
41 | + * Labels to display form |
|
42 | + */ |
|
43 | 43 | public function labels() |
44 | 44 | { |
45 | 45 | return [ |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
54 | - * Rules to validate send form |
|
55 | - */ |
|
54 | + * Rules to validate send form |
|
55 | + */ |
|
56 | 56 | public function rules() |
57 | 57 | { |
58 | 58 | $rules = [ |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | public function __construct($captcha = true) |
22 | 22 | { |
23 | - $this->_useCaptcha = (bool)$captcha; |
|
23 | + $this->_useCaptcha = (bool) $captcha; |
|
24 | 24 | parent::__construct(); |
25 | 25 | } |
26 | 26 |
@@ -95,7 +95,7 @@ |
||
95 | 95 | |
96 | 96 | /** |
97 | 97 | * Send email notification after feedback request creation |
98 | - * @param $record |
|
98 | + * @param FeedbackPost $record |
|
99 | 99 | * @throws \Ffcms\Core\Exception\SyntaxException |
100 | 100 | */ |
101 | 101 | private function sendEmail($record) |
@@ -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 |
@@ -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 |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | ?> |
28 | 28 | |
29 | 29 | <?php |
30 | -if ((int)$post->closed === 0 && \App::$User->isAuth()) { |
|
30 | +if ((int) $post->closed === 0 && \App::$User->isAuth()) { |
|
31 | 31 | $user = App::$User->identity(); |
32 | - if ($user->getId() === (int)$post->user_id) { |
|
33 | - echo '<div class="pull-right">' . |
|
34 | - Url::link(['feedback/close', $post->id, $post->hash], __('Close request'), ['class' => 'btn btn-danger']) . |
|
32 | + if ($user->getId() === (int) $post->user_id) { |
|
33 | + echo '<div class="pull-right">'. |
|
34 | + Url::link(['feedback/close', $post->id, $post->hash], __('Close request'), ['class' => 'btn btn-danger']). |
|
35 | 35 | '</div>'; |
36 | 36 | } |
37 | 37 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | </div> |
53 | 53 | <h3><?= __('Answers') ?></h3> |
54 | 54 | <hr /> |
55 | -<?php if ((int)$post->readed === 0 && ($answers === null || $answers->count() < 1)): ?> |
|
55 | +<?php if ((int) $post->readed === 0 && ($answers === null || $answers->count() < 1)): ?> |
|
56 | 56 | <p class="alert alert-warning"><?= __('This message is not properly readed by website administrators') ?></p> |
57 | 57 | <?php endif; ?> |
58 | 58 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | <?php foreach ($answers as $answer): ?> |
61 | 61 | <div class="row"> |
62 | 62 | <div class="col-md-12"> |
63 | - <div class="panel <?= (int)$answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
63 | + <div class="panel <?= (int) $answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
64 | 64 | <div class="panel-heading"> |
65 | 65 | <strong><?= $answer->name ?> (<?= $answer->email ?>)</strong>, |
66 | 66 | <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | <?php endif; ?> |
76 | 76 | |
77 | 77 | <br /> |
78 | -<?php if ((int)$post->closed === 0 && $model !== null): ?> |
|
78 | +<?php if ((int) $post->closed === 0 && $model !== null): ?> |
|
79 | 79 | <h3><?= __('Add answer') ?></h3> |
80 | 80 | <?php $form = new Form($model, ['class' => 'form-horizontal', 'method' => 'post']) ?> |
81 | 81 | <?= $form->start() ?> |
@@ -32,8 +32,8 @@ |
||
32 | 32 | foreach ($records as $item) { |
33 | 33 | $message = Str::sub(\App::$Security->strip_tags($item->message), 0, 50); |
34 | 34 | $author = Simplify::parseUserNick($item->user_id, $item->guest_name); |
35 | - if ((int)$item->user_id > 0) { |
|
36 | - $author = Url::link(['user/update', (int)$item->user_id], $author); |
|
35 | + if ((int) $item->user_id > 0) { |
|
36 | + $author = Url::link(['user/update', (int) $item->user_id], $author); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | App::$Session->set('content.rate.ignore', $ignored); |
65 | 65 | |
66 | 66 | // save rating changes to database |
67 | - switch($this->_type) { |
|
67 | + switch ($this->_type) { |
|
68 | 68 | case 'plus': |
69 | 69 | $this->_content->rating += 1; |
70 | 70 | break; |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $this->_content->save(); |
77 | 77 | |
78 | 78 | // update content author rating |
79 | - $authorId = (int)$this->_content->author_id; |
|
79 | + $authorId = (int) $this->_content->author_id; |
|
80 | 80 | if ($authorId > 0 && App::$User->isExist($authorId)) { |
81 | 81 | $authorObject = App::$User->identity($authorId); |
82 | 82 | if ($authorObject !== null) { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | // @codingStandardsIgnoreFile |
7 | 7 | |
8 | 8 | use Codeception\Module\Asserts; |
9 | -use Helper\Unit; |
|
10 | 9 | |
11 | 10 | trait UnitTesterActions |
12 | 11 | { |
@@ -6,7 +6,6 @@ |
||
6 | 6 | // @codingStandardsIgnoreFile |
7 | 7 | |
8 | 8 | use Codeception\Module\PhpBrowser; |
9 | -use Helper\Acceptance; |
|
10 | 9 | |
11 | 10 | trait WebGuyActions |
12 | 11 | { |