Fixed issue #16575: Token not marked as answered if email encryption …

…is turned on
LimeSurvey · Mar 29, 2021 · 0eb3461 · 0eb3461
1 parent 19dab67
commit 0eb3461
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 54 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -422,7 +422,8 @@ function submittokens($quotaexit = false)
         }
         $token->usesleft--;
     }
-    $token->save();
+    $token->decrypt();
+    $token->encryptSave();
 
     if ($quotaexit == false) {
         if ($token && trim(strip_tags($thissurvey['email_confirm'])) != "" && $thissurvey['sendconfirmation'] == "Y") {

diff --git a/application/views/admin/super/layout_insurvey.php b/application/views/admin/super/layout_insurvey.php
@@ -7,67 +7,67 @@
 
 //headers will be generated with the template file /admin/super/header.php
 $this->_showHeaders($aData, false);
-    //The adminmenu bar will be generated from /admin/super/adminmenu.php
-    $this->_showadminmenu($aData);
+//The adminmenu bar will be generated from /admin/super/adminmenu.php
+$this->_showadminmenu($aData);
+
+// Generated through /admin/usergroup/usergroupbar_view
+$this->_userGroupBar($aData);
+
+echo "<!-- BEGIN LAYOUT_INSURVEY -->";
+// Needed to evaluate EM expressions in question summary
+// See bug #11845
+LimeExpressionManager::StartProcessingPage(false, true);
+$aData['debug'] = $aData;
+$this->_titlebar($aData);
+
+//The load indicator for pjax
+echo ' <div id="pjax-file-load-container" class="ls-flex-row col-12"><div style="height:2px;width:0px;"></div></div>';
+
+// echo "<pre>".print_r($aData, true)."</pre>";
+
+//The container to hold the vuejs application
+echo ' <!-- Survey page, started in Survey_Common_Action::render_wrapped_template() -->
+    <div id="vue-apps-main-container" '
+. 'class="ls-flex-row align-items-flex-begin align-content-flex-end col-12" '
+. '>';
+    //Rendered through /admin/super/sidemenu
+    $this->_surveysidemenu($aData);
+    echo '<div '
+    . 'class="ls-flex-column align-items-flex-start align-content-flex-start col-11 ls-flex-item transition-animate-width main-content-container" '
+    . '>';
 
-    // Generated through /admin/usergroup/usergroupbar_view
-    $this->_userGroupBar($aData);
+        echo '<div id="pjax-content" class="col-12">';
+            echo LayoutHelper::renderTopbar($aData);
 
-    echo "<!-- BEGIN LAYOUT_INSURVEY -->";
-    // Needed to evaluate EM expressions in question summary
-    // See bug #11845
-    LimeExpressionManager::StartProcessingPage(false, true);
-    $aData['debug'] = $aData;
-    $this->_titlebar($aData);
+            //Rendered through /admin/responses/browsemenubar_view
+            //$this->_browsemenubar($aData);
+            //Rendered through /admin/survey/Question/questionbar_view
+            $this->_organizequestionbar($aData);
 
-    //The load indicator for pjax
-    echo ' <div id="pjax-file-load-container" class="ls-flex-row col-12"><div style="height:2px;width:0px;"></div></div>';
+            echo '<div id="in_survey_common" '
+            . 'class="container-fluid ls-flex-column col-12"'
+            . '>';
 
-    // echo "<pre>".print_r($aData, true)."</pre>";
+                //Rendered through /admin/update/_update_notification
+                $this->_updatenotification();
+                //Rendered through /notifications/notifications
+                $this->_notifications();
+
+                //// Here the main content views.
+                //Rendered through /admin/survey/QuestionGroups/listquestiongroups
+                $this->_listquestiongroups($aData);
+                //Rendered through /admin/survey/Question/listquestions
+                $this->_listquestions($aData);
+                //Rendered through /admin/super/sidebody
+                //With content of /admin/survey/surveySummary_view
+                $this->_nsurveysummary($aData);
+
+                echo $content;
 
-    //The container to hold the vuejs application
-    echo ' <!-- Survey page, started in Survey_Common_Action::render_wrapped_template() -->
-        <div id="vue-apps-main-container" '
-    . 'class="ls-flex-row align-items-flex-begin align-content-flex-end col-12" '
-    . '>';
-        //Rendered through /admin/super/sidemenu
-        $this->_surveysidemenu($aData);
-        echo '<div '
-        . 'class="ls-flex-column align-items-flex-start align-content-flex-start col-11 ls-flex-item transition-animate-width main-content-container" '
-        . '>';
-
-            echo '<div id="pjax-content" class="col-12">';
-                echo LayoutHelper::renderTopbar($aData);
-
-                //Rendered through /admin/responses/browsemenubar_view
-                //$this->_browsemenubar($aData);
-                //Rendered through /admin/survey/Question/questionbar_view
-                $this->_organizequestionbar($aData);
-
-                echo '<div id="in_survey_common" '
-                . 'class="container-fluid ls-flex-column col-12"'
-                . '>';
-
-                    //Rendered through /admin/update/_update_notification
-                    $this->_updatenotification();
-                    //Rendered through /notifications/notifications
-                    $this->_notifications();
-
-                    //// Here the main content views.
-                    //Rendered through /admin/survey/QuestionGroups/listquestiongroups
-                    $this->_listquestiongroups($aData);
-                    //Rendered through /admin/survey/Question/listquestions
-                    $this->_listquestions($aData);
-                    //Rendered through /admin/super/sidebody
-                    //With content of /admin/survey/surveySummary_view
-                    $this->_nsurveysummary($aData);
-
-                    echo $content;
-
-                echo "</div>\n";
             echo "</div>\n";
         echo "</div>\n";
     echo "</div>\n";
+echo "</div>\n";
 echo "<!-- END LAYOUT_INSURVEY -->";
 
 // Footer