version 0.2.15

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

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 2a13af7..ba2d4ff 100644 (file)
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -54,6 +54,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
        {\r
 \r
                SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
+               SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");\r
                SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");\r
                for(long i=0; i<xml.MessageCount(); i++)\r
                {\r
@@ -71,8 +72,24 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
                        }\r
                        st.Reset();\r
                }\r
-               mst.Finalize();\r
-               st.Finalize();\r
+\r
+               // insert external message indexes\r
+               for(long i=0; i<xml.ExternalMessageCount(); i++)\r
+               {\r
+                       spk.Bind(0,xml.GetExternalIdentity(i));\r
+                       spk.Step();\r
+                       if(spk.RowReturned())\r
+                       {\r
+                               int thisidentityid=0;\r
+                               spk.ResultInt(0,thisidentityid);\r
+                               mst.Bind(0,thisidentityid);\r
+                               mst.Bind(1,xml.GetExternalDate(i));\r
+                               mst.Bind(2,xml.GetExternalIndex(i));\r
+                               mst.Step();\r
+                               mst.Reset();\r
+                       }\r
+                       spk.Reset();\r
+               }\r
 \r
                st=m_db->Prepare("INSERT INTO tblMessageListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");\r
                st.Bind(0,identityid);\r
@@ -139,7 +156,7 @@ void MessageListRequester::Initialize()
 {\r
        m_fcpuniquename="MessageListRequester";\r
        std::string tempval;\r
-       Option::instance()->Get("MaxMessageListRequests",tempval);\r
+       Option::Instance()->Get("MaxMessageListRequests",tempval);\r
        StringFunctions::Convert(tempval,m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
@@ -150,6 +167,17 @@ void MessageListRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
+\r
+       Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);\r
+       if(tempval=="true")\r
+       {\r
+               m_localtrustoverrides=true;\r
+       }\r
+       else\r
+       {\r
+               m_localtrustoverrides=false;\r
+       }\r
+\r
 }\r
 \r
 void MessageListRequester::PopulateIDList()\r
@@ -159,8 +187,17 @@ void MessageListRequester::PopulateIDList()
 \r
        date.SetToGMTime();\r
 \r
+       SQLite3DB::Statement st;\r
+\r
        // select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
-       SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+       if(m_localtrustoverrides==false)\r
+       {\r
+               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.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')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+       }\r
+       else\r
+       {\r
+               st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+       }\r
        st.Step();\r
 \r
        m_ids.clear();\r