@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | <h1><?= __('Feedback list') ?></h1> |
| 24 | 24 | <hr /> |
| 25 | 25 | <?php if ($records === null || $records->count() < 1) { |
| 26 | - echo '<p class="alert alert-warning">' . __('Feedback requests is empty now!') . '</p>'; |
|
| 26 | + echo '<p class="alert alert-warning">'.__('Feedback requests is empty now!').'</p>'; |
|
| 27 | 27 | return; |
| 28 | 28 | } |
| 29 | 29 | |
@@ -31,17 +31,16 @@ discard block |
||
| 31 | 31 | foreach ($records as $item) { |
| 32 | 32 | /** @var \Apps\ActiveRecord\FeedbackPost $item*/ |
| 33 | 33 | $items[] = [ |
| 34 | - ['text' => $item->id . ((int)$item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>' : null), 'html' => true], |
|
| 34 | + ['text' => $item->id.((int) $item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>' : null), 'html' => true], |
|
| 35 | 35 | ['text' => Url::link(['feedback/read', $item->id], Text::snippet($item->message, 40, false)), 'html' => true], |
| 36 | 36 | ['text' => $item->getAnswers()->count()], |
| 37 | 37 | ['text' => $item->email], |
| 38 | 38 | ['text' => |
| 39 | - (int)$item->closed === 1 ? |
|
| 40 | - '<span class="label label-danger">' . __('Closed') . '</span>' : |
|
| 41 | - '<span class="label label-success">' . __('Opened') . '</span>', |
|
| 39 | + (int) $item->closed === 1 ? |
|
| 40 | + '<span class="label label-danger">'.__('Closed').'</span>' : '<span class="label label-success">'.__('Opened').'</span>', |
|
| 42 | 41 | 'html' => true, '!secure' => true], |
| 43 | 42 | ['text' => Date::convertToDatetime($item->updated_at, Date::FORMAT_TO_HOUR)], |
| 44 | - ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> ') . |
|
| 43 | + ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> '). |
|
| 45 | 44 | Url::link(['feedback/delete', 'post', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
| 46 | 45 | 'html' => true, 'property' => ['class' => 'text-center']] |
| 47 | 46 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | /** @var array $configs */ |
| 3 | 3 | ?> |
| 4 | 4 | |
| 5 | -<?php if ((bool)$configs['guestAdd'] && (bool)$configs['guestModerate'] && !\App::$User->isAuth()): ?> |
|
| 5 | +<?php if ((bool) $configs['guestAdd'] && (bool) $configs['guestModerate'] && !\App::$User->isAuth()): ?> |
|
| 6 | 6 | <p class="alert alert-warning"><?= __('All guest comments will be moderated before display') ?></p> |
| 7 | 7 | <?php endif; ?> |
| 8 | 8 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | </a> |
| 35 | 35 | </i> |
| 36 | 36 | </div> |
| 37 | - <div id="comment-text" class="comment-text"><?= __('Loading') . ' ...' ?></div> |
|
| 37 | + <div id="comment-text" class="comment-text"><?= __('Loading').' ...' ?></div> |
|
| 38 | 38 | </div> |
| 39 | 39 | <div id="comment-answers-0" class="hidden"></div> |
| 40 | 40 | <div class="row hidden" id="add-replay-to"> |
@@ -57,12 +57,12 @@ discard block |
||
| 57 | 57 | <span id="answer-date">00.00.00 00-00-00</span> |
| 58 | 58 | <span id="answer-user-name"><?= __('Unknown') ?></span>: |
| 59 | 59 | </div> |
| 60 | - <div id="answer-text" class="comment-text"><?= __('Loading') . ' ...' ?></div> |
|
| 60 | + <div id="answer-text" class="comment-text"><?= __('Loading').' ...' ?></div> |
|
| 61 | 61 | </div> |
| 62 | 62 | </li> |
| 63 | 63 | </ul> |
| 64 | 64 | |
| 65 | -<?php if ((int)$configs['guestAdd'] === 1 || \App::$User->isAuth()): ?> |
|
| 65 | +<?php if ((int) $configs['guestAdd'] === 1 || \App::$User->isAuth()): ?> |
|
| 66 | 66 | <!-- comment form --> |
| 67 | 67 | <form name="comment-add-form" action="" method="post" style="padding-top: 15px;" class="form-horizontal"> |
| 68 | 68 | <input type="hidden" name="replay-to" value="0" /> |
@@ -71,9 +71,12 @@ |
||
| 71 | 71 | <span><i class="fa fa-eye"></i><?= $model->views ?></span> |
| 72 | 72 | <?php endif ?> |
| 73 | 73 | </div> |
| 74 | - <?php else: ?> |
|
| 74 | + <?php else { |
|
| 75 | + : ?> |
|
| 75 | 76 | <hr /> |
| 76 | - <?php endif; ?> |
|
| 77 | + <?php endif; |
|
| 78 | +} |
|
| 79 | +?> |
|
| 77 | 80 | <?php if ($trash): ?> |
| 78 | 81 | <p class="alert alert-danger"><i class="fa fa-trash-o"></i> <?= __('This content is placed in trash') ?></p> |
| 79 | 82 | <?php endif; ?> |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** @var array $configs */ |
| 3 | -use Ffcms\Core\Helper\Security; |
|
| 4 | 3 | |
| 5 | 4 | ?> |
| 6 | 5 | |
@@ -45,15 +45,15 @@ |
||
| 45 | 45 | public function getAnswerCount() |
| 46 | 46 | { |
| 47 | 47 | // check if count is cached |
| 48 | - if (MainApp::$Memory->get('commentpost.answer.count.' . $this->id) !== null) { |
|
| 49 | - return MainApp::$Memory->get('commentpost.answer.count.' . $this->id); |
|
| 48 | + if (MainApp::$Memory->get('commentpost.answer.count.'.$this->id) !== null) { |
|
| 49 | + return MainApp::$Memory->get('commentpost.answer.count.'.$this->id); |
|
| 50 | 50 | } |
| 51 | 51 | // get count from db |
| 52 | 52 | $count = CommentAnswer::where('comment_id', '=', $this->id) |
| 53 | 53 | ->where('moderate', '=', 0) |
| 54 | 54 | ->count(); |
| 55 | 55 | // save in cache |
| 56 | - MainApp::$Memory->set('commentpost.answer.count.' . $this->id, $count); |
|
| 56 | + MainApp::$Memory->set('commentpost.answer.count.'.$this->id, $count); |
|
| 57 | 57 | return $count; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -47,12 +47,12 @@ discard block |
||
| 47 | 47 | public function check() |
| 48 | 48 | { |
| 49 | 49 | // check if user is auth'd or guest name is defined |
| 50 | - if (!App::$User->isAuth() && ((int)$this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
| 50 | + if (!App::$User->isAuth() && ((int) $this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
| 51 | 51 | throw new JsonException(__('Guest name is not defined')); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // guest moderation |
| 55 | - if (!App::$User->isAuth() && (bool)$this->_configs['guestModerate']) { |
|
| 55 | + if (!App::$User->isAuth() && (bool) $this->_configs['guestModerate']) { |
|
| 56 | 56 | $captcha = App::$Request->request->get('captcha'); |
| 57 | 57 | if (!App::$Captcha->validate($captcha)) { |
| 58 | 58 | throw new JsonException(__('Captcha is incorrect! Click on image to refresh and try again')); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | // check if message length is correct |
| 68 | - if (Str::length($this->message) < (int)$this->_configs['minLength'] || Str::length($this->message) > (int)$this->_configs['maxLength']) { |
|
| 68 | + if (Str::length($this->message) < (int) $this->_configs['minLength'] || Str::length($this->message) > (int) $this->_configs['maxLength']) { |
|
| 69 | 69 | throw new JsonException(__('Message length is incorrect. Current: %cur%, min - %min%, max - %max%', [ |
| 70 | 70 | 'cur' => Str::length($this->message), |
| 71 | 71 | 'min' => $this->_configs['minLength'], |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $record->lang = App::$Request->getLanguage(); |
| 111 | 111 | $record->ip = $this->ip; |
| 112 | 112 | // check if premoderation is enabled and user is guest |
| 113 | - if ((int)$this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 113 | + if ((int) $this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 114 | 114 | $record->moderate = 1; |
| 115 | 115 | } |
| 116 | 116 | $record->save(); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * FormCommentModerate constructor. Pass active record and type of comment system inside. |
| 14 | - * @param object $record |
|
| 14 | + * @param object $records |
|
| 15 | 15 | * @param string $type |
| 16 | 16 | */ |
| 17 | 17 | public function __construct($records, $type) |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | <?php |
| 29 | 29 | if ($records === null || $records->count() < 1) { |
| 30 | - echo '<p class="alert alert-warning">' . __('Answers is not founded') . '</p>'; |
|
| 30 | + echo '<p class="alert alert-warning">'.__('Answers is not founded').'</p>'; |
|
| 31 | 31 | return; |
| 32 | 32 | } |
| 33 | 33 | $items = []; |
@@ -36,21 +36,21 @@ discard block |
||
| 36 | 36 | $commentObject = $item->getCommentPost(); |
| 37 | 37 | $message = Text::cut(\App::$Security->strip_tags($item->message), 0, 75); |
| 38 | 38 | |
| 39 | - $moderate = (bool)$item->moderate; |
|
| 39 | + $moderate = (bool) $item->moderate; |
|
| 40 | 40 | if ($moderate) { |
| 41 | 41 | $moderateIsFound = true; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $items[] = [ |
| 45 | 45 | 1 => ['text' => $item->id], |
| 46 | - 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-' . $item->id]], $message), 'html' => true], |
|
| 47 | - 3 => ['text' => Simplify::parseUserLink((int)$item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
| 48 | - 4 => ['text' => '<a href="' . App::$Alias->scriptUrl . $commentObject->pathway . '" target="_blank">' . Str::sub($commentObject->pathway, 0, 20) . '...</a>', 'html' => true], |
|
| 46 | + 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-'.$item->id]], $message), 'html' => true], |
|
| 47 | + 3 => ['text' => Simplify::parseUserLink((int) $item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
| 48 | + 4 => ['text' => '<a href="'.App::$Alias->scriptUrl.$commentObject->pathway.'" target="_blank">'.Str::sub($commentObject->pathway, 0, 20).'...</a>', 'html' => true], |
|
| 49 | 49 | 5 => ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)], |
| 50 | - 6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>') . |
|
| 51 | - ' ' . Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
| 50 | + 6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>'). |
|
| 51 | + ' '.Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
| 52 | 52 | 'html' => true, 'property' => ['class' => 'text-center']], |
| 53 | - 'property' => ['class' => 'checkbox-row' . ($moderate !== false ? ' alert-warning' : null)] |
|
| 53 | + 'property' => ['class' => 'checkbox-row'.($moderate !== false ? ' alert-warning' : null)] |
|
| 54 | 54 | ]; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | <?php |
| 28 | 28 | if ($records === null || $records->count() < 1) { |
| 29 | - echo '<p class="alert alert-warning">' . __('Comments is not founded') . '</p>'; |
|
| 29 | + echo '<p class="alert alert-warning">'.__('Comments is not founded').'</p>'; |
|
| 30 | 30 | return; |
| 31 | 31 | } |
| 32 | 32 | $items = []; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | foreach ($records as $item) { |
| 35 | 35 | $message = Text::cut(\App::$Security->strip_tags($item->message), 0, 75); |
| 36 | 36 | |
| 37 | - $moderate = (bool)$item->moderate; |
|
| 37 | + $moderate = (bool) $item->moderate; |
|
| 38 | 38 | // if even one moderate item is found - change global flag to true |
| 39 | 39 | if ($moderate) { |
| 40 | 40 | $moderateIsFound = true; |
@@ -42,16 +42,16 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $items[] = [ |
| 44 | 44 | 1 => ['text' => $item->id], |
| 45 | - 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['comments/read', $item->id], $message), 'html' => true], |
|
| 45 | + 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['comments/read', $item->id], $message), 'html' => true], |
|
| 46 | 46 | 3 => ['text' => $item->getAnswerCount()], |
| 47 | - 4 => ['text' => Simplify::parseUserLink((int)$item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
| 48 | - 5 => ['text' => '<a href="' . App::$Alias->scriptUrl . $item->pathway . '" target="_blank">' . Str::sub($item->pathway, 0, 20) . '...</a>', 'html' => true], |
|
| 47 | + 4 => ['text' => Simplify::parseUserLink((int) $item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
| 48 | + 5 => ['text' => '<a href="'.App::$Alias->scriptUrl.$item->pathway.'" target="_blank">'.Str::sub($item->pathway, 0, 20).'...</a>', 'html' => true], |
|
| 49 | 49 | 6 => ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)], |
| 50 | - 7 => ['text' => Url::link(['comments/read', $item->id], '<i class="fa fa-list fa-lg"></i>') . |
|
| 51 | - ' ' . Url::link(['comments/delete', 'comment', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
| 50 | + 7 => ['text' => Url::link(['comments/read', $item->id], '<i class="fa fa-list fa-lg"></i>'). |
|
| 51 | + ' '.Url::link(['comments/delete', 'comment', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
| 52 | 52 | 'html' => true, 'property' => ['class' => 'text-center']], |
| 53 | 53 | 'property' => [ |
| 54 | - 'class' => 'checkbox-row' . ($moderate !== false ? ' alert-warning' : null) |
|
| 54 | + 'class' => 'checkbox-row'.($moderate !== false ? ' alert-warning' : null) |
|
| 55 | 55 | ] |
| 56 | 56 | ]; |
| 57 | 57 | } |
@@ -29,16 +29,16 @@ discard block |
||
| 29 | 29 | $author = Url::link(['user/update', $record->user_id], $author); |
| 30 | 30 | } |
| 31 | 31 | ?> |
| 32 | - <?= $author . ', ' . Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR) ?> |
|
| 32 | + <?= $author.', '.Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR) ?> |
|
| 33 | 33 | <div class="pull-right"> |
| 34 | - <?php if ((bool)$record->moderate):?> |
|
| 34 | + <?php if ((bool) $record->moderate):?> |
|
| 35 | 35 | <?= Url::link(['comments/publish', 'comment', $record->id], __('Publish'), ['class' => 'label label-warning']) ?> |
| 36 | 36 | <?php endif; ?> |
| 37 | 37 | <?= Url::link(['comments/edit', 'comment', $record->id], __('Edit'), ['class' => 'label label-primary']) ?> |
| 38 | 38 | <?= Url::link(['comments/delete', 'comment', $record->id], __('Delete'), ['class' => 'label label-danger']) ?> |
| 39 | 39 | </div> |
| 40 | 40 | </div> |
| 41 | - <div class="panel-body<?= ((bool)$record->moderate ? ' text-warning' : null)?>"> |
|
| 41 | + <div class="panel-body<?= ((bool) $record->moderate ? ' text-warning' : null)?>"> |
|
| 42 | 42 | <?= $record->message ?> |
| 43 | 43 | </div> |
| 44 | 44 | </div> |
@@ -59,16 +59,16 @@ discard block |
||
| 59 | 59 | <?php |
| 60 | 60 | $answerAuthor = Simplify::parseUserLink($answer->user_id, $answer->guest_name, 'user/update'); |
| 61 | 61 | ?> |
| 62 | - <?= $answerAuthor . ', ' . Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
|
| 62 | + <?= $answerAuthor.', '.Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
|
| 63 | 63 | <div class="pull-right"> |
| 64 | - <?php if ((bool)$answer->moderate):?> |
|
| 64 | + <?php if ((bool) $answer->moderate):?> |
|
| 65 | 65 | <?= Url::link(['comments/publish', 'answer', $answer->id], __('Publish'), ['class' => 'label label-warning']) ?> |
| 66 | 66 | <?php endif; ?> |
| 67 | 67 | <?= Url::link(['comments/edit', 'answer', $answer->id], __('Edit'), ['class' => 'label label-primary']) ?> |
| 68 | 68 | <?= Url::link(['comments/delete', 'answer', $answer->id], __('Delete'), ['class' => 'label label-danger']) ?> |
| 69 | 69 | </div> |
| 70 | 70 | </div> |
| 71 | - <div class="panel-body<?= ((bool)$answer->moderate ? ' text-warning' : null)?>"> |
|
| 71 | + <div class="panel-body<?= ((bool) $answer->moderate ? ' text-warning' : null)?>"> |
|
| 72 | 72 | <?= $answer->message ?> |
| 73 | 73 | </div> |
| 74 | 74 | </div> |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | public function actionIndex() |
| 40 | 40 | { |
| 41 | 41 | // set current page and offset |
| 42 | - $page = (int)App::$Request->query->get('page'); |
|
| 42 | + $page = (int) App::$Request->query->get('page'); |
|
| 43 | 43 | $offset = $page * self::ITEM_PER_PAGE; |
| 44 | 44 | |
| 45 | 45 | // initialize active record model |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | public function actionDelete($type, $id = 0) |
| 135 | 135 | { |
| 136 | 136 | // sounds like a multiply delete definition |
| 137 | - if ($id === 0 || (int)$id < 1) { |
|
| 137 | + if ($id === 0 || (int) $id < 1) { |
|
| 138 | 138 | $ids = App::$Request->query->get('selected'); |
| 139 | 139 | if (Obj::isArray($ids) && Arr::onlyNumericValues($ids)) { |
| 140 | 140 | $id = $ids; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | if ($model->send() && $model->validate()) { |
| 169 | 169 | $model->make(); |
| 170 | 170 | App::$Session->getFlashBag()->add('success', __('Comments or answers are successful deleted!')); |
| 171 | - App::$Response->redirect('comments/' . ($type === 'answer' ? 'answerlist' : 'index')); |
|
| 171 | + App::$Response->redirect('comments/'.($type === 'answer' ? 'answerlist' : 'index')); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | // render view |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | public function actionPublish($type, $id = 0) |
| 188 | 188 | { |
| 189 | 189 | // check if it multiple accept ids |
| 190 | - if ($id === 0 || (int)$id < 1) { |
|
| 190 | + if ($id === 0 || (int) $id < 1) { |
|
| 191 | 191 | $ids = App::$Request->query->get('selected'); |
| 192 | 192 | if (Obj::isArray($ids) && Arr::onlyNumericValues($ids)) { |
| 193 | 193 | $id = $ids; |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | if ($model->send()) { |
| 222 | 222 | $model->make(); |
| 223 | 223 | App::$Session->getFlashBag()->add('success', __('Comments or answers are successful published')); |
| 224 | - App::$Response->redirect('comments/' . ($type === 'answer' ? 'answerlist' : 'index')); |
|
| 224 | + App::$Response->redirect('comments/'.($type === 'answer' ? 'answerlist' : 'index')); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | return App::$View->render('publish', [ |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | public function actionAnswerlist() |
| 237 | 237 | { |
| 238 | 238 | // set current page and offset |
| 239 | - $page = (int)App::$Request->query->get('page'); |
|
| 239 | + $page = (int) App::$Request->query->get('page'); |
|
| 240 | 240 | $offset = $page * self::ITEM_PER_PAGE; |
| 241 | 241 | |
| 242 | 242 | // initialize ar answers model |