@@ -7,7 +7,7 @@ |
||
| 7 | 7 | /** @var array $url */ |
| 8 | 8 | /** @var array $properties */ |
| 9 | 9 | |
| 10 | -$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999); |
|
| 10 | +$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999); |
|
| 11 | 11 | $properties['id'] = $rndId; |
| 12 | 12 | |
| 13 | 13 | echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) { |
@@ -13,11 +13,14 @@ |
||
| 13 | 13 | |
| 14 | 14 | <?php if (App::$Captcha->isFull()): ?> |
| 15 | 15 | <div class="col-md-9 offset-md-3"><?= $html ?></div> |
| 16 | -<?php else: ?> |
|
| 16 | +<?php else { |
|
| 17 | + : ?> |
|
| 17 | 18 | <div class="row"> |
| 18 | 19 | <div class="col-md-9 offset-md-3"> |
| 19 | 20 | <img src="<?= $html ?>" alt="captcha" onClick="this.src='<?=$html?>&rnd='+Math.random()" /> |
| 20 | 21 | </div> |
| 21 | 22 | </div> |
| 22 | 23 | <?= $form->fieldset()->text($name, null, __('Enter data from security image to prove that you are human. If you can\'t read symbols - click on image to reload')) ?> |
| 23 | -<?php endif; ?> |
|
| 24 | 24 | \ No newline at end of file |
| 25 | +<?php endif; |
|
| 26 | +} |
|
| 27 | +?> |
|
| 25 | 28 | \ No newline at end of file |
@@ -77,7 +77,8 @@ discard block |
||
| 77 | 77 | </div> |
| 78 | 78 | <?php if (\App::$Captcha->isFull()): ?> |
| 79 | 79 | <div class="col-md-offset-3 col-md-9"><?= \App::$Captcha->get() ?></div> |
| 80 | - <?php else: ?> |
|
| 80 | + <?php else { |
|
| 81 | + : ?> |
|
| 81 | 82 | <div class="form-group"> |
| 82 | 83 | <label for="guest-captcha" class="col-sm-3 control-label"><?= __('Captcha') ?>:</label> |
| 83 | 84 | <div class="col-sm-9"> |
@@ -85,7 +86,9 @@ discard block |
||
| 85 | 86 | <input id="guest-captcha" type="text" name="captcha" class="form-control" required> |
| 86 | 87 | </div> |
| 87 | 88 | </div> |
| 88 | - <?php endif; ?> |
|
| 89 | + <?php endif; |
|
| 90 | +} |
|
| 91 | +?> |
|
| 89 | 92 | <?php endif; ?> |
| 90 | 93 | <textarea class="form-control wysiwyg" name="message"></textarea> |
| 91 | 94 | </form> |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | /** @var int $id */ |
| 6 | 6 | ?> |
| 7 | 7 | |
| 8 | -<?php if ((bool)$configs['guestAdd'] && (bool)$configs['guestModerate'] && !\App::$User->isAuth()): ?> |
|
| 8 | +<?php if ((bool) $configs['guestAdd'] && (bool) $configs['guestModerate'] && !\App::$User->isAuth()): ?> |
|
| 9 | 9 | <p class="alert alert-warning"><?= $this->bootstrap()->alert('warning', __('All guest comments will be moderated before display')) ?></p> |
| 10 | 10 | <?php endif; ?> |
| 11 | 11 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | </a> |
| 38 | 38 | </i> |
| 39 | 39 | </div> |
| 40 | - <div id="comment-text" class="comment-text"><?= __('Loading') . ' ...' ?></div> |
|
| 40 | + <div id="comment-text" class="comment-text"><?= __('Loading').' ...' ?></div> |
|
| 41 | 41 | </div> |
| 42 | 42 | <div id="comment-answers-0" class="d-none"></div> |
| 43 | 43 | <div class="row d-none" id="add-replay-to"> |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | <span id="answer-date">00.00.00 00-00-00</span> |
| 61 | 61 | <span id="answer-user-name"><?= __('Unknown') ?></span>: |
| 62 | 62 | </div> |
| 63 | - <div id="answer-text" class="comment-text"><?= __('Loading') . ' ...' ?></div> |
|
| 63 | + <div id="answer-text" class="comment-text"><?= __('Loading').' ...' ?></div> |
|
| 64 | 64 | </div> |
| 65 | 65 | </li> |
| 66 | 66 | </ul> |
| 67 | 67 | |
| 68 | -<?php if ((bool)$configs['guestAdd'] || \App::$User->isAuth()): ?> |
|
| 68 | +<?php if ((bool) $configs['guestAdd'] || \App::$User->isAuth()): ?> |
|
| 69 | 69 | <!-- comment form --> |
| 70 | 70 | <form name="comment-add-form" action="" method="post" style="padding-top: 15px;" class="form-horizontal"> |
| 71 | 71 | <input type="hidden" name="replay-to" value="0" /> |
@@ -32,8 +32,8 @@ |
||
| 32 | 32 | $menu->menu([ |
| 33 | 33 | 'text' => Str::upperCase($lang), |
| 34 | 34 | 'tab' => function() use ($form, $lang) { |
| 35 | - return $form->fieldset()->text('title.' . $lang, null, __('Enter category title, visible for users')) . |
|
| 36 | - $form->fieldset()->text('description.' . $lang, null, __('Enter category description')); |
|
| 35 | + return $form->fieldset()->text('title.'.$lang, null, __('Enter category title, visible for users')). |
|
| 36 | + $form->fieldset()->text('description.'.$lang, null, __('Enter category description')); |
|
| 37 | 37 | }, |
| 38 | 38 | 'tabActive' => $lang === \App::$Request->getLanguage() |
| 39 | 39 | ]); |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | <div class="row mb-1"> |
| 15 | 15 | <div class="col-md-6"> |
| 16 | 16 | <i class="fa fa-user"></i> |
| 17 | - <?php if ((int)$comment['user']['id'] > 0): ?> |
|
| 17 | + <?php if ((int) $comment['user']['id'] > 0): ?> |
|
| 18 | 18 | <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name'], ['style' => 'color: #595959']) ?> |
| 19 | 19 | <?php else: ?> |
| 20 | 20 | <?= $comment['user']['name'] ?> |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | <div class="row"> |
| 31 | 31 | <div class="col widget-comment-text"> |
| 32 | - <a href="<?= \App::$Alias->baseUrl . '/' . $comment['app_name'] . '/comments/' . $comment['app_id'] ?>"> |
|
| 32 | + <a href="<?= \App::$Alias->baseUrl.'/'.$comment['app_name'].'/comments/'.$comment['app_id'] ?>"> |
|
| 33 | 33 | <?= Text::cut(\App::$Security->strip_tags($comment['text']), 0, $snippet) ?> |
| 34 | 34 | </a> |
| 35 | 35 | </div> |
@@ -16,9 +16,12 @@ |
||
| 16 | 16 | <i class="fa fa-user"></i> |
| 17 | 17 | <?php if ((int)$comment['user']['id'] > 0): ?> |
| 18 | 18 | <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name'], ['style' => 'color: #595959']) ?> |
| 19 | - <?php else: ?> |
|
| 19 | + <?php else { |
|
| 20 | + : ?> |
|
| 20 | 21 | <?= $comment['user']['name'] ?> |
| 21 | - <?php endif; ?> |
|
| 22 | + <?php endif; |
|
| 23 | +} |
|
| 24 | +?> |
|
| 22 | 25 | </div> |
| 23 | 26 | <div class="col-md-6 pull-right"> |
| 24 | 27 | <small class="text-secondary pull-right"> |
@@ -57,17 +57,17 @@ discard block |
||
| 57 | 57 | public function check() |
| 58 | 58 | { |
| 59 | 59 | // check if user is auth'd or guest name is defined |
| 60 | - if (!App::$User->isAuth() && ((int)$this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
| 60 | + if (!App::$User->isAuth() && ((int) $this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) { |
|
| 61 | 61 | throw new JsonException(__('Guest name is not defined')); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // check if target app_name or id is empty |
| 65 | - if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int)$this->appId < 0) { |
|
| 65 | + if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int) $this->appId < 0) { |
|
| 66 | 66 | throw new JsonException(__('Wrong target name or id')); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // check if message length is correct |
| 70 | - if (Str::length($this->message) < (int)$this->_configs['minLength'] || Str::length($this->message) > (int)$this->_configs['maxLength']) { |
|
| 70 | + if (Str::length($this->message) < (int) $this->_configs['minLength'] || Str::length($this->message) > (int) $this->_configs['maxLength']) { |
|
| 71 | 71 | throw new JsonException(__('Message length is incorrect. Current: %cur%, min - %min%, max - %max%', [ |
| 72 | 72 | 'cur' => Str::length($this->message), |
| 73 | 73 | 'min' => $this->_configs['minLength'], |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | // guest moderation |
| 79 | - if (!App::$User->isAuth() && (bool)$this->_configs['guestModerate']) { |
|
| 79 | + if (!App::$User->isAuth() && (bool) $this->_configs['guestModerate']) { |
|
| 80 | 80 | $captcha = App::$Request->request->get('captcha'); |
| 81 | 81 | if (!App::$Captcha->validate($captcha)) { |
| 82 | 82 | throw new JsonException(__('Captcha is incorrect! Click on image to refresh and try again')); |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | { |
| 111 | 111 | $record = new CommentPost(); |
| 112 | 112 | $record->app_name = $this->appName; |
| 113 | - $record->app_relation_id = (int)$this->appId; |
|
| 113 | + $record->app_relation_id = (int) $this->appId; |
|
| 114 | 114 | $record->user_id = $this->_userId; |
| 115 | 115 | $record->guest_name = $this->guestName; |
| 116 | 116 | $record->message = $this->message; |
| 117 | 117 | $record->lang = App::$Request->getLanguage(); |
| 118 | 118 | // check if pre moderation is enabled and user is guest |
| 119 | - if ((int)$this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 119 | + if ((int) $this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 120 | 120 | $record->moderate = 1; |
| 121 | 121 | } |
| 122 | 122 | $record->save(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $this->setJsonHeader(); |
| 32 | 32 | $configs = AppRecord::getConfigs('widget', 'Comments'); |
| 33 | 33 | |
| 34 | - $replayTo = (int)$this->request->request->get('replay-to'); |
|
| 34 | + $replayTo = (int) $this->request->request->get('replay-to'); |
|
| 35 | 35 | $model = null; |
| 36 | 36 | // check if its a answer (comment answer type) |
| 37 | 37 | if ($replayTo > 0) { |
@@ -40,15 +40,15 @@ discard block |
||
| 40 | 40 | } else { // sounds like new comment row |
| 41 | 41 | $model = new CommentPostAdd($configs); |
| 42 | 42 | $model->appName = App::$Security->strip_tags($this->request->request->get('app_name')); |
| 43 | - $model->appId = (int)$this->request->request->get('app_id'); |
|
| 43 | + $model->appId = (int) $this->request->request->get('app_id'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // pass general comment params to model |
| 47 | - $model->message = App::$Security->secureHtml((string)$this->request->request->get('message')); |
|
| 47 | + $model->message = App::$Security->secureHtml((string) $this->request->request->get('message')); |
|
| 48 | 48 | $model->guestName = App::$Security->strip_tags($this->request->request->get('guest-name')); |
| 49 | 49 | |
| 50 | 50 | // check model conditions before add new row |
| 51 | - if (!$model|| !$model->check()) { |
|
| 51 | + if (!$model || !$model->check()) { |
|
| 52 | 52 | throw new NativeException('Unknown error'); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -40,14 +40,14 @@ |
||
| 40 | 40 | // for each item in path array calculate comments count |
| 41 | 41 | foreach ($ids as $id) { |
| 42 | 42 | $query = CommentPost::where('app_name', $appName) |
| 43 | - ->where('app_relation_id', (int)$id) |
|
| 43 | + ->where('app_relation_id', (int) $id) |
|
| 44 | 44 | ->where('moderate', '=', 0); |
| 45 | 45 | // check if comments is depend of language locale |
| 46 | - if ((bool)$configs['onlyLocale']) { |
|
| 46 | + if ((bool) $configs['onlyLocale']) { |
|
| 47 | 47 | $query = $query->where('lang', '=', $this->request->getLanguage()); |
| 48 | 48 | } |
| 49 | 49 | // set itemId => count |
| 50 | - $count[(int)$id] = $query->count(); |
|
| 50 | + $count[(int) $id] = $query->count(); |
|
| 51 | 51 | } |
| 52 | 52 | // render json response |
| 53 | 53 | return json_encode(['status' => 1, 'count' => $count]); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | public function init(): void |
| 21 | 21 | { |
| 22 | 22 | if (App::$Request->getLanguage() !== 'en') { |
| 23 | - App::$Translate->append('/i18n/Front/' . App::$Request->getLanguage() . '/CommentWidget.php'); |
|
| 23 | + App::$Translate->append('/i18n/Front/'.App::$Request->getLanguage().'/CommentWidget.php'); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function display(): ?string |
| 32 | 32 | { |
| 33 | - if (!$this->name || (int)$this->id < 1) { |
|
| 33 | + if (!$this->name || (int) $this->id < 1) { |
|
| 34 | 34 | return null; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | return App::$View->render('widgets/comments/show', [ |
| 38 | 38 | 'configs' => $this->getConfigs(), |
| 39 | - 'name' => (string)$this->name, |
|
| 40 | - 'id' => (int)$this->id, |
|
| 39 | + 'name' => (string) $this->name, |
|
| 40 | + 'id' => (int) $this->id, |
|
| 41 | 41 | ]); |
| 42 | 42 | } |
| 43 | 43 | } |