From d9a5f7cd3346048b779518bdf53dc2d04ef100d8 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Fri, 30 Apr 2021 11:13:30 +0200
Subject: [PATCH] Fixed issue #17276: Error with survey expiration date and
 using MSSQL

---
 application/controllers/SurveyAdministrationController.php | 4 ++--
 application/core/Survey_Common_Action.php                  | 4 ++--
 application/helpers/export_helper.php                      | 4 ++--
 application/helpers/replacements_helper.php                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/controllers/SurveyAdministrationController.php b/application/controllers/SurveyAdministrationController.php
index bab5e3402de..bb3b8c94ba4 100644
--- a/application/controllers/SurveyAdministrationController.php
+++ b/application/controllers/SurveyAdministrationController.php
@@ -2728,14 +2728,14 @@ private function surveysummary(&$aData)
 
         $dateformatdetails = getDateFormatData(Yii::app()->session['dateformat']);
         if (trim($oSurvey->startdate) != '') {
-            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s', $oSurvey->startdate);
+            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s.v', $oSurvey->startdate);
             $aData['startdate'] = $datetimeobj->format($dateformatdetails['phpdate'] . ' H:i');
         } else {
             $aData['startdate'] = "-";
         }
 
         if (trim($oSurvey->expires) != '') {
-            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s', $oSurvey->expires);
+            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s.v', $oSurvey->expires);
             $aData['expdate'] = $datetimeobj->format($dateformatdetails['phpdate'] . ' H:i');
         } else {
             $aData['expdate'] = "-";
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index 93302d0045e..f5ecf1c9d9e 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -1134,14 +1134,14 @@ public function _surveysummary($aData)
 
         $dateformatdetails = getDateFormatData(Yii::app()->session['dateformat']);
         if (trim($oSurvey->startdate) != '') {
-            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s', $oSurvey->startdate);
+            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s.v', $oSurvey->startdate);
             $aData['startdate'] = $datetimeobj->format($dateformatdetails['phpdate'] . ' H:i');
         } else {
             $aData['startdate'] = "-";
         }
 
         if (trim($oSurvey->expires) != '') {
-            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s', $oSurvey->expires);
+            $datetimeobj = DateTime::createFromFormat('Y-m-d H:i:s.v', $oSurvey->expires);
             $aData['expdate'] = $datetimeobj->format($dateformatdetails['phpdate'] . ' H:i');
         } else {
             $aData['expdate'] = "-";
diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php
index 87e6eb8f1ec..dc25fc68692 100644
--- a/application/helpers/export_helper.php
+++ b/application/helpers/export_helper.php
@@ -2324,11 +2324,11 @@ function tokensExport($iSurveyID)
             $brow = array_map('MaskFormula', $brow);
         }
         if (trim($brow['validfrom'] != '')) {
-            $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s", $brow['validfrom']);
+            $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s.v", $brow['validfrom']);
             $brow['validfrom'] = $datetimeobj->format('Y-m-d H:i');
         }
         if (trim($brow['validuntil'] != '')) {
-            $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s", $brow['validuntil']);
+            $datetimeobj = DateTime::createFromFormat("Y-m-d H:i:s.v", $brow['validuntil']);
             $brow['validuntil'] = $datetimeobj->format('Y-m-d H:i');
         }
 
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
index 77671e9e8ed..9461e816fd5 100755
--- a/application/helpers/replacements_helper.php
+++ b/application/helpers/replacements_helper.php
@@ -220,7 +220,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     // Expiry
     if (isset($thissurvey['expiry'])) {
         $dateformatdetails = getDateFormatData($thissurvey['surveyls_dateformat']);
-        $datetimeobj = DateTime::createFromFormat( "Y-m-d H:i:s", $thissurvey['expiry']);
+        $datetimeobj = DateTime::createFromFormat( "Y-m-d H:i:s.v", $thissurvey['expiry']);
         $_dateoutput = $datetimeobj->format($dateformatdetails['phpdate']);
     } else {
         $_dateoutput = '-';
@@ -403,7 +403,7 @@ function getStandardsReplacementFields($thissurvey)
     // Expiry
     if (isset($thissurvey['expiry'])) {
         $dateformatdetails = getDateFormatData($thissurvey['surveyls_dateformat']);
-        $datetimeobj = DateTime::createFromFormat( "Y-m-d H:i:s", $thissurvey['expiry']);
+        $datetimeobj = DateTime::createFromFormat( "Y-m-d H:i:s.v", $thissurvey['expiry']);
         $_dateoutput = $datetimeobj->format($dateformatdetails['phpdate']);
     } else {
         $_dateoutput = '-';