diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Push.php b/lib/Alchemy/Phrasea/Controller/Prod/Push.php index c77c0ae5ea..d485e2be4a 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Push.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Push.php @@ -433,15 +433,16 @@ class Push implements ControllerProviderInterface $receipt = $request->get('recept') ? $app['authentication']->getUser()->get_email() : ''; $params = array( - 'from' => $app['authentication']->getUser()->get_id() - , 'from_email' => $app['authentication']->getUser()->get_email() - , 'to' => $participant_user->get_id() - , 'to_email' => $participant_user->get_email() - , 'to_name' => $participant_user->get_display_name() - , 'url' => $url - , 'accuse' => $receipt - , 'message' => $request->request->get('message') - , 'ssel_id' => $Basket->getId() + 'from' => $app['authentication']->getUser()->get_id(), + 'from_email' => $app['authentication']->getUser()->get_email(), + 'to' => $participant_user->get_id(), + 'to_email' => $participant_user->get_email(), + 'to_name' => $participant_user->get_display_name(), + 'url' => $url, + 'accuse' => $receipt, + 'message' => $request->request->get('message'), + 'ssel_id' => $Basket->getId(), + 'duration' => (int) $request->request->get('duration'), ); $app['events-manager']->trigger('__PUSH_VALIDATION__', $params); diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php index b2c8f1a05d..52a6a7f0ee 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationReminder.php @@ -56,7 +56,7 @@ class MailInfoValidationReminder extends AbstractMailWithLink */ public function getButtonText() { - return _('Validate'); + return _('Start validation'); } /** diff --git a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php index a475d4e3da..3bed35b906 100644 --- a/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php +++ b/lib/Alchemy/Phrasea/Notification/Mail/MailInfoValidationRequest.php @@ -19,6 +19,8 @@ class MailInfoValidationRequest extends AbstractMailWithLink private $title; /** @var \User_Adapter */ private $user; + /** @var integer */ + private $duration; /** * Sets the title of the validation @@ -40,6 +42,11 @@ class MailInfoValidationRequest extends AbstractMailWithLink $this->user = $user; } + public function setDuration($duration) + { + $this->duration = (int) $duration; + } + /** * {@inheritdoc} */ @@ -60,6 +67,14 @@ class MailInfoValidationRequest extends AbstractMailWithLink */ public function getMessage() { + if (0 < $this->duration) { + if (1 < $this->duration) { + return $this->message . "\n\n" . "You have 1 day to validate the selection."; + } else { + return $this->message . "\n\n" . sprintf(_("You have %d days to validate the selection.", $this->duration)); + } + } + return $this->message; } @@ -68,7 +83,7 @@ class MailInfoValidationRequest extends AbstractMailWithLink */ public function getButtonText() { - return _('Validate'); + return _('Start validation'); } /** diff --git a/lib/classes/eventsmanager/notify/validate.php b/lib/classes/eventsmanager/notify/validate.php index c209d2003d..a19a226a29 100644 --- a/lib/classes/eventsmanager/notify/validate.php +++ b/lib/classes/eventsmanager/notify/validate.php @@ -112,6 +112,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract if ($readyToSend) { $mail = MailInfoValidationRequest::create($this->app, $receiver, $emitter, $params['message']); $mail->setButtonUrl($params['url']); + $mail->setDuration($params['duration']); $mail->setTitle($title); $mail->setUser($user_from);