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
23d00a37
Commit
23d00a37
authored
Feb 25, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- FIX
parent
fdc06011
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
common/modules/users/controllers/UserController.php
common/modules/users/controllers/UserController.php
+1
-1
common/modules/users/models/User.php
common/modules/users/models/User.php
+2
-3
No files found.
common/modules/users/controllers/UserController.php
View file @
23d00a37
...
...
@@ -128,7 +128,7 @@ class UserController extends \common\components\BaseController {
$model
->
password
=
Yii
::
$app
->
getSecurity
()
->
generatePasswordHash
(
$model
->
password
);
$model
->
activate_code
=
md5
(
$model
->
password
.
'xdf5sf'
);
$model
->
source
=
User
::
SOURCE_DEFAULT
;
if
(
!
$model
->
save
(
false
)
||
!
$model
->
afterRegistration
())
if
(
!
$model
->
save
(
false
)
||
!
$model
->
afterRegistration
(
[
'email'
=>
$model
->
email
]
))
throw
new
BadRequestHttpException
(
current
(
current
(
$model
->
getErrors
())),
500
);
$assignment
=
new
AuthAssignment
();
...
...
common/modules/users/models/User.php
View file @
23d00a37
...
...
@@ -552,14 +552,13 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
* Проверяем есть ли среди активных триггеров тот, у которого указан параметр проверки регистрации.
* Если указан, выполняем действия триггера
*/
public
function
afterRegistration
(){
public
function
afterRegistration
(
$params
=
array
()
){
/** @var TriggerTrigger[] $actualTriggers */
$actualTriggers
=
TriggerTrigger
::
getActualTriggers
();
foreach
(
$actualTriggers
as
$trigger
)
{
$exists
=
TriggerCondition
::
find
()
->
where
([
'trigger_id'
=>
$trigger
->
id
,
'condition_id'
=>
CheckUserToRegistration
::
CONDITION_ID
])
->
exists
();
if
(
$exists
===
true
)
{
return
true
;
$init
=
$trigger
->
initAction
();
$init
=
$trigger
->
initAction
(
$params
);
if
(
$init
===
true
)
{
return
true
;
}
else
{
...
...
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