@@ -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> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | $catConfigs = []; |
| 16 | 16 | foreach ($model->category['configs'] as $key=>$value) { |
| 17 | - $catConfigs[$key] = (bool)$value; |
|
| 17 | + $catConfigs[$key] = (bool) $value; |
|
| 18 | 18 | } |
| 19 | 19 | $catMeta = [ |
| 20 | 20 | 'date' => $catConfigs['showDate'], |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | <?php if ($item['important']): ?> |
| 75 | 75 | <i class="fa fa-fire" style="color: #a50000"></i> |
| 76 | 76 | <?php endif; ?> |
| 77 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"> |
|
| 77 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"> |
|
| 78 | 78 | <?= $item['title'] ?> |
| 79 | 79 | </a> |
| 80 | 80 | </h2> |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | <?php |
| 102 | 102 | $ownerNick = $item['author']->profile === null ? __('Unknown') : $item['author']->profile->getNickname(); |
| 103 | 103 | if ($item['author']->getId() < 1) { |
| 104 | - echo '<s>' . $ownerNick . '</s>'; |
|
| 104 | + echo '<s>'.$ownerNick.'</s>'; |
|
| 105 | 105 | } else { |
| 106 | 106 | echo Url::a(['profile/show', [$item['author']->getId()]], $ownerNick, ['itemprop' => 'author']); |
| 107 | 107 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | <div class="row"> |
| 119 | 119 | <div class="col-md-12"> |
| 120 | 120 | <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?> |
| 121 | - <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail d-none d-sm-block" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" /> |
|
| 121 | + <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail d-none d-sm-block" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" /> |
|
| 122 | 122 | <?php endif; ?> |
| 123 | 123 | <div itemprop="text articleBody"> |
| 124 | 124 | <?= $item['text'] ?> |
@@ -135,15 +135,15 @@ discard block |
||
| 135 | 135 | }*/ ?> |
| 136 | 136 | |
| 137 | 137 | <span class="spaced"><i class="fa fa-comment-o"></i> |
| 138 | - <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a> |
|
| 138 | + <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a> |
|
| 139 | 139 | </span> |
| 140 | 140 | <span class="float-right"> |
| 141 | - <?php if ((int)$catConfigs['showTags'] === 1 && $item['tags'] !== null && Any::isArray($item['tags'])): ?> |
|
| 141 | + <?php if ((int) $catConfigs['showTags'] === 1 && $item['tags'] !== null && Any::isArray($item['tags'])): ?> |
|
| 142 | 142 | <span class="spaced"><i class="fa fa-tags"></i> |
| 143 | 143 | <?php |
| 144 | 144 | foreach ($item['tags'] as $tag) { |
| 145 | 145 | $tag = trim($tag); |
| 146 | - echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary']) . " "; |
|
| 146 | + echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary'])." "; |
|
| 147 | 147 | } |
| 148 | 148 | ?> |
| 149 | 149 | </span> |
@@ -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 | } |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // check in cache |
| 64 | - if (MainApp::$Memory->get('profile.object.cache.' . $userId) !== null) { |
|
| 65 | - return MainApp::$Memory->get('profile.object.cache.' . $userId); |
|
| 64 | + if (MainApp::$Memory->get('profile.object.cache.'.$userId) !== null) { |
|
| 65 | + return MainApp::$Memory->get('profile.object.cache.'.$userId); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // find row |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $object = $profile->first(); |
| 77 | - MainApp::$Memory->set('profile.object.cache.' . $userId, $object); |
|
| 77 | + MainApp::$Memory->set('profile.object.cache.'.$userId, $object); |
|
| 78 | 78 | |
| 79 | 79 | return $object; |
| 80 | 80 | } |
@@ -86,17 +86,17 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function getAvatarUrl($type = 'small') |
| 88 | 88 | { |
| 89 | - $default = '/upload/user/avatar/' . $type . '/default.jpg'; |
|
| 89 | + $default = '/upload/user/avatar/'.$type.'/default.jpg'; |
|
| 90 | 90 | if (!Arr::in($type, ['small', 'big', 'medium'])) { |
| 91 | - return MainApp::$Alias->scriptUrl . $default; |
|
| 91 | + return MainApp::$Alias->scriptUrl.$default; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - $route = '/upload/user/avatar/' . $type . '/' . $this->user_id . '.jpg'; |
|
| 94 | + $route = '/upload/user/avatar/'.$type.'/'.$this->user_id.'.jpg'; |
|
| 95 | 95 | if (File::exist($route)) { |
| 96 | - return MainApp::$Alias->scriptUrl . $route . '?mtime=' . File::mTime($route); |
|
| 96 | + return MainApp::$Alias->scriptUrl.$route.'?mtime='.File::mTime($route); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - return MainApp::$Alias->scriptUrl . $default; |
|
| 99 | + return MainApp::$Alias->scriptUrl.$default; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | /** |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | { |
| 108 | 108 | $userNick = $this->nick; |
| 109 | 109 | if (!$userNick || Str::likeEmpty($userNick)) { |
| 110 | - $userNick = 'id' . $this->id; |
|
| 110 | + $userNick = 'id'.$this->id; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | return $userNick; |
@@ -68,15 +68,15 @@ |
||
| 68 | 68 | public function getAnswerCount() |
| 69 | 69 | { |
| 70 | 70 | // check if count is cached |
| 71 | - if (MainApp::$Memory->get('commentpost.answer.count.' . $this->id) !== null) { |
|
| 72 | - return MainApp::$Memory->get('commentpost.answer.count.' . $this->id); |
|
| 71 | + if (MainApp::$Memory->get('commentpost.answer.count.'.$this->id) !== null) { |
|
| 72 | + return MainApp::$Memory->get('commentpost.answer.count.'.$this->id); |
|
| 73 | 73 | } |
| 74 | 74 | // get count from db |
| 75 | 75 | $count = CommentAnswer::where('comment_id', $this->id) |
| 76 | 76 | ->where('moderate', 0) |
| 77 | 77 | ->count(); |
| 78 | 78 | // save in cache |
| 79 | - MainApp::$Memory->set('commentpost.answer.count.' . $this->id, $count); |
|
| 79 | + MainApp::$Memory->set('commentpost.answer.count.'.$this->id, $count); |
|
| 80 | 80 | return $count; |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -46,10 +46,10 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public static function check($user1, $user2): bool |
| 48 | 48 | { |
| 49 | - $query = self::where(function ($query) use ($user1, $user2) { |
|
| 49 | + $query = self::where(function($query) use ($user1, $user2) { |
|
| 50 | 50 | $query->where('user_id', $user1) |
| 51 | 51 | ->where('target_id', $user2); |
| 52 | - })->orWhere(function ($query) use ($user1, $user2) { |
|
| 52 | + })->orWhere(function($query) use ($user1, $user2) { |
|
| 53 | 53 | $query->where('user_id', $user2) |
| 54 | 54 | ->where('target_id', $user1); |
| 55 | 55 | }); |