From ad2b146c3c813c481d14b6390583e957d447574e Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Fri, 29 May 2015 17:49:01 +0200 Subject: [PATCH] Remove parameter from MailService::send --- app/classes/Framadate/Services/MailService.php | 8 ++++---- find_polls.php | 2 +- studs.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/classes/Framadate/Services/MailService.php b/app/classes/Framadate/Services/MailService.php index 1f87d6e..18807b2 100644 --- a/app/classes/Framadate/Services/MailService.php +++ b/app/classes/Framadate/Services/MailService.php @@ -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 diff --git a/find_polls.php b/find_polls.php index 5e25a07..c4ced25 100644 --- a/find_polls.php +++ b/find_polls.php @@ -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')); diff --git a/studs.php b/studs.php index 26d7b23..0ebdd0f 100644 --- a/studs.php +++ b/studs.php @@ -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); } }