version 0.3.16

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

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