Fixed issue #15195: Expiration date can be set before start date (#2558)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Aug 12, 2022 · d84f4af · d84f4af
1 parent 4c41fab
commit d84f4af
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 1 deletion.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -531,7 +531,8 @@ public function rules()
             array('running', 'safe', 'on' => 'search'),
             array('expires', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
             array('startdate', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
-            array('datecreated', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true)
+            array('datecreated', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m'],'allowEmpty' => true),
+            array('expires', 'checkExpireAfterStart'),
         );
     }
 
@@ -2282,4 +2283,17 @@ function ($s) {
         );
         return $aSurveys;
     }
+
+    /**
+     * Validates the Expiration Date is not lower than the Start Date
+     */
+    public function checkExpireAfterStart($attributes, $params)
+    {
+        if (empty($this->startdate) || empty($this->expires)) {
+            return true;
+        }
+        if ($this->expires < $this->startdate) {
+            $this->addError('expires', gT("Expiration date can't be lower than the start date", 'unescaped'));
+        }
+    }
 }
diff --git a/application/views/admin/survey/subview/accordion/_publication_panel.php b/application/views/admin/survey/subview/accordion/_publication_panel.php
@@ -17,6 +17,7 @@
     var sAdminEmailAddressNeeded = '".gT("If you are using token functions or notifications emails you need to set an administrator email address.",'js')."'
     var sURLParameters = '';
     var sAddParam = '';
+    var expirationLowerThanStartError = '" . gT("Expiration date can't be lower than the start date") . "';
 ", LSYii_ClientScript::POS_BEGIN);
 ?>
 <!-- Publication panel -->

diff --git a/application/views/surveyAdministration/editLocalSettings_main_view.php b/application/views/surveyAdministration/editLocalSettings_main_view.php
@@ -72,6 +72,9 @@
 
 $('#".$entryData['name']."').on('submit.editLocalsettings', function(e){
     e.preventDefault();
+    if (!validateSettingsForm($(this))) {
+      return false;
+    }
     var data = $(this).serializeArray();
     var uri = $(this).attr('action');
     $.ajax({

diff --git a/assets/scripts/admin/surveysettings.js b/assets/scripts/admin/surveysettings.js
@@ -152,6 +152,40 @@ function guidGenerator() {
     return (S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4());
 }
 
+/**
+ * Validate settings form depending on form name
+ */
+function validateSettingsForm($form) {
+    switch ($form.attr('id')) {
+        case 'publication':
+            return validateEndDateHigherThanStart(
+                $('#startdate_datetimepicker').data('DateTimePicker'),
+                $('#expires_datetimepicker').data('DateTimePicker'),
+                expirationLowerThanStartError
+            );
+        default:
+            return true;
+    }
+}
+
+/**
+ * Validates that an end date is not lower than a start date
+ */
+function validateEndDateHigherThanStart(startDatePicker, endDatePicker, errorMessage) {
+    if (!startDatePicker || !startDatePicker.date()) {
+        return true;
+    }
+    if (!endDatePicker || !endDatePicker.date()) {
+        return true;
+    }
+    const difference = endDatePicker.date().diff(startDatePicker.date());
+    if (difference >= 0) {
+        return true;
+    }
+    LS.LsGlobalNotifier.createFlash(errorMessage, 'alert-danger fade in');
+    return false;
+}
+
 $(document).on('ready  pjax:scriptcomplete', function(){
     if (window.PanelIntegrationData) {
         var i10n = window.PanelIntegrationData.i10n;