diff --git a/create_classic_poll.php b/create_classic_poll.php index 21c652b..0df4a69 100644 --- a/create_classic_poll.php +++ b/create_classic_poll.php @@ -102,10 +102,10 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || ( $message = __('Mail', "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= '

'; $message .= Utils::htmlEscape($_SESSION['form']->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlEscape($_SESSION['form']->title) . '".
'; - $message .= __('Mail', 'Thanks for filling the poll at the link above') . ' :

%s'; + $message .= __('Mail', 'Thanks for filling the poll at the link above') . ' :

%1$s'; $message_admin = __('Mail', "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); - $message_admin .= ' :

%s'; + $message_admin .= ' :

%1$s'; $message = sprintf($message, Utils::getUrlSondage($poll_id)); $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true)); diff --git a/create_date_poll.php b/create_date_poll.php index d33e48f..76cd629 100644 --- a/create_date_poll.php +++ b/create_date_poll.php @@ -99,10 +99,10 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) || $message = __('Mail', "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll."); $message .= '

'; $message .= Utils::htmlEscape($_SESSION['form']->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlEscape($_SESSION['form']->title) . '".
'; - $message .= __('Mail', 'Thanks for filling the poll at the link above') . ' :

%s'; + $message .= __('Mail', 'Thanks for filling the poll at the link above') . ' :

%1$s'; $message_admin = __('Mail', "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above"); - $message_admin .= ' :

%s'; + $message_admin .= ' :

%1$s'; $message = sprintf($message, Utils::getUrlSondage($poll_id)); $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true)); diff --git a/studs.php b/studs.php index 7270fd1..8f793f1 100644 --- a/studs.php +++ b/studs.php @@ -80,7 +80,8 @@ function sendUpdateNotification($poll, $mailService, $name, $type) { $message .= __('Mail', "wrote a comment.\nYou can find your poll at the link") . " :\n\n"; break; } - $message .= Utils::getUrlSondage($poll->admin_id, true) . "\n\n"; + $urlSondage = Utils::getUrlSondage($poll->admin_id, true); + $message .= '' . $urlSondage . '' . "\n\n"; $messageTypeKey = $type . '-' . $poll->id; $mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey);