X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeermaintenancepage.cpp;h=240c12e822ac2ad77da3966da4bc4a713de2f445;hb=05ef25de71be91442b4cbd22dc7cc45629c5d5bb;hp=502cea608dd556ab52c52ba9fe8199717b1f5071;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index 502cea6..240c12e 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")
 		{
@@ -33,13 +33,13 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 		}
 		else if((*queryvars.find("formaction")).second=="removeneversent")
 		{
-			m_db->Execute("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage GROUP BY IdentityID);");
+			m_db->Execute("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage WHERE IdentityID IS NOT NULL GROUP BY IdentityID);");
 		}
 		else if((*queryvars.find("formaction")).second=="removelastseenneversent20")
 		{
 			date=Poco::Timestamp();
 			date-=Poco::Timespan(20,0,0,0,0);
-			st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage GROUP BY IdentityID) AND LastSeen<?;");
+			st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage WHERE IdentityID IS NOT NULL GROUP BY IdentityID) AND LastSeen<?;");
 			st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
@@ -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>";