X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=836d402d839c9ee3241df5e2576701acf30f90b3;hp=5b6d2713b5f5f89d845daece840ef72e940eb44a;hb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a;hpb=107bd97018964d48425306026d06afd038e84db0

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 5b6d271..836d402 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -206,6 +206,25 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 
 		if(validmessage && savetoboardcount>0)
 		{
+			std::string nntpbody="";
+			nntpbody=xml.GetBody();
+
+			//add file keys/sizes to body
+			std::vector<MessageXML::fileattachment> fileattachments=xml.GetFileAttachments();
+			if(fileattachments.size()>0)
+			{
+				nntpbody+="\r\nAttachments";
+			}
+			for(std::vector<MessageXML::fileattachment>::iterator i=fileattachments.begin(); i!=fileattachments.end(); i++)
+			{
+				std::string sizestr="0";
+				StringFunctions::Convert((*i).m_size,sizestr);
+
+				nntpbody+="\r\n"+(*i).m_key;
+				nntpbody+="\r\n"+sizestr+" bytes";
+				nntpbody+="\r\n";
+			}
+
 			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));
@@ -214,7 +233,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 			st.Bind(4,xml.GetSubject());
 			st.Bind(5,xml.GetMessageID());
 			st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));
-			st.Bind(7,xml.GetBody());
+			st.Bind(7,nntpbody);
 			st.Bind(8,index);
 			inserted=st.Step(true);
 			int messageid=st.GetLastInsertRowID();
@@ -376,6 +395,7 @@ void MessageRequester::PopulateIDList()
 	sql+="WHERE (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) ";
 	sql+="AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
 	sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	sql+="AND tblIdentity.Name <> '' ";
 	sql+=";";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);