From 49bf38f5b906b705cd4ffb0bca452dd4965a9810 Mon Sep 17 00:00:00 2001
From: azammitdcarf <azammitdcarf>
Date: Fri, 13 Feb 2009 03:11:20 +0000
Subject: [PATCH] Will skip welcome screen for question by question

---
 include/limesurvey/question.php |  5 +++--
 include/limesurvey/save.php     | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/limesurvey/question.php b/include/limesurvey/question.php
index 876072de..f6a142e1 100644
--- a/include/limesurvey/question.php
+++ b/include/limesurvey/question.php
@@ -71,7 +71,7 @@ if ($surveyexists <1)
 if (!isset($_SESSION['step']) || !$_SESSION['step'])
 {
 	$totalquestions = buildsurveysession();
-	sendcacheheaders();
+/*	sendcacheheaders();
 	doHeader();
 
 	echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"));
@@ -96,7 +96,8 @@ if (!isset($_SESSION['step']) || !$_SESSION['step'])
 	echo "\n</form>\n";
 	echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"));
 	doFooter();
-	exit;
+	exit;*/
+	$_SESSION['step'] = 1;
 }
 
 //******************************************************************************************************
diff --git a/include/limesurvey/save.php b/include/limesurvey/save.php
index 762b5fa6..71bee4f1 100644
--- a/include/limesurvey/save.php
+++ b/include/limesurvey/save.php
@@ -267,6 +267,7 @@ function savedcontrol()
 			"startlanguage"=>GetBaseLanguageFromSurveyID($surveyid),
 			"refurl"=>getenv("HTTP_REFERER"),
 			"token"=>$_POST['token']);
+
 			//One of the strengths of ADOdb's AutoExecute() is that only valid field names for $table are updated
 			if ($connect->AutoExecute($thissurvey['tablename'], $sdata,'INSERT'))    // Checked    
 			{
@@ -407,8 +408,11 @@ function createinsertquery()
                 echo submitfailed();
                 exit;
             }
-           		
-		     	
+           	
+
+			if (isset($_POST['token']) && in_array('token',$colnames))
+				$values[array_search('token',$colnames)] = $_POST['token'];
+
 			// INSERT NEW ROW
 			$query = "INSERT INTO ".db_quote_id($thissurvey['tablename'])."\n"
 			."(".implode(', ', array_map('db_quote_id',$colnames));
@@ -430,7 +434,7 @@ function createinsertquery()
 			{
 				$query .= ",".db_quote_id('submitdate'); 
 			}
-			if (isset($_POST['token']))
+			if (isset($_POST['token']) && !in_array('token',$colnames))
 				$query .= ",".db_quote_id('token');
 			$query .=") ";
 			$query .="VALUES (".implode(", ", $values);
@@ -453,7 +457,7 @@ function createinsertquery()
                 // is if a ALL-IN-ONE survey, we don't set the submit date before the data is validated
 				$query .= ", ".$connect->DBDate($mysubmitdate);
 			}
-			if (isset($_POST['token']))
+			if (isset($_POST['token']) && !in_array('token',$colnames))
 				$query .= ",'".$_POST['token']."'";
 			$query .=")";
 		}