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
09ac470d
Commit
09ac470d
authored
Mar 21, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Добавлены новые параметры в метод afterSubscribe, для возврата ошибок
parent
cbf3de8e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
19 deletions
+36
-19
common/modules/users/models/User.php
common/modules/users/models/User.php
+36
-19
No files found.
common/modules/users/models/User.php
View file @
09ac470d
...
@@ -641,7 +641,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
...
@@ -641,7 +641,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
* @param array $params
* @param array $params
* @return bool
* @return bool
*/
*/
public
function
afterSubscribe
(
$params
=
array
()){
public
function
afterSubscribe
(
$params
=
array
()
,
$return
=
false
){
$date
=
new
\DateTime
();
$date
=
new
\DateTime
();
/** @var TriggerTrigger[] $actualTriggers */
/** @var TriggerTrigger[] $actualTriggers */
$actualTriggers
=
TriggerTrigger
::
getActualTriggers
();
$actualTriggers
=
TriggerTrigger
::
getActualTriggers
();
...
@@ -655,27 +655,44 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
...
@@ -655,27 +655,44 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
// Указываем дату следующей отправки (по умолчанию сегодня, в момент срабатывания триггера)
// Указываем дату следующей отправки (по умолчанию сегодня, в момент срабатывания триггера)
$user
=
User
::
findOne
(
$this
->
id
);
$user
=
User
::
findOne
(
$this
->
id
);
$user
->
delivery_date
=
$date
->
format
(
'Y-m-d'
);
$user
->
delivery_date
=
$date
->
format
(
'Y-m-d'
);
$user
->
save
();
if
(
$user
->
save
())
{
// Вызываем перезапуск всех триггеров
// Вызываем перезапуск всех триггеров
$curl
=
curl_init
();
$curl
=
curl_init
();
curl_setopt
(
$curl
,
CURLOPT_URL
,
Yii
::
$app
->
urlManager
->
createAbsoluteUrl
(
'/triggers/default/rechecktriggers'
));
curl_setopt
(
$curl
,
CURLOPT_URL
,
Yii
::
$app
->
urlManager
->
createAbsoluteUrl
(
'/triggers/default/rechecktriggers'
));
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
if
(
!
curl_exec
(
$curl
))
{
if
(
!
curl_exec
(
$curl
))
{
if
(
$return
===
false
)
{
$this
->
addError
(
'email'
,
curl_error
(
$curl
));
$this
->
addError
(
'email'
,
curl_error
(
$curl
));
return
false
;
return
false
;
}
else
return
curl_error
(
$curl
);
}
}
// Затем инициируем рассылку
// Затем инициируем рассылку
$curl
=
curl_init
();
$curl
=
curl_init
();
curl_setopt
(
$curl
,
CURLOPT_URL
,
Yii
::
$app
->
urlManager
->
createAbsoluteUrl
(
'/triggers/default/recheckcases'
));
curl_setopt
(
$curl
,
CURLOPT_URL
,
Yii
::
$app
->
urlManager
->
createAbsoluteUrl
(
'/triggers/default/recheckcases'
));
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
if
(
!
curl_exec
(
$curl
))
{
if
(
!
curl_exec
(
$curl
))
{
if
(
$return
===
false
)
{
$this
->
addError
(
'email'
,
curl_error
(
$curl
));
$this
->
addError
(
'email'
,
curl_error
(
$curl
));
return
false
;
return
false
;
}
else
return
curl_error
(
$curl
);
}
}
return
true
;
return
true
;
}
else
{
}
else
{
if
(
$return
===
false
)
{
$this
->
addError
(
'email'
,
current
(
current
(
$user
->
getErrors
())));
return
false
;
}
else
return
current
(
current
(
$user
->
getErrors
()));
}
}
else
{
if
(
$return
===
false
)
{
$this
->
addError
(
'email'
,
$init
);
$this
->
addError
(
'email'
,
$init
);
return
false
;
return
false
;
}
else
{
return
$init
;
}
}
}
}
}
}
}
...
...
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