Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
fe230474
Commit
fe230474
authored
Mar 17, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Добавлен вызов методов проверки существования юзера, проверки валидности хеша и авторизации
parent
7f7dce36
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
common/modules/content/controllers/PageController.php
common/modules/content/controllers/PageController.php
+11
-1
No files found.
common/modules/content/controllers/PageController.php
View file @
fe230474
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
namespace
common\modules\content\controllers
;
namespace
common\modules\content\controllers
;
use
common\modules\users\models\User
;
use
Yii
;
use
Yii
;
use
yii\web\BadRequestHttpException
;
use
yii\web\BadRequestHttpException
;
use
common\modules\content\models\CoContent
;
use
common\modules\content\models\CoContent
;
...
@@ -20,7 +21,7 @@ class PageController extends \common\components\BaseController
...
@@ -20,7 +21,7 @@ class PageController extends \common\components\BaseController
return
$this
->
render
(
'index'
);
return
$this
->
render
(
'index'
);
}
}
public
function
actionView
(
$id
=
null
,
$page
=
null
)
public
function
actionView
(
$id
=
null
,
$page
=
null
,
$hash
=
null
,
$email
=
null
)
{
{
if
(
empty
(
$id
)
&&
empty
(
$page
))
{
if
(
empty
(
$id
)
&&
empty
(
$page
))
{
// if(!\Yii::$app->user->isGuest)
// if(!\Yii::$app->user->isGuest)
...
@@ -35,6 +36,15 @@ class PageController extends \common\components\BaseController
...
@@ -35,6 +36,15 @@ class PageController extends \common\components\BaseController
{
{
$model
=
CoContent
::
findOne
([
'url'
=>
$page
]);
$model
=
CoContent
::
findOne
([
'url'
=>
$page
]);
}
}
if
(
!
empty
(
$email
)
&&
!
empty
(
$hash
))
{
/** @var User $user */
$user
=
User
::
find
()
->
where
([
'email'
=>
$email
])
->
one
();
if
(
!
is_null
(
$user
))
{
if
(
$user
->
checkToAutoAuthByHash
(
$hash
)
===
true
)
$user
->
authUser
();
}
}
$content
=
$model
->
lang
->
getFinishedContent
();
$content
=
$model
->
lang
->
getFinishedContent
();
$this
->
meta_title
=
$model
->
metaTag
->
title
;
$this
->
meta_title
=
$model
->
metaTag
->
title
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment