version 0.3.20

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

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 62d5bb2..41f7d85 100644 (file)
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -19,6 +19,36 @@ MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp
        Initialize();\r
 }\r
 \r
+const bool MessageListRequester::CheckDateNotFuture(const std::string &datestr) const\r
+{\r
+       std::vector<std::string> dateparts;\r
+       int year=0;\r
+       int month=0;\r
+       int day=0;\r
+       Poco::DateTime today;\r
+\r
+       StringFunctions::Split(datestr,"-",dateparts);\r
+       if(dateparts.size()==3)\r
+       {\r
+               StringFunctions::Convert(dateparts[0],year);\r
+               StringFunctions::Convert(dateparts[1],month);\r
+               StringFunctions::Convert(dateparts[2],day);\r
+               if(today.year()>year || (today.year()==year && today.month()>month) || (today.year()==year && today.month()==month && today.day()>=day))\r
+               {\r
+                       return true;\r
+               }\r
+               else\r
+               {\r
+                       return false;\r
+               }\r
+       }\r
+       else\r
+       {\r
+               return false;\r
+       }\r
+\r
+}\r
+\r
 void MessageListRequester::GetBoardList(std::map<std::string,bool> &boards)\r
 {\r
        SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, SaveReceivedMessages FROM tblBoard;");\r
@@ -56,6 +86,8 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
        std::map<std::string,bool> boards;      // list of boards and if we will save messages for that board or not\r
        bool addmessage=false;\r
        std::string boardsstr="";\r
+       std::string datestr="";\r
+       std::vector<std::string> dateparts;\r
 \r
        GetBoardList(boards);\r
 \r
@@ -78,10 +110,13 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 \r
        // receive the file\r
        data.resize(datalength);\r
-       m_fcp->ReceiveRaw(&data[0],datalength);\r
+       if(data.size()>0)\r
+       {\r
+               m_fcp->ReceiveRaw(&data[0],datalength);\r
+       }\r
 \r
        // parse file into xml and update the database\r
-       if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
+       if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
 \r
                SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
@@ -115,6 +150,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
                                boardsstr+=(*j);\r
                        }\r
 \r
+                       if(CheckDateNotFuture(xml.GetDate(i))==false)\r
+                       {\r
+                               addmessage=false;\r
+                               m_log->error("MessageListRequester::HandleAllData date for message is in future! "+xml.GetDate(i));\r
+                       }\r
+\r
                        if(addmessage==true)\r
                        {\r
                                st.Bind(0,identityid);\r
@@ -167,6 +208,12 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
                                        boardsstr+=(*j);\r
                                }\r
 \r
+                               if(CheckDateNotFuture(xml.GetExternalDate(i))==false)\r
+                               {\r
+                                       addmessage=false;\r
+                                       m_log->error("MessageListRequester::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));\r
+                               }\r
+\r
                                if(addmessage==true)\r
                                {\r
                                        spk.Bind(0,xml.GetExternalIdentity(i));\r
@@ -259,9 +306,10 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 void MessageListRequester::Initialize()\r
 {\r
        m_fcpuniquename="MessageListRequester";\r
-       std::string tempval;\r
-       Option::Instance()->Get("MaxMessageListRequests",tempval);\r
-       StringFunctions::Convert(tempval,m_maxrequests);\r
+       std::string tempval="";\r
+\r
+       m_maxrequests=0;\r
+       Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r