From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Sun, 20 Jul 2008 11:53:00 +0000 (+0200)
Subject: version 0.3.13
X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=commitdiff_plain;h=fcb124f8d6d3f5678e82049fb8e5e23c8cfaec6d

version 0.3.13
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebd70aa..08eed47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,6 +95,7 @@ src/http/pages/optionspage.cpp
 src/http/pages/peerdetailspage.cpp
 src/http/pages/peermaintenancepage.cpp
 src/http/pages/peertrustpage.cpp
+src/http/pages/recentlyaddedpage.cpp
 src/http/pages/showcaptchapage.cpp
 src/http/pages/versioninfopage.cpp
 src/nntp/extensiontrust.cpp
diff --git a/include/global.h b/include/global.h
index 572cb25..868e753 100644
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 
 #define VERSION_MAJOR		"0"
 #define VERSION_MINOR		"3"
-#define VERSION_RELEASE		"12"
+#define VERSION_RELEASE		"13"
 #define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
 
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;
diff --git a/include/http/ipagehandler.h b/include/http/ipagehandler.h
index 745f727..11bdc22 100644
--- a/include/http/ipagehandler.h
+++ b/include/http/ipagehandler.h
@@ -34,6 +34,9 @@ protected:
 
 	void CreateQueryVarMap(Poco::Net::HTTPServerRequest &request, std::map<std::string,std::string> &vars);
 
+	const std::string CreateFormPassword();
+	const bool ValidateFormPassword(const std::map<std::string,std::string> &vars);
+
 	// replaces html elements with encoded characters (i.e. < becomes &lt;)
 	const std::string SanitizeOutput(const std::string &input);
 
diff --git a/include/http/pages/recentlyaddedpage.h b/include/http/pages/recentlyaddedpage.h
new file mode 100644
index 0000000..ec9c1cc
--- /dev/null
+++ b/include/http/pages/recentlyaddedpage.h
@@ -0,0 +1,20 @@
+#ifndef _recentlyaddedpage_
+#define _recentlyaddedpage_
+
+#include "../ipagehandler.h"
+#include "../../idatabase.h"
+
+class RecentlyAddedPage:public IPageHandler,public IDatabase
+{
+public:
+	RecentlyAddedPage(const std::string &templatestr):IPageHandler(templatestr)		{}
+
+	IPageHandler *New()	{ return new RecentlyAddedPage(m_template); }
+
+private:
+	const bool WillHandleURI(const std::string &uri);
+	const std::string GeneratePage(const std::string &method, const std::map<std::string,std::string> &queryvars);
+
+};
+
+#endif	// _recentlyaddedpage_
diff --git a/src/dbsetup.cpp b/src/dbsetup.cpp
index 9b2ab00..b9f30be 100644
--- a/src/dbsetup.cpp
+++ b/src/dbsetup.cpp
@@ -401,6 +401,12 @@ void SetupDB()
 				LocalIdentityID		INTEGER\
 				);");
 
+	// Temporary table for form passwords
+	db->Execute("CREATE TEMPORARY TABLE IF NOT EXISTS tmpFormPassword(\
+				Date			DATETIME,\
+				Password		TEXT\
+				);");
+
 	// low / high / message count for each board
 	db->Execute("CREATE VIEW IF NOT EXISTS vwBoardStats AS \
 				SELECT tblBoard.BoardID AS 'BoardID', IFNULL(MIN(MessageID),0) AS 'LowMessageID', IFNULL(MAX(MessageID),0) AS 'HighMessageID', COUNT(MessageID) AS 'MessageCount' \
diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index b185b9d..6904186 100644
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -52,7 +52,8 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 			// identity doesn't have any non-solved puzzles for today - start a new insert
 			if(rs2.Empty()==true)
 			{
-				if(m_lastinserted.find(rs.GetInt(0))==m_lastinserted.end() || m_lastinserted[rs.GetInt(0)]<=lastinsert)
+				// make sure we are on the next day or the appropriate amount of time has elapsed since the last insert
+				if(m_lastinserted.find(rs.GetInt(0))==m_lastinserted.end() || m_lastinserted[rs.GetInt(0)]<=lastinsert || m_lastinserted[rs.GetInt(0)].day()!=now.day())
 				{
 					StartInsert(rs.GetInt(0));
 					m_lastinserted[rs.GetInt(0)]=now;
diff --git a/src/freenet/siteinserter.cpp b/src/freenet/siteinserter.cpp
index 02b5a73..458b71b 100644
--- a/src/freenet/siteinserter.cpp
+++ b/src/freenet/siteinserter.cpp
@@ -228,7 +228,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);
diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 9ef9b61..be6bfc1 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -33,6 +33,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	long index;
 	int insertcount=0;
 	int dayinsertcount=0;
+	int previnsertcount=0;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(message["DataLength"],datalength);
@@ -71,6 +72,23 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	{
 		m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");
 	}
+
+	// get count of identities added more than 24 hours ago - if 0 then we will accept more than 100 identities now
+	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded<?;");
+	st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
+	st.Step();
+	if(st.RowReturned())
+	{
+		if(st.ResultNull(0)==false)
+		{
+			st.ResultInt(0,previnsertcount);
+		}
+	}
+	else
+	{
+		m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added more than 24 hours ago");
+	}
+
 	now=Poco::DateTime();
 
 	// parse file into xml and update the database
@@ -119,7 +137,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 			st.Step();
 			if(st.RowReturned()==false)
 			{
-				if(insertcount<50 && dayinsertcount<100)
+				if(insertcount<50 && (dayinsertcount<100 || previnsertcount==0))
 				{
 					idinsert.Bind(0,identity);
 					idinsert.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
@@ -183,7 +201,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 		{
 			m_log->warning("TrustListRequester::HandleAllData TrustList contained more than 50 new identities : "+message["Identifier"]);
 		}
-		if(dayinsertcount>=100)
+		if(dayinsertcount>=100 && previnsertcount>0)
 		{
 			m_log->warning("TrustListRequester::HandleAllData TrustList would have inserted more than 100 new identities in the last 24 hours : "+message["Identifier"]);
 		}
diff --git a/src/http/fmshttprequesthandlerfactory.cpp b/src/http/fmshttprequesthandlerfactory.cpp
index 8d89baa..e91fb51 100644
--- a/src/http/fmshttprequesthandlerfactory.cpp
+++ b/src/http/fmshttprequesthandlerfactory.cpp
@@ -17,6 +17,7 @@
 #include "../../include/http/pages/peermaintenancepage.h"
 #include "../../include/http/pages/peertrustpage.h"
 #include "../../include/http/pages/versioninfopage.h"
+#include "../../include/http/pages/recentlyaddedpage.h"
 
 FMSHTTPRequestHandlerFactory::FMSHTTPRequestHandlerFactory()
 {
@@ -54,6 +55,7 @@ FMSHTTPRequestHandlerFactory::FMSHTTPRequestHandlerFactory()
 	m_pagehandlers.push_back(new PeerMaintenancePage(templatestr));
 	m_pagehandlers.push_back(new PeerTrustPage(templatestr));
 	m_pagehandlers.push_back(new VersionInfoPage(templatestr));
+	m_pagehandlers.push_back(new RecentlyAddedPage(templatestr));
 	// homepage must be last - catch all page handler
 	m_pagehandlers.push_back(new HomePage(templatestr));
 
diff --git a/src/http/ipagehandler.cpp b/src/http/ipagehandler.cpp
index 9048d98..c9e4a1a 100644
--- a/src/http/ipagehandler.cpp
+++ b/src/http/ipagehandler.cpp
@@ -1,8 +1,14 @@
 #include "../../include/http/ipagehandler.h"
 #include "../../include/stringfunctions.h"
 #include "../../include/http/multipartparser.h"
+#include "../../include/db/sqlite3db.h"
 
 #include <Poco/Net/HTMLForm.h>
+#include <Poco/UUIDGenerator.h>
+#include <Poco/UUID.h>
+#include <Poco/DateTime.h>
+#include <Poco/DateTimeFormatter.h>
+#include <Poco/Timespan.h>
 
 #include <cstring>
 
@@ -35,6 +41,28 @@ void IPageHandler::CreateArgArray(const std::map<std::string,std::string> &vars,
 	}
 }
 
+const std::string IPageHandler::CreateFormPassword()
+{
+	Poco::DateTime date;
+	Poco::UUIDGenerator uuidgen;
+	Poco::UUID uuid;
+	try
+	{
+		uuid=uuidgen.createRandom();
+	}
+	catch(...)
+	{
+	}
+
+	SQLite3DB::Statement st=SQLite3DB::DB::Instance()->Prepare("INSERT INTO tmpFormPassword(Date,Password) VALUES(?,?);");
+	st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
+	st.Bind(1,uuid.toString());
+	st.Step();
+
+	return "<input type=\"hidden\" name=\"formpassword\" value=\""+uuid.toString()+"\">";
+
+}
+
 const std::string IPageHandler::CreateTrueFalseDropDown(const std::string &name, const std::string &selected)
 {
 	std::string rval="";
@@ -123,3 +151,49 @@ const std::string IPageHandler::SanitizeOutput(const std::string &input)
 	output=StringFunctions::Replace(output," ","&nbsp;");
 	return output;
 }
+
+const bool IPageHandler::ValidateFormPassword(const std::map<std::string,std::string> &vars)
+{
+	Poco::DateTime date;
+	date-=Poco::Timespan(0,1,0,0,0);
+
+	SQLite3DB::Statement st=SQLite3DB::DB::Instance()->Prepare("DELETE FROM tmpFormPassword WHERE Date<?;");
+	st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
+	st.Step();
+
+	std::map<std::string,std::string>::const_iterator i=vars.find("formpassword");
+	if(i!=vars.end())
+	{
+		st=SQLite3DB::DB::Instance()->Prepare("SELECT COUNT(*) FROM tmpFormPassword WHERE Password=?;");
+		st.Bind(0,(*i).second);
+		st.Step();
+		if(st.RowReturned())
+		{
+			if(st.ResultNull(0)==false)
+			{
+				int rval=0;
+				st.ResultInt(0,rval);
+				if(rval>0)
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return false;
+	}
+}
diff --git a/src/http/pages/addpeerpage.cpp b/src/http/pages/addpeerpage.cpp
index f4e483b..4453af5 100644
--- a/src/http/pages/addpeerpage.cpp
+++ b/src/http/pages/addpeerpage.cpp
@@ -12,7 +12,7 @@ const std::string AddPeerPage::GeneratePage(const std::string &method, const std
 {
 	std::string content="";
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="add")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="add" && ValidateFormPassword(queryvars))
 	{
 		Poco::DateTime date;
 		std::string publickey="";
@@ -33,6 +33,7 @@ const std::string AddPeerPage::GeneratePage(const std::string &method, const std
 
 	content+="<h2>Add Peer</h2>";
 	content+="<form name=\"frmaddpeer\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"add\">";
 	content+="Public Key : ";
 	content+="<input type=\"text\" name=\"publickey\" size=\"100\">";
diff --git a/src/http/pages/announceidentitypage.cpp b/src/http/pages/announceidentitypage.cpp
index 6de18a3..7858d88 100644
--- a/src/http/pages/announceidentitypage.cpp
+++ b/src/http/pages/announceidentitypage.cpp
@@ -46,7 +46,7 @@ const std::string AnnounceIdentityPage::GeneratePage(const std::string &method,
 	int requestindex=0;
 	bool willshow=false;
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="announce")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="announce" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement insert=m_db->Prepare("INSERT INTO tblIdentityIntroductionInserts(LocalIdentityID,Day,UUID,Solution) VALUES(?,?,?,?);");
 		std::string localidentityidstr="";
@@ -81,6 +81,7 @@ const std::string AnnounceIdentityPage::GeneratePage(const std::string &method,
 
 	content+="<h2>Announce Identity</h2>";
 	content+="<form name=\"frmannounce\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"announce\">";
 	content+="<table>";
 	content+="<tr><td colspan=\"4\"><center>Select Identity : ";
diff --git a/src/http/pages/boardspage.cpp b/src/http/pages/boardspage.cpp
index 8b2866e..e9cc2a3 100644
--- a/src/http/pages/boardspage.cpp
+++ b/src/http/pages/boardspage.cpp
@@ -47,7 +47,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 
 	if(queryvars.find("formaction")!=queryvars.end())
 	{
-		if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && queryvars.find("boarddescription")!=queryvars.end())
+		if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && queryvars.find("boarddescription")!=queryvars.end() && ValidateFormPassword(queryvars))
 		{
 			std::string boardname="";
 			std::string boarddescription="";
@@ -63,11 +63,11 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 			addst.Bind(3,"Added manually");
 			addst.Step();
 		}
-		if((*queryvars.find("formaction")).second=="remove0messages")
+		if((*queryvars.find("formaction")).second=="remove0messages" && ValidateFormPassword(queryvars))
 		{
 			m_db->Execute("DELETE FROM tblBoard WHERE BoardID IN (SELECT BoardID FROM vwBoardStats WHERE MessageCount=0 AND BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard));");
 		}
-		if((*queryvars.find("formaction")).second=="update")
+		if((*queryvars.find("formaction")).second=="update" && ValidateFormPassword(queryvars))
 		{
 			int boardid;
 			std::vector<std::string> boardids;
@@ -174,21 +174,21 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 
 	content+="<tr>";
 	content+="<td colspan=\"3\"><center>";
-	content+="<form name=\"frmboardsearch\" action=\"boards.htm\" method=\"POST\"><input type=\"text\" name=\"boardsearch\" value=\""+SanitizeOutput(boardsearch)+"\"><input type=\"submit\" value=\"Search\"></form>";
+	content+="<form name=\"frmboardsearch\" action=\"boards.htm\" method=\"POST\"><input type=\"text\" name=\"boardsearch\" value=\""+SanitizeOutput(boardsearch)+"\">"+CreateFormPassword()+"<input type=\"submit\" value=\"Search\"></form>";
 	content+="</center></td>";
 	content+="</tr>";
 
 	content+="<tr>";
 	content+="<td colspan=\"3\"><center>";
-	content+="<form name=\"frmremoveboard\" action=\"boards.htm\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"remove0messages\">Remove boards with 0 messages<input type=\"submit\" value=\"Remove\"></form>";
+	content+="<form name=\"frmremoveboard\" action=\"boards.htm\" method=\"POST\">"+CreateFormPassword()+"<input type=\"hidden\" name=\"formaction\" value=\"remove0messages\">Remove boards with 0 messages<input type=\"submit\" value=\"Remove\"></form>";
 	content+="</center></td>";
 	content+="</tr>";
 
 	content+="<tr>";
-	content+="<td><form name=\"frmaddboard\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"addboard\"><input type=\"text\" name=\"boardname\"></td><td><input type=\"text\" name=\"boarddescription\" size=\"40\" maxlength=\"50\"></td><td><input type=\"submit\" value=\"Add Board\"></form></td>";
+	content+="<td><form name=\"frmaddboard\" method=\"POST\">"+CreateFormPassword()+"<input type=\"hidden\" name=\"formaction\" value=\"addboard\"><input type=\"text\" name=\"boardname\"></td><td><input type=\"text\" name=\"boarddescription\" size=\"40\" maxlength=\"50\"></td><td><input type=\"submit\" value=\"Add Board\"></form></td>";
 	content+="</tr>";
 
-	content+="<tr><td colspan=\"4\"><hr><form name=\"frmboards\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\"></td></tr>";
+	content+="<tr><td colspan=\"4\"><hr><form name=\"frmboards\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\">"+CreateFormPassword()+"</td></tr>";
 	content+="<tr>";
 	content+="<th>Name</th><th>Description</th><th>Save Received Messages *</th><th>Added Method</th>";
 	content+="</tr>";	
diff --git a/src/http/pages/controlboardpage.cpp b/src/http/pages/controlboardpage.cpp
index 380e3de..5677a91 100644
--- a/src/http/pages/controlboardpage.cpp
+++ b/src/http/pages/controlboardpage.cpp
@@ -23,7 +23,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
 
 	if(queryvars.find("formaction")!=queryvars.end())
 	{
-		if((*queryvars.find("formaction")).second=="remove" && queryvars.find("boardid")!=queryvars.end())
+		if((*queryvars.find("formaction")).second=="remove" && queryvars.find("boardid")!=queryvars.end() && ValidateFormPassword(queryvars))
 		{
 			int boardid=0;
 			StringFunctions::Convert((*queryvars.find("boardid")).second,boardid);
@@ -45,7 +45,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
 			st.Step();
 
 		}
-		if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && (*queryvars.find("boardname")).second!="")
+		if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && (*queryvars.find("boardname")).second!="" && ValidateFormPassword(queryvars))
 		{
 			Poco::DateTime date;
 			st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded) VALUES(?,?);");
@@ -90,6 +90,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
 		content+="<td>"+changetrustlisttruststr+"</td>\r\n";
 		content+="<td>";
 		content+="<form name=\"frmremove\" method=\"POST\">";
+		content+=CreateFormPassword();
 		content+="<input type=\"hidden\" name=\"formaction\" value=\"remove\">";
 		content+="<input type=\"hidden\" name=\"boardid\" value=\""+boardidstr+"\">";
 		content+="<input type=\"submit\" value=\"Remove\">";
@@ -102,6 +103,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
 	content+="<tr>";
 	content+="<td>";
 	content+="<form name=\"frmaddboard\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"addboard\">";
 	content+="<input type=\"text\" name=\"boardname\">";
 	content+="</td>\r\n<td>";
diff --git a/src/http/pages/createidentitypage.cpp b/src/http/pages/createidentitypage.cpp
index 8a65914..10152ba 100644
--- a/src/http/pages/createidentitypage.cpp
+++ b/src/http/pages/createidentitypage.cpp
@@ -12,7 +12,7 @@ const std::string CreateIdentityPage::GeneratePage(const std::string &method, co
 {
 	std::string content="";
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="create")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="create" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblLocalIdentity(Name,PublishTrustList,DateCreated) VALUES(?,'false',?);");
 		std::string name="";
@@ -36,6 +36,7 @@ const std::string CreateIdentityPage::GeneratePage(const std::string &method, co
 	{
 		content+="<h2>Create Identity</h2>";
 		content+="<form name=\"frmcreateidentity\" method=\"POST\">";
+		content+=CreateFormPassword();
 		content+="<input type=\"hidden\" name=\"formaction\" value=\"create\">";
 		content+="Name : <input type=\"text\" name=\"name\" maxlength=\"40\">";
 		content+=" <input type=\"submit\" value=\"Create\">";
diff --git a/src/http/pages/execquerypage.cpp b/src/http/pages/execquerypage.cpp
index 8d46c46..358f34a 100644
--- a/src/http/pages/execquerypage.cpp
+++ b/src/http/pages/execquerypage.cpp
@@ -10,7 +10,7 @@ const std::string ExecQueryPage::GeneratePage(const std::string &method, const s
 	std::string content="";
 	std::string query="";
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="execute" && queryvars.find("query")!=queryvars.end() && (*queryvars.find("query")).second!="")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="execute" && queryvars.find("query")!=queryvars.end() && (*queryvars.find("query")).second!="" && ValidateFormPassword(queryvars))
 	{
 		query=(*queryvars.find("query")).second;
 		SQLite3DB::Recordset rs=m_db->Query(query);
@@ -50,6 +50,7 @@ const std::string ExecQueryPage::GeneratePage(const std::string &method, const s
 
 	content+="<h2>Execute Query</h2>";
 	content+="<form name=\"frmquery\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"execute\">";
 	content+="<textarea name=\"query\" rows=\"10\" cols=\"80\">"+StringFunctions::Replace(query,"<","&lt;")+"</textarea>";
 	content+="<input type=\"submit\" value=\"Execute Query\">";
diff --git a/src/http/pages/homepage.cpp b/src/http/pages/homepage.cpp
index d74a30e..417e1af 100644
--- a/src/http/pages/homepage.cpp
+++ b/src/http/pages/homepage.cpp
@@ -19,7 +19,7 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m
 	Option::Instance()->Get("FCPHost",fcphost);
 	Option::Instance()->Get("FProxyPort",fproxyport);
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="shutdown")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="shutdown" && ValidateFormPassword(queryvars))
 	{
 		m_log->trace("HomePage::GeneratePage requested shutdown");
 		((FMSApp *)&FMSApp::instance())->Terminate();
@@ -94,6 +94,7 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m
 
 	content+="<p class=\"paragraph\">";
 	content+="<form name=\"frmshutdown\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"shutdown\">";
 	content+="<input type=\"submit\" value=\"Shutdown FMS\">";
 	content+="</form>";
diff --git a/src/http/pages/insertedfilespage.cpp b/src/http/pages/insertedfilespage.cpp
index 65cdeea..e97bf63 100644
--- a/src/http/pages/insertedfilespage.cpp
+++ b/src/http/pages/insertedfilespage.cpp
@@ -16,7 +16,7 @@ const std::string InsertedFilesPage::GeneratePage(const std::string &method, con
 	Option::Instance()->Get("FProxyPort",fproxyport);
 
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="removefile" && queryvars.find("fileid")!=queryvars.end())
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="removefile" && queryvars.find("fileid")!=queryvars.end() && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement del=m_db->Prepare("DELETE FROM tblFileInserts WHERE FileInsertID=?;");
 		del.Bind(0,(*queryvars.find("fileid")).second);
@@ -40,6 +40,7 @@ const std::string InsertedFilesPage::GeneratePage(const std::string &method, con
 
 		content+="<a href=\"http://"+node+":"+fproxyport+"/"+StringFunctions::UriEncode(key)+"\">"+SanitizeOutput(filename)+"</a> - "+sizestr+" bytes";
 		content+="<form name=\"frmRemove"+insertidstr+"\" method=\"POST\">";
+		content+=CreateFormPassword();
 		content+="<input type=\"hidden\" name=\"formaction\" value=\"removefile\">";
 		content+="<input type=\"hidden\" name=\"fileid\" value=\""+insertidstr+"\">";
 		content+="<input type=\"submit\" value=\"Remove\">";
diff --git a/src/http/pages/localidentitiespage.cpp b/src/http/pages/localidentitiespage.cpp
index 5fa76b5..d4e0d44 100644
--- a/src/http/pages/localidentitiespage.cpp
+++ b/src/http/pages/localidentitiespage.cpp
@@ -18,11 +18,13 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 	content+="<table><tr><th>Export Identities</th><th>Import Identities</th></tr>";
 	content+="<tr><td>";
 	content+="<form name=\"frmexport\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"export\">";
 	content+="<input type=\"submit\" value=\"Export Identities\">";
 	content+="</form>";
 	content+="</td><td>";
 	content+="<form name=\"frmimport\" method=\"POST\" enctype=\"multipart/form-data\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"import\">";
 	content+="<input type=\"file\" name=\"file\">";
 	content+="<input type=\"submit\" value=\"Import Identities\">";
@@ -63,7 +65,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		st.ResultText(9,maxmessagedelay);
 
 		content+="<tr>";
-		content+="<td title=\""+publickey+"\"><form name=\"frmupdate\""+countstr+"\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\"><input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</td>";
+		content+="<td title=\""+publickey+"\"><form name=\"frmupdate\""+countstr+"\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\">"+CreateFormPassword()+"<input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("singleuse["+countstr+"]",singleuse)+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("publishtrustlist["+countstr+"]",publishtrustlist)+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("publishboardlist["+countstr+"]",publishboardlist)+"</td>";
@@ -86,7 +88,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		trustst.Reset();
 
 		content+="<td><input type=\"submit\" value=\"Update\"></form></td>";
-		content+="<td><form name=\"frmdel\""+countstr+"\" method=\"POST\" action=\"confirm.htm\"><input type=\"hidden\" name=\"formaction\" value=\"delete\"><input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\"><input type=\"hidden\" name=\"targetpage\" value=\"localidentities.htm\"><input type=\"hidden\" name=\"confirmdescription\" value=\"Are you sure you want to delete "+SanitizeOutput(CreateShortIdentityName(name,publickey))+"?\"><input type=\"submit\" value=\"Delete\"></form></td>";
+		content+="<td><form name=\"frmdel\""+countstr+"\" method=\"POST\" action=\"confirm.htm\">"+CreateFormPassword()+"<input type=\"hidden\" name=\"formaction\" value=\"delete\"><input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\"><input type=\"hidden\" name=\"targetpage\" value=\"localidentities.htm\"><input type=\"hidden\" name=\"confirmdescription\" value=\"Are you sure you want to delete "+SanitizeOutput(CreateShortIdentityName(name,publickey))+"?\"><input type=\"submit\" value=\"Delete\"></form></td>";
 		content+="</tr>";
 		content+="<tr><td></td><td colspan=\"7\" class=\"smaller\">"+publickey+"</td></tr>";
 		st.Step();
@@ -232,7 +234,7 @@ void LocalIdentitiesPage::handleRequest(Poco::Net::HTTPServerRequest &request, P
 	CreateQueryVarMap(request,vars);
 
 	std::string formaction="";
-	if(vars.find("formaction")!=vars.end())
+	if(vars.find("formaction")!=vars.end() && ValidateFormPassword(vars))
 	{
 		formaction=(*vars.find("formaction")).second;
 		if(formaction=="update")
diff --git a/src/http/pages/optionspage.cpp b/src/http/pages/optionspage.cpp
index 5a1d8e1..5c61e16 100644
--- a/src/http/pages/optionspage.cpp
+++ b/src/http/pages/optionspage.cpp
@@ -38,9 +38,10 @@ const std::string OptionsPage::GeneratePage(const std::string &method, const std
 {
 	std::string content="<h2 style=\"text-align:center;\">Options</h2>\r\n";
 	content+="<form name=\"frmoptions\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"save\">";
+	content+=CreateFormPassword();
 	content+="<table><tr><th>Option</th><th>Value</th><th>Description</th></tr>";
 
-	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="save")
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="save" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement update=m_db->Prepare("UPDATE tblOption SET OptionValue=? WHERE Option=?;");
 		std::vector<std::string> options;
diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index f4661ab..9e70ca8 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -36,21 +36,21 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		StringFunctions::Convert((*queryvars.find("identityid")).second,identityid);
 	}
 
-	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="deletemessages")
+	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="deletemessages" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement del=m_db->Prepare("DELETE FROM tblMessage WHERE IdentityID=?;");
 		del.Bind(0,identityid);
 		del.Step();
 	}
 
-	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="hide")
+	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="hide" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement del=m_db->Prepare("UPDATE tblIdentity SET Hidden='true' WHERE IdentityID=?;");
 		del.Bind(0,identityid);
 		del.Step();
 	}
 	
-	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="show")
+	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="show" && ValidateFormPassword(queryvars))
 	{
 		SQLite3DB::Statement del=m_db->Prepare("UPDATE tblIdentity SET Hidden='false' WHERE IdentityID=?;");
 		del.Bind(0,identityid);
@@ -112,6 +112,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		content+="<tr><td>Hidden in Main Peer Trust Page</td>";
 		content+="<td>"+hidden;
 		content+="&nbsp;<form name=\"frmhidden\" method=\"POST\">";
+		content+=CreateFormPassword();
 		content+="<input type=\"hidden\" name=\"identityid\" value=\""+identityidstr+"\">";
 		if(hidden=="false")
 		{
@@ -140,6 +141,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		content+="<td>Message Count</td>";
 		content+="<td>"+messagecountstr;
 		content+="&nbsp;&nbsp;<form name=\"frmdeletemessages\" method=\"POST\">";
+		content+=CreateFormPassword();
 		content+="<input type=\"hidden\" name=\"identityid\" value=\""+identityidstr+"\">";
 		content+="<input type=\"hidden\" name=\"formaction\" value=\"deletemessages\">";
 		content+="<input type=\"submit\" value=\"Delete Messages\">";
diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index 502cea6..f605f5f 100644
--- a/src/http/pages/peermaintenancepage.cpp
+++ b/src/http/pages/peermaintenancepage.cpp
@@ -17,7 +17,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	std::string tempval;
 	Poco::DateTime date;
 
-	if(queryvars.find("formaction")!=queryvars.end())
+	if(queryvars.find("formaction")!=queryvars.end() && ValidateFormPassword(queryvars))
 	{
 		if((*queryvars.find("formaction")).second=="removenotseen")
 		{
@@ -83,6 +83,9 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 
 	content+="<h2>Peer Maintenance</h2>";
 	content+="<p class=\"paragraph\">Removing a peer will not remove the messages they sent, but will remove everything else about that peer, including their trust levels.</p>";
+	content+="<p>";
+	content+="<a href=\"recentlyadded.htm\">Recently Added Peers</a>";
+	content+="</p>";
 	content+="<table>";
 	content+="<tr><th colspan=\"3\">Stats</th></tr>";
 
@@ -102,6 +105,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>never seen</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removenotseen\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -119,6 +123,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>last seen more than 20 days ago</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removelastseen20\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -136,6 +141,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>last sent a message more than 30 days ago</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removeposted30daysago\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -150,6 +156,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>never sent a message</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removeneversent\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -167,6 +174,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>added more than 20 days ago and never sent a message</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removeadded20daysneversent\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -184,6 +192,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="<td>last seen more than 20 days ago and never sent a message</td>";
 	content+="<td>";
 	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"removelastseenneversent20\">";
 	content+="<input type=\"submit\" value=\"Remove\">";
 	content+="</form>";
@@ -191,13 +200,17 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</tr>";
 
 	content+="<tr>";
-	content+="<td><form name=\"frmdelete\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"removedaysago\"></td>";
+	content+="<td><form name=\"frmdelete\" method=\"POST\">";
+	content+=CreateFormPassword();
+	content+="<input type=\"hidden\" name=\"formaction\" value=\"removedaysago\"></td>";
 	content+="<td>last seen <input type=\"text\" name=\"daysago\" size=\"2\"> days ago</td>";
 	content+="<td><input type=\"submit\" value=\"Remove\"></form></td>";
 	content+="</tr>";
 
 	content+="<tr>";
-	content+="<td><form name=\"frmdelete\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"removenulldaysago\"></td>";
+	content+="<td><form name=\"frmdelete\" method=\"POST\">";
+	content+=CreateFormPassword();
+	content+="<input type=\"hidden\" name=\"formaction\" value=\"removenulldaysago\"></td>";
 	content+="<td>last seen <input type=\"text\" name=\"daysago\" size=\"2\"> days ago, and have null local trust</td>";
 	content+="<td><input type=\"submit\" value=\"Remove\"></form></td>";
 	content+="</tr>";
diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index 92f804c..3fee7ac 100644
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -148,7 +148,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		}
 	}
 
-	if(localidentityid!=-1 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="update")
+	if(localidentityid!=-1 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="update" && ValidateFormPassword(queryvars))
 	{
 		std::vector<std::string> identityids;
 		std::vector<std::string> oldlmt;
@@ -276,6 +276,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	content+="</div>";
 
 	content+="<form name=\"frmtrust\" method=\"POST\">";
+	content+=CreateFormPassword();
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"update\">";
 	content+="<input type=\"hidden\" name=\"localidentityid\" value=\""+localidentityidstr+"\">";
 	content+="<input type=\"hidden\" name=\"startrow\" value=\""+startrowstr+"\">";
diff --git a/src/http/pages/recentlyaddedpage.cpp b/src/http/pages/recentlyaddedpage.cpp
new file mode 100644
index 0000000..2b09ce8
--- /dev/null
+++ b/src/http/pages/recentlyaddedpage.cpp
@@ -0,0 +1,95 @@
+#include "../../../include/http/pages/recentlyaddedpage.h"
+#include "../../../include/global.h"
+#include "../../../include/stringfunctions.h"
+
+#include <Poco/DateTime.h>
+#include <Poco/DateTimeFormatter.h>
+#include <Poco/Timespan.h>
+
+const std::string RecentlyAddedPage::GeneratePage(const std::string &method, const std::map<std::string,std::string> &queryvars)
+{
+	std::string content="";
+	Poco::DateTime date;
+	int count=0;
+	std::string countstr="0";
+
+	if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="delete" && ValidateFormPassword(queryvars))
+	{
+		std::vector<std::string> identityids;
+		CreateArgArray(queryvars,"chkdel",identityids);
+
+		SQLite3DB::Statement del=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID=?;");
+
+		for(std::vector<std::string>::iterator i=identityids.begin(); i!=identityids.end(); i++)
+		{
+			if((*i)!="")
+			{
+				del.Bind(0,(*i));
+				del.Step();
+				del.Reset();
+			}
+		}
+
+	}
+
+	content="<h2>Recently Added Peers</h2>";
+
+	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID, PublicKey, Name, DateAdded, AddedMethod FROM tblIdentity WHERE DateAdded>=? ORDER BY DateAdded DESC;");
+	date-=Poco::Timespan(5,0,0,0,0);
+	st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
+	st.Step();
+
+	content+="<form name=\"frmdel\" method=\"post\">";
+	content+=CreateFormPassword();
+	content+="<input type=\"hidden\" name=\"formaction\" value=\"delete\">";
+	content+="<table class=\"small90\">";
+	content+="<tr><th>Name</th><th>Date Added</th><th>Added Method</th></tr>";
+
+	while(st.RowReturned())
+	{
+		std::string identityidstr="";
+		std::string publickey="";
+		std::string name="";
+		std::string dateadded="";
+		std::string addedmethod="";
+
+		st.ResultText(0,identityidstr);
+		st.ResultText(1,publickey);
+		st.ResultText(2,name);
+		st.ResultText(3,dateadded);
+		st.ResultText(4,addedmethod);
+
+		StringFunctions::Convert(count,countstr);
+
+		content+="<tr>";
+		content+="<td title=\""+publickey+"\">";
+		content+="<a href=\"peerdetails.htm?identityid="+identityidstr+"\">";
+		content+=SanitizeOutput(CreateShortIdentityName(name,publickey));
+		content+="</a>";
+		content+="</td>";
+		content+="<td>"+dateadded+"</td>";
+		content+="<td>"+SanitizeOutput(addedmethod)+"</td>";
+		content+="<td><input type=\"checkbox\" name=\"chkdel["+countstr+"]\" value=\""+identityidstr+"\"></td>";
+		content+="</tr>";
+
+		count++;
+
+		st.Step();
+	}
+	content+="<tr><td colspan=\"4\"><center><input type=\"submit\" value=\"Delete Selected\"></center></td></tr>";
+	content+="</table>";
+
+	return StringFunctions::Replace(m_template,"[CONTENT]",content);
+}
+
+const bool RecentlyAddedPage::WillHandleURI(const std::string &uri)
+{
+	if(uri.find("recentlyadded.")!=std::string::npos)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}