X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=6680b8b93d675afdc7c18ac6306951d494b7a05d;hb=befd91205eff729a182f66de15374a577a8718f7;hp=ac56c5c388808074ec6c5293d14189950093ffbd;hpb=ee580d19b7920904587e18d72a3465d52eab6204;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index ac56c5c..6680b8b 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -127,11 +127,15 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 		if(boards.size()<=0)
 		{
 			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain any boards! "+message["Identifier"]);
+			// remove this identityid from request list
+			RemoveFromRequestList(idparts[1]);			
 			return true;
 		}
 		if(xml.GetReplyBoard()=="")
 		{
 			m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]);
+			// remove this identityid from request list
+			RemoveFromRequestList(idparts[1]);			
 			return true;
 		}
 
@@ -191,7 +195,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 
 		if(validmessage && savetoboardcount>0)
 		{
-			st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body) VALUES(?,?,?,?,?,?,?,?);");
+			st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");
 			st.Bind(0,identityid);
 			st.Bind(1,GetIdentityName(identityid));
 			st.Bind(2,xml.GetDate());
@@ -200,6 +204,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 			st.Bind(5,xml.GetMessageID());
 			st.Bind(6,GetBoardID(xml.GetReplyBoard()));
 			st.Bind(7,xml.GetBody());
+			st.Bind(8,index);
 			inserted=st.Step(true);
 			int messageid=st.GetLastInsertRowID();