From 38552da738b2e18409a8c259bb0d91d8d7a076a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Clermont=C3=A9?= <dclermonte@april.org>
Date: Thu, 9 Aug 2018 15:06:24 +0200
Subject: [PATCH] Updated AdminPollService to limit end_date (#336).
---
.../Framadate/Services/AdminPollService.php | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/app/classes/Framadate/Services/AdminPollService.php b/app/classes/Framadate/Services/AdminPollService.php
index e86bbb8b..88c9de01 100644
--- a/app/classes/Framadate/Services/AdminPollService.php
+++ b/app/classes/Framadate/Services/AdminPollService.php
@@ -33,10 +33,20 @@ class AdminPollService {
function updatePoll($poll) {
global $config;
- if ($poll->end_date > $poll->creation_date) {
- return $this->pollRepository->update($poll);
+
+ $end_date = strtotime($poll->end_date);
+
+ if ($end_date < strtotime($poll->creation_date)) {
+
+ $poll->end_date = $poll->creation_date;
+
+ } elseif ($end_date > $this->pollService->maxExpiryDate()) {
+
+ $poll->end_date = $this->pollService->maxExpiryDate();
+
}
- return false;
+
+ return $this->pollRepository->update($poll);
}
/**
--
GitLab