X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fsiteinserter.cpp;h=9ee3019a352892125abe2de401df1af309d4a331;hp=9db96517ed98b5378c897ea470d9651bc8d1918b;hb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a;hpb=e773b0ecb8a35c67cde5b2e82bbebb05224f34d0

diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 9db9651..9ee3019 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -113,7 +113,7 @@ std::string SiteInserter::GenerateLinks(const bool publishtrustlist, const bool
 
 void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey, std::map<std::string,std::string> &pages)
 {
-	SQLite3DB::Statement st=m_db->Prepare("SELECT Name, PrivateKey, PublishTrustList, PublishBoardList FROM tblLocalIdentity WHERE LocalIdentityID=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Name, PrivateKey, PublishTrustList, PublishBoardList, FreesiteEdition FROM tblLocalIdentity WHERE LocalIdentityID=?;");
 	st.Bind(0,localidentityid);
 	st.Step();
 
@@ -182,6 +182,66 @@ void SiteInserter::GeneratePages(const long localidentityid, std::string &uskkey
 			LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_ERROR,"SiteInserter::GeneratePages unable to open "+filename+" or site-template.htm.");
 		}
 
+		// get extra files that the user wants to add to the Freesite
+		filename=name+"-files.txt";
+		infile=fopen(filename.c_str(),"r+b");
+		if(infile)
+		{
+			std::vector<std::string> files;
+
+			fseek(infile,0,SEEK_END);
+			long len=ftell(infile);
+			fseek(infile,0,SEEK_SET);
+
+			std::vector<unsigned char> data;
+			data.resize(len);
+			fread(&data[0],1,data.size(),infile);
+			fclose(infile);
+
+			// split on \r and \n - on systems with \r\n line endings there will be blank entries, but we'll just skip those
+			std::string filecontent(data.begin(),data.end());
+			StringFunctions::SplitMultiple(filecontent,"\r\n",files);
+
+			for(std::vector<std::string>::iterator i=files.begin(); i!=files.end(); i++)
+			{
+				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");
+					if(infile)
+					{
+						fseek(infile,0,SEEK_END);
+						len=ftell(infile);
+						fseek(infile,0,SEEK_SET);
+
+						data.resize(len);
+						fread(&data[0],1,data.size(),infile);
+						fclose(infile);
+
+						filecontent="";
+						filecontent.append(data.begin(),data.end());
+
+						// strip off path from filename
+						while(filename.find_first_of("/")!=std::string::npos)
+						{
+							filename.erase(0,filename.find_first_of("/")+1);
+						}
+
+						if(filecontent.size()>0)
+						{
+							pages[filename]=filecontent;
+						}
+
+					}
+					else
+					{
+						m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"SiteInserter::GeneratePages could not include user file "+(*i));
+					}
+				}
+			}
+
+		}
+
 	}
 }
 
@@ -285,6 +345,8 @@ const bool SiteInserter::HandlePutFailed(FCPMessage &message)
 
 	RemoveFromInsertList(localidentityid);
 
+	m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"SiteInserter::HandlePutFailed failed to insert Freesite, Freenet error code : "+message["Code"]);
+
 	return true;
 }