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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index e298271..5b6d271 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();
 					}