X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=c9b78bb94b5271b1b3ba784afe58bb583be9a4eb;hb=b4f4686250878cdf4fcb2986a2ea6546cba867d1;hp=e298271c76710040b9577dce93b5017ecf04f1d6;hpb=8a0a83a78390f22f99d4487cda2569909dfbc28e;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index e298271..c9b78bb 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -17,7 +17,7 @@ MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
 	Initialize();
 }
 
-const long MessageRequester::GetBoardID(const std::string &boardname)
+const long MessageRequester::GetBoardID(const std::string &boardname, const std::string &identityname)
 {
 	std::string lowerboard=boardname;
 	StringFunctions::LowerCase(lowerboard,lowerboard);
@@ -35,7 +35,7 @@ const long MessageRequester::GetBoardID(const std::string &boardname)
 	{
 		DateTime now;
 		now.SetToGMTime();
-		st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages) VALUES(?,?,?);");
+		st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages,AddedMethod) VALUES(?,?,?,?);");
 		st.Bind(0,boardname);
 		st.Bind(1,now.Format("%Y-%m-%d %H:%M:%S"));
 		if(m_savemessagesfromnewboards)
@@ -46,6 +46,7 @@ const long MessageRequester::GetBoardID(const std::string &boardname)
 		{
 			st.Bind(2,"false");
 		}
+		st.Bind(3,"Message from "+identityname);
 		st.Step(true);
 		return st.GetLastInsertRowID();
 	}	
@@ -212,7 +213,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 			st.Bind(3,xml.GetTime());
 			st.Bind(4,xml.GetSubject());
 			st.Bind(5,xml.GetMessageID());
-			st.Bind(6,GetBoardID(xml.GetReplyBoard()));
+			st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));
 			st.Bind(7,xml.GetBody());
 			st.Bind(8,index);
 			inserted=st.Step(true);
@@ -227,7 +228,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 					if(SaveToBoard((*i)))
 					{
 						st.Bind(0,messageid);
-						st.Bind(1,GetBoardID((*i)));
+						st.Bind(1,GetBoardID((*i),GetIdentityName(identityid)));
 						st.Step();
 						st.Reset();
 					}
@@ -375,6 +376,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);