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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index ac56c5c..c9b78bb 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -17,10 +17,12 @@ 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);
 	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardID FROM tblBoard WHERE BoardName=?;");
-	st.Bind(0,boardname);
+	st.Bind(0,lowerboard);
 	st.Step();
 
 	if(st.RowReturned())
@@ -33,9 +35,18 @@ const long MessageRequester::GetBoardID(const std::string &boardname)
 	{
 		DateTime now;
 		now.SetToGMTime();
-		st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded) 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)
+		{
+			st.Bind(2,"true");
+		}
+		else
+		{
+			st.Bind(2,"false");
+		}
+		st.Bind(3,"Message from "+identityname);
 		st.Step(true);
 		return st.GetLastInsertRowID();
 	}	
@@ -127,11 +138,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,15 +206,16 @@ 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());
 			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);
 			int messageid=st.GetLastInsertRowID();
 
@@ -212,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();
 					}
@@ -332,6 +348,15 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
+	Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);
+	if(tempval=="true")
+	{
+		m_savemessagesfromnewboards=true;
+	}
+	else
+	{
+		m_savemessagesfromnewboards=false;
+	}
 }
 
 void MessageRequester::PopulateIDList()
@@ -351,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);