X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fsiteinserter.cpp;h=0ae9fc5a4dba74d97af6b1891900ef24b3d79892;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=4c71c3084efb04289360e2b3b5aa6dc2e3bed885;hpb=b7f3b3e6ae9dc527f02b5c06e2eeae0e9cac3ad8;p=fms.git

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 4c71c30..0ae9fc5 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -14,7 +14,7 @@ SiteInserter::SiteInserter()
 	Initialize();
 }
 
-SiteInserter::SiteInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)
+SiteInserter::SiteInserter(FCPv2::Connection *fcp):IIndexInserter<long>(fcp)
 {
 	Initialize();
 }
@@ -44,8 +44,6 @@ std::string SiteInserter::GenerateIndex(const std::string &htmltemplate, const l
 {
 	std::string content="";
 
-	content+="<h3>My last few posts</h3>";
-
 	SQLite3DB::Statement boardst=m_db->Prepare("SELECT tblBoard.BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=? ORDER BY tblBoard.BoardName COLLATE NOCASE;");
 	SQLite3DB::Statement st=m_db->Prepare("SELECT tblMessage.Body, tblMessage.Subject, tblMessage.MessageID FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID INNER JOIN tblLocalIdentity ON tblIdentity.PublicKey=tblLocalIdentity.PublicKey WHERE tblLocalIdentity.LocalIdentityID=? ORDER BY tblMessage.MessageDate DESC, tblMessage.MessageTime DESC LIMIT 0,10;");
 	st.Bind(0,localidentityid);
@@ -356,7 +354,7 @@ const std::string SiteInserter::GetClassString(const std::string &trustlevel)
 	}
 }
 
-const bool SiteInserter::HandlePutFailed(FCPMessage &message)
+const bool SiteInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	long localidentityid;
@@ -371,7 +369,7 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message)
 	return true;
 }
 
-const bool SiteInserter::HandlePutSuccessful(FCPMessage &message)
+const bool SiteInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
 	std::vector<std::string> uriparts;
@@ -420,7 +418,7 @@ const std::string SiteInserter::SanitizeOutput(const std::string &input)
 
 const bool SiteInserter::StartInsert(const long &localidentityid)
 {
-	FCPMessage message;
+	FCPv2::Message message;
 	std::string localidentityidstr="";
 	std::string sizestr="";
 	std::string uskkey="";
@@ -452,12 +450,12 @@ const bool SiteInserter::StartInsert(const long &localidentityid)
 		filenum++;
 	}
 
-	m_fcp->SendMessage(message);
+	m_fcp->Send(message);
 
 	// send data of each page
 	for(std::map<std::string,std::string>::iterator pagei=pages.begin(); pagei!=pages.end(); pagei++)
 	{
-		m_fcp->SendRaw(&(*pagei).second[0],(*pagei).second.size());
+		m_fcp->Send(std::vector<char>((*pagei).second.begin(),(*pagei).second.end()));
 	}
 
 	m_inserting.push_back(localidentityid);