{\r
m_fcpuniquename="MessageRequester";\r
std::string tempval;\r
- Option::instance()->Get("MaxMessageRequests",tempval);\r
+ Option::Instance()->Get("MaxMessageRequests",tempval);\r
StringFunctions::Convert(tempval,m_maxrequests);\r
if(m_maxrequests<1)\r
{\r
{\r
m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageRequests is currently set at "+tempval+". This value might be incorrectly configured.");\r
}\r
- Option::instance()->Get("MessageDownloadMaxDaysBackward",tempval);\r
+ Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);\r
StringFunctions::Convert(tempval,m_maxdaysbackward);\r
if(m_maxdaysbackward<0)\r
{\r
std::string val1;\r
std::string val2;\r
std::string val3;\r
+ std::string sql;\r
\r
date.SetToGMTime();\r
date.Add(0,0,0,-m_maxdaysbackward);\r
\r
- SQLite3DB::Statement st=m_db->Prepare("SELECT tblIdentity.IdentityID,Day,RequestIndex FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"';");\r
+ sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";\r
+ sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";\r
+ sql+="WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') 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+=";";\r
+\r
+ SQLite3DB::Statement st=m_db->Prepare(sql);\r
st.Step();\r
\r
+ m_ids.clear();\r
+\r
while(st.RowReturned())\r
{\r
st.ResultText(0,val1);\r
\r
m_ids[requestid]=true;\r
\r
-}
\ No newline at end of file
+}\r