X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzleinserter.cpp;h=66635bb5ad7f8ed6f12c98fff5be87afdf1e689e;hb=5c0453c8697cfaa843dd7f799e5404733ee56e13;hp=a4b661746b6028d4ad659366f9faf3f3eb803958;hpb=8adfd604a97d385869b0ce763b35d014d7aa2cca;p=fms.git

diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index a4b6617..66635bb 100644
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -27,11 +27,17 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 	
 	while(!rs.AtEnd())
 	{
+		std::string localidentityidstr;
 		DateTime now;
 		now.SetToGMTime();
 
+		if(rs.GetField(0))
+		{
+			localidentityidstr=rs.GetField(0);
+		}
+
 		// if this identity has any non-solved puzzles for today, we don't need to insert a new puzzle
-		SQLite3DB::Recordset rs2=m_db->Query("SELECT UUID FROM tblIntroductionPuzzleInserts WHERE Day='"+now.Format("%Y-%m-%d")+"' AND FoundSolution='false';");
+		SQLite3DB::Recordset rs2=m_db->Query("SELECT UUID FROM tblIntroductionPuzzleInserts WHERE Day='"+now.Format("%Y-%m-%d")+"' AND FoundSolution='false' AND LocalIdentityID="+localidentityidstr+";");
 
 		// identity doesn't have any non-solved puzzles for today - start a new insert
 		if(rs2.Empty()==true)
@@ -195,7 +201,9 @@ void IntroductionPuzzleInserter::StartInsert(const long localidentityid)
 	FCPMessage message;
 	std::string xmldata;
 	std::string xmldatasizestr;
-	std::string privatekey;
+	std::string privatekey="";
+	std::string publickey="";
+	std::string keypart="";
 
 	StringFunctions::Convert(localidentityid,idstring);
 	now.SetToGMTime();
@@ -211,20 +219,29 @@ void IntroductionPuzzleInserter::StartInsert(const long localidentityid)
 	}
 	StringFunctions::Convert(index,indexstr);
 
-	SQLite3DB::Recordset rs2=m_db->Query("SELECT PrivateKey FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");
+	SQLite3DB::Recordset rs2=m_db->Query("SELECT PrivateKey,PublicKey FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");
 	if(rs2.Empty()==false && rs2.GetField(0)!=NULL)
 	{
 		privatekey=rs2.GetField(0);
+		if(rs2.GetField(1))
+		{
+			publickey=rs2.GetField(1);
+		}
+		if(publickey.size()>=50)
+		{
+			// remove - and ~
+			keypart=StringFunctions::Replace(StringFunctions::Replace(publickey.substr(4,43),"-",""),"~","");
+		}
 	}
 
-	Option::instance()->Get("MessageBase",messagebase);
+	Option::Instance()->Get("MessageBase",messagebase);
 
 	GenerateCaptcha(encodedpuzzle,solutionstring);
 
 	xml.SetType("captcha");
-	xml.SetUUID(uuid.Generate());
+	xml.SetUUID(uuid.Generate()+"@"+keypart);
 	xml.SetPuzzleData(encodedpuzzle);
-	xml.SetMimeType("bitmap/image");
+	xml.SetMimeType("image/bmp");
 
 	xmldata=xml.GetXML();
 	StringFunctions::Convert(xmldata.size(),xmldatasizestr);