X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fboardspage.cpp;h=8b2866ed8421a5bd71757c2545b5782c819783e3;hp=ed8d46965d390ebd3e6d3e552c41dc852da9b40e;hb=026dc6b2bc548c945359c4e166eff514f2c47c6a;hpb=8a0a83a78390f22f99d4487cda2569909dfbc28e

diff --git a/src/http/pages/boardspage.cpp b/src/http/pages/boardspage.cpp
index ed8d469..8b2866e 100644
--- a/src/http/pages/boardspage.cpp
+++ b/src/http/pages/boardspage.cpp
@@ -1,6 +1,8 @@
 #include "../../../include/http/pages/boardspage.h"
 #include "../../../include/stringfunctions.h"
-#include "../../../include/datetime.h"
+
+#include <Poco/DateTime.h>
+#include <Poco/DateTimeFormatter.h>
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -41,8 +43,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 	std::string startrowstr="0";
 	std::string boardsearch="";
 	std::string sql="";
-	DateTime now;
-	now.SetToGMTime();
+	Poco::DateTime now;
 
 	if(queryvars.find("formaction")!=queryvars.end())
 	{
@@ -55,15 +56,16 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 			StringFunctions::LowerCase(boardname,boardname);
 			boarddescription=(*queryvars.find("boarddescription")).second;
 
-			SQLite3DB::Statement addst=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES(?,?,?);");
+			SQLite3DB::Statement addst=m_db->Prepare("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,AddedMethod) VALUES(?,?,?,?);");
 			addst.Bind(0,boardname);
 			addst.Bind(1,boarddescription);
-			addst.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));
+			addst.Bind(2,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
+			addst.Bind(3,"Added manually");
 			addst.Step();
 		}
 		if((*queryvars.find("formaction")).second=="remove0messages")
 		{
-			m_db->Execute("DELETE FROM tblBoard WHERE BoardID IN (SELECT BoardID FROM vwBoardStats WHERE MessageCount=0);");
+			m_db->Execute("DELETE FROM tblBoard WHERE BoardID IN (SELECT BoardID FROM vwBoardStats WHERE MessageCount=0 AND BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard));");
 		}
 		if((*queryvars.find("formaction")).second=="update")
 		{
@@ -152,7 +154,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 	st.Finalize();
 
 
-	sql="SELECT BoardID,BoardName,BoardDescription,SaveReceivedMessages FROM tblBoard WHERE BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard)";
+	sql="SELECT BoardID,BoardName,BoardDescription,SaveReceivedMessages,AddedMethod FROM tblBoard WHERE BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard)";
 	if(boardsearch!="")
 	{
 		sql+=" AND (BoardName LIKE '%' || ? || '%' OR BoardDescription LIKE '%' || ? || '%')";
@@ -186,9 +188,9 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 	content+="<td><form name=\"frmaddboard\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"addboard\"><input type=\"text\" name=\"boardname\"></td><td><input type=\"text\" name=\"boarddescription\" size=\"40\" maxlength=\"50\"></td><td><input type=\"submit\" value=\"Add Board\"></form></td>";
 	content+="</tr>";
 
-	content+="<tr><td colspan=\"3\"><hr><form name=\"frmboards\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\"></td></tr>";
+	content+="<tr><td colspan=\"4\"><hr><form name=\"frmboards\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\"></td></tr>";
 	content+="<tr>";
-	content+="<th>Name</th><th>Description</th><th>Save Received Messages *</th>";
+	content+="<th>Name</th><th>Description</th><th>Save Received Messages *</th><th>Added Method</th>";
 	content+="</tr>";	
 	while(st.RowReturned() && rownum<rowsperpage)
 	{
@@ -197,11 +199,13 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 		std::string boardname="";
 		std::string boarddescription="";
 		std::string savereceivedmessages="";
+		std::string addedmethod="";
 
 		st.ResultText(0,boardidstr);
 		st.ResultText(1,boardname);
 		st.ResultText(2,boarddescription);
 		st.ResultText(3,savereceivedmessages);
+		st.ResultText(4,addedmethod);
 
 		StringFunctions::Convert(rownum,rownumstr);
 
@@ -219,6 +223,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 		}
 		content+=">";
 		content+="</td>";
+		content+="<td class=\"smaller\">"+SanitizeOutput(addedmethod)+"</td>";
 		content+="</tr>\r\n";
 		st.Step();
 		rownum++;
@@ -238,7 +243,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 		}
 		if(startrow+rowsperpage<boardcount)
 		{
-			while(cols<2)
+			while(cols<3)
 			{
 				content+="<td></td>";
 				cols++;
@@ -249,14 +254,14 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 	}
 
 	content+="<tr>";
-	content+="<td colspan=\"3\"><center><input type=\"submit\" value=\"Update\"></center></form></td>";
+	content+="<td colspan=\"4\"><center><input type=\"submit\" value=\"Update\"></center></form></td>";
 	content+="</tr>";
 	content+="</table>";
 	content+="<p class=\"paragraph\">";
-	content+="* If you uncheck this box, any new messages you download that are posted to this board will be discarded.";
+	content+="* If you uncheck this box, any new messages you download that are posted to this board will be discarded.  When multiple local identities are used, it is best not to discard messages from any boards, as identifying which identities are the same person is much easier when their message lists are missing messages from the same boards.";
 	content+="</p>";
 
-	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 BoardsPage::WillHandleURI(const std::string &uri)