@@ -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() ?> |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * FormCommentUpdate constructor. Pass record inside the model. |
| 18 | - * @param Apps\ActiveRecord\CommentPost|Apps\ActiveRecord\CommentAnswer $record |
|
| 18 | + * @param \Ffcms\Core\Arch\ActiveModel $record |
|
| 19 | 19 | */ |
| 20 | 20 | public function __construct($record, $type = 'comment') |
| 21 | 21 | { |
@@ -24,8 +24,8 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | - * Set default values from active record data |
|
| 28 | - */ |
|
| 27 | + * Set default values from active record data |
|
| 28 | + */ |
|
| 29 | 29 | public function before() |
| 30 | 30 | { |
| 31 | 31 | $this->message = $this->_record->message; |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | - * Labels to display in view |
|
| 37 | - */ |
|
| 36 | + * Labels to display in view |
|
| 37 | + */ |
|
| 38 | 38 | public function labels() |
| 39 | 39 | { |
| 40 | 40 | return [ |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | - * Validation rules for comment body |
|
| 48 | - */ |
|
| 47 | + * Validation rules for comment body |
|
| 48 | + */ |
|
| 49 | 49 | public function rules() |
| 50 | 50 | { |
| 51 | 51 | return [ |
@@ -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 | { |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | { |
| 21 | 21 | use _generated\WebGuyActions; |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Define custom actions here |
|
| 25 | - */ |
|
| 23 | + /** |
|
| 24 | + * Define custom actions here |
|
| 25 | + */ |
|
| 26 | 26 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $this->setJsonHeader(); |
| 33 | 33 | $configs = AppRecord::getConfigs('widget', 'Comments'); |
| 34 | 34 | |
| 35 | - $replayTo = (int)App::$Request->request->get('replay-to'); |
|
| 35 | + $replayTo = (int) App::$Request->request->get('replay-to'); |
|
| 36 | 36 | $model = null; |
| 37 | 37 | // check if its a answer (comment answer type) |
| 38 | 38 | if ($replayTo > 0) { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // pass general comment params to model |
| 47 | - $model->message = App::$Security->secureHtml((string)App::$Request->request->get('message')); |
|
| 47 | + $model->message = App::$Security->secureHtml((string) App::$Request->request->get('message')); |
|
| 48 | 48 | $model->guestName = App::$Security->strip_tags(App::$Request->request->get('guest-name')); |
| 49 | 49 | |
| 50 | 50 | // check model conditions before add new row |
@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | // get configs |
| 77 | 77 | $configs = AppRecord::getConfigs('widget', 'Comments'); |
| 78 | 78 | // items per page |
| 79 | - $perPage = (int)$configs['perPage']; |
|
| 79 | + $perPage = (int) $configs['perPage']; |
|
| 80 | 80 | // offset can be only integer |
| 81 | - $index = (int)$index; |
|
| 81 | + $index = (int) $index; |
|
| 82 | 82 | $offset = $perPage * $index; |
| 83 | 83 | // get comment target path and check |
| 84 | - $path = (string)App::$Request->query->get('path'); |
|
| 84 | + $path = (string) App::$Request->query->get('path'); |
|
| 85 | 85 | if (Str::likeEmpty($path)) { |
| 86 | 86 | throw new NotFoundException('Wrong path'); |
| 87 | 87 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | $query = CommentPost::where('pathway', '=', $path); |
| 91 | 91 | |
| 92 | 92 | // check if comments is depend of language locale |
| 93 | - if ((int)$configs['onlyLocale'] === 1) { |
|
| 93 | + if ((int) $configs['onlyLocale'] === 1) { |
|
| 94 | 94 | $query = $query->where('lang', '=', App::$Request->getLanguage()); |
| 95 | 95 | } |
| 96 | 96 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | { |
| 141 | 141 | $this->setJsonHeader(); |
| 142 | 142 | // check input data |
| 143 | - if (!Obj::isLikeInt($commentId) || (int)$commentId < 1) { |
|
| 143 | + if (!Obj::isLikeInt($commentId) || (int) $commentId < 1) { |
|
| 144 | 144 | throw new ForbiddenException('Input data is incorrect'); |
| 145 | 145 | } |
| 146 | 146 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | |
| 150 | 150 | // get data from db by comment id |
| 151 | 151 | $records = CommentAnswer::where('comment_id', '=', $commentId); |
| 152 | - if ((int)$configs['onlyLocale'] === 1) { |
|
| 152 | + if ((int) $configs['onlyLocale'] === 1) { |
|
| 153 | 153 | $records = $records->where('lang', '=', App::$Request->getLanguage()); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | foreach ($path as $id => $uri) { |
| 194 | 194 | $query = CommentPost::where('pathway', '=', $uri); |
| 195 | 195 | // check if comments is depend of language locale |
| 196 | - if ((int)$configs['onlyLocale'] === 1) { |
|
| 196 | + if ((int) $configs['onlyLocale'] === 1) { |
|
| 197 | 197 | $query = $query->where('lang', '=', App::$Request->getLanguage()); |
| 198 | 198 | } |
| 199 | 199 | // set itemId => count |
| 200 | - $count[(int)$id] = $query->count(); |
|
| 200 | + $count[(int) $id] = $query->count(); |
|
| 201 | 201 | } |
| 202 | 202 | // render json response |
| 203 | 203 | return json_encode(['status' => 1, 'count' => $count]); |
@@ -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 | { |