#include <xmem.h>\r
#endif\r
\r
-Message::Message()\r
+Message::Message(SQLite3DB::DB *db):IDatabase(db)\r
{\r
Initialize();\r
}\r
\r
-Message::Message(const long messageid)\r
+Message::Message(SQLite3DB::DB *db, const long messageid):IDatabase(db)\r
{\r
Load(messageid);\r
}\r
return false;\r
}\r
\r
+const bool Message::Create(const long localidentityid, const long boardid, const std::string &subject, const std::string &body, const std::string &references)\r
+{\r
+ Initialize();\r
+\r
+ Poco::UUIDGenerator uuidgen;\r
+ Poco::UUID uuid;\r
+\r
+ // get header info\r
+ // date is always set to now regardless of what message has\r
+ m_datetime=Poco::Timestamp();\r
+\r
+ // messageuuid is always a unique id we generate regardless of message message-id\r
+ try\r
+ {\r
+ uuid=uuidgen.createRandom();\r
+ m_messageuuid=uuid.toString();\r
+ StringFunctions::UpperCase(m_messageuuid,m_messageuuid);\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->fatal("Message::ParseNNTPMessage could not create UUID");\r
+ }\r
+ \r
+ // get from\r
+ SQLite3DB::Statement st=m_db->Prepare("SELECT Name FROM tblLocalIdentity WHERE LocalIdentityID=?;");\r
+ st.Bind(0,localidentityid);\r
+ st.Step();\r
+ if(st.RowReturned())\r
+ {\r
+ st.ResultText(0,m_fromname);\r
+ }\r
+\r
+ // get boards posted to\r
+ std::string boardname="";\r
+ SQLite3DB::Statement boardst=m_db->Prepare("SELECT BoardName FROM tblBoard WHERE BoardID=?;");\r
+ boardst.Bind(0,boardid);\r
+ boardst.Step();\r
+ if(boardst.RowReturned())\r
+ {\r
+ boardst.ResultText(0,boardname);\r
+ }\r
+\r
+ m_boards.push_back(boardname);\r
+ m_replyboardname=boardname;\r
+\r
+ m_subject=subject;\r
+\r
+ m_body=body;\r
+\r
+ if(references!="")\r
+ {\r
+ m_inreplyto[0]=references;\r
+ }\r
+\r
+ return true;\r
+}\r
+\r
const int Message::FindLocalIdentityID(const std::string &name)\r
{\r
SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID FROM tblLocalIdentity WHERE Name=?;");\r
{\r
std::string rval("");\r
\r
- rval+="From: "+m_fromname+"\r\n";\r
+ rval+="From: "+SanitizeFromName(m_fromname)+"\r\n";\r
rval+="Newsgroups: ";\r
for(std::vector<std::string>::const_iterator i=m_boards.begin(); i!=m_boards.end(); i++)\r
{\r
m_inreplyto.clear();\r
m_fileattachments.clear();\r
m_changemessagetrustonreply=0;\r
- Option::Instance()->Get("ChangeMessageTrustOnReply",tempval);\r
+ Option option(m_db);\r
+\r
+ option.Get("ChangeMessageTrustOnReply",tempval);\r
StringFunctions::Convert(tempval,m_changemessagetrustonreply);\r
- Option::Instance()->Get("AddNewPostFromIdentities",tempval);\r
+ option.Get("AddNewPostFromIdentities",tempval);\r
if(tempval=="true")\r
{\r
m_addnewpostfromidentities=true;\r
m_addnewpostfromidentities=false;\r
}\r
tempval="50";\r
- Option::Instance()->Get("MinLocalMessageTrust",tempval);\r
+ option.Get("MinLocalMessageTrust",tempval);\r
StringFunctions::Convert(tempval,m_minlocalmessagetrust);\r
tempval="51";\r
- Option::Instance()->Get("MinLocalTrustListTrust",tempval);\r
+ option.Get("MinLocalTrustListTrust",tempval);\r
StringFunctions::Convert(tempval,m_minlocaltrustlisttrust);\r
}\r
\r
return true;\r
}\r
\r
+const std::string Message::SanitizeFromName(const std::string &fromname) const\r
+{\r
+ return StringFunctions::Replace(fromname,",","_");\r
+}\r
+\r
const bool Message::StartFreenetInsert()\r
{\r
\r