version 0.2.6

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

diff --git a/src/freenet/boardlistrequester.cpp b/src/freenet/boardlistrequester.cpp
index 6b52a46..9fbc6b2 100644 (file)
--- a/src/freenet/boardlistrequester.cpp
+++ b/src/freenet/boardlistrequester.cpp
@@ -15,6 +15,36 @@ BoardListRequester::BoardListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)
        Initialize();\r
 }\r
 \r
+std::string BoardListRequester::GetIdentityName(const long identityid)\r
+{\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey FROM tblIdentity WHERE IdentityID=?;");\r
+       st.Bind(0,identityid);\r
+       st.Step();\r
+       if(st.RowReturned())\r
+       {\r
+               std::vector<std::string> keyparts;\r
+               std::string key;\r
+               std::string name;\r
+               st.ResultText(0,name);\r
+               st.ResultText(1,key);\r
+               \r
+               StringFunctions::SplitMultiple(key,"@,",keyparts);\r
+               \r
+               if(keyparts.size()>1)\r
+               {\r
+                       return name+"@"+keyparts[1];\r
+               }\r
+               else\r
+               {\r
+                       return name+"@invalidpublickey";\r
+               }\r
+       }\r
+       else\r
+       {\r
+               return "";\r
+       }\r
+}\r
+\r
 const bool BoardListRequester::HandleAllData(FCPMessage &message)\r
 {      \r
        DateTime now;\r
@@ -25,6 +55,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
        BoardListXML xml;\r
        long identityid;\r
        long index;\r
+       std::string identityname="";\r
 \r
        now.SetToGMTime();\r
        StringFunctions::Split(message["Identifier"],"|",idparts);\r
@@ -32,6 +63,8 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
        StringFunctions::Convert(idparts[1],identityid);\r
        StringFunctions::Convert(idparts[2],index);\r
 \r
+       identityname=GetIdentityName(identityid);\r
+\r
        // wait for all data to be received from connection\r
        while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)\r
        {\r
@@ -53,7 +86,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
        {\r
 \r
                SQLite3DB::Statement brd=m_db->Prepare("SELECT BoardID,BoardName,BoardDescription FROM tblBoard WHERE BoardName=?;");\r
-               SQLite3DB::Statement ins=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES(?,?,?);");\r
+               SQLite3DB::Statement ins=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,SaveReceivedMessages,AddedMethod) VALUES(?,?,?,?,?);");\r
                SQLite3DB::Statement upd=m_db->Prepare("UPDATE tblBoard SET BoardDescription=? WHERE BoardID=?;");\r
                for(long i=0; i<xml.GetCount(); i++)\r
                {\r
@@ -71,6 +104,7 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
                                if(description=="" && xml.GetDescription(i)!="")\r
                                {\r
                                        upd.Bind(0,xml.GetDescription(i));\r
+                                       upd.Bind(1,boardid);\r
                                        upd.Step();\r
                                        upd.Reset();\r
                                }\r
@@ -80,6 +114,15 @@ const bool BoardListRequester::HandleAllData(FCPMessage &message)
                                ins.Bind(0,xml.GetName(i));\r
                                ins.Bind(1,xml.GetDescription(i));\r
                                ins.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));\r
+                               if(m_savemessagesfromnewboards)\r
+                               {\r
+                                       ins.Bind(3,"true");\r
+                               }\r
+                               else\r
+                               {\r
+                                       ins.Bind(3,"false");\r
+                               }\r
+                               ins.Bind(4,"Board List of "+identityname);\r
                                ins.Step();\r
                                ins.Reset();\r
                        }\r
@@ -165,6 +208,17 @@ void BoardListRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\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
 \r
 void BoardListRequester::PopulateIDList()\r
@@ -173,7 +227,7 @@ void BoardListRequester::PopulateIDList()
        DateTime today;\r
        today.SetToGMTime();\r
 \r
-       SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+today.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) AND PublishBoardList='true' ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
        st.Step();\r
 \r
        m_ids.clear();\r