version 0.2.7

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 13cc1f2..c9b78bb 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -17,7 +17,7 @@ MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
        Initialize();\r
 }\r
 \r
-const long MessageRequester::GetBoardID(const std::string &boardname)\r
+const long MessageRequester::GetBoardID(const std::string &boardname, const std::string &identityname)\r
 {\r
        std::string lowerboard=boardname;\r
        StringFunctions::LowerCase(lowerboard,lowerboard);\r
@@ -35,9 +35,18 @@ const long MessageRequester::GetBoardID(const std::string &boardname)
        {\r
                DateTime now;\r
                now.SetToGMTime();\r
-               st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded) VALUES(?,?);");\r
+               st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages,AddedMethod) VALUES(?,?,?,?);");\r
                st.Bind(0,boardname);\r
                st.Bind(1,now.Format("%Y-%m-%d %H:%M:%S"));\r
+               if(m_savemessagesfromnewboards)\r
+               {\r
+                       st.Bind(2,"true");\r
+               }\r
+               else\r
+               {\r
+                       st.Bind(2,"false");\r
+               }\r
+               st.Bind(3,"Message from "+identityname);\r
                st.Step(true);\r
                return st.GetLastInsertRowID();\r
        }       \r
@@ -204,7 +213,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                        st.Bind(3,xml.GetTime());\r
                        st.Bind(4,xml.GetSubject());\r
                        st.Bind(5,xml.GetMessageID());\r
-                       st.Bind(6,GetBoardID(xml.GetReplyBoard()));\r
+                       st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));\r
                        st.Bind(7,xml.GetBody());\r
                        st.Bind(8,index);\r
                        inserted=st.Step(true);\r
@@ -219,7 +228,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                                        if(SaveToBoard((*i)))\r
                                        {\r
                                                st.Bind(0,messageid);\r
-                                               st.Bind(1,GetBoardID((*i)));\r
+                                               st.Bind(1,GetBoardID((*i),GetIdentityName(identityid)));\r
                                                st.Step();\r
                                                st.Reset();\r
                                        }\r
@@ -339,6 +348,15 @@ void MessageRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
+       Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);\r
+       if(tempval=="true")\r
+       {\r
+               m_savemessagesfromnewboards=true;\r
+       }\r
+       else\r
+       {\r
+               m_savemessagesfromnewboards=false;\r
+       }\r
 }\r
 \r
 void MessageRequester::PopulateIDList()\r
@@ -358,6 +376,7 @@ void MessageRequester::PopulateIDList()
        sql+="WHERE (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) ";\r
        sql+="AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";\r
        sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";\r
+       sql+="AND tblIdentity.Name <> '' ";\r
        sql+=";";\r
 \r
        SQLite3DB::Statement st=m_db->Prepare(sql);\r