version 0.1.11

[fms.git] / src / freenet / messagerequester.cpp

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index d58494b..07faaf9 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -1,6 +1,8 @@
 #include "../../include/freenet/messagerequester.h"\r
 #include "../../include/freenet/messagexml.h"\r
 \r
+#include <algorithm>\r
+\r
 #ifdef XMEM\r
        #include <xmem.h>\r
 #endif\r
@@ -113,6 +115,10 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
        if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
                std::vector<std::string> boards=xml.GetBoards();\r
+               if(boards.size()>m_maxboardspermessage)\r
+               {\r
+                       boards.resize(m_maxboardspermessage);\r
+               }\r
 \r
                if(boards.size()<=0)\r
                {\r
@@ -124,6 +130,12 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                        m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]);\r
                        return true;\r
                }\r
+               \r
+               // make sure the reply board is on the board list - if not, replace the last element of boardswith the reply board\r
+               if(xml.GetReplyBoard()!="" && std::find(boards.begin(),boards.end(),xml.GetReplyBoard())==boards.end() && boards.size()>0)\r
+               {\r
+                       boards[boards.size()-1]=xml.GetReplyBoard();\r
+               }\r
 \r
                st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body) VALUES(?,?,?,?,?,?,?,?);");\r
                st.Bind(0,identityid);\r
@@ -252,6 +264,17 @@ void MessageRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxPeerMessagesPerDay is currently set at "+tempval+".  This value might be incorrectly configured.  The suggested value is 200.");\r
        }\r
+       Option::Instance()->Get("MaxBoardsPerMessage",tempval);\r
+       StringFunctions::Convert(tempval,m_maxboardspermessage);\r
+       if(m_maxboardspermessage<1)\r
+       {\r
+               m_maxboardspermessage=1;\r
+               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxBoardsPerMessage is currently set at "+tempval+".  It must be 1 or greater.");\r
+       }\r
+       if(m_maxboardspermessage>20)\r
+       {\r
+               m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");\r
+       }\r
 }\r
 \r
 void MessageRequester::PopulateIDList()\r