Fixed issue #06015: INSERTANS does not work in end message

LimeSurvey · Apr 16, 2012 · d6bc722 · d6bc722 · TMSWhite · Apr 16, 2012
1 parent 3dc5adb
commit d6bc722
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -787,6 +787,18 @@
         templatereplace($surveyinfo['surveyls_welcometext']);
         $surveysummary .= LimeExpressionManager::GetLastPrettyPrintExpression();
 
+        if (trim($surveyinfo['surveyls_endtext'])!='')
+        {
+            $surveysummary .= "</td></tr>\n"
+            . "<tr >\n"
+            . "<td align='right' valign='top'><strong>"
+            . $clang->gT("End message:")."</strong></td>\n"
+            . "<td align='left'>";
+
+            templatereplace($surveyinfo['surveyls_endtext']);
+            $surveysummary .= LimeExpressionManager::GetLastPrettyPrintExpression();
+        }
+
         $surveysummary .= "</td></tr>\n"
         . "<tr ><td align='right' valign='top'><strong>"
         . $clang->gT("Administrator:")."</strong></td>\n"

diff --git a/group.php b/group.php
@@ -318,10 +318,6 @@
             {
                 $assessments = doAssessment($surveyid);
             }
-            if($thissurvey['printanswers'] != 'Y')
-            {
-                killSession();
-            }
 
             sendcacheheaders();
             doHeader();
@@ -342,7 +338,8 @@
             unlink('upload/tmp/'.$_SESSION['files'][$i]['filename']);
             }
             */
-            $completed = $thissurvey['surveyls_endtext'];
+            // can't kill session before end message, otherwise INSERTANS doesn't work.
+            $completed = templatereplace($thissurvey['surveyls_endtext']);
             $completed .= "<br /><strong><font size='2' color='red'>".$clang->gT("Did Not Save")."</font></strong><br /><br />\n\n";
             $completed .= $clang->gT("Your survey responses have not been recorded. This survey is not yet active.")."<br /><br />\n";
             if ($thissurvey['printanswers'] == 'Y')
@@ -351,6 +348,10 @@
                 // in other cases the session is cleared at submit time
                 $completed .= "<a href='{$publicurl}/index.php?sid=$surveyid&amp;move=clearall'>".$clang->gT("Clear Responses")."</a><br /><br />\n";
             }
+            if($thissurvey['printanswers'] != 'Y')
+            {
+                killSession();
+            }
         }
         else //THE FOLLOWING DEALS WITH SUBMITTING ANSWERS AND COMPLETING AN ACTIVE SURVEY
         {
@@ -412,7 +413,7 @@
             }
             else
             {
-                $completed = $thissurvey['surveyls_endtext'];
+                $completed = templatereplace($thissurvey['surveyls_endtext']);
             }
 
             // Link to Print Answer Preview  **********