#include <xmem.h>\r
#endif\r
\r
-MessageRequester::MessageRequester()\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)\r
{\r
Initialize();\r
}\r
\r
-MessageRequester::MessageRequester(FCPv2::Connection *fcp):IIndexRequester<std::string>(fcp)\r
+MessageRequester::MessageRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexRequester<std::string>(db,fcp)\r
{\r
Initialize();\r
}\r
nntpbody+="\r\n";\r
}\r
\r
+ m_db->Execute("BEGIN;");\r
+\r
st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");\r
st.Bind(0,identityid);\r
st.Bind(1,GetIdentityName(identityid));\r
//m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAddData could not insert message into database. "+message["Identifier"]);\r
}\r
\r
+ m_db->Execute("COMMIT;");\r
+\r
} // if validmessage\r
}\r
else\r
void MessageRequester::Initialize()\r
{\r
m_fcpuniquename="MessageRequester";\r
- std::string tempval;\r
-\r
+ std::string tempval("");\r
m_maxrequests=0;\r
- Option::Instance()->GetInt("MaxMessageRequests",m_maxrequests);\r
+ Option option(m_db);\r
+\r
+ option.GetInt("MaxMessageRequests",m_maxrequests);\r
if(m_maxrequests<1)\r
{\r
m_maxrequests=1;\r
}\r
\r
m_maxdaysbackward=0;\r
- Option::Instance()->GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
+ option.GetInt("MessageDownloadMaxDaysBackward",m_maxdaysbackward);\r
if(m_maxdaysbackward<0)\r
{\r
m_maxdaysbackward=0;\r
}\r
\r
m_maxpeermessages=0;\r
- Option::Instance()->GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
+ option.GetInt("MaxPeerMessagesPerDay",m_maxpeermessages);\r
if(m_maxpeermessages<1)\r
{\r
m_maxpeermessages=1;\r
}\r
\r
m_maxboardspermessage=0;\r
- Option::Instance()->GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
+ option.GetInt("MaxBoardsPerMessage",m_maxboardspermessage);\r
if(m_maxboardspermessage<1)\r
{\r
m_maxboardspermessage=1;\r
m_log->warning("Option MaxBoardsPerMessage is currently set at "+tempval+". This value might be incorrectly configured.");\r
}\r
\r
- Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+ option.Get("SaveMessagesFromNewBoards",tempval);\r
if(tempval=="true")\r
{\r
m_savemessagesfromnewboards=true;\r
m_savemessagesfromnewboards=false;\r
}\r
\r
- Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+ option.Get("LocalTrustOverridesPeerTrust",tempval);\r
if(tempval=="true")\r
{\r
m_localtrustoverrides=true;\r