@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | $scan = File::listFiles(static::INDEX_PATH, ['.xml'], true); |
| 48 | 48 | if (Obj::isArray($scan)) { |
| 49 | 49 | foreach ($scan as $file) { |
| 50 | - if ($this->_lang !== null && !Str::contains('.' . $this->_lang, $file)) { |
|
| 50 | + if ($this->_lang !== null && !Str::contains('.'.$this->_lang, $file)) { |
|
| 51 | 51 | continue; |
| 52 | 52 | } |
| 53 | - $this->files[] = static::INDEX_PATH . '/' . $file; |
|
| 53 | + $this->files[] = static::INDEX_PATH.'/'.$file; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | // build file information data |
| 68 | 68 | foreach ($this->files as $file) { |
| 69 | 69 | $this->info[] = [ |
| 70 | - 'loc' => App::$Alias->scriptUrl . $file, |
|
| 70 | + 'loc' => App::$Alias->scriptUrl.$file, |
|
| 71 | 71 | 'lastmod' => Date::convertToDatetime(File::mTime($file), 'c') |
| 72 | 72 | ]; |
| 73 | 73 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | $this->items[] = [ |
| 59 | 59 | 'text' => $text, |
| 60 | 60 | 'date' => Date::humanize($record->created_at), |
| 61 | - 'new' => (bool)$record->readed === false |
|
| 61 | + 'new' => (bool) $record->readed === false |
|
| 62 | 62 | ]; |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -5,30 +5,30 @@ |
||
| 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/UserNotification.php'); |
|
| 28 | -require_once(root . '/Private/Database/Tables/UserProvider.php'); |
|
| 29 | -require_once(root . '/Private/Database/Tables/UserRecovery.php'); |
|
| 30 | -require_once(root . '/Private/Database/Tables/WallPost.php'); |
|
| 31 | -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/UserNotification.php'); |
|
| 28 | +require_once(root.'/Private/Database/Tables/UserProvider.php'); |
|
| 29 | +require_once(root.'/Private/Database/Tables/UserRecovery.php'); |
|
| 30 | +require_once(root.'/Private/Database/Tables/WallPost.php'); |
|
| 31 | +require_once(root.'/Private/Database/Tables/WallAnswer.php'); |
|
| 32 | 32 | |
| 33 | 33 | // use default preset (for none or other presets) |
| 34 | -require_once (root . '/Private/Database/Other/PresetDefault.php'); |
|
| 35 | 34 | \ No newline at end of file |
| 35 | +require_once (root.'/Private/Database/Other/PresetDefault.php'); |
|
| 36 | 36 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'instances' => [ |
|
| 3 | - 'Apps\Controller\Front\Content::buildSitemapSchedule' => 10800, |
|
| 4 | - 'Apps\Controller\Front\Profile::buildSitemapSchedule' => 10800, |
|
| 5 | - 'Apps\Controller\Front\Profile::cleanupTablesSchedule' => 86400 |
|
| 6 | - ] |
|
| 2 | + 'instances' => [ |
|
| 3 | + 'Apps\Controller\Front\Content::buildSitemapSchedule' => 10800, |
|
| 4 | + 'Apps\Controller\Front\Profile::buildSitemapSchedule' => 10800, |
|
| 5 | + 'Apps\Controller\Front\Profile::cleanupTablesSchedule' => 86400 |
|
| 6 | + ] |
|
| 7 | 7 | ]; |
| 8 | 8 | \ No newline at end of file |
@@ -1,41 +1,41 @@ |
||
| 1 | 1 | <?php return [ |
| 2 | - 'baseProto' => 'http', |
|
| 3 | - 'baseDomain' => 'ffcms.app', |
|
| 4 | - 'basePath' => '/', |
|
| 5 | - 'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$', |
|
| 6 | - 'timezone' => 'Europe/Moscow', |
|
| 7 | - 'adminEmail' => '[email protected]', |
|
| 8 | - 'debug' => [ |
|
| 9 | - 'all' => false, |
|
| 10 | - 'cookie' => [ |
|
| 11 | - 'key' => 'fdebug_jepP2', |
|
| 12 | - 'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA' |
|
| 13 | - ] |
|
| 14 | - ], |
|
| 15 | - 'userCron' => false, |
|
| 16 | - 'theme' => [ |
|
| 17 | - 'Front' => 'default', |
|
| 18 | - 'Admin' => 'default' |
|
| 19 | - ], |
|
| 20 | - 'database' => [ |
|
| 21 | - 'driver' => 'mysql', |
|
| 22 | - 'host' => '127.0.0.1', |
|
| 23 | - 'username' => 'mysql', |
|
| 24 | - 'password' => 'mysql', |
|
| 25 | - 'database' => 'ffcms', |
|
| 26 | - 'prefix' => 'ffcms_', |
|
| 27 | - 'charset' => 'utf8', |
|
| 28 | - 'collation' => 'utf8_unicode_ci' |
|
| 29 | - ], |
|
| 30 | - 'baseLanguage' => 'en', |
|
| 31 | - 'multiLanguage' => true, |
|
| 32 | - 'singleLanguage' => 'en', |
|
| 33 | - 'languages' => [ |
|
| 34 | - 'en', |
|
| 35 | - 'ru' |
|
| 36 | - ], |
|
| 37 | - 'languageDomainAlias' => false, |
|
| 38 | - 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 39 | - 'gaTrackId' => false, |
|
| 40 | - 'trustedProxy' => false |
|
| 2 | + 'baseProto' => 'http', |
|
| 3 | + 'baseDomain' => 'ffcms.app', |
|
| 4 | + 'basePath' => '/', |
|
| 5 | + 'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$', |
|
| 6 | + 'timezone' => 'Europe/Moscow', |
|
| 7 | + 'adminEmail' => '[email protected]', |
|
| 8 | + 'debug' => [ |
|
| 9 | + 'all' => false, |
|
| 10 | + 'cookie' => [ |
|
| 11 | + 'key' => 'fdebug_jepP2', |
|
| 12 | + 'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA' |
|
| 13 | + ] |
|
| 14 | + ], |
|
| 15 | + 'userCron' => false, |
|
| 16 | + 'theme' => [ |
|
| 17 | + 'Front' => 'default', |
|
| 18 | + 'Admin' => 'default' |
|
| 19 | + ], |
|
| 20 | + 'database' => [ |
|
| 21 | + 'driver' => 'mysql', |
|
| 22 | + 'host' => '127.0.0.1', |
|
| 23 | + 'username' => 'mysql', |
|
| 24 | + 'password' => 'mysql', |
|
| 25 | + 'database' => 'ffcms', |
|
| 26 | + 'prefix' => 'ffcms_', |
|
| 27 | + 'charset' => 'utf8', |
|
| 28 | + 'collation' => 'utf8_unicode_ci' |
|
| 29 | + ], |
|
| 30 | + 'baseLanguage' => 'en', |
|
| 31 | + 'multiLanguage' => true, |
|
| 32 | + 'singleLanguage' => 'en', |
|
| 33 | + 'languages' => [ |
|
| 34 | + 'en', |
|
| 35 | + 'ru' |
|
| 36 | + ], |
|
| 37 | + 'languageDomainAlias' => false, |
|
| 38 | + 'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com', |
|
| 39 | + 'gaTrackId' => false, |
|
| 40 | + 'trustedProxy' => false |
|
| 41 | 41 | ]; |
| 42 | 42 | \ No newline at end of file |
@@ -28,38 +28,38 @@ discard block |
||
| 28 | 28 | <div class="panel panel-info"> |
| 29 | 29 | <div class="panel-heading"> |
| 30 | 30 | <?php |
| 31 | - if ((int)$record->readed !== 1) { |
|
| 31 | + if ((int) $record->readed !== 1) { |
|
| 32 | 32 | echo '<i class="fa fa-bell"></i> '; |
| 33 | 33 | } |
| 34 | 34 | ?> |
| 35 | 35 | <?= __('Message sent') ?>: <?= Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR) ?>. |
| 36 | 36 | <?php |
| 37 | - if ((int)$record->closed !== 1) { |
|
| 38 | - echo '<span class="label label-success">' . __('Opened') . '</span>'; |
|
| 37 | + if ((int) $record->closed !== 1) { |
|
| 38 | + echo '<span class="label label-success">'.__('Opened').'</span>'; |
|
| 39 | 39 | } else { |
| 40 | - echo '<span class="label label-danger">' . __('Closed') . '</span>'; |
|
| 40 | + echo '<span class="label label-danger">'.__('Closed').'</span>'; |
|
| 41 | 41 | } |
| 42 | 42 | ?> |
| 43 | 43 | </div> |
| 44 | 44 | <div class="panel-body"> |
| 45 | 45 | <?php |
| 46 | - if ((int)$record->closed !== 0) { |
|
| 47 | - echo '<p class="alert alert-warning">' . __('The feedback request is closed! Thread in only-read mode') . '.</p>'; |
|
| 46 | + if ((int) $record->closed !== 0) { |
|
| 47 | + echo '<p class="alert alert-warning">'.__('The feedback request is closed! Thread in only-read mode').'.</p>'; |
|
| 48 | 48 | } |
| 49 | 49 | ?> |
| 50 | 50 | <p><?= Str::replace("\n", "<br />", $record->message) ?></p> |
| 51 | 51 | <hr /> |
| 52 | 52 | <?php |
| 53 | 53 | // show "mark as read" button if message is not readed |
| 54 | - if ((int)$record->readed !== 1) { |
|
| 55 | - echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']) . ' '; |
|
| 54 | + if ((int) $record->readed !== 1) { |
|
| 55 | + echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']).' '; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | // show close/open button depend of current status |
| 59 | - if ((int)$record->closed === 0) { |
|
| 60 | - echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']) . ' '; |
|
| 59 | + if ((int) $record->closed === 0) { |
|
| 60 | + echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']).' '; |
|
| 61 | 61 | } else { |
| 62 | - echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']) . ' '; |
|
| 62 | + echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']).' '; |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | ?> |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | <div class="panel-body"> |
| 77 | 77 | <?php |
| 78 | 78 | $uInfo = 'no'; |
| 79 | - if ((int)$record->user_id > 0) { |
|
| 79 | + if ((int) $record->user_id > 0) { |
|
| 80 | 80 | $user = \App::$User->identity($record->user_id); |
| 81 | 81 | if ($user !== null && $user->getId() > 0) { |
| 82 | 82 | $uInfo = Url::link(['user/update', $user->getId()], $user->getProfile()->getNickname()); |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | <?php if ($record->getAnswers()->count() > 0): ?> |
| 103 | 103 | <?php foreach ($record->getAnswers()->get() as $answer): ?> |
| 104 | - <div class="panel <?= (int)$answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
| 104 | + <div class="panel <?= (int) $answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>"> |
|
| 105 | 105 | <div class="panel-heading"> |
| 106 | - <?= __('From') ?>: <?= $answer->name . '(' . $answer->email . ')' . ((int)$answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id' . $answer->user_id . ']') : null) ?>, |
|
| 106 | + <?= __('From') ?>: <?= $answer->name.'('.$answer->email.')'.((int) $answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id'.$answer->user_id.']') : null) ?>, |
|
| 107 | 107 | <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?> |
| 108 | 108 | <span class="pull-right"> |
| 109 | 109 | <?= Url::link(['feedback/update', 'answer', $answer->id], __('Edit'), ['class' => 'label label-primary']) ?> |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | <?php |
| 58 | 58 | $form = new Form($model, ['class' => 'form-horizontal', 'method' => 'post', 'action' => '']); |
| 59 | 59 | echo $form->start(); |
| 60 | - echo $form->submitButton(__('Delete'), ['class' => 'btn btn-danger']) . " "; |
|
| 60 | + echo $form->submitButton(__('Delete'), ['class' => 'btn btn-danger'])." "; |
|
| 61 | 61 | echo Url::link(['user/index'], __('Cancel'), ['class' => 'btn btn-default']); |
| 62 | 62 | echo $form->finish(); |
| 63 | 63 | ?> |
| 64 | 64 | \ No newline at end of file |
@@ -34,10 +34,10 @@ |
||
| 34 | 34 | $record->save(); |
| 35 | 35 | |
| 36 | 36 | // add user notification |
| 37 | - if ((int)$this->_post->user_id > 0 && $this->_userId !== (int)$this->_post->user_id) { |
|
| 38 | - $notify = new EntityAddNotification((int)$this->_post->user_id); |
|
| 39 | - $uri = '/feedback/read/' . $this->_post->id . '/' . $this->_post->hash . '#feedback-answer-' . $record->id; |
|
| 40 | - $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [ |
|
| 37 | + if ((int) $this->_post->user_id > 0 && $this->_userId !== (int) $this->_post->user_id) { |
|
| 38 | + $notify = new EntityAddNotification((int) $this->_post->user_id); |
|
| 39 | + $uri = '/feedback/read/'.$this->_post->id.'/'.$this->_post->hash.'#feedback-answer-'.$record->id; |
|
| 40 | + $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [ |
|
| 41 | 41 | 'snippet' => Text::snippet(App::$Security->strip_tags($this->message), 50), |
| 42 | 42 | 'post' => Text::snippet(App::$Security->strip_tags($this->_post->message), 50) |
| 43 | 43 | ]); |
@@ -41,18 +41,18 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | // get configs |
| 43 | 43 | $configs = $this->getConfigs(); |
| 44 | - if (!App::$User->isAuth() && (int)$configs['guestAdd'] !== 1) { |
|
| 44 | + if (!App::$User->isAuth() && (int) $configs['guestAdd'] !== 1) { |
|
| 45 | 45 | throw new ForbiddenException(__('Feedback available only for authorized users')); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | // initialize model |
| 49 | - $model = new FormFeedbackAdd((int)$configs['useCaptcha'] === 1); |
|
| 49 | + $model = new FormFeedbackAdd((int) $configs['useCaptcha'] === 1); |
|
| 50 | 50 | if ($model->send()) { |
| 51 | 51 | if ($model->validate()) { |
| 52 | 52 | // if validation is passed save data to db and get row |
| 53 | 53 | $record = $model->make(); |
| 54 | 54 | App::$Session->getFlashBag()->add('success', __('Your message was added successful')); |
| 55 | - $this->response->redirect('feedback/read/' . $record->id . '/' . $record->hash); |
|
| 55 | + $this->response->redirect('feedback/read/'.$record->id.'/'.$record->hash); |
|
| 56 | 56 | } else { |
| 57 | 57 | App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below')); |
| 58 | 58 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | // render output view |
| 62 | 62 | return $this->view->render('create', [ |
| 63 | 63 | 'model' => $model->filter(), |
| 64 | - 'useCaptcha' => (int)$configs['useCaptcha'] === 1 |
|
| 64 | + 'useCaptcha' => (int) $configs['useCaptcha'] === 1 |
|
| 65 | 65 | ]); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $userId = App::$User->isAuth() ? App::$User->identity()->getId() : 0; |
| 94 | 94 | $model = null; |
| 95 | 95 | // check if feedback post is not closed for answers |
| 96 | - if ((int)$recordPost->closed === 0) { |
|
| 96 | + if ((int) $recordPost->closed === 0) { |
|
| 97 | 97 | // init new answer add model |
| 98 | 98 | $model = new FormAnswerAdd($recordPost, $userId); |
| 99 | 99 | // if answer is sender lets try to make it model |
@@ -138,10 +138,10 @@ discard block |
||
| 138 | 138 | // check if action is submited |
| 139 | 139 | if ($this->request->request->get('closeRequest', false)) { |
| 140 | 140 | // if created by authorized user |
| 141 | - if ((int)$record->user_id !== 0) { |
|
| 141 | + if ((int) $record->user_id !== 0) { |
|
| 142 | 142 | $user = App::$User->identity(); |
| 143 | 143 | // button is pressed not by request creator |
| 144 | - if ($user === null || $user->getId() !== (int)$record->user_id) { |
|
| 144 | + if ($user === null || $user->getId() !== (int) $record->user_id) { |
|
| 145 | 145 | throw new ForbiddenException(__('This feedback request was created by another user')); |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | // add notification and redirect |
| 154 | 154 | App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!')); |
| 155 | - $this->response->redirect('feedback/read/' . $id . '/' . $hash); |
|
| 155 | + $this->response->redirect('feedback/read/'.$id.'/'.$hash); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | return $this->view->render('close'); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | public function actionList() |
| 169 | 169 | { |
| 170 | 170 | // set current page and offset |
| 171 | - $page = (int)$this->request->query->get('page'); |
|
| 171 | + $page = (int) $this->request->query->get('page'); |
|
| 172 | 172 | $offset = $page * self::ITEM_PER_PAGE; |
| 173 | 173 | |
| 174 | 174 | // check if user is authorized or throw exception |