version 0.3.13

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

diff --git a/src/http/pages/controlboardpage.cpp b/src/http/pages/controlboardpage.cpp
index c685ca4..5677a91 100644 (file)
--- a/src/http/pages/controlboardpage.cpp
+++ b/src/http/pages/controlboardpage.cpp
@@ -1,6 +1,8 @@
 #include "../../../include/http/pages/controlboardpage.h"\r
 #include "../../../include/stringfunctions.h"\r
-#include "../../../include/datetime.h"\r
+\r
+#include <Poco/DateTime.h>\r
+#include <Poco/DateTimeFormatter.h>\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
@@ -21,7 +23,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
 \r
        if(queryvars.find("formaction")!=queryvars.end())\r
        {\r
-               if((*queryvars.find("formaction")).second=="remove" && queryvars.find("boardid")!=queryvars.end())\r
+               if((*queryvars.find("formaction")).second=="remove" && queryvars.find("boardid")!=queryvars.end() && ValidateFormPassword(queryvars))\r
                {\r
                        int boardid=0;\r
                        StringFunctions::Convert((*queryvars.find("boardid")).second,boardid);\r
@@ -43,13 +45,12 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
                        st.Step();\r
 \r
                }\r
-               if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && (*queryvars.find("boardname")).second!="")\r
+               if((*queryvars.find("formaction")).second=="addboard" && queryvars.find("boardname")!=queryvars.end() && (*queryvars.find("boardname")).second!="" && ValidateFormPassword(queryvars))\r
                {\r
-                       DateTime date;\r
-                       date.SetToGMTime();\r
+                       Poco::DateTime date;\r
                        st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded) VALUES(?,?);");\r
                        st.Bind(0,(*queryvars.find("boardname")).second);\r
-                       st.Bind(1,date.Format("%Y-%m-%d %H:%M:%S"));\r
+                       st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));\r
                        if(st.Step(true))\r
                        {\r
                                boardid=st.GetLastInsertRowID();\r
@@ -89,6 +90,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
                content+="<td>"+changetrustlisttruststr+"</td>\r\n";\r
                content+="<td>";\r
                content+="<form name=\"frmremove\" method=\"POST\">";\r
+               content+=CreateFormPassword();\r
                content+="<input type=\"hidden\" name=\"formaction\" value=\"remove\">";\r
                content+="<input type=\"hidden\" name=\"boardid\" value=\""+boardidstr+"\">";\r
                content+="<input type=\"submit\" value=\"Remove\">";\r
@@ -101,12 +103,13 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
        content+="<tr>";\r
        content+="<td>";\r
        content+="<form name=\"frmaddboard\" method=\"POST\">";\r
+       content+=CreateFormPassword();\r
        content+="<input type=\"hidden\" name=\"formaction\" value=\"addboard\">";\r
        content+="<input type=\"text\" name=\"boardname\">";\r
        content+="</td>\r\n<td>";\r
-       content+="<input type=\"text\" name=\"changemessagetrust\" size=\"2\" maxlength=\"3\">";\r
+       content+="<input type=\"text\" name=\"changemessagetrust\" size=\"2\" maxlength=\"4\">";\r
        content+="</td>\r\n<td>";\r
-       content+="<input type=\"text\" name=\"changetrustlisttrust\" size=\"2\" maxlength=\"3\">";\r
+       content+="<input type=\"text\" name=\"changetrustlisttrust\" size=\"2\" maxlength=\"4\">";\r
        content+="</td>\r\n<td>";\r
        content+="<input type=\"submit\" value=\"Add\">";\r
        content+="</form>";\r
@@ -114,7 +117,7 @@ const std::string ControlBoardPage::GeneratePage(const std::string &method, cons
        content+="</tr>";\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
+       return StringFunctions::Replace(m_template,"[CONTENT]",content);\r
 }\r
 \r
 const bool ControlBoardPage::WillHandleURI(const std::string &uri)\r