version 0.2.11

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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index adf8168..836d402 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -17,10 +17,12 @@ 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
        SQLite3DB::Statement st=m_db->Prepare("SELECT BoardID FROM tblBoard WHERE BoardName=?;");\r
-       st.Bind(0,boardname);\r
+       st.Bind(0,lowerboard);\r
        st.Step();\r
 \r
        if(st.RowReturned())\r
@@ -33,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
@@ -127,11 +138,15 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
                if(boards.size()<=0)\r
                {\r
                        m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain any boards! "+message["Identifier"]);\r
+                       // remove this identityid from request list\r
+                       RemoveFromRequestList(idparts[1]);                      \r
                        return true;\r
                }\r
                if(xml.GetReplyBoard()=="")\r
                {\r
                        m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]);\r
+                       // remove this identityid from request list\r
+                       RemoveFromRequestList(idparts[1]);                      \r
                        return true;\r
                }\r
 \r
@@ -191,6 +206,25 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 \r
                if(validmessage && savetoboardcount>0)\r
                {\r
+                       std::string nntpbody="";\r
+                       nntpbody=xml.GetBody();\r
+\r
+                       //add file keys/sizes to body\r
+                       std::vector<MessageXML::fileattachment> fileattachments=xml.GetFileAttachments();\r
+                       if(fileattachments.size()>0)\r
+                       {\r
+                               nntpbody+="\r\nAttachments";\r
+                       }\r
+                       for(std::vector<MessageXML::fileattachment>::iterator i=fileattachments.begin(); i!=fileattachments.end(); i++)\r
+                       {\r
+                               std::string sizestr="0";\r
+                               StringFunctions::Convert((*i).m_size,sizestr);\r
+\r
+                               nntpbody+="\r\n"+(*i).m_key;\r
+                               nntpbody+="\r\n"+sizestr+" bytes";\r
+                               nntpbody+="\r\n";\r
+                       }\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
@@ -198,8 +232,8 @@ 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(7,xml.GetBody());\r
+                       st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));\r
+                       st.Bind(7,nntpbody);\r
                        st.Bind(8,index);\r
                        inserted=st.Step(true);\r
                        int messageid=st.GetLastInsertRowID();\r
@@ -213,7 +247,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
@@ -333,6 +367,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
@@ -352,6 +395,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