X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fsiteinserter.cpp;h=7ffee2553f3953c9a1029d06b44cb14ef98fece7;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=77da44a9aa4b260ce09eac576314667cf8139dfd;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 77da44a..7ffee25 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -4,17 +4,18 @@
 #include <Poco/DateTime.h>
 #include <Poco/Timespan.h>
 #include <Poco/DateTimeFormatter.h>
+#include <cstdio>
 
 #ifdef XMEM
 	#include <xmem.h>
 #endif
 
-SiteInserter::SiteInserter()
+SiteInserter::SiteInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)
 {
 	Initialize();
 }
 
-SiteInserter::SiteInserter(FCPv2 *fcp):IIndexInserter<long>(fcp)
+SiteInserter::SiteInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)
 {
 	Initialize();
 }
@@ -44,8 +45,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);
@@ -166,10 +165,10 @@ void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey
 		uskkey=key;
 
 		filename=name+"-template.htm";
-		FILE *infile=fopen(filename.c_str(),"r+b");
+		FILE *infile=fopen(filename.c_str(),"rb");
 		if(!infile)
 		{
-			infile=fopen("site-template.htm","r+b");
+			infile=fopen("site-template.htm","rb");
 		}
 		if(infile)
 		{
@@ -205,7 +204,7 @@ void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey
 
 		// get extra files that the user wants to add to the Freesite
 		filename=name+"-files.txt";
-		infile=fopen(filename.c_str(),"r+b");
+		infile=fopen(filename.c_str(),"rb");
 		if(infile)
 		{
 			std::vector<std::string> files;
@@ -228,7 +227,7 @@ void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey
 				if((*i)!="" && (*i).find("index.htm")==std::string::npos && (*i).find("trustlist.htm")==std::string::npos && (*i).find("files.htm")==std::string::npos)
 				{
 					filename=(*i);
-					infile=fopen(filename.c_str(),"r+b");
+					infile=fopen(filename.c_str(),"rb");
 					if(infile)
 					{
 						fseek(infile,0,SEEK_END);
@@ -277,11 +276,11 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
 	st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 	st.Step();
 
-	content+="<table>";
-	content+="<tr><th colspan=\"5\">";
+	content+="<table class=\"trustlist\">";
+	content+="<tr class=\"title\"><thcolspan=\"5\">";
 	content+="Trust List of "+SanitizeOutput(name);
 	content+="</th></tr>";
-	content+="<tr><td></td><th>Message Trust</th><th>Message Comment</th><th>Trust List Trust</th><th>Trust Comment</th></tr>";
+	content+="<tr class=\"headings\"><th></th><th>Message Trust</th><th>Message Comment</th><th>Trust List Trust</th><th>Trust Comment</th></tr>";
 	while(st.RowReturned())
 	{
 		std::string idname="";
@@ -317,11 +316,11 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
 		content+="<tr>";
 		if(freesiteedition!="")
 		{
-			content+="<td><a href=\""+uskkey+"\">"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</a></td>";
+			content+="<td><div><a href=\""+uskkey+"\">"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</a></div></td>";
 		}
 		else
 		{
-			content+="<td>"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</td>";
+			content+="<td><div>"+SanitizeOutput(CreateShortIdentityName(idname,publickey))+"</div></td>";
 		}
 		content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";
 		content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";
@@ -331,6 +330,7 @@ std::string SiteInserter::GenerateTrustList(const std::string &htmltemplate, con
 
 		st.Step();
 	}
+	content+="</table>";
 
 	return StringFunctions::Replace(htmltemplate,"[CONTENT]",content);
 
@@ -355,7 +355,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;
@@ -370,7 +370,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;
@@ -419,7 +419,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="";
@@ -451,12 +451,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);