From 93269539d70870f06417cefbab86e03c85299e8d Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 1 Oct 2019 15:49:54 -0400
Subject: [PATCH] (js) Allow single-day vacation autoreply

Fixes #4698
---
 NEWS                                                          | 1 +
 UI/WebServerResources/js/Preferences/PreferencesController.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 041ba56e9f..a049c3f62a 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Bug fixes
  - [web] properly encode URL of cards from exteral sources
  - [web] restore cards selection after automatic refresh (#4809)
  - [web] don't mark draft as deleted when SOGoMailKeepDraftsAfterSend is enabled (#4830)
+ - [web] allow single-day vacation auto-reply (#4698)
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
  - [core] honor groups when setting IMAP ACLs
  - [core] honor "any authenticated user" when setting IMAP ACLs
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index 73bd081b13..f9a68e1e83 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -500,7 +500,7 @@
           d.Vacation.enabled) {
         if (d.Vacation.startDateEnabled) {
           r = (!d.Vacation.endDateEnabled ||
-               date.getTime() < d.Vacation.endDate.getTime()) &&
+               date.getTime() <= d.Vacation.endDate.getTime()) &&
             date.getTime() >= today.getTime();
         }
       }
@@ -515,7 +515,7 @@
           d.Vacation.enabled) {
         if (d.Vacation.endDateEnabled) {
           r = (!d.Vacation.startDateEnabled ||
-               date.getTime() > d.Vacation.startDate.getTime()) &&
+               date.getTime() >= d.Vacation.startDate.getTime()) &&
             date.getTime() >= today.getTime();
         }
       }