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
9a3b749c
Commit
9a3b749c
authored
Feb 26, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Добавлена замена параметра user_fio
parent
c3006379
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+10
-1
No files found.
common/modules/triggers/models/TriggerTrigger.php
View file @
9a3b749c
...
@@ -214,6 +214,8 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -214,6 +214,8 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
* @return string
* @return string
*/
*/
public
function
initAction
(
$params
=
array
()){
public
function
initAction
(
$params
=
array
()){
$templateData
=
[];
if
(
array_key_exists
(
'email'
,
$params
))
if
(
array_key_exists
(
'email'
,
$params
))
$email
=
$params
[
'email'
];
$email
=
$params
[
'email'
];
elseif
(
empty
(
$email
)
&&
!
Yii
::
$app
->
user
->
isGuest
)
{
elseif
(
empty
(
$email
)
&&
!
Yii
::
$app
->
user
->
isGuest
)
{
...
@@ -222,12 +224,19 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
...
@@ -222,12 +224,19 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
return
'Email not found'
;
return
'Email not found'
;
}
}
if
(
isset
(
$email
))
{
$user
=
User
::
find
()
->
where
([
'email'
=>
$email
])
->
one
();
if
(
!
is_null
(
$user
))
{
$templateData
[
'user_fio'
]
=
$user
->
fio
;
}
}
/** @var \DateTime $time_now */
/** @var \DateTime $time_now */
$time_now
=
new
\DateTime
();
$time_now
=
new
\DateTime
();
/** @var MessageTemplate $templateModel */
/** @var MessageTemplate $templateModel */
$templateModel
=
MessageTemplate
::
findOne
(
$this
->
message_template_id
);
$templateModel
=
MessageTemplate
::
findOne
(
$this
->
message_template_id
);
/** @var Templates $template */
/** @var Templates $template */
$template
=
new
Templates
(
$this
->
message_template_id
);
$template
=
new
Templates
(
$this
->
message_template_id
,
$templateData
);
$sender
=
new
UnisenderAPI
();
$sender
=
new
UnisenderAPI
();
// Create the send list
// Create the send list
$newList
=
$sender
->
createList
();
$newList
=
$sender
->
createList
();
...
...
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