@@ -26,8 +26,8 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | public function before() |
| 28 | 28 | { |
| 29 | - $this->count = (int)$this->_configs['count']; |
|
| 30 | - $this->cache = (int)$this->_configs['cache']; |
|
| 29 | + $this->count = (int) $this->_configs['count']; |
|
| 30 | + $this->cache = (int) $this->_configs['cache']; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -27,9 +27,9 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | public function before() |
| 29 | 29 | { |
| 30 | - $this->snippet = (int)$this->_configs['snippet']; |
|
| 31 | - $this->count = (int)$this->_configs['count']; |
|
| 32 | - $this->cache = (int)$this->_configs['cache']; |
|
| 30 | + $this->snippet = (int) $this->_configs['snippet']; |
|
| 31 | + $this->count = (int) $this->_configs['count']; |
|
| 32 | + $this->cache = (int) $this->_configs['cache']; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -35,15 +35,15 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // convert id to real integer |
| 38 | - $user_id = (int)$user_id; |
|
| 38 | + $user_id = (int) $user_id; |
|
| 39 | 39 | |
| 40 | 40 | if (!Obj::isInt($user_id) || $user_id < 1) { |
| 41 | 41 | return null; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // check in memory cache object |
| 45 | - if (MainApp::$Memory->get('user.object.cache.' . $user_id) !== null) { |
|
| 46 | - return MainApp::$Memory->get('user.object.cache.' . $user_id); |
|
| 45 | + if (MainApp::$Memory->get('user.object.cache.'.$user_id) !== null) { |
|
| 46 | + return MainApp::$Memory->get('user.object.cache.'.$user_id); |
|
| 47 | 47 | } |
| 48 | 48 | // not founded in memory? lets make query |
| 49 | 49 | $user = self::find($user_id); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // store cache and return object |
| 56 | - MainApp::$Memory->set('user.object.cache.' . $user->id, $user); |
|
| 56 | + MainApp::$Memory->set('user.object.cache.'.$user->id, $user); |
|
| 57 | 57 | return $user; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public function getId() |
| 65 | 65 | { |
| 66 | - return (int)$this->id; |
|
| 66 | + return (int) $this->id; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | public static function isAuth() |
| 85 | 85 | { |
| 86 | 86 | // get data from session |
| 87 | - $sessionUserId = (int)MainApp::$Session->get('ff_user_id', 0); |
|
| 87 | + $sessionUserId = (int) MainApp::$Session->get('ff_user_id', 0); |
|
| 88 | 88 | |
| 89 | 89 | // check if session contains user id data |
| 90 | 90 | if ($sessionUserId < 1) { |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | return false; |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - return ((int)$identity->id > 0 && (int)$identity->id === $sessionUserId); |
|
| 106 | + return ((int) $identity->id > 0 && (int) $identity->id === $sessionUserId); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -118,12 +118,12 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | // convert id to real integer |
| 121 | - $id = (int)$id; |
|
| 121 | + $id = (int) $id; |
|
| 122 | 122 | |
| 123 | - $find = MainApp::$Memory->get('user.counter.cache.' . $id); |
|
| 123 | + $find = MainApp::$Memory->get('user.counter.cache.'.$id); |
|
| 124 | 124 | if ($find === null) { |
| 125 | 125 | $find = self::where('id', '=', $id)->count(); |
| 126 | - MainApp::$Memory->set('user.counter.cache.' . $id, $find); |
|
| 126 | + MainApp::$Memory->set('user.counter.cache.'.$id, $find); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | return $find === 1; |
@@ -5,28 +5,28 @@ |
||
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | // require all tables |
| 8 | -require_once(root . '/Private/Database/Tables/App.php'); |
|
| 9 | -require_once(root . '/Private/Database/Tables/Blacklist.php'); |
|
| 10 | -require_once(root . '/Private/Database/Tables/CommentAnswer.php'); |
|
| 11 | -require_once(root . '/Private/Database/Tables/CommentPost.php'); |
|
| 12 | -require_once(root . '/Private/Database/Tables/Content.php'); |
|
| 13 | -require_once(root . '/Private/Database/Tables/ContentCategory.php'); |
|
| 14 | -require_once(root . '/Private/Database/Tables/ContentRating.php'); |
|
| 15 | -require_once(root . '/Private/Database/Tables/ContentTag.php'); |
|
| 16 | -require_once(root . '/Private/Database/Tables/FeedbackAnswer.php'); |
|
| 17 | -require_once(root . '/Private/Database/Tables/FeedbackPost.php'); |
|
| 18 | -require_once(root . '/Private/Database/Tables/Invite.php'); |
|
| 19 | -require_once(root . '/Private/Database/Tables/Message.php'); |
|
| 20 | -require_once(root . '/Private/Database/Tables/Profile.php'); |
|
| 21 | -require_once(root . '/Private/Database/Tables/ProfileField.php'); |
|
| 22 | -require_once(root . '/Private/Database/Tables/ProfileRating.php'); |
|
| 23 | -require_once(root . '/Private/Database/Tables/Role.php'); |
|
| 24 | -require_once(root . '/Private/Database/Tables/Session.php'); |
|
| 25 | -require_once(root . '/Private/Database/Tables/User.php'); |
|
| 26 | -require_once(root . '/Private/Database/Tables/UserLog.php'); |
|
| 27 | -require_once(root . '/Private/Database/Tables/UserRecovery.php'); |
|
| 28 | -require_once(root . '/Private/Database/Tables/WallPost.php'); |
|
| 29 | -require_once(root . '/Private/Database/Tables/WallAnswer.php'); |
|
| 8 | +require_once(root.'/Private/Database/Tables/App.php'); |
|
| 9 | +require_once(root.'/Private/Database/Tables/Blacklist.php'); |
|
| 10 | +require_once(root.'/Private/Database/Tables/CommentAnswer.php'); |
|
| 11 | +require_once(root.'/Private/Database/Tables/CommentPost.php'); |
|
| 12 | +require_once(root.'/Private/Database/Tables/Content.php'); |
|
| 13 | +require_once(root.'/Private/Database/Tables/ContentCategory.php'); |
|
| 14 | +require_once(root.'/Private/Database/Tables/ContentRating.php'); |
|
| 15 | +require_once(root.'/Private/Database/Tables/ContentTag.php'); |
|
| 16 | +require_once(root.'/Private/Database/Tables/FeedbackAnswer.php'); |
|
| 17 | +require_once(root.'/Private/Database/Tables/FeedbackPost.php'); |
|
| 18 | +require_once(root.'/Private/Database/Tables/Invite.php'); |
|
| 19 | +require_once(root.'/Private/Database/Tables/Message.php'); |
|
| 20 | +require_once(root.'/Private/Database/Tables/Profile.php'); |
|
| 21 | +require_once(root.'/Private/Database/Tables/ProfileField.php'); |
|
| 22 | +require_once(root.'/Private/Database/Tables/ProfileRating.php'); |
|
| 23 | +require_once(root.'/Private/Database/Tables/Role.php'); |
|
| 24 | +require_once(root.'/Private/Database/Tables/Session.php'); |
|
| 25 | +require_once(root.'/Private/Database/Tables/User.php'); |
|
| 26 | +require_once(root.'/Private/Database/Tables/UserLog.php'); |
|
| 27 | +require_once(root.'/Private/Database/Tables/UserRecovery.php'); |
|
| 28 | +require_once(root.'/Private/Database/Tables/WallPost.php'); |
|
| 29 | +require_once(root.'/Private/Database/Tables/WallAnswer.php'); |
|
| 30 | 30 | |
| 31 | 31 | // insert demo content |
| 32 | -require_once (root . '/Private/Database/Other/DemoContent.php'); |
|
| 33 | 32 | \ No newline at end of file |
| 33 | +require_once (root.'/Private/Database/Other/DemoContent.php'); |
|
| 34 | 34 | \ No newline at end of file |
@@ -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" /> |
@@ -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(); |
@@ -57,7 +57,7 @@ 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 | |
@@ -67,7 +67,7 @@ discard block |
||
| 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')); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $record->message = $this->message; |
| 115 | 115 | $record->lang = App::$Request->getLanguage(); |
| 116 | 116 | // check if premoderation is enabled and user is guest |
| 117 | - if ((int)$this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 117 | + if ((int) $this->_configs['guestModerate'] === 1 && $this->_userId < 1) { |
|
| 118 | 118 | $record->moderate = 1; |
| 119 | 119 | } |
| 120 | 120 | $record->save(); |