\r
#include <Poco/DateTime.h>\r
#include <Poco/DateTimeFormatter.h>\r
+#include <Poco/DateTimeParser.h>\r
#include <Poco/Timestamp.h>\r
\r
#ifdef XMEM\r
\r
}\r
\r
+const bool MessageListRequester::CheckDateWithinMaxDays(const std::string &datestr) const\r
+{\r
+ Poco::DateTime checkdate;\r
+ Poco::DateTime date;\r
+ int tzdiff=0;\r
+ if(Poco::DateTimeParser::tryParse(datestr,date,tzdiff))\r
+ {\r
+ checkdate-=Poco::Timespan(m_messagedownloadmaxdaysbackward,0,0,0,0);\r
+ if(checkdate<=date)\r
+ {\r
+ return true;\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ return false;\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
m_log->error("MessageListRequester::HandleAllData date for message is in future! "+xml.GetDate(i));\r
}\r
\r
+ if(addmessage==true && CheckDateWithinMaxDays(xml.GetDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ }\r
+\r
if(addmessage==true)\r
{\r
st.Bind(0,identityid);\r
}\r
else\r
{\r
- m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr);\r
+ //m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr+" on "+xml.GetDate(i));\r
}\r
}\r
\r
m_log->error("MessageListRequester::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));\r
}\r
\r
+ if(addmessage==true && CheckDateWithinMaxDays(xml.GetExternalDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ }\r
+\r
if(addmessage==true)\r
{\r
spk.Bind(0,xml.GetExternalIdentity(i));\r
}\r
else\r
{\r
- m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i));\r
+ //m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i) + " on " + xml.GetExternalDate(i));\r
}\r
}\r
}\r
m_savetonewboards=false;\r
}\r
\r
+ m_messagedownloadmaxdaysbackward=5;\r
+ tempval="5";\r
+ Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);\r
+ StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);\r
+\r
}\r
\r
void MessageListRequester::PopulateIDList()\r