version 0.1.15

[fms.git] / src / http / pages / peermaintenancepage.cpp

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index f6cf386..3ded4eb 100644 (file)
--- 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);\r
                        date.SetToGMTime();\r
                        date.Add(0,0,0,-tempint);\r
-                       st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage GROUP BY IdentityID) AND LastSeen<?;");\r
+                       st=m_db->Prepare("DELETE FROM tblIdentity WHERE LastSeen<?;");\r
+                       st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));\r
+                       st.Step();\r
+               }\r
+               else if((*queryvars.find("formaction")).second=="removenulldaysago" && queryvars.find("daysago")!=queryvars.end() && (*queryvars.find("daysago")).second!="")\r
+               {\r
+                       int tempint=10000;\r
+                       StringFunctions::Convert((*queryvars.find("daysago")).second,tempint);\r
+                       date.SetToGMTime();\r
+                       date.Add(0,0,0,-tempint);\r
+                       st=m_db->Prepare("DELETE FROM tblIdentity WHERE LastSeen<? AND LocalMessageTrust IS NULL AND LocalTrustListTrust IS NULL;");\r
                        st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));\r
                        st.Step();\r
                }\r
@@ -132,6 +142,12 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
        content+="<td><input type=\"submit\" value=\"Remove\"></form></td>";\r
        content+="</tr>";\r
 \r
+       content+="<tr>";\r
+       content+="<td><form name=\"frmdelete\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"removenulldaysago\"></td>";\r
+       content+="<td>last seen <input type=\"text\" name=\"daysago\" size=\"2\"> days ago, and have null local trust</td>";\r
+       content+="<td><input type=\"submit\" value=\"Remove\"></form></td>";\r
+       content+="</tr>";\r
+\r
        content+="</table>";\r
 \r
        return "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"+StringFunctions::Replace(m_template,"[CONTENT]",content);\r