FMS : Freenet Message System

Could not open forum-template.htm! Place in program directory and restart!

data(len,0); + fseek(infile,0,SEEK_SET); + fread(&data[0],1,len,infile); + fclose(infile); + forumtemplate.assign(data.begin(),data.end()); + } + else + { + m_log->error("HTTPThread::HTTPThread could not open forum-template.htm"); + } + // push back page handlers m_pagehandlers.push_back(new OptionsPage(templatestr)); m_pagehandlers.push_back(new CreateIdentityPage(templatestr)); @@ -56,6 +81,13 @@ FMSHTTPRequestHandlerFactory::FMSHTTPRequestHandlerFactory() m_pagehandlers.push_back(new PeerTrustPage(templatestr)); m_pagehandlers.push_back(new VersionInfoPage(templatestr)); m_pagehandlers.push_back(new RecentlyAddedPage(templatestr)); + m_pagehandlers.push_back(new BrowseBoardsPage(templatestr)); + m_pagehandlers.push_back(new BrowseMessagesPage(templatestr)); + m_pagehandlers.push_back(new ShowImagePage()); + m_pagehandlers.push_back(new ForumMainPage(forumtemplate)); + m_pagehandlers.push_back(new ForumThreadsPage(forumtemplate)); + m_pagehandlers.push_back(new ForumViewThreadPage(forumtemplate)); + m_pagehandlers.push_back(new ForumCreatePostPage(forumtemplate)); // homepage must be last - catch all page handler m_pagehandlers.push_back(new HomePage(templatestr)); diff --git a/src/http/ipagehandler.cpp b/src/http/ipagehandler.cpp index c9e4a1a..52e96f6 100644 --- a/src/http/ipagehandler.cpp +++ b/src/http/ipagehandler.cpp @@ -197,3 +197,15 @@ const bool IPageHandler::ValidateFormPassword(const std::mapSelect Identity : "; content+=CreateLocalIdentityDropDown("localidentityid",""); content+=""; - content+="Type the answers of a few of the following puzzles. You don't need to get them all correct, but remember that they are case sensitive. Getting announced will take some time. DO NOT continuously solve captchas. Solve 30 at most, wait a day, and if your identity has not been announced, repeat until it is."; + content+="Type the answers of a few of the following puzzles. You don't need to get them all correct, but remember that they are case sensitive. Getting announced will take some time and you must assign trust to other identities to see yourself announced. DO NOT continuously solve captchas. Solve 30 at most, wait a day, and if your identity has not been announced, repeat until it is."; content+=""; date-=Poco::Timespan(1,0,0,0,0); @@ -98,7 +98,7 @@ const std::string AnnounceIdentityPage::GeneratePage(const std::string &method, if(st.RowReturned()==false) { - content+="You must wait for some puzzles to be downloaded. Check back later."; + content+="You must wait for some puzzles to be downloaded. Make sure you have assigned trust to some other identities' trust lists and check back later."; } while(st.RowReturned() && shown<20) diff --git a/src/http/pages/boardspage.cpp b/src/http/pages/boardspage.cpp index e9cc2a3..397aefa 100644 --- a/src/http/pages/boardspage.cpp +++ b/src/http/pages/boardspage.cpp @@ -75,23 +75,29 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std: std::vector descriptions; std::vector oldsavemessages; std::vector savemessages; + std::vector oldforums; + std::vector forums; CreateArgArray(queryvars,"boardid",boardids); CreateArgArray(queryvars,"oldboarddescription",olddescriptions); CreateArgArray(queryvars,"boarddescription",descriptions); CreateArgArray(queryvars,"oldsavereceivedmessages",oldsavemessages); CreateArgArray(queryvars,"savereceivedmessages",savemessages); + CreateArgArray(queryvars,"oldforum",oldforums); + CreateArgArray(queryvars,"forum",forums); olddescriptions.resize(boardids.size(),""); descriptions.resize(boardids.size(),""); oldsavemessages.resize(boardids.size(),""); savemessages.resize(boardids.size(),""); + oldforums.resize(boardids.size(),""); + forums.resize(boardids.size(),""); - SQLite3DB::Statement updatest=m_db->Prepare("UPDATE tblBoard SET BoardDescription=?, SaveReceivedMessages=? WHERE BoardID=?;"); + SQLite3DB::Statement updatest=m_db->Prepare("UPDATE tblBoard SET BoardDescription=?, SaveReceivedMessages=?, Forum=? WHERE BoardID=?;"); for(int i=0; i"; content+=""; content+=""; @@ -190,7 +204,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std: content+="

"+CreateFormPassword()+""; content+=""; - content+="NameDescriptionSave Received Messages *Added Method"; + content+="NameDescriptionSave Received Messages *ForumAdded Method"; content+=""; while(st.RowReturned() && rownum"+SanitizeOutput(addedmethod)+""; + content+=""; + content+=""; + content+=""; content+="\r\n"; st.Step(); rownum++; @@ -238,17 +263,17 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std: if(startrow>0) { StringFunctions::Convert(startrow-rowsperpage,tempstr); - content+="<-- Previous Page"; - cols+=1; + content+="<-- Previous Page"; + cols+=2; } if(startrow+rowsperpageNext Page -->"; + content+="Next Page -->"; } content+=""; } diff --git a/src/http/pages/browseboardspage.cpp b/src/http/pages/browseboardspage.cpp new file mode 100644 index 0000000..e759cd6 --- /dev/null +++ b/src/http/pages/browseboardspage.cpp @@ -0,0 +1,212 @@ +#include "../../../include/http/pages/browseboardspage.h" +#include "../../../include/stringfunctions.h" + +#ifdef XMEM + #include +#endif + +const std::string BrowseBoardsPage::BuildQueryString(const long startrow, const std::string &boardsearch, const std::string &sortby, const std::string &sortorder) +{ + std::string returnval=""; + std::string tempval=""; + + if(startrow>=0) + { + StringFunctions::Convert(startrow,tempval); + returnval+="startrow="+tempval; + } + + if(boardsearch!="") + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="boardsearch="+boardsearch; + } + + if(sortby!="") + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="sortby="+sortby; + if(sortorder=="ASC" || sortorder=="DESC") + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="sortorder="+sortorder; + } + else + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="sortorder=ASC"; + } + } + + return returnval; + +} + +const std::string BrowseBoardsPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + std::string content=""; + std::string sql=""; + std::string boardname=""; + int rowsperpage=25; + std::string rowsperpagestr="26"; // 1 more than rowsperpage so we know if there are more boards + long startrow=0; + std::string startrowstr="0"; + int messagecount=0; + std::string messagecountstr="0"; + std::string lastdate=""; + int count=0; + std::string boardsearch=""; + std::string sortby=""; + std::string sortorder=""; + + // if startrow is specified + if(queryvars.find("startrow")!=queryvars.end()) + { + startrowstr=(*queryvars.find("startrow")).second; + // convert back and forth, just in case a number wasn't passed in startrow + StringFunctions::Convert(startrowstr,startrow); + if(startrow<0) + { + startrow=0; + } + StringFunctions::Convert(startrow,startrowstr); + } + if(queryvars.find("boardsearch")!=queryvars.end()) + { + boardsearch=(*queryvars.find("boardsearch")).second; + } + if(queryvars.find("sortby")!=queryvars.end() && queryvars.find("sortorder")!=queryvars.end()) + { + sortby=(*queryvars.find("sortby")).second; + sortorder=(*queryvars.find("sortorder")).second; + if(sortby!="BoardName" && sortby!="MessageCount" && sortby!="LastMessage") + { + sortby="BoardName"; + } + if(sortorder!="ASC" && sortorder!="DESC") + { + sortorder="ASC"; + } + } + else + { + sortby="BoardName"; + sortorder="ASC"; + } + + content="

Browse Messages

"; + content+=""; + content+=""; + content+=""; + content+=""; + + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + + sql="SELECT tblBoard.BoardID, tblBoard.BoardName, COUNT(tblMessageBoard.MessageID) AS 'MessageCount', MAX(tblMessage.MessageDate || ' ' || tblMessage.MessageTime) AS 'LastMessage'"; + sql+="FROM tblBoard LEFT JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID "; + sql+="LEFT JOIN tblMessage ON tblMessageBoard.MessageID=tblMessage.MessageID "; + sql+="WHERE (tblMessageBoard.MessageID>=0 OR tblMessageBoard.MessageID IS NULL) "; + if(boardsearch!="") + { + sql+="AND tblBoard.BoardName LIKE '%' || ? || '%' "; + } + sql+="GROUP BY tblBoard.BoardID "; + sql+="ORDER BY "+sortby+" COLLATE NOCASE "+sortorder+" "; + sql+="LIMIT "+startrowstr+","+rowsperpagestr+";"; + + SQLite3DB::Statement st=m_db->Prepare(sql); + if(boardsearch!="") + { + st.Bind(0,boardsearch); + } + + st.Step(); + while(st.RowReturned() && count++"+SanitizeOutput(boardname)+""; + content+=""; + content+=""; + content+="\r\n"; + st.Step(); + } + + if(startrow>0 || st.RowReturned()) + { + content+=""; + + if(startrow>0) + { + int thisstartrow=startrow-rowsperpage; + if(thisstartrow<0) + { + thisstartrow=0; + } + content+=""; + } + else + { + content+=""; + } + + content+=""; + + if(st.RowReturned()) + { + int thisstartrow=startrow+rowsperpage; + content+=""; + } + + content+=""; + } + content+="

Board	Message Count	Last Message
"+SanitizeOutput(messagecountstr)+"	"+SanitizeOutput(lastdate)+"
<--			-->

"; + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} + +const std::string BrowseBoardsPage::ReverseSort(const std::string &sortname, const std::string ¤tsortby, const std::string ¤tsortorder) +{ + if(sortname==currentsortby) + { + if(currentsortorder=="ASC") + { + return "DESC"; + } + else + { + return "ASC"; + } + } + else + { + return currentsortorder; + } +} diff --git a/src/http/pages/browsemessagespage.cpp b/src/http/pages/browsemessagespage.cpp new file mode 100644 index 0000000..9601064 --- /dev/null +++ b/src/http/pages/browsemessagespage.cpp @@ -0,0 +1,265 @@ +#include "../../../include/http/pages/browsemessagespage.h" +#include "../../../include/stringfunctions.h" +#include "../../../include/global.h" +#include "../../../include/messagethread.h" + +#ifdef XMEM + #include +#endif + +const std::string BrowseMessagesPage::BuildQueryString(const long startrow, const std::string &boardidstr, const std::string &messageidstr) +{ + std::string returnval=""; + std::string tempval=""; + + if(startrow>=0) + { + StringFunctions::Convert(startrow,tempval); + returnval+="startrow="+tempval; + } + + if(boardidstr!="") + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="boardid="+boardidstr; + } + + if(messageidstr!="") + { + if(returnval!="") + { + returnval+="&"; + } + returnval+="messageid="+messageidstr; + } + + return returnval; + +} + +const std::string BrowseMessagesPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + std::string content=""; + long boardid=-1; + std::string boardidstr=""; + std::string messageidstr=""; + int startrow=0; + std::string startrowstr="0"; + int rowsperpage=50; + std::string rowsperpagestr="51"; // one more than rowsperpage so we can know if there are more messages + std::string sql=""; + int rowcount=0; + int page=0; + + // if startrow is specified + if(queryvars.find("startrow")!=queryvars.end()) + { + startrowstr=(*queryvars.find("startrow")).second; + // convert back and forth, just in case a number wasn't passed in startrow + StringFunctions::Convert(startrowstr,startrow); + if(startrow<0) + { + startrow=0; + } + StringFunctions::Convert(startrow,startrowstr); + } + if(queryvars.find("boardid")!=queryvars.end()) + { + boardidstr=(*queryvars.find("boardid")).second; + StringFunctions::Convert(boardidstr,boardid); + } + if(queryvars.find("messageid")!=queryvars.end()) + { + messageidstr=(*queryvars.find("messageid")).second; + page=1; + } + + if(page==0) + { + sql="SELECT Subject, FromName, MessageDate || ' ' || MessageTime, Body, tblMessage.MessageID "; + sql+="FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID "; + if(boardidstr!="") + { + sql+="WHERE tblMessageBoard.BoardID=? "; + } + sql+="ORDER BY MessageDate || ' ' || MessageTime DESC "; + sql+="LIMIT "+startrowstr+","+rowsperpagestr+";"; + + SQLite3DB::Statement st=m_db->Prepare(sql); + if(boardidstr!="") + { + st.Bind(0,boardidstr); + } + st.Step(); + + content+=""; + content+=""; + + rowcount=0; + while(st.RowReturned() && rowcount++400) + { + body.erase(400); + body+="..."; + } + + content+=""; + content+=""; + content+=""; + content+=""; + content+="\r\n"; + + st.Step(); + } + + if(startrow>0 || st.RowReturned()) + { + content+=""; + + if(startrow>0) + { + int thisstartrow=startrow-rowsperpage; + if(thisstartrow<0) + { + thisstartrow=0; + } + content+=""; + } + else + { + content+=""; + } + + content+=""; + + if(st.RowReturned()) + { + int thisstartrow=startrow+rowsperpage; + content+=""; + } + content+=""; + } + + content+="

Subject	From	Date
"+SanitizeOutput(subject)+"	"+fromname+"	"+SanitizeOutput(messagedate)+"
<--			-->

"; + } + else if(page==1) + { + sql="SELECT Body, FromName, MessageDate || ' ' || MessageTime, Subject FROM tblMessage WHERE MessageID=?;"; + SQLite3DB::Statement st=m_db->Prepare(sql); + st.Bind(0,messageidstr); + + st.Step(); + if(st.RowReturned()) + { + std::string body=""; + std::string fromname=""; + std::string messagedate=""; + std::string subject=""; + std::string boards=""; + + st.ResultText(0,body); + st.ResultText(1,fromname); + st.ResultText(2,messagedate); + st.ResultText(3,subject); + + // get boards message was posted to + SQLite3DB::Statement st2=m_db->Prepare("SELECT tblBoard.BoardID, tblBoard.BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;"); + st2.Bind(0,messageidstr); + st2.Step(); + while(st2.RowReturned()) + { + std::string boardname=""; + std::string innerboardidstr=""; + + st2.ResultText(0,innerboardidstr); + st2.ResultText(1,boardname); + + if(boards!="") + { + boards+=", "; + } + + boards+=""+SanitizeOutput(boardname)+""; + + st2.Step(); + } + + content+="

"; + content+="

"; + content+=boards; + content+="

"; + content+="

"; + content+=SanitizeOutput(subject); + content+="

"; + content+="

"; + content+=SanitizeOutput(fromname); + content+="

"; + content+="

"; + content+=SanitizeOutput(messagedate); + content+="

"; + content+="

"; + content+=SanitizeOutput(body); + content+="

"; + content+="

\r\n"; + + long currentlevel=0; + MessageThread thread; + thread.Load(messageidstr,boardid); + + std::vector nodes=thread.GetNodes(); + if(nodes.size()>1) + { + content+="

::const_iterator i=nodes.begin(); i!=nodes.end(); i++) + { + if((*i).m_level>currentlevel) + { + content+="

"+SanitizeOutput((*i).m_subject)+" - "+SanitizeOutput((*i).m_fromname); + } + else + { + content+=SanitizeOutput((*i).m_subject)+" - "+SanitizeOutput((*i).m_fromname); + } + content+="\r\n"; + } + while(currentlevel-->0) + { + content+="

"; + } + content+="

\r\n"; + } + } + } + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} diff --git a/src/http/pages/forumcreatepostpage.cpp b/src/http/pages/forumcreatepostpage.cpp new file mode 100644 index 0000000..ac9ed16 --- /dev/null +++ b/src/http/pages/forumcreatepostpage.cpp @@ -0,0 +1,227 @@ +#include "../../../include/http/pages/forumcreatepostpage.h" +#include "../../../include/stringfunctions.h" +#include "../../../include/message.h" + +#ifdef XMEM + #include +#endif + +const std::string ForumCreatePostPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + int page=0; + std::string content=""; + std::string boardidstr=""; + std::string currentpagestr=""; + std::string threadidstr=""; + std::string replytomessageidstr=""; + std::string error=""; + std::string boardname=""; + std::string subject=""; + std::string body=""; + std::string localidentityidstr=""; + + if(queryvars.find("boardid")!=queryvars.end()) + { + boardidstr=(*queryvars.find("boardid")).second; + } + if(queryvars.find("currentpage")!=queryvars.end()) + { + currentpagestr=(*queryvars.find("currentpage")).second; + } + if(queryvars.find("threadid")!=queryvars.end()) + { + threadidstr=(*queryvars.find("threadid")).second; + } + if(queryvars.find("replytomessageid")!=queryvars.end()) + { + replytomessageidstr=(*queryvars.find("replytomessageid")).second; + } + + if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="send") + { + if(queryvars.find("localidentityid")!=queryvars.end() && (*queryvars.find("localidentityid")).second!="") + { + localidentityidstr=(*queryvars.find("localidentityid")).second; + } + else + { + error="You must select a local identity as the sender
"; + } + + if(queryvars.find("subject")!=queryvars.end() && (*queryvars.find("subject")).second!="") + { + subject=(*queryvars.find("subject")).second; + } + else + { + error+="You must enter a subject
"; + } + + if(queryvars.find("body")!=queryvars.end() && (*queryvars.find("body")).second!="") + { + body=(*queryvars.find("body")).second; + body=StringFunctions::Replace(body,"\r\n","\n"); + } + else + { + error+="You must enter a message body
"; + } + + if(error=="") + { + Message mess; + + long localidentityid=-1; + long boardid=-1; + std::string references=""; + + StringFunctions::Convert(localidentityidstr,localidentityid); + StringFunctions::Convert(boardidstr,boardid); + + if(replytomessageidstr!="") + { + SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessage WHERE MessageID=?;"); + st.Bind(0,replytomessageidstr); + st.Step(); + if(st.RowReturned()) + { + st.ResultText(0,references); + } + } + + if(mess.Create(localidentityid,boardid,subject,body,references)) + { + if(mess.PostedToAdministrationBoard()==true) + { + mess.HandleAdministrationMessage(); + } + if(mess.StartFreenetInsert()) + { + page=1; + } + } + else + { + error="Could not create message"; + } + } + } + else + { + if(replytomessageidstr!="") + { + SQLite3DB::Statement replyst=m_db->Prepare("SELECT Subject, Body FROM tblMessage WHERE MessageID=?;"); + replyst.Bind(0,replytomessageidstr); + replyst.Step(); + if(replyst.RowReturned()) + { + replyst.ResultText(0,subject); + replyst.ResultText(1,body); + + if(subject.size()<3 || (subject.substr(0,2)!="re:" && subject.substr(0,2)!="Re:")) + { + subject="Re: "+subject; + } + + if(body.size()>0) + { + if(body[0]=='>') + { + body=">"+body; + } + else + { + body="> "+body; + } + std::string::size_type pos=body.find("\n"); + while(pos!=std::string::npos) + { + if(pos+1') + { + body.insert(pos+1,">"); + } + else + { + body.insert(pos+1,"> "); + } + pos=body.find("\n",pos+2); + } + body+="\n"; + } + } + } + } + + SQLite3DB::Statement boardnamest=m_db->Prepare("SELECT BoardName FROM tblBoard WHERE BoardID=?;"); + boardnamest.Bind(0,boardidstr); + boardnamest.Step(); + if(boardnamest.RowReturned()) + { + boardnamest.ResultText(0,boardname); + } + + content+=CreateForumHeader(); + + content+=""; + content+=""; + content+=""; + content+=""; + content+="

Forum : "+SanitizeOutput(boardname)+"

\r\n"; + + if(error!="") + { + content+="

"+error+"

\r\n"; + } + + if(page==0) + { + content+=""; + } + else if(page==1) + { + content+="You have sent your message. It will show up in the thread after it has been successfully inserted and retrieved by FMS."; + } + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} + +const std::string ForumCreatePostPage::LocalIdentityDropDown(const std::string &name, const std::string &selectedid) +{ + std::string html=""; + return html; +} diff --git a/src/http/pages/forummainpage.cpp b/src/http/pages/forummainpage.cpp new file mode 100644 index 0000000..ae97874 --- /dev/null +++ b/src/http/pages/forummainpage.cpp @@ -0,0 +1,93 @@ +#include "../../../include/http/pages/forummainpage.h" +#include "../../../include/stringfunctions.h" + +#ifdef XMEM + #include +#endif + +const std::string ForumMainPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + std::string content=""; + + content+=CreateForumHeader(); + + content+="\r\n"; + content+="\r\n"; + + SQLite3DB::Statement newmessagesst=m_db->Prepare("SELECT tblMessage.MessageID FROM tblMessage INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID INNER JOIN tblThreadPost ON tblMessage.MessageID=tblThreadPost.MessageID WHERE tblMessageBoard.BoardID=? AND tblMessage.Read=0 LIMIT 0,1;"); + SQLite3DB::Statement lastmessagest=m_db->Prepare("SELECT tblMessage.MessageID, tblMessage.IdentityID, tblMessage.FromName, tblMessage.Subject, tblMessage.MessageDate || ' ' || tblMessage.MessageTime, tblThread.ThreadID FROM tblMessage INNER JOIN tblThreadPost ON tblMessage.MessageID=tblThreadPost.MessageID INNER JOIN tblThread ON tblThreadPost.ThreadID=tblThread.ThreadID WHERE tblThread.BoardID=? ORDER BY tblMessage.MessageDate || tblMessage.MessageTime DESC LIMIT 0,1;"); + + SQLite3DB::Statement st=m_db->Prepare("SELECT tblBoard.BoardID, BoardName, BoardDescription, COUNT(tblThreadPost.MessageID) FROM tblBoard LEFT JOIN tblThread ON tblBoard.BoardID=tblThread.BoardID LEFT JOIN tblThreadPost ON tblThread.ThreadID=tblThreadPost.ThreadID WHERE Forum='true' GROUP BY tblBoard.BoardID ORDER BY BoardName COLLATE NOCASE;"); + st.Step(); + while(st.RowReturned()) + { + int boardid=-1; + std::string boardidstr="-1"; + std::string boardname=""; + std::string boarddescription=""; + std::string postcountstr=""; + + st.ResultInt(0,boardid); + st.ResultText(0,boardidstr); + st.ResultText(1,boardname); + st.ResultText(2,boarddescription); + st.ResultText(3,postcountstr); + + content+=""; + content+=""; + + content+=""; + content+=""; + + lastmessagest.Bind(0,boardid); + lastmessagest.Step(); + content+=""; + lastmessagest.Reset(); + + content+="\r\n"; + st.Step(); + } + + content+="

New	Forum	Posts	Last Post
"; + + newmessagesst.Bind(0,boardid); + newmessagesst.Step(); + if(newmessagesst.RowReturned()) + { + content+=" $\"New$ "; + } + else + { + content+=" $\"No$ "; + } + newmessagesst.Reset(); + + content+="	"; + content+=""+SanitizeOutput(boardname)+" "; + content+=""+SanitizeOutput(boarddescription)+""; + content+="	"; + content+=postcountstr+" posts"; + content+="	"; + if(lastmessagest.RowReturned()) + { + std::string messageidstr=""; + std::string identityidstr=""; + std::string fromname=""; + std::string messagedate=""; + std::string subject=""; + std::string threadidstr=""; + + lastmessagest.ResultText(0,messageidstr); + lastmessagest.ResultText(1,identityidstr); + lastmessagest.ResultText(2,fromname); + lastmessagest.ResultText(3,subject); + lastmessagest.ResultText(4,messagedate); + lastmessagest.ResultText(5,threadidstr); + + content+="Last post on "+messagedate+" in "; + content+=""+FixSubject(subject)+" by "+FixFromName(fromname)+""; + } + content+="

\r\n"; + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} diff --git a/src/http/pages/forumthreadspage.cpp b/src/http/pages/forumthreadspage.cpp new file mode 100644 index 0000000..0777fe1 --- /dev/null +++ b/src/http/pages/forumthreadspage.cpp @@ -0,0 +1,197 @@ +#include "../../../include/http/pages/forumthreadspage.h" +#include "../../../include/stringfunctions.h" +#include + +const std::string ForumThreadsPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + int currentpage=1; + std::string currentpagestr="1"; + std::string content=""; + int startrow=0; + std::string startrowstr="0"; + int rowsperpage=25; + std::string rowsperpagestr="25"; + std::string sql=""; + int boardid=-1; + std::string boardidstr="-1"; + int count=0; + int threadcount=0; + SQLite3DB::Statement newthreadpostst=m_db->Prepare("SELECT tblMessage.MessageID FROM tblThreadPost INNER JOIN tblMessage ON tblThreadPost.MessageID=tblMessage.MessageID WHERE tblThreadPost.ThreadID=? AND tblMessage.Read=0 LIMIT 0,1;"); + SQLite3DB::Statement replycountst=m_db->Prepare("SELECT COUNT(*)-1 FROM tblThreadPost WHERE ThreadID=?;"); + SQLite3DB::Statement boardnamest=m_db->Prepare("SELECT tblBoard.BoardName FROM tblBoard WHERE BoardID=?;"); + SQLite3DB::Statement threadcountst=m_db->Prepare("SELECT COUNT(*) FROM tblThread WHERE BoardID=?;"); + + if(queryvars.find("boardid")!=queryvars.end()) + { + boardidstr=(*queryvars.find("boardid")).second; + StringFunctions::Convert(boardidstr,boardid); + } + if(queryvars.find("currentpage")!=queryvars.end()) + { + currentpagestr=(*queryvars.find("currentpage")).second; + StringFunctions::Convert(currentpagestr,currentpage); + if(currentpage<0) + { + currentpage=0; + } + StringFunctions::Convert(currentpage,currentpagestr); + } + if(queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="markallread" && boardid!=-1) + { + SQLite3DB::Statement markst=m_db->Prepare("UPDATE tblMessage SET Read=1 WHERE tblMessage.Read=0 AND tblMessage.MessageID IN (SELECT MessageID FROM tblThread INNER JOIN tblThreadPost ON tblThread.ThreadID=tblThreadPost.ThreadID WHERE tblThread.BoardID=?);"); + markst.Bind(0,boardid); + markst.Step(); + } + + startrow=(currentpage-1)*rowsperpage; + StringFunctions::Convert(startrow,startrowstr); + + content+=CreateForumHeader(); + + content+=""; + content+=""; + + boardnamest.Bind(0,boardid); + boardnamest.Step(); + if(boardnamest.RowReturned()) + { + std::string boardname=""; + boardnamest.ResultText(0,boardname); + content+=""; + } + content+=""; + content+=""; + content+=""; + content+="

Forum : "+SanitizeOutput(boardname)+"

Mark All Read

New Post

\r\n"; + + content+=""; + content+="\r\n"; + + sql="SELECT tblThread.ThreadID, tblThread.LastMessageID, tblLastMessage.FromName, tblLastMessage.MessageDate || ' ' || tblLastMessage.MessageTime, tblFirstMessage.Subject, tblFirstMessage.FromName, tblFirstMessage.IdentityID, tblLastMessage.IdentityID"; + sql+=" FROM tblThread INNER JOIN tblMessage AS tblLastMessage ON tblThread.LastMessageID=tblLastMessage.MessageID INNER JOIN tblMessage AS tblFirstMessage ON tblThread.FirstMessageID=tblFirstMessage.MessageID"; + sql+=" WHERE tblThread.BoardID=?"; + sql+=" ORDER BY tblLastMessage.MessageDate || tblLastMessage.MessageTime DESC"; + sql+=" LIMIT "+startrowstr+","+rowsperpagestr+";"; + + SQLite3DB::Statement threadst=m_db->Prepare(sql); + threadst.Bind(0,boardid); + threadst.Step(); + count=0; + while(threadst.RowReturned() && count++"; + + newthreadpostst.Bind(0,threadidstr); + newthreadpostst.Step(); + if(newthreadpostst.RowReturned()) + { + content+=" $\"New$ "; + } + else + { + content+=" $\"No$ "; + } + newthreadpostst.Reset(); + + content+=""; + content+=""; + content+=""; + + content+=""; + + content+=""; + + content+="\r\n"; + + threadst.Step(); + } + + threadcountst.Bind(0,boardid); + threadcountst.Step(); + if(threadcountst.RowReturned()) + { + threadcountst.ResultInt(0,threadcount); + } + + if(threadcount>=rowsperpage) + { + int totalpages=ceil(static_cast(threadcount)/static_cast(rowsperpage)); + int lastwrote=0; + content+=""; + + content+=""; + + content+="\r\n"; + } + + content+="

New	Subject	Started By	Replies	Last Post
"; + content+=""+SanitizeOutput(firstmessagesubject)+""; + content+="	"; + content+=""+FixFromName(firstmessagefromname)+""; + content+="	"; + + replycountst.Bind(0,threadidstr); + replycountst.Step(); + if(replycountst.RowReturned()) + { + std::string count="0"; + replycountst.ResultText(0,count); + content+=count; + } + else + { + content+="0"; + } + replycountst.Reset(); + + content+="	"; + content+=lastmessagedate+" by "+FixFromName(lastmessagefromname)+""; + content+="
Pages : "; + + for(int i=1; i<=totalpages; i++) + { + if(i==1 \|\| (i>currentpage-3 && i"+pagestr+""; + } + else + { + content+=" "+pagestr; + } + lastwrote=i; + } + } + + content+=" "; + + content+="

\r\n"; + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} diff --git a/src/http/pages/forumviewthreadpage.cpp b/src/http/pages/forumviewthreadpage.cpp new file mode 100644 index 0000000..0b69926 --- /dev/null +++ b/src/http/pages/forumviewthreadpage.cpp @@ -0,0 +1,158 @@ +#include "../../../include/http/pages/forumviewthreadpage.h" +#include "../../../include/stringfunctions.h" + +#ifdef XMEM + #include +#endif + +const std::string ForumViewThreadPage::FixBody(const std::string &body) +{ + static std::string whitespace=" \t\r\n"; + std::string output=body; + + // put \n after 80 contiguous characters in the body + std::string::size_type prevpos=0; + std::string::size_type pos=output.find_first_of(whitespace); + while(pos!=std::string::npos) + { + while(pos-prevpos>80) + { + output.insert(prevpos+80,"\n"); + prevpos+=81; // 81 because of the extra newline we just inserted + } + prevpos=pos; + pos=output.find_first_of(whitespace,pos+1); + } + while(output.size()-prevpos>80) // check the last line of the message (no whitespace after it) + { + output.insert(prevpos+80,"\n"); + prevpos+=81; + } + + output=StringFunctions::Replace(output,"<","<"); + output=StringFunctions::Replace(output,">",">"); + output=StringFunctions::Replace(output,"\n","
"); + return output; +} + +const std::string ForumViewThreadPage::GeneratePage(const std::string &method, const std::map &queryvars) +{ + std::string content=""; + std::string threadidstr=""; + std::string boardidstr=""; + std::string currentpagestr=""; + std::string boardname=""; + + if(queryvars.find("threadid")!=queryvars.end()) + { + threadidstr=(*queryvars.find("threadid")).second; + } + if(queryvars.find("currentpage")!=queryvars.end()) + { + currentpagestr=(*queryvars.find("currentpage")).second; + } + if(queryvars.find("boardid")!=queryvars.end()) + { + boardidstr=(*queryvars.find("boardid")).second; + } + + content+=CreateForumHeader(); + + SQLite3DB::Statement updateread=m_db->Prepare("UPDATE tblMessage SET Read=1 WHERE tblMessage.MessageID IN (SELECT MessageID FROM tblThreadPost WHERE ThreadID=?);"); + updateread.Bind(0,threadidstr); + updateread.Step(); + + SQLite3DB::Statement trustst=m_db->Prepare("SELECT LocalMessageTrust, LocalTrustListTrust, PeerMessageTrust, PeerTrustListTrust, Name FROM tblIdentity WHERE IdentityID=?;"); + + SQLite3DB::Statement boardnamest=m_db->Prepare("SELECT tblBoard.BoardName FROM tblBoard INNER JOIN tblThread ON tblBoard.BoardID=tblThread.BoardID WHERE tblThread.ThreadID=?;"); + boardnamest.Bind(0,threadidstr); + boardnamest.Step(); + + if(boardnamest.RowReturned()) + { + boardnamest.ResultText(0,boardname); + } + + content+=""; + content+=""; + content+=""; + content+=""; + content+="

Forum : "+SanitizeOutput(boardname)+"

\r\n"; + + SQLite3DB::Statement st=m_db->Prepare("SELECT tblMessage.MessageID, tblMessage.IdentityID, tblMessage.FromName, tblMessage.Subject, tblMessage.MessageDate || ' ' || tblMessage.MessageTime, tblMessage.Body FROM tblMessage INNER JOIN tblThreadPost ON tblMessage.MessageID=tblThreadPost.MessageID WHERE tblThreadPost.ThreadID=? ORDER BY tblThreadPost.PostOrder;"); + st.Bind(0,threadidstr); + + content+=""; + st.Step(); + while(st.RowReturned()) + { + std::string messageidstr=""; + std::string identityidstr=""; + std::string fromname=""; + std::string subject=""; + std::string datetime=""; + std::string body=""; + + st.ResultText(0,messageidstr); + st.ResultText(1,identityidstr); + st.ResultText(2,fromname); + st.ResultText(3,subject); + st.ResultText(4,datetime); + st.ResultText(5,body); + + content+=""; + content+=""; + content+=""; + content+=""; + content+="\r\n"; + content+=""; + content+=""; + content+=""; + trustst.Reset(); + + st.Step(); + } + content+="

"; + content+=""; + content+=""+FixFromName(fromname)+"
"; + + trustst.Bind(0,identityidstr); + trustst.Step(); + if(trustst.RowReturned()) + { + std::string localmessagetrust=""; + std::string localtrustlisttrust=""; + std::string peermessagetrust=""; + std::string peertrustlisttrust=""; + std::string name=""; + + trustst.ResultText(0,localmessagetrust); + trustst.ResultText(1,localtrustlisttrust); + trustst.ResultText(2,peermessagetrust); + trustst.ResultText(3,peertrustlisttrust); + trustst.ResultText(4,name); + + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+=""; + content+="

Trust
	Local	Peer
Message	"+localmessagetrust+"	"+peermessagetrust+"
Trust List	"+localtrustlisttrust+"	"+peertrustlisttrust+"

"; + } + + content+="

"; + content+=SanitizeOutput(subject)+" on "+datetime; + content+="

"; + content+=FixBody(body); + content+="

"; + + return StringFunctions::Replace(m_template,"[CONTENT]",content); +} diff --git a/src/http/pages/homepage.cpp b/src/http/pages/homepage.cpp index 3ebe2f1..ec4ea32 100644 --- a/src/http/pages/homepage.cpp +++ b/src/http/pages/homepage.cpp @@ -66,6 +66,10 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m content+="You can see the release info here
"; showgenericupdate=false; } + else + { + content+="Release info
"; + } } diff --git a/src/http/pages/localidentitiespage.cpp b/src/http/pages/localidentitiespage.cpp index 400260f..7910789 100644 --- a/src/http/pages/localidentitiespage.cpp +++ b/src/http/pages/localidentitiespage.cpp @@ -33,7 +33,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c content+="

"; - content+=""; + content+="

Name	Single Use	Publish Trust List	Publish Board List	Publish Freesite	Min Message Delay	Max Message Delay	Announced? *

"; SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID,tblLocalIdentity.Name,tblLocalIdentity.PublicKey,tbLLocalIdentity.PublishTrustList,tblLocalIdentity.SingleUse,tblLocalIdentity.PublishBoardList,tblIdentity.IdentityID,tblLocalIdentity.PublishFreesite,tblLocalIdentity.MinMessageDelay,tblLocalIdentity.MaxMessageDelay FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey ORDER BY tblLocalIdentity.Name;"); st.Step(); @@ -116,7 +116,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c } content+="

Name	Single Use	Publish Trust List	Publish Board List	Publish Freesite	Min Message Delay	Max Message Delay	Announced? *

"; - content+="

* An identity is considered successfully announced when you have downloaded a trust list from someone that contains the identity. The number in parenthesis is how many trust lists that identity appears in.

"; + content+="

* An identity is considered successfully announced when you have downloaded a trust list from someone that contains the identity. You must trust other identities' trust lists for this to happen. The number in parenthesis is how many trust lists the identity appears in.

"; content+="

Single Use Identities will automatically be deleted 7 days after creation.

"; content+="

Messages that each identity sends may be delayed by a random number of minutes between min and max. Set both to 0 to send messages as soon as possible.

"; diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp index fe03c91..d80ae18 100644 --- a/src/http/pages/peertrustpage.cpp +++ b/src/http/pages/peertrustpage.cpp @@ -261,14 +261,14 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s // search drop down content+="

"; - content+=""; content+="

"; content+="

"; - content+="

"; + content+=""; content+="Load Trust List of "; content+=CreateLocalIdentityDropDown("localidentityid",localidentityid); content+=""; @@ -285,14 +285,14 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s content+=""; } content+=""; - content+=""; - content+=""; + content+=""; + content+=""; content+=""; - content+=""; - content+=""; + content+=""; + content+=""; content+=""; - content+=""; - content+=""; + content+=""; + content+=""; content+="\r\n"; // get count of identities we are showing @@ -425,7 +425,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s if(startrow>0) { StringFunctions::Convert(startrow-rowsperpage,tempstr); - content+=""; + content+=""; cols+=3; } if(startrow+rowsperpageNext Page -->"; + content+=""; } content+=""; } @@ -484,15 +484,3 @@ const std::string PeerTrustPage::ReverseSort(const std::string &sortname, const return currentsortorder; } } - -const bool PeerTrustPage::WillHandleURI(const std::string &uri) -{ - if(uri.find("peertrust.")!=std::string::npos) - { - return true; - } - else - { - return false; - } -} diff --git a/src/http/pages/recentlyaddedpage.cpp b/src/http/pages/recentlyaddedpage.cpp index 2b09ce8..313544e 100644 --- a/src/http/pages/recentlyaddedpage.cpp +++ b/src/http/pages/recentlyaddedpage.cpp @@ -81,15 +81,3 @@ const std::string RecentlyAddedPage::GeneratePage(const std::string &method, con return StringFunctions::Replace(m_template,"[CONTENT]",content); } - -const bool RecentlyAddedPage::WillHandleURI(const std::string &uri) -{ - if(uri.find("recentlyadded.")!=std::string::npos) - { - return true; - } - else - { - return false; - } -} diff --git a/src/http/pages/showcaptchapage.cpp b/src/http/pages/showcaptchapage.cpp index 088fffa..736ba85 100644 --- a/src/http/pages/showcaptchapage.cpp +++ b/src/http/pages/showcaptchapage.cpp @@ -13,7 +13,10 @@ void ShowCaptchaPage::handleRequest(Poco::Net::HTTPServerRequest &request, Poco: std::map queryvars; CreateQueryVarMap(request,queryvars); - response.setChunkedTransferEncoding(true); + if(request.getVersion()==Poco::Net::HTTPRequest::HTTP_1_1) + { + response.setChunkedTransferEncoding(true); + } std::string content=""; if(queryvars.find("UUID")!=queryvars.end()) diff --git a/src/http/pages/showimagepage.cpp b/src/http/pages/showimagepage.cpp new file mode 100644 index 0000000..8b653ee --- /dev/null +++ b/src/http/pages/showimagepage.cpp @@ -0,0 +1,64 @@ +#include "../../../include/http/pages/showimagepage.h" + +#ifdef XMEM + #include +#endif + +std::map > ShowImagePage::m_imagecache; + +void ShowImagePage::handleRequest(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response) +{ + m_log->trace("ShowImagePage::handleRequest from "+request.clientAddress().toString()); + + std::map queryvars; + CreateQueryVarMap(request,queryvars); + + if(request.getVersion()==Poco::Net::HTTPRequest::HTTP_1_1) + { + response.setChunkedTransferEncoding(true); + } + + std::string content=""; + if(queryvars.find("image")!=queryvars.end()) + { + if(m_imagecache.find((*queryvars.find("image")).second)!=m_imagecache.end()) + { + content+=std::string(m_imagecache[(*queryvars.find("image")).second].begin(),m_imagecache[(*queryvars.find("image")).second].end()); + } + else + { + FILE *infile=fopen((*queryvars.find("image")).second.c_str(),"rb"); + if(infile) + { + fseek(infile,0,SEEK_END); + long filelen=ftell(infile); + fseek(infile,0,SEEK_SET); + + if(filelen>0) + { + std::vector data(filelen,0); + fread(&data[0],1,data.size(),infile); + content+=std::string(data.begin(),data.end()); + m_imagecache[(*queryvars.find("image")).second]=data; + } + + fclose(infile); + } + } + } + + std::ostream &ostr = response.send(); + ostr << content; +} + +const bool ShowImagePage::WillHandleURI(const std::string &uri) +{ + if(uri.find("showimage.htm")!=std::string::npos) + { + return true; + } + else + { + return false; + } +} diff --git a/src/http/pages/versioninfopage.cpp b/src/http/pages/versioninfopage.cpp index 670e9da..13b88ba 100644 --- a/src/http/pages/versioninfopage.cpp +++ b/src/http/pages/versioninfopage.cpp @@ -4,59 +4,71 @@ #include +#ifdef XMEM + #include +#endif + const std::string VersionInfoPage::GeneratePage(const std::string &method, const std::map &queryvars) { std::string content=""; + bool hascriteria=false; std::string major=VERSION_MAJOR; std::string minor=VERSION_MINOR; std::string release=VERSION_RELEASE; + std::string sql=""; if(queryvars.find("Major")!=queryvars.end()) { major=(*queryvars.find("Major")).second; + hascriteria=true; } if(queryvars.find("Minor")!=queryvars.end()) { minor=(*queryvars.find("Minor")).second; + hascriteria=true; } if(queryvars.find("Release")!=queryvars.end()) { release=(*queryvars.find("Release")).second; + hascriteria=true; } - SQLite3DB::Statement st=m_db->Prepare("SELECT Notes, Changes FROM tblFMSVersion WHERE Major=? AND Minor=? AND Release=?;"); - st.Bind(0,major); - st.Bind(1,minor); - st.Bind(2,release); + sql="SELECT Notes, Changes, Major, Minor, Release FROM tblFMSVersion "; + if(hascriteria==true) + { + sql+="WHERE Major=? AND Minor=? AND Release=? "; + } + sql+="ORDER BY Major DESC, Minor DESC, Release DESC;"; + SQLite3DB::Statement st=m_db->Prepare(sql); + if(hascriteria==true) + { + st.Bind(0,major); + st.Bind(1,minor); + st.Bind(2,release); + } st.Step(); - if(st.RowReturned()) + while(st.RowReturned()) { std::string notes=""; std::string changes=""; st.ResultText(0,notes); st.ResultText(1,changes); + st.ResultText(2,major); + st.ResultText(3,minor); + st.ResultText(4,release); + content+="

"; content+="

Release "+major+"."+minor+"."+release+"

"; content+="

Notes

"; content+=StringFunctions::Replace(notes,"\n","
"); content+="

Changes

"; content+=StringFunctions::Replace(changes,"\n","
"); + content+="

"; + st.Step(); } return StringFunctions::Replace(m_template,"[CONTENT]",content); } - -const bool VersionInfoPage::WillHandleURI(const std::string &uri) -{ - if(uri.find("versioninfo.")!=std::string::npos) - { - return true; - } - else - { - return false; - } -} diff --git a/src/message.cpp b/src/message.cpp index 8a3935d..0445e29 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -49,6 +49,63 @@ const bool Message::CheckForAdministrationBoard(const std::vector & return false; } +const bool Message::Create(const long localidentityid, const long boardid, const std::string &subject, const std::string &body, const std::string &references) +{ + Initialize(); + + Poco::UUIDGenerator uuidgen; + Poco::UUID uuid; + + // get header info + // date is always set to now regardless of what message has + m_datetime=Poco::Timestamp(); + + // messageuuid is always a unique id we generate regardless of message message-id + try + { + uuid=uuidgen.createRandom(); + m_messageuuid=uuid.toString(); + StringFunctions::UpperCase(m_messageuuid,m_messageuuid); + } + catch(...) + { + m_log->fatal("Message::ParseNNTPMessage could not create UUID"); + } + + // get from + SQLite3DB::Statement st=m_db->Prepare("SELECT Name FROM tblLocalIdentity WHERE LocalIdentityID=?;"); + st.Bind(0,localidentityid); + st.Step(); + if(st.RowReturned()) + { + st.ResultText(0,m_fromname); + } + + // get boards posted to + std::string boardname=""; + SQLite3DB::Statement boardst=m_db->Prepare("SELECT BoardName FROM tblBoard WHERE BoardID=?;"); + boardst.Bind(0,boardid); + boardst.Step(); + if(boardst.RowReturned()) + { + boardst.ResultText(0,boardname); + } + + m_boards.push_back(boardname); + m_replyboardname=boardname; + + m_subject=subject; + + m_body=body; + + if(references!="") + { + m_inreplyto[0]=references; + } + + return true; +} + const int Message::FindLocalIdentityID(const std::string &name) { SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID FROM tblLocalIdentity WHERE Name=?;"); diff --git a/src/messagethread.cpp b/src/messagethread.cpp new file mode 100644 index 0000000..37e3693 --- /dev/null +++ b/src/messagethread.cpp @@ -0,0 +1,120 @@ +#include "../include/messagethread.h" +#include "../include/stringfunctions.h" + +#include + +#ifdef XMEM + #include +#endif + +void MessageThread::AddChildren(const long messageid, const long level, const long boardid) +{ + SQLite3DB::Statement st=m_db->Prepare("SELECT tblMessageReplyTo.MessageID, tblMessage1.Subject, tblMessage1.FromName, tblMessage1.MessageDate || ' ' || tblMessage1.MessageTime FROM tblMessage INNER JOIN tblMessageReplyTo ON tblMessage.MessageUUID=tblMessageReplyTo.ReplyToMessageUUID INNER JOIN tblMessage AS 'tblMessage1' ON tblMessageReplyTo.MessageID=tblMessage1.MessageID INNER JOIN tblMessageBoard ON tblMessage1.MessageID=tblMessageBoard.MessageID WHERE tblMessage.MessageID=? AND tblMessageBoard.BoardID=? AND tblMessageReplyTo.ReplyOrder=0 ORDER BY tblMessage1.MessageDate || ' ' || tblMessage1.MessageTime;"); + st.Bind(0,messageid); + st.Bind(1,boardid); + st.Step(); + while(st.RowReturned()) + { + int childid=0; + std::string subject=""; + std::string fromname=""; + std::string datetime=""; + st.ResultInt(0,childid); + st.ResultText(1,subject); + st.ResultText(2,fromname); + st.ResultText(3,datetime); + + threadnode node; + node.m_messageid=childid; + node.m_level=level; + node.m_subject=subject; + node.m_fromname=fromname; + node.m_date=datetime; + m_nodes.push_back(node); + + AddChildren(childid,level+1,boardid); + + st.Step(); + } +} + +const MessageThread::threadnode MessageThread::GetOriginalMessageNode(const long messageid, const long boardid) +{ + SQLite3DB::Statement st=m_db->Prepare("SELECT tblMessage.MessageID, tblMessage.Subject, tblMessage.FromName, tblMessage.MessageDate || ' ' || tblMessage.MessageTime FROM tblMessageReplyTo INNER JOIN tblMessage ON tblMessageReplyTo.ReplyToMessageUUID=tblMessage.MessageUUID INNER JOIN tblMessageBoard ON tblMessage.MessageID=tblMessageBoard.MessageID WHERE tblMessageReplyTo.ReplyOrder=0 AND tblMessageReplyTo.MessageID=? AND tblMessageBoard.BoardID=?;"); + st.Bind(0,messageid); + st.Bind(1,boardid); + st.Step(); + if(st.RowReturned()) + { + int id=0; + std::string subject=""; + std::string fromname=""; + std::string datetime=""; + st.ResultInt(0,id); + st.ResultText(1,subject); + st.ResultText(2,fromname); + st.ResultText(3,datetime); + + threadnode node; + node.m_messageid=id; + node.m_level=0; + node.m_subject=subject; + node.m_fromname=fromname; + node.m_date=datetime; + + return GetOriginalMessageNode(node.m_messageid,boardid); + } + else + { + threadnode node; + node.m_messageid=-1; + node.m_level=0; + node.m_subject=""; + node.m_fromname=""; + node.m_date=""; + + SQLite3DB::Statement st2=m_db->Prepare("SELECT Subject, FromName, MessageDate || ' ' || MessageTime FROM tblMessage WHERE MessageID=?;"); + st2.Bind(0,messageid); + st2.Step(); + + if(st2.RowReturned()) + { + node.m_messageid=messageid; + st2.ResultText(0,node.m_subject); + st2.ResultText(1,node.m_fromname); + st2.ResultText(2,node.m_date); + } + + return node; + } +} + +const bool MessageThread::Load(const long messageid, const long boardid, const bool bydate) +{ + threadnode originalmessagenode=GetOriginalMessageNode(messageid,boardid); + + if(originalmessagenode.m_messageid>=0) + { + m_nodes.push_back(originalmessagenode); + + AddChildren(originalmessagenode.m_messageid,1,boardid); + + if(bydate==true) + { + std::sort(m_nodes.begin(),m_nodes.end(),datecompare()); + } + + return true; + } + else + { + return false; + } +} + +const bool MessageThread::Load(const std::string &messageidstr, const long boardid, const bool bydate) +{ + long messageid=0; + StringFunctions::Convert(messageidstr,messageid); + return Load(messageid,boardid,bydate); +} diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp index 84d07ff..0212e23 100644 --- a/src/nntp/nntpconnection.cpp +++ b/src/nntp/nntpconnection.cpp @@ -17,11 +17,10 @@ #include #endif -NNTPConnection::NNTPConnection(SOCKET sock) +NNTPConnection::NNTPConnection(SOCKET sock):m_socket(sock) { - std::string tempval; + std::string tempval(""); - m_socket=sock; m_tempbuffer.resize(32768); m_status.m_isposting=false; diff --git a/src/nntp/nntplistener.cpp b/src/nntp/nntplistener.cpp index 6355ebc..04fa1e1 100644 --- a/src/nntp/nntplistener.cpp +++ b/src/nntp/nntplistener.cpp @@ -159,7 +159,7 @@ void NNTPListener::StartListen() } else { - m_log->error("NNTPListener::StartListen socket listen failed"); + m_log->error("NNTPListener::StartListen socket listen failed on "+sa.toString()); #ifdef _WIN32 closesocket(sock); #else @@ -169,7 +169,7 @@ void NNTPListener::StartListen() } else { - m_log->error("NNTPListener::StartListen socket bind failed"); + m_log->error("NNTPListener::StartListen socket bind failed on "+sa.toString()); #ifdef _WIN32 closesocket(sock); #else @@ -179,7 +179,7 @@ void NNTPListener::StartListen() } else { - m_log->error("NNTPListener::StartListen couldn't create socket"); + m_log->error("NNTPListener::StartListen couldn't create socket on "+sa.toString()); } } catch(Poco::Exception &e) diff --git a/src/threadbuilder.cpp b/src/threadbuilder.cpp new file mode 100644 index 0000000..521cccc --- /dev/null +++ b/src/threadbuilder.cpp @@ -0,0 +1,85 @@ +#include "../include/threadbuilder.h" +#include "../include/messagethread.h" + +const bool ThreadBuilder::Build(const long messageid, const long boardid, const bool bydate) +{ + int count=0; + int threadid=-1; + MessageThread mt; + std::vector m_threadmessages; + + mt.Load(messageid,boardid,bydate); + m_threadmessages=mt.GetNodes(); + + // find threadid of this thread if it already exists in a thread + SQLite3DB::Statement st=m_db->Prepare("SELECT tblThread.ThreadID FROM tblThread INNER JOIN tblThreadPost ON tblThread.ThreadID=tblThreadPost.ThreadID WHERE tblThread.BoardID=? AND tblThreadPost.MessageID=?;"); + st.Bind(0,boardid); + st.Bind(1,messageid); + + st.Step(); + if(st.RowReturned()) + { + st.ResultInt(0,threadid); + } + else + { + st.Reset(); + // message doesn't exist in a thread, try to find a message in the thread that is already in a thread + for(std::vector::const_iterator i=m_threadmessages.begin(); i!=m_threadmessages.end() && threadid==-1; i++) + { + st.Bind(0,boardid); + st.Bind(1,(*i).m_messageid); + st.Step(); + + if(st.RowReturned()) + { + st.ResultInt(0,threadid); + } + + st.Reset(); + + } + + // thread doesn't exist - create it + if(threadid==-1) + { + st=m_db->Prepare("INSERT INTO tblThread(BoardID) VALUES(?);"); + st.Bind(0,boardid); + st.Step(true); + threadid=st.GetLastInsertRowID(); + } + } + + if(m_threadmessages.size()>0) + { + st=m_db->Prepare("UPDATE tblThread SET FirstMessageID=?, LastMessageID=? WHERE ThreadID=?;"); + st.Bind(0,m_threadmessages[0].m_messageid); + st.Bind(1,m_threadmessages[m_threadmessages.size()-1].m_messageid); + st.Bind(2,threadid); + st.Step(); + + st=m_db->Prepare("DELETE FROM tblThreadPost WHERE ThreadID=?;"); + st.Bind(0,threadid); + st.Step(); + + count=0; + st=m_db->Prepare("INSERT INTO tblThreadPost(ThreadID,MessageID,PostOrder) VALUES(?,?,?);"); + for(std::vector::const_iterator i=m_threadmessages.begin(); i!=m_threadmessages.end(); i++, count++) + { + st.Bind(0,threadid); + st.Bind(1,(*i).m_messageid); + st.Bind(2,count); + st.Step(); + st.Reset(); + } + } + else + { + st=m_db->Prepare("DELETE FROM tblThread WHERE ThreadID=?;"); + st.Bind(0,threadid); + st.Step(); + } + + return true; + +} diff --git a/template.htm b/template.htm index 7509afd..248c006 100644 --- a/template.htm +++ b/template.htm @@ -1,7 +1,7 @@ -FMS : Freenet Message System +FMS : Freenet Message System @@ -236,9 +271,10 @@ td { padding-left:5px; padding-right:5px; }

Name	Local Message Trust
Name	Local Message Trust	Message Comment	Peer Message Trust	Local Trust List Trust	Peer Message Trust	Local Trust List Trust	Trust Comment	Peer Trust List Trust	Message Count	Peer Trust List Trust	Message Count
<-- Previous Page	<-- Previous Page	Next Page -->

From	"+LocalIdentityDropDown("localidentityid",localidentityidstr)+"
Subject
Message	"+SanitizeOutput(body)+"