X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fboardlistrequester.cpp;h=099242dfc96008814010b17bd52adfd6800a9f6a;hb=8a0a83a78390f22f99d4487cda2569909dfbc28e;hp=6b52a4603d364544451c0e8943f1a61f10707304;hpb=df316253862dc50e8e5a790d9634ef90be37badb;p=fms.git

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index 6b52a46..099242d 100644
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -53,7 +53,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 	{
 
 		SQLite3DB::Statement brd=m_db->Prepare("SELECT BoardID,BoardName,BoardDescription FROM tblBoard WHERE BoardName=?;");
-		SQLite3DB::Statement ins=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES(?,?,?);");
+		SQLite3DB::Statement ins=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,SaveReceivedMessages) VALUES(?,?,?,?);");
 		SQLite3DB::Statement upd=m_db->Prepare("UPDATE tblBoard SET BoardDescription=? WHERE BoardID=?;");
 		for(long i=0; i<xml.GetCount(); i++)
 		{
@@ -71,6 +71,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 				if(description=="" && xml.GetDescription(i)!="")
 				{
 					upd.Bind(0,xml.GetDescription(i));
+					upd.Bind(1,boardid);
 					upd.Step();
 					upd.Reset();
 				}
@@ -80,6 +81,14 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
 				ins.Bind(0,xml.GetName(i));
 				ins.Bind(1,xml.GetDescription(i));
 				ins.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));
+				if(m_savemessagesfromnewboards)
+				{
+					ins.Bind(3,"true");
+				}
+				else
+				{
+					ins.Bind(3,"false");
+				}
 				ins.Step();
 				ins.Reset();
 			}
@@ -165,6 +174,17 @@ void BoardListRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardListRequests 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 BoardListRequester::PopulateIDList()
@@ -173,7 +193,7 @@ void BoardListRequester::PopulateIDList()
 	DateTime today;
 	today.SetToGMTime();
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
 	st.Step();
 
 	m_ids.clear();