Fixed a couple bugs regarding tokens

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@1936 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 17, 2006 · 0f18fff · 0f18fff
1 parent e177438
commit 0f18fff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -446,7 +446,7 @@
 	if (!isset($order) || !$order) {$bquery .= " ORDER BY tid";}
 	else {$bquery .= " ORDER BY $order"; }
 	$bquery .= " LIMIT $start, $limit";
-	$bresult = db_execute_assoc($bquery) or die (_("Error").": $bquery<br />".htmlspecialchars($connect->ErrorMsg()));
+	$bresult = db_execute_num($bquery) or die (_("Error").": $bquery<br />".htmlspecialchars($connect->ErrorMsg()));
 	$bgc="";
 
 	echo "<tr><td colspan='2'>\n"
@@ -501,7 +501,7 @@
 
 	while ($brow = $bresult->FetchRow())
 	{
-		$brow['token'] = trim($brow['token']);
+	$brow['token'] = trim($brow['token']);
 		if ($bgc == "#EEEEEE") {$bgc = "#DDDDDD";} else {$bgc = "#EEEEEE";}
 		echo "\t<tr bgcolor='$bgc'>\n";
 		for ($i=0; $i<=$bfieldcount; $i++)
@@ -973,7 +973,7 @@
 			$itresult = $connect->Execute($itquery);
 			$newtokencount++;
 		}
-		$message=str_replace("{TOKENCOUNT}", $newtokencount, _("TOKENCOUNT} tokens have been created"));
+		$message=str_replace("{TOKENCOUNT}", $newtokencount, _("{TOKENCOUNT} tokens have been created"));
 		echo "<br /><strong>$message</strong><br /><br />\n";
 	}
 	echo "\t</font></td></tr></table>\n";
@@ -1178,7 +1178,8 @@
 		$data['attribute_1'] = $_POST['attribute1'];
 		$data['attribute_2'] = $_POST['attribute2'];
 	}
-	$inquery = $connect->GetInsertSQL("{$dbprefix}tokens_$surveyid", $data);
+    $tblInsert="{$dbprefix}tokens_$surveyid";
+	$inquery = $connect->GetInsertSQL($tblInsert, $data);
 	$inresult = $connect->Execute($inquery) or die ("Add new record failed:<br />\n$inquery<br />\n".htmlspecialchars($connect->ErrorMsg()));
 	echo "<br />$setfont<font color='green'><strong>"._("Success")."</strong></font><br />\n"
 	."<br />"._("Added New Token")."<br /><br />\n"
@@ -1308,8 +1309,9 @@
 //	."</body>\n</html>";
 
 
-function form($error=false) {
-	global $surveyid, $btstyle, , $setfont;
+function form($error=false)
+{
+	global $surveyid, $setfont;
 
 	if ($error) {print $error . "<br /><br />\n";}
 

diff --git a/index.php b/index.php
@@ -226,8 +226,7 @@
 {
 	//check if token actually does exist
 
-	$tkquery = "SELECT COUNT(*) FROM ".db_table_name('tokens_$surveyid')." WHERE token='".trim(returnglobal('token'))."' AND AND (completed = 'N' or completed='')";
-
+	$tkquery = "SELECT COUNT(*) FROM ".db_table_name('tokens_'.$surveyid)." WHERE token='".trim(returnglobal('token'))."' AND (completed = 'N' or completed='')";
 	$tkresult = db_execute_num($tkquery);
 	list($tkexist) = $tkresult->FetchRow();
 	if (!$tkexist)
@@ -412,7 +411,7 @@ function loadanswers()
 function getTokenData($surveyid, $token)
 {
 	global $dbprefix, $connect;
-	$query = "SELECT * FROM ".db_table_name('tokens_$surveyid')." WHERE token='$token'";
+	$query = "SELECT * FROM ".db_table_name('tokens_'.$surveyid)." WHERE token='$token'";
 	$result = db_execute_assoc($query) or die("Couldn't get token info in getTokenData()<br />".$query."<br />".htmlspecialchars($connect->ErrorMsg()));
 	while($row=$result->FetchRow())
 	{