X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fboardspage.cpp;h=43870cec605c50e6b56af4b06fd6c6d423e40a05;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hp=f143d324eb4788f10169c51b85032bdc10f646ec;hpb=4430e7762844c66428b6f822288beb71b7f82b95;p=fms.git

diff --git a/src/http/pages/boardspage.cpp b/src/http/pages/boardspage.cpp
index f143d32..43870ce 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())
 	{
@@ -52,14 +53,20 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 			std::string boarddescription="";
 
 			boardname=(*queryvars.find("boardname")).second;
+			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 AND BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard));");
+		}
 		if((*queryvars.find("formaction")).second=="update")
 		{
 			int boardid;
@@ -147,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 '%' || ? || '%')";
@@ -172,12 +179,18 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 	content+="</tr>";
 
 	content+="<tr>";
-	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\"></td><td><input type=\"submit\" value=\"Add Board\"></form></td>";
+	content+="<td colspan=\"3\"><center>";
+	content+="<form name=\"frmremoveboard\" action=\"boards.htm\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"remove0messages\">Remove boards with 0 messages<input type=\"submit\" value=\"Remove\"></form>";
+	content+="</center></td>";
+	content+="</tr>";
+
+	content+="<tr>";
+	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)
 	{
@@ -186,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);
 
@@ -198,7 +213,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 		content+="<td>"+SanitizeOutput(boardname)+"</td>";
 		content+="<td><input type=\"hidden\" name=\"boardid["+rownumstr+"]\" value=\""+boardidstr+"\">";
 		content+="<input type=\"hidden\" name=\"oldboarddescription["+rownumstr+"]\" value=\""+StringFunctions::Replace(SanitizeOutput(boarddescription),"&nbsp;"," ")+"\">";
-		content+="<input type=\"text\" name=\"boarddescription["+rownumstr+"]\" value=\""+SanitizeOutput(boarddescription)+"\" size=\"40\"></td>";
+		content+="<input type=\"text\" name=\"boarddescription["+rownumstr+"]\" value=\""+SanitizeOutput(boarddescription)+"\" size=\"40\" maxlength=\"50\"></td>";
 		content+="<td>";
 		content+="<input type=\"hidden\" name=\"oldsavereceivedmessages["+rownumstr+"]\" value=\""+savereceivedmessages+"\">";
 		content+="<input type=\"checkbox\" name=\"savereceivedmessages["+rownumstr+"]\" value=\"true\"";
@@ -208,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++;
@@ -227,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++;
@@ -238,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+="</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)