Fixed token export, and added tid at the end of import.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2823 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Apr 30, 2007 · 1cee1fb · 1cee1fb
1 parent d21970f
commit 1cee1fb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -67,10 +67,9 @@
 	$bresult = db_execute_assoc($bquery) or die ("$bquery<br />".htmlspecialchars($connect->ErrorMsg()));
 	$bfieldcount=$bresult->FieldCount();
 
-	$tokenoutput .= "Tid, Firstname, Lastname, Email, Token , Language, Attribute1, Attribute2, mpid\n";
+	$tokenoutput .= "firstname, lastname, email, token, language code, attribute1, attribute2, tid\n";
 	while ($brow = $bresult->FetchRow())
 	{
-		$tokenoutput .= '"'.trim($brow['tid'])."\",";
 		$tokenoutput .= '"'.trim($brow['firstname'])."\",";
 		$tokenoutput .= '"'.trim($brow['lastname'])."\",";
 		$tokenoutput .= '"'.trim($brow['email'])."\",";
@@ -81,7 +80,7 @@
 			$tokenoutput .= ",";
 			$tokenoutput .= '"'.trim($brow['attribute_1'])."\",";
 			$tokenoutput .= '"'.trim($brow['attribute_2'])."\",";
-			$tokenoutput .= '"'.trim($brow['mpid'])."\"";
+			$tokenoutput .= '"'.trim($brow['tid'])."\"";
 		}
 		$tokenoutput .= "\n";
 	}
@@ -1377,9 +1376,13 @@
 							if (!isset($line[5])) $line[5] = "";
 							if (!isset($line[6])) $line[6] = "";
 							$iq = "INSERT INTO ".db_table_name("tokens_$surveyid")." \n"
-							. "(firstname, lastname, email, token, language, attribute_1, attribute_2";
+							. "(";
+							if (isset($line[7])) $iq .="tid, ";
+							$iq .="firstname, lastname, email, token, language, attribute_1, attribute_2";
 							$iq .=") \n"
-							. "VALUES (".$connect->qstr($line[0]).", ".$connect->qstr($line[1]).", ".$connect->qstr($line[2]).", ".$connect->qstr($line[3]).", ".strtolower($connect->qstr($line[4]))." , ".$connect->qstr($line[5]).", ".$connect->qstr($line[6])."";
+							. "VALUES (";
+							if (isset($line[7])) $iq .= $connect->qstr($line[7]).", ";
+							$iq .= $connect->qstr($line[0]).", ".$connect->qstr($line[1]).", ".$connect->qstr($line[2]).", ".$connect->qstr($line[3]).", ".strtolower($connect->qstr($line[4]))." , ".$connect->qstr($line[5]).", ".$connect->qstr($line[6])."";
 							$iq .= ")";
 							$ir = $connect->Execute($iq) or die ("Couldn't insert line<br />\n$buffer<br />\n".htmlspecialchars($connect->ErrorMsg())."<pre style='text-align: left'>$iq</pre>\n");
 							$xz++;