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

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index 5daaa01..502cea6 100644
--- a/src/http/pages/peermaintenancepage.cpp
+++ b/src/http/pages/peermaintenancepage.cpp
@@ -1,6 +1,10 @@
 #include "../../../include/http/pages/peermaintenancepage.h"
 #include "../../../include/stringfunctions.h"
-#include "../../../include/datetime.h"
+
+#include <Poco/DateTime.h>
+#include <Poco/Timestamp.h>
+#include <Poco/Timespan.h>
+#include <Poco/DateTimeFormatter.h>
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -11,7 +15,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	std::string content="";
 	SQLite3DB::Statement st;
 	std::string tempval;
-	DateTime date;
+	Poco::DateTime date;
 
 	if(queryvars.find("formaction")!=queryvars.end())
 	{
@@ -21,10 +25,10 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 		}
 		else if((*queryvars.find("formaction")).second=="removelastseen20")
 		{
-			date.SetToGMTime();
-			date.Add(0,0,0,-20);
+			date=Poco::Timestamp();
+			date-=Poco::Timespan(20,0,0,0,0);
 			st=m_db->Prepare("DELETE FROM tblIdentity WHERE LastSeen<?;");
-			st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+			st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
 		else if((*queryvars.find("formaction")).second=="removeneversent")
@@ -33,46 +37,46 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 		}
 		else if((*queryvars.find("formaction")).second=="removelastseenneversent20")
 		{
-			date.SetToGMTime();
-			date.Add(0,0,0,-20);
+			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.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+			st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
 		else if((*queryvars.find("formaction")).second=="removedaysago" && 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);
+			date=Poco::Timestamp();
+			date-=Poco::Timespan(tempint,0,0,0,0);
 			st=m_db->Prepare("DELETE FROM tblIdentity WHERE LastSeen<?;");
-			st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+			st.Bind(0,Poco::DateTimeFormatter::format(date,"%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);
+			date=Poco::Timestamp();
+			date-=Poco::Timespan(tempint,0,0,0,0);
 			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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
 		else if((*queryvars.find("formaction")).second=="removeposted30daysago")
 		{
-			date.SetToGMTime();
-			date.Add(0,0,0,-30);
+			date=Poco::Timestamp();
+			date-=Poco::Timespan(30,0,0,0,0);
 			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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d"));
 			st.Step();
 		}
 		else if((*queryvars.find("formaction")).second=="removeadded20daysneversent")
 		{
-			date.SetToGMTime();
-			date.Add(0,0,0,-20);
+			date=Poco::Timestamp();
+			date-=Poco::Timespan(20,0,0,0,0);
 			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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 			st.Step();
 		}
 	}
@@ -104,10 +108,10 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</td>";
 	content+="</tr>";
 
-	date.SetToGMTime();
-	date.Add(0,0,0,-20);
+	date=Poco::Timestamp();
+	date-=Poco::Timespan(20,0,0,0,0);
 	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE LastSeen<?;");
-	st.Bind(0,date.Format("%Y-%m-%d %H:%M:%S"));
+	st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 	st.Step();
 	st.ResultText(0,tempval);
 	content+="<tr>";
@@ -121,10 +125,10 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</td>";
 	content+="</tr>";
 
-	date.SetToGMTime();
-	date.Add(0,0,0,-30);
+	date=Poco::Timestamp();
+	date-=Poco::Timespan(30,0,0,0,0);
 	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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d"));
 	st.Step();
 	st.ResultText(0,tempval);
 	content+="<tr>";
@@ -152,10 +156,10 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</td>";
 	content+="</tr>";
 
-	date.SetToGMTime();
-	date.Add(0,0,0,-20);
+	date=Poco::Timestamp();
+	date-=Poco::Timespan(20,0,0,0,0);
 	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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 	st.Step();
 	st.ResultText(0,tempval);
 	content+="<tr>";
@@ -169,10 +173,10 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 	content+="</td>";
 	content+="</tr>";
 
-	date.SetToGMTime();
-	date.Add(0,0,0,-20);
+	date=Poco::Timestamp();
+	date-=Poco::Timespan(20,0,0,0,0);
 	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.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));
 	st.Step();
 	st.ResultText(0,tempval);
 	content+="<tr>";
@@ -200,7 +204,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
 
 	content+="</table>";
 
-	return "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"+StringFunctions::Replace(m_template,"[CONTENT]",content);
+	return StringFunctions::Replace(m_template,"[CONTENT]",content);
 }
 
 const bool PeerMaintenancePage::WillHandleURI(const std::string &uri)