Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
framadate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nounous
framadate
Commits
ad2b146c
Commit
ad2b146c
authored
9 years ago
by
Olivier PEREZ
Browse files
Options
Downloads
Patches
Plain Diff
Remove parameter from MailService::send
parent
d7d9b11f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/classes/Framadate/Services/MailService.php
+4
-4
4 additions, 4 deletions
app/classes/Framadate/Services/MailService.php
find_polls.php
+1
-1
1 addition, 1 deletion
find_polls.php
studs.php
+1
-1
1 addition, 1 deletion
studs.php
with
6 additions
and
6 deletions
app/classes/Framadate/Services/MailService.php
+
4
−
4
View file @
ad2b146c
...
...
@@ -20,7 +20,7 @@ class MailService {
return
filter_var
(
$email
,
FILTER_VALIDATE_EMAIL
);
}
function
send
(
$to
,
$subject
,
$body
,
$param
=
''
,
$msgKey
=
null
)
{
function
send
(
$to
,
$subject
,
$body
,
$msgKey
=
null
)
{
if
(
$this
->
smtp_allowed
==
true
&&
$this
->
canSendMsg
(
$msgKey
))
{
mb_internal_encoding
(
'UTF-8'
);
...
...
@@ -54,7 +54,7 @@ class MailService {
// Send mail
$this
->
sendMail
(
$to
,
$subject
,
$body
,
$param
,
$msgKey
,
$headers
);
$this
->
sendMail
(
$to
,
$subject
,
$body
,
$msgKey
,
$headers
);
}
}
...
...
@@ -69,8 +69,8 @@ class MailService {
return
!
isset
(
$_SESSION
[
self
::
MAILSERVICE_KEY
][
$msgKey
])
||
time
()
-
$_SESSION
[
self
::
MAILSERVICE_KEY
][
$msgKey
]
>
self
::
DELAY_BEFORE_RESEND
;
}
private
function
sendMail
(
$to
,
$subject
,
$body
,
$param
,
$msgKey
,
$headers
)
{
mail
(
$to
,
$subject
,
$body
,
$headers
,
$param
);
private
function
sendMail
(
$to
,
$subject
,
$body
,
$msgKey
,
$headers
)
{
mail
(
$to
,
$subject
,
$body
,
$headers
,
''
);
// Log
...
...
This diff is collapsed.
Click to expand it.
find_polls.php
+
1
−
1
View file @
ad2b146c
...
...
@@ -43,7 +43,7 @@ if (!empty($_POST['mail'])) {
$smarty
->
assign
(
'polls'
,
$polls
);
$body
=
$smarty
->
fetch
(
'mail/find_polls.tpl'
);
$mailService
->
send
(
$mail
,
__
(
'Homepage'
,
'Where are my polls'
),
$body
,
''
,
'SEND_POLLS'
);
$mailService
->
send
(
$mail
,
__
(
'Homepage'
,
'Where are my polls'
),
$body
,
'SEND_POLLS'
);
$message
=
new
Message
(
'success'
,
__
(
'FindPolls'
,
'Polls sent'
));
}
else
{
$message
=
new
Message
(
'warning'
,
__
(
'Error'
,
'No polls found'
));
...
...
This diff is collapsed.
Click to expand it.
studs.php
+
1
−
1
View file @
ad2b146c
...
...
@@ -83,7 +83,7 @@ function sendUpdateNotification($poll, $mailService, $name, $type) {
$message
.
=
Utils
::
getUrlSondage
(
$poll
->
admin_id
,
true
)
.
"
\n\n
"
;
$messageTypeKey
=
$type
.
'-'
.
$poll
->
id
;
$mailService
->
send
(
$poll
->
admin_mail
,
$subject
,
$message
,
''
,
$messageTypeKey
);
$mailService
->
send
(
$poll
->
admin_mail
,
$subject
,
$message
,
$messageTypeKey
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment