X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeermaintenancepage.cpp;h=5daaa01b87f576e7f4ea2751acdb3d89377048a6;hb=18b45335ba24f3b6b6d4f4acfe8c5a5ae845ce00;hp=f7946008933b4bd13a7ce906f06099457c8b6421;hpb=df316253862dc50e8e5a790d9634ef90be37badb;p=fms.git

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index f794600..5daaa01 100644
--- a/src/http/pages/peermaintenancepage.cpp
+++ b/src/http/pages/peermaintenancepage.cpp
@@ -45,7 +45,33 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 			StringFunctions::Convert((*queryvars.find("daysago")).second,tempint);
 			date.SetToGMTime();
 			date.Add(0,0,0,-tempint);
-			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 LastSeen<?;");
+			st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+			st.Step();
+		}
+		else if((*queryvars.find("formaction")).second=="removenulldaysago" && queryvars.find("daysago")!=queryvars.end() && (*queryvars.find("daysago")).second!="")
+		{
+			int tempint=10000;
+			StringFunctions::Convert((*queryvars.find("daysago")).second,tempint);
+			date.SetToGMTime();
+			date.Add(0,0,0,-tempint);
+			st=m_db->Prepare("DELETE FROM tblIdentity WHERE LastSeen<? AND LocalMessageTrust IS NULL AND LocalTrustListTrust IS NULL;");
+			st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+			st.Step();
+		}
+		else if((*queryvars.find("formaction")).second=="removeposted30daysago")
+		{
+			date.SetToGMTime();
+			date.Add(0,0,0,-30);
+			st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID IN (SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE (SELECT MAX(MessageDate) FROM tblMessage WHERE tblMessage.IdentityID=tblIdentity.IdentityID)<=? GROUP BY tblIdentity.IdentityID);");
+			st.Bind(0,date.Format("%Y-%m-%d"));
+			st.Step();
+		}
+		else if((*queryvars.find("formaction")).second=="removeadded20daysneversent")
+		{
+			date.SetToGMTime();
+			date.Add(0,0,0,-20);
+			st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID IN (SELECT tblIdentity.IdentityID FROM tblIdentity LEFT JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE tblMessage.IdentityID IS NULL AND tblIdentity.DateAdded<?);");
 			st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
@@ -95,6 +121,23 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</td>";
 	content+="</tr>";
 
+	date.SetToGMTime();
+	date.Add(0,0,0,-30);
+	st=m_db->Prepare("SELECT COUNT(*) FROM (SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE (SELECT MAX(MessageDate) FROM tblMessage WHERE tblMessage.IdentityID=tblIdentity.IdentityID)<=? GROUP BY tblIdentity.IdentityID);");
+	st.Bind(0,date.Format("%Y-%m-%d"));
+	st.Step();
+	st.ResultText(0,tempval);
+	content+="<tr>";
+	content+="<td>"+tempval+"</td>";
+	content+="<td>last sent a message more than 30 days ago</td>";
+	content+="<td>";
+	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+="<input type=\"hidden\" name=\"formaction\" value=\"removeposted30daysago\">";
+	content+="<input type=\"submit\" value=\"Remove\">";
+	content+="</form>";
+	content+="</td>";
+	content+="</tr>";
+
 	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity LEFT JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE tblMessage.IdentityID IS NULL;");
 	st.Step();
 	st.ResultText(0,tempval);
@@ -111,6 +154,23 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 
 	date.SetToGMTime();
 	date.Add(0,0,0,-20);
+	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity LEFT JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE tblMessage.IdentityID IS NULL AND tblIdentity.DateAdded<?;");
+	st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+	st.Step();
+	st.ResultText(0,tempval);
+	content+="<tr>";
+	content+="<td>"+tempval+"</td>";
+	content+="<td>added more than 20 days ago and never sent a message</td>";
+	content+="<td>";
+	content+="<form name=\"frmremove\" method=\"POST\">";
+	content+="<input type=\"hidden\" name=\"formaction\" value=\"removeadded20daysneversent\">";
+	content+="<input type=\"submit\" value=\"Remove\">";
+	content+="</form>";
+	content+="</td>";
+	content+="</tr>";
+
+	date.SetToGMTime();
+	date.Add(0,0,0,-20);
 	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity LEFT JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID WHERE tblMessage.IdentityID IS NULL AND tblIdentity.LastSeen<?;");
 	st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
 	st.Step();
@@ -132,6 +192,12 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	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>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>";
+
 	content+="</table>";
 
 	return "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"+StringFunctions::Replace(m_template,"[CONTENT]",content);
@@ -147,4 +213,4 @@ const bool PeerMaintenancePage::WillHandleURI(const std::string &uri)
 	{
 		return false;
 	}
-}
\ No newline at end of file
+}