X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Finactivemessagelistrequester.cpp;h=a0a0277057688a38d0cde6c55b7b3cec3753018e;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=7cbfbe86881a54569251876e59a734540613a12b;hpb=e662ea47fba8715474851ceebacba400984ee433;p=fms.git

diff --git a/src/freenet/inactivemessagelistrequester.cpp b/src/freenet/inactivemessagelistrequester.cpp
index 7cbfbe8..a0a0277 100644
--- a/src/freenet/inactivemessagelistrequester.cpp
+++ b/src/freenet/inactivemessagelistrequester.cpp
@@ -6,12 +6,12 @@
 	#include <xmem.h>
 #endif
 
-InactiveMessageListRequester::InactiveMessageListRequester()
+InactiveMessageListRequester::InactiveMessageListRequester(SQLite3DB::DB *db):MessageListRequester(db)
 {
 	Initialize();
 }
 
-InactiveMessageListRequester::InactiveMessageListRequester(FCPv2 *fcp):MessageListRequester(fcp)
+InactiveMessageListRequester::InactiveMessageListRequester(SQLite3DB::DB *db, FCPv2::Connection *fcp):MessageListRequester(db,fcp)
 {
 	Initialize();
 }
@@ -22,10 +22,11 @@ void InactiveMessageListRequester::Initialize()
 	std::string tempval="";
 
 	m_maxrequests=0;
-	Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);
+	Option option(m_db);
+	option.GetInt("MaxMessageListRequests",m_maxrequests);
 
 	// inactive identities get 1/2 of the max requests option -  active identities get 1/2 + any remaining if not evenly divisible
-	m_maxrequests=(m_maxrequests/2)+(m_maxrequests%2);
+	m_maxrequests=(m_maxrequests/2);
 
 	if(m_maxrequests<1)
 	{
@@ -38,7 +39,7 @@ void InactiveMessageListRequester::Initialize()
 	}
 
 	tempval="";
-	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	option.Get("LocalTrustOverridesPeerTrust",tempval);
 	if(tempval=="true")
 	{
 		m_localtrustoverrides=true;
@@ -49,7 +50,7 @@ void InactiveMessageListRequester::Initialize()
 	}
 
 	tempval="";
-	Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);
+	option.Get("SaveMessagesFromNewBoards",tempval);
 	if(tempval=="true")
 	{
 		m_savetonewboards=true;
@@ -61,7 +62,7 @@ void InactiveMessageListRequester::Initialize()
 
 	m_messagedownloadmaxdaysbackward=5;
 	tempval="5";
-	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
+	option.Get("MessageDownloadMaxDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);
 
 }