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

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index f794600..3ded4eb 100644
--- a/src/http/pages/peermaintenancepage.cpp
+++ b/src/http/pages/peermaintenancepage.cpp
@@ -45,7 +45,17 @@ 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();
 		}
@@ -132,6 +142,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 +163,4 @@ const bool PeerMaintenancePage::WillHandleURI(const std::string &uri)
 	{
 		return false;
 	}
-}
\ No newline at end of file
+}