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
0d7cd6d9
Commit
0d7cd6d9
authored
Mar 05, 2016
by
Виталий Мурашко
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Source message
parent
a05c45b2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
36 additions
and
4 deletions
+36
-4
common/modules/school/controllers/CourseController.php
common/modules/school/controllers/CourseController.php
+7
-0
common/modules/school/controllers/LessonController.php
common/modules/school/controllers/LessonController.php
+18
-1
common/modules/users/controllers/UserController.php
common/modules/users/controllers/UserController.php
+7
-2
common/modules/users/models/User.php
common/modules/users/models/User.php
+1
-0
frontend/config/main.php
frontend/config/main.php
+3
-1
No files found.
common/modules/school/controllers/CourseController.php
View file @
0d7cd6d9
...
@@ -42,6 +42,13 @@ class CourseController extends BaseController
...
@@ -42,6 +42,13 @@ class CourseController extends BaseController
public
function
actionView
(
$id
)
public
function
actionView
(
$id
)
{
{
if
(
$_GET
[
"source"
]
==
'email'
&&
!
Yii
::
$app
->
response
->
cookies
->
get
(
'source'
)){
$options
[
'name'
]
=
'source'
;
$options
[
'value'
]
=
'email'
;
$options
[
'expire'
]
=
time
()
+
86400
*
365
;
$cookie
=
new
\yii\web\Cookie
(
$options
);
\Yii
::
$app
->
response
->
cookies
->
add
(
$cookie
);
}
$model
=
Courses
::
findOne
(
$id
);
$model
=
Courses
::
findOne
(
$id
);
$searchModel
=
new
SearchLessons
();
$searchModel
=
new
SearchLessons
();
$search
[
'course_id'
]
=
$id
;
$search
[
'course_id'
]
=
$id
;
...
...
common/modules/school/controllers/LessonController.php
View file @
0d7cd6d9
...
@@ -22,7 +22,15 @@ class LessonController extends BaseController
...
@@ -22,7 +22,15 @@ class LessonController extends BaseController
public
function
actionView
(
$id
)
public
function
actionView
(
$id
)
{
{
$model
=
Lessons
::
findOne
(
$id
);
if
(
$_GET
[
"source"
]
==
'email'
&&
!
Yii
::
$app
->
response
->
cookies
->
get
(
'source'
)){
$options
[
'name'
]
=
'source'
;
$options
[
'value'
]
=
'email'
;
$options
[
'expire'
]
=
time
()
+
86400
*
365
;
$cookie
=
new
\yii\web\Cookie
(
$options
);
\Yii
::
$app
->
response
->
cookies
->
add
(
$cookie
);
}
$model
=
Lessons
::
findOne
(
$id
);
\Yii
::
$app
->
view
->
registerMetaTag
([
\Yii
::
$app
->
view
->
registerMetaTag
([
'property'
=>
'og:title'
,
'property'
=>
'og:title'
,
...
@@ -52,4 +60,13 @@ class LessonController extends BaseController
...
@@ -52,4 +60,13 @@ class LessonController extends BaseController
\Yii
::
$app
->
response
->
sendFile
(
$file
);
\Yii
::
$app
->
response
->
sendFile
(
$file
);
}
}
}
}
function
cookie
(
$name
,
$value
=
null
,
$expire
=
null
){
$options
[
'name'
]
=
$name
;
$options
[
'value'
]
=
$value
;
$options
[
'expire'
]
=
time
()
+
86400
*
365
;
$cookie
=
new
\yii\web\Cookie
(
$options
);
\Yii
::
$app
->
response
->
cookies
->
add
(
$cookie
);
}
}
}
common/modules/users/controllers/UserController.php
View file @
0d7cd6d9
...
@@ -125,8 +125,13 @@ class UserController extends \common\components\BaseController {
...
@@ -125,8 +125,13 @@ class UserController extends \common\components\BaseController {
if
(
$model
->
validate
())
{
if
(
$model
->
validate
())
{
$password
=
$model
->
password
;
$password
=
$model
->
password
;
$model
->
password
=
Yii
::
$app
->
getSecurity
()
->
generatePasswordHash
(
$model
->
password
);
$model
->
password
=
Yii
::
$app
->
getSecurity
()
->
generatePasswordHash
(
$model
->
password
);
//$model->activate_code = md5($model->password . 'xdf5sf');
if
(
Yii
::
$app
->
request
->
cookies
->
get
(
'source'
)
==
'email'
){
$model
->
source
=
User
::
SOURCE_DEFAULT
;
$model
->
source
=
User
::
SOURCE_MESSAGE
;
}
else
{
$model
->
source
=
User
::
SOURCE_DEFAULT
;
}
$model
->
save
(
false
);
$model
->
save
(
false
);
$assignment
=
new
AuthAssignment
();
$assignment
=
new
AuthAssignment
();
...
...
common/modules/users/models/User.php
View file @
0d7cd6d9
...
@@ -69,6 +69,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
...
@@ -69,6 +69,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
const
SCENARIO_RECOVER_PASSWORD
=
'RecoverPassword'
;
const
SCENARIO_RECOVER_PASSWORD
=
'RecoverPassword'
;
const
SCENARIO_SOCIAL_REGISTRATION
=
'SocialRegistration'
;
const
SCENARIO_SOCIAL_REGISTRATION
=
'SocialRegistration'
;
const
SOURCE_DEFAULT
=
'direct'
;
const
SOURCE_DEFAULT
=
'direct'
;
const
SOURCE_MESSAGE
=
'email'
;
public
$password_c
;
public
$password_c
;
public
$captcha
;
public
$captcha
;
...
...
frontend/config/main.php
View file @
0d7cd6d9
...
@@ -179,8 +179,10 @@ return [
...
@@ -179,8 +179,10 @@ return [
'support'
=>
'support/support/index'
,
'support'
=>
'support/support/index'
,
'support/<_a>/<id:\d+>'
=>
'support/support/<_a>'
,
'support/<_a>/<id:\d+>'
=>
'support/support/<_a>'
,
'support/<_a>'
=>
'support/support/<_a>'
,
'support/<_a>'
=>
'support/support/<_a>'
,
'school'
=>
'school/course/index'
,
'school/'
=>
'school/course/index'
,
'school/course/<id>/<source>'
=>
'school/course/view'
,
'school/course/<id>'
=>
'school/course/view'
,
'school/course/<id>'
=>
'school/course/view'
,
'school/lesson/<id>/<source>'
=>
'school/lesson/view'
,
'school/lesson/<id>'
=>
'school/lesson/view'
,
'school/lesson/<id>'
=>
'school/lesson/view'
,
'login/eauth/<service_eauth:google|vk|facebook>'
=>
'site/login'
,
'login/eauth/<service_eauth:google|vk|facebook>'
=>
'site/login'
,
'login'
=>
'site/login'
,
'login'
=>
'site/login'
,
...
...
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