version 0.3.29

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

diff --git a/src/http/pages/forumcreatepostpage.cpp b/src/http/pages/forumcreatepostpage.cpp
index ac9ed16..b211ae3 100644 (file)
--- a/src/http/pages/forumcreatepostpage.cpp
+++ b/src/http/pages/forumcreatepostpage.cpp
@@ -1,6 +1,7 @@
 #include "../../../include/http/pages/forumcreatepostpage.h"\r
 #include "../../../include/stringfunctions.h"\r
 #include "../../../include/message.h"\r
+#include "../../../include/unicode/unicodeformatter.h"\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
@@ -37,7 +38,7 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
                replytomessageidstr=(*queryvars.find("replytomessageid")).second;\r
        }\r
 \r
-       if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="send")\r
+       if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="send" && ValidateFormPassword(queryvars))\r
        {\r
                if(queryvars.find("localidentityid")!=queryvars.end() && (*queryvars.find("localidentityid")).second!="")\r
                {\r
@@ -61,6 +62,7 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
                {\r
                        body=(*queryvars.find("body")).second;\r
                        body=StringFunctions::Replace(body,"\r\n","\n");\r
+                       UnicodeFormatter::LineWrap(body,80,">",body);\r
                }\r
                else\r
                {\r
@@ -69,7 +71,7 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
 \r
                if(error=="")\r
                {\r
-                       Message mess;\r
+                       Message mess(m_db);\r
                        \r
                        long localidentityid=-1;\r
                        long boardid=-1;\r
@@ -110,15 +112,17 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
        {\r
                if(replytomessageidstr!="")\r
                {\r
-                       SQLite3DB::Statement replyst=m_db->Prepare("SELECT Subject, Body FROM tblMessage WHERE MessageID=?;");\r
+                       std::string fromname="";\r
+                       SQLite3DB::Statement replyst=m_db->Prepare("SELECT Subject, Body, FromName FROM tblMessage WHERE MessageID=?;");\r
                        replyst.Bind(0,replytomessageidstr);\r
                        replyst.Step();\r
                        if(replyst.RowReturned())\r
                        {\r
                                replyst.ResultText(0,subject);\r
                                replyst.ResultText(1,body);\r
+                               replyst.ResultText(2,fromname);\r
 \r
-                               if(subject.size()<3 || (subject.substr(0,2)!="re:" && subject.substr(0,2)!="Re:"))\r
+                               if(subject.size()<3 || (subject.substr(0,3)!="re:" && subject.substr(0,3)!="Re:"))\r
                                {\r
                                        subject="Re: "+subject;\r
                                }\r
@@ -148,6 +152,8 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
                                        }\r
                                        body+="\n";\r
                                }\r
+                               body=fromname+" wrote:\n"+body;\r
+\r
                        }\r
                }\r
        }\r
@@ -181,10 +187,11 @@ const std::string ForumCreatePostPage::GeneratePage(const std::string &method, c
                content+="<input type=\"hidden\" name=\"threadid\" value=\""+threadidstr+"\">";\r
                content+="<input type=\"hidden\" name=\"replytomessageid\" value=\""+replytomessageidstr+"\">";\r
                content+="<input type=\"hidden\" name=\"formaction\" value=\"send\">";\r
+               content+=CreateFormPassword();\r
                content+="<table class=\"createpost\">";\r
                content+="<tr><td class=\"identity\">From</td><td>"+LocalIdentityDropDown("localidentityid",localidentityidstr)+"</td></tr>";\r
                content+="<tr><td class=\"subject\">Subject</td><td><input type=\"text\" name=\"subject\" maxlength=\"60\" size=\"60\" value=\""+SanitizeOutput(subject)+"\"></td></tr>";\r
-               content+="<tr><td class=\"body\">Message</td><td><textarea name=\"body\" cols=\"80\" rows=\"30\">"+SanitizeOutput(body)+"</textarea></td></tr>";\r
+               content+="<tr><td class=\"body\">Message</td><td><textarea name=\"body\" cols=\"80\" rows=\"30\">"+SanitizeTextAreaOutput(body)+"</textarea></td></tr>";\r
                content+="<tr><td colspan=\"2\" class=\"send\"><input type=\"submit\" value=\"Send\"></td></tr>";\r
                content+="</table>\r\n";\r
                content+="</form>";\r