Dev Merge branch 'master' into develop

Dev em_manager_helper needs encryption call implemented by Denis
LimeSurvey · Jan 8, 2020 · 66a9782 · 66a9782
2 parents a86272a + 4ac5327
commit 66a9782
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 15 deletions.
diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -611,10 +611,11 @@ private function getPluginsData($sString, $aDatas)
             // show "Exit and clear survey" button whenever there is 'srid' key set,
             // button won't be rendered on welcome and final page because 'srid' key doesn't exist on those pages
             // additionally checks for submit page to compensate when srid is needed to render other views
-            if (isset($_SESSION['survey_' . $surveyid]['srid'])
-                && $aDatas['aSurveyInfo']['active'] == 'Y'
-                && $aDatas['aSurveyInfo']['include_content'] !== 'submit'
-                && $aDatas['aSurveyInfo']['include_content'] !== 'submit_preview'
+            if (
+                isset($_SESSION['survey_' . $surveyid]['srid'])
+                && isset($aDatas['aSurveyInfo']['active']) && $aDatas['aSurveyInfo']['active'] == 'Y'
+                && isset($aDatas['aSurveyInfo']['include_content']) && $aDatas['aSurveyInfo']['include_content'] !== 'submit'
+                && isset($aDatas['aSurveyInfo']['include_content']) && $aDatas['aSurveyInfo']['include_content'] !== 'submit_preview'
             ) {
                 $aDatas['aSurveyInfo']['bShowClearAll'] = true;
             }

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -5640,7 +5640,10 @@ private function _UpdateValuesInDatabase($finished=false)
                                 $cSave->set_answer_time();
                             }
                         }
+                    } else {
+                        LimeExpressionManager::addFrontendFlashMessage('error', $this->gT('This response was already submitted.'), $this->sid);
                     }
+
                     if ($finished) {
                         // Delete the save control record if successfully finalize the submission
                         $criteria = new CDbCriteria;
@@ -5666,15 +5669,15 @@ private function _UpdateValuesInDatabase($finished=false)
                     else
                     {
                         if ($finished && ($oResponse->submitdate == null || Survey::model()->findByPk($this->sid)->alloweditaftercompletion == 'Y')) {
-                            if($this->surveyOptions['datestamp'])
-                            {
-                                // Replace with date("Y-m-d H:i:s") ? See timeadjust
-                                $submitdate = date("Y-m-d H:i:s");
-                            }  else {
-                                $submitdate  = date("Y-m-d H:i:s",mktime(0,0,0,1,1,1980));
+                            /* Less update : just do what you need to to */
+                            if($this->surveyOptions['datestamp']) {
+                                $submitdate = dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $this->surveyOptions['timeadjust']);
+                            } else {
+                                $submitdate = date("Y-m-d H:i:s",mktime(0,0,0,1,1,1980));
+                            }
+                            if (!Response::model($this->sid)->updateByPk($oResponse->id,array('submitdate'=>$submitdate))) {
+                                LimeExpressionManager::addFrontendFlashMessage('error', $this->gT('An error happen when try to submit your response.'), $this->sid);
                             }
-                            $oResponse->submitdate = $submitdate;
-                            $oResponse->encryptSave();
                         }
                     }
 

diff --git a/application/helpers/remotecontrol/remotecontrol_handle.php b/application/helpers/remotecontrol/remotecontrol_handle.php
@@ -1835,10 +1835,13 @@ public function delete_participants($sSessionKey, $iSurveyID, $aTokenIDs)
                     $token = Token::model($iSurveyID)->findByPk($iTokenID);
                     if (!isset($token)) {
                                             $aResult[$iTokenID] = 'Invalid token ID';
-                    } elseif ($token->delete()) {
-                                            $aResult[$iTokenID] = 'Deleted';
                     } else {
-                                            $aResult[$iTokenID] = 'Deletion went wrong';
+                                            $iDel = Token::model($iSurveyID)->deleteByPk($iTokenID);
+                                            if ($iDel > 0) {
+                                                $aResult[$iTokenID] = 'Deleted';
+                                            } else {
+                                                $aResult[$iTokenID] = 'Deletion went wrong';
+                                            }
                     }
                 }
                 return $aResult;

diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo
diff --git a/locale/da/da.mo b/locale/da/da.mo
diff --git a/locale/de/de.mo b/locale/de/de.mo
diff --git a/locale/es/es.mo b/locale/es/es.mo
diff --git a/locale/fr/fr.mo b/locale/fr/fr.mo
diff --git a/locale/hr/hr.mo b/locale/hr/hr.mo
diff --git a/locale/hu/hu.mo b/locale/hu/hu.mo
diff --git a/locale/it-informal/it-informal.mo b/locale/it-informal/it-informal.mo
diff --git a/locale/it/it.mo b/locale/it/it.mo
diff --git a/locale/ko/ko.mo b/locale/ko/ko.mo
diff --git a/locale/ky/ky.mo b/locale/ky/ky.mo
diff --git a/locale/ru/ru.mo b/locale/ru/ru.mo
diff --git a/locale/tr/tr.mo b/locale/tr/tr.mo