@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | - * Set default model properties from global configuration |
|
| 26 | - */ |
|
| 25 | + * Set default model properties from global configuration |
|
| 26 | + */ |
|
| 27 | 27 | public function before() |
| 28 | 28 | { |
| 29 | 29 | $this->count = (int)$this->_configs['count']; |
@@ -31,8 +31,8 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | - * Form display labels |
|
| 35 | - */ |
|
| 34 | + * Form display labels |
|
| 35 | + */ |
|
| 36 | 36 | public function labels() |
| 37 | 37 | { |
| 38 | 38 | return [ |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | - * Validation rules |
|
| 46 | - */ |
|
| 45 | + * Validation rules |
|
| 46 | + */ |
|
| 47 | 47 | public function rules() |
| 48 | 48 | { |
| 49 | 49 | return [ |
@@ -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 | /** |
@@ -1,6 +1,4 @@ |
||
| 1 | 1 | <?php |
| 2 | -use Ffcms\Core\Helper\Date; |
|
| 3 | -use Ffcms\Core\Helper\Text; |
|
| 4 | 2 | use Ffcms\Core\Helper\Url; |
| 5 | 3 | use Apps\Model\Api\Comments\EntityCommentData; |
| 6 | 4 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | <ul class="list-inline list-info"> |
| 23 | 23 | <li><i class="fa fa-calendar"></i> <?= $data['date'] ?></li> |
| 24 | 24 | <li><i class="fa fa-user"></i> |
| 25 | - <?php if ((int)$data['user']['id'] > 0): ?> |
|
| 25 | + <?php if ((int) $data['user']['id'] > 0): ?> |
|
| 26 | 26 | <?= Url::link(['profile/show', $data['user']['id']], $data['user']['name']) ?> |
| 27 | 27 | <?php else: ?> |
| 28 | 28 | <?= $data['user']['name'] ?> |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | <img class="media-object img-responsive" src="<?= $data['user']['avatar']?>" style="width: 64px; height: 64px;" alt="Picture of user <?= $data['user']['name'] ?>"> |
| 36 | 36 | </span> |
| 37 | 37 | <div class="media-body"> |
| 38 | - <a href="<?= \App::$Alias->baseUrl . $data['pathway'] ?>"><?= $data['text'] ?></a> |
|
| 38 | + <a href="<?= \App::$Alias->baseUrl.$data['pathway'] ?>"><?= $data['text'] ?></a> |
|
| 39 | 39 | </div> |
| 40 | 40 | </li> |
| 41 | 41 | </ul> |
@@ -24,9 +24,12 @@ |
||
| 24 | 24 | <li><i class="fa fa-user"></i> |
| 25 | 25 | <?php if ((int)$data['user']['id'] > 0): ?> |
| 26 | 26 | <?= Url::link(['profile/show', $data['user']['id']], $data['user']['name']) ?> |
| 27 | - <?php else: ?> |
|
| 27 | + <?php else { |
|
| 28 | + : ?> |
|
| 28 | 29 | <?= $data['user']['name'] ?> |
| 29 | - <?php endif; ?> |
|
| 30 | + <?php endif; |
|
| 31 | +} |
|
| 32 | +?> |
|
| 30 | 33 | </li> |
| 31 | 34 | </ul> |
| 32 | 35 | </li> |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Extend\Core\Arch\FrontWidget as AbstractWidget; |
| 7 | 7 | use Ffcms\Core\Traits\OopTools; |
| 8 | 8 | use Apps\ActiveRecord\CommentPost; |
| 9 | -use Apps\Model\Api\Comments\EntityCommentData; |
|
| 10 | 9 | |
| 11 | 10 | class Newcomment extends AbstractWidget |
| 12 | 11 | { |
@@ -12,22 +12,22 @@ discard block |
||
| 12 | 12 | { |
| 13 | 13 | use OopTools; |
| 14 | 14 | |
| 15 | - public $snippet; |
|
| 16 | - public $count; |
|
| 17 | - public $cache; |
|
| 15 | + public $snippet; |
|
| 16 | + public $count; |
|
| 17 | + public $cache; |
|
| 18 | 18 | |
| 19 | 19 | public function init() |
| 20 | 20 | { |
| 21 | - $cfg = $this->getConfigs(); |
|
| 22 | - if ($this->snippet === null) { |
|
| 23 | - $this->snippet = $cfg['snippet']; |
|
| 24 | - } |
|
| 25 | - if ($this->count === null) { |
|
| 26 | - $this->count = $cfg['count']; |
|
| 27 | - } |
|
| 28 | - if ($this->cache === null) { |
|
| 29 | - $this->cache = $cfg['cache']; |
|
| 30 | - } |
|
| 21 | + $cfg = $this->getConfigs(); |
|
| 22 | + if ($this->snippet === null) { |
|
| 23 | + $this->snippet = $cfg['snippet']; |
|
| 24 | + } |
|
| 25 | + if ($this->count === null) { |
|
| 26 | + $this->count = $cfg['count']; |
|
| 27 | + } |
|
| 28 | + if ($this->cache === null) { |
|
| 29 | + $this->cache = $cfg['cache']; |
|
| 30 | + } |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function display() |
@@ -49,10 +49,10 @@ discard block |
||
| 49 | 49 | return __('Comments not yet found'); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - return App::$View->render('widgets/newcomment/default', [ |
|
| 53 | - 'records' => $records, |
|
| 54 | - 'snippet' => $this->snippet |
|
| 55 | - ]); |
|
| 52 | + return App::$View->render('widgets/newcomment/default', [ |
|
| 53 | + 'records' => $records, |
|
| 54 | + 'snippet' => $this->snippet |
|
| 55 | + ]); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | private function makeQuery() |
@@ -35,9 +35,9 @@ |
||
| 35 | 35 | $classHash = $this->createStringClassSnapshotHash(); |
| 36 | 36 | |
| 37 | 37 | $records = null; |
| 38 | - if ((int)$this->cache > 0) { |
|
| 39 | - if (App::$Cache->get('widget.newcomment.' . $classHash) !== null) { |
|
| 40 | - $records = App::$Cache->get('widget.newcomment.' . $classHash); |
|
| 38 | + if ((int) $this->cache > 0) { |
|
| 39 | + if (App::$Cache->get('widget.newcomment.'.$classHash) !== null) { |
|
| 40 | + $records = App::$Cache->get('widget.newcomment.'.$classHash); |
|
| 41 | 41 | } else { |
| 42 | 42 | $records = $this->makeQuery(); |
| 43 | 43 | } |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | - * Set default values from configs |
|
| 27 | - */ |
|
| 26 | + * Set default values from configs |
|
| 27 | + */ |
|
| 28 | 28 | public function before() |
| 29 | 29 | { |
| 30 | 30 | $this->snippet = (int)$this->_configs['snippet']; |
@@ -33,8 +33,8 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
| 36 | - * Labels for form display |
|
| 37 | - */ |
|
| 36 | + * Labels for form display |
|
| 37 | + */ |
|
| 38 | 38 | public function labels() |
| 39 | 39 | { |
| 40 | 40 | return [ |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | - * Settings validation rules |
|
| 49 | - */ |
|
| 48 | + * Settings validation rules |
|
| 49 | + */ |
|
| 50 | 50 | public function rules() |
| 51 | 51 | { |
| 52 | 52 | return [ |
@@ -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 | /** |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | /** |
| 161 | 161 | * Get user person like a object via email |
| 162 | 162 | * @param string $email |
| 163 | - * @return null|static |
|
| 163 | + * @return null|ActiveModel |
|
| 164 | 164 | */ |
| 165 | 165 | public static function getIdentityViaEmail($email) |
| 166 | 166 | { |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | /** |
| 211 | 211 | * Get user logs |
| 212 | - * @return \Apps\ActiveRecord\UserLog |
|
| 212 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 213 | 213 | */ |
| 214 | 214 | public function getLogs() |
| 215 | 215 | { |
@@ -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; |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Ffcms\Core\Exception\NotFoundException; |
| 15 | 15 | use Ffcms\Core\Helper\Type\Obj; |
| 16 | 16 | use Ffcms\Core\Helper\Type\Str; |
| 17 | -use Apps\ActiveRecord\UserLog; |
|
| 18 | 17 | |
| 19 | 18 | /** |
| 20 | 19 | * Class User - standard user controller: login/signup/logout/etc |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | App::$Session->getFlashBag()->add('error', __('User is never exist or password is incorrect!')); |
| 55 | 55 | // initialize fail event |
| 56 | 56 | App::$Event->run(static::EVENT_USER_LOGIN_FAIL, [ |
| 57 | - 'model' => $loginForm |
|
| 57 | + 'model' => $loginForm |
|
| 58 | 58 | ]); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -114,14 +114,14 @@ discard block |
||
| 114 | 114 | if ($registerForm->tryRegister($configs['registrationType'] === 1)) { |
| 115 | 115 | // initialize succes signup event |
| 116 | 116 | App::$Event->run(static::EVENT_USER_REGISTER_SUCCESS, [ |
| 117 | - 'model' => $registerForm |
|
| 117 | + 'model' => $registerForm |
|
| 118 | 118 | ]); |
| 119 | 119 | // send notification of successful registering |
| 120 | 120 | App::$Session->getFlashBag()->add('success', __('Your account is registered. You must confirm account via email')); |
| 121 | 121 | } else { |
| 122 | 122 | // init fail signup event |
| 123 | 123 | App::$Event->run(static::EVENT_USER_REGISTER_FAIL, [ |
| 124 | - 'model' => $registerForm |
|
| 124 | + 'model' => $registerForm |
|
| 125 | 125 | ]); |
| 126 | 126 | App::$Session->getFlashBag()->add('error', __('Login or email is always used on website')); |
| 127 | 127 | } |
@@ -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 |