X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=f13d04d29eb3a2ecd0139d8a7cb3ae2a74cab188;hb=3f6f19146f015fa8d2c89f1e72cd467dbc4115aa;hp=13cc1f2179ede3165665a7408fd5a14f6f9144ef;hpb=3dc3ac3cfe10b7196a7977e9c041c29fa141c35e;p=fms.git

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 13cc1f2..f13d04d 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,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();
 	}	
@@ -197,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));
@@ -204,8 +232,8 @@ 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(7,xml.GetBody());
+			st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));
+			st.Bind(7,nntpbody);
 			st.Bind(8,index);
 			inserted=st.Step(true);
 			int messageid=st.GetLastInsertRowID();
@@ -219,7 +247,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();
 					}
@@ -339,6 +367,27 @@ 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;
+	}
+
+	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	if(tempval=="true")
+	{
+		m_localtrustoverrides=true;
+	}
+	else
+	{
+		m_localtrustoverrides=false;
+	}
+
 }
 
 void MessageRequester::PopulateIDList()
@@ -355,9 +404,17 @@ void MessageRequester::PopulateIDList()
 
 	sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";
 	sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";
-	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+="WHERE FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
+	if(m_localtrustoverrides==false)
+	{
+		sql+="AND (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) ";
+		sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	}
+	else
+	{
+		sql+="AND (tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (tblIdentity.LocalMessageTrust IS NULL 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);
@@ -437,7 +494,7 @@ void MessageRequester::StartRequest(const std::string &requestid)
 		message["Identifier"]=m_fcpuniquename+"|"+requestid+"|"+parts[0]+"|"+parts[1]+"|"+parts[2]+"|"+message["URI"];
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";		// 1 MB
-		message["MaxRetries"]="-1";			// use new ULPR since we are fairly sure message exists since the author says it does
+		message["MaxRetries"]="-1";			// use ULPR since we are fairly sure message exists since the author says it does
 
 		m_fcp->SendMessage(message);