From d6f636035be2f96326fbabb61676d4eb5b31166c Mon Sep 17 00:00:00 2001
From: Adam Zammit <adam.zammit@acspri.org.au>
Date: Wed, 1 Feb 2017 15:13:48 +1100
Subject: [PATCH] allow welcome screen if desired

---
 include/limesurvey/group.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/limesurvey/group.php b/include/limesurvey/group.php
index 7a3819ef..ffbfd969 100644
--- a/include/limesurvey/group.php
+++ b/include/limesurvey/group.php
@@ -88,16 +88,15 @@ else
     {
         $totalquestions = buildsurveysession();
         LimeExpressionManager::StartSurvey($thissurvey['sid'], $surveyMode, $surveyOptions, false,$LEMdebugLevel);
-//      $_SESSION['step'] = 0;
-        //if ($surveyMode == 'survey') {
-          //  $move = "movenext"; // to force a call to NavigateForwards()
-       // }
-       // else if (isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
+      $_SESSION['step'] = 0;
+        if ($surveyMode == 'survey') {
+            $move = "movenext"; // to force a call to NavigateForwards()
+        }
+        else if (isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
                 //If explicitply set, hide the welcome screen
-         //       $_SESSION['step'] = 0;
                 $_SESSION['step'] = 1;
                 $move = "movenext";
-           // }
+            }
     }
 
     if (!isset($_SESSION['totalsteps'])) {$_SESSION['totalsteps']=0;}
@@ -718,11 +717,11 @@ echo sDefaultSubmitHandler();
 
 if ($surveyMode == 'survey')
 {
-//    if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
+    if(isset($thissurvey['showwelcome']) && $thissurvey['showwelcome'] == 'N') {
         //Hide the welcome screen if explicitly set
- //   } else {
-   //     echo templatereplace(file_get_contents("$thistpl/welcome.pstpl"))."\n";
-   // }
+    } else {
+        echo templatereplace(file_get_contents("$thistpl/welcome.pstpl"))."\n";
+    }
 
     if ($thissurvey['anonymized'] == "Y")
     {