#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
insert.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d"));\r
insert.Bind(1,Poco::DateTimeFormatter::format(now,"%H:%M:%S"));\r
insert.Bind(2,identityname+" Trust Changed");\r
- insert.Bind(3,uuid.toString());\r
+ std::string uuidstr=uuid.toString();\r
+ StringFunctions::UpperCase(uuidstr,uuidstr);\r
+ insert.Bind(3,uuidstr);\r
insert.Bind(4,boardid);\r
insert.Bind(5,messagebody);\r
insert.Step(true);\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
try\r
{\r
uuid=uuidgen.createRandom();\r
+ m_messageuuid=uuid.toString();\r
+ StringFunctions::UpperCase(m_messageuuid,m_messageuuid);\r
}\r
catch(...)\r
{\r
// remove any path folding\r
m_replyboardname=StringFunctions::Replace(m_replyboardname,"\r\n","");\r
m_replyboardname=StringFunctions::Replace(m_replyboardname,"\t","");\r
+ std::vector<std::string> parts;\r
+ StringFunctions::Split(m_replyboardname,",",parts);\r
+ if(parts.size()>1)\r
+ {\r
+ m_replyboardname=parts[0];\r
+ }\r
}\r
else\r
{\r
std::string temp=mime.GetFieldValue("References");\r
// remove any path folding\r
temp=StringFunctions::Replace(temp,"\r\n","");\r
- temp=StringFunctions::Replace(temp,"\t","");\r
+ temp=StringFunctions::Replace(temp,"\t"," ");\r
std::vector<std::string> parts;\r
int count=0;\r
StringFunctions::SplitMultiple(temp,", \t",parts);\r
for(std::vector<std::string>::reverse_iterator i=parts.rbegin(); i!=parts.rend(); i++)\r
{\r
- // get rid of < and > and any whitespace\r
- (*i)=StringFunctions::Replace((*i),"<","");\r
- (*i)=StringFunctions::Replace((*i),">","");\r
- (*i)=StringFunctions::TrimWhitespace((*i));\r
- /*\r
- // erase @ and everything after\r
- if((*i).find("@")!=std::string::npos)\r
- {\r
- (*i).erase((*i).find("@"));\r
- }\r
- */\r
- // only erase after @ if message is old type with @freenetproject.org\r
- if((*i).find("@freenetproject.org")!=std::string::npos)\r
- {\r
- (*i).erase((*i).find("@"));\r
- }\r
- if((*i)!="")\r
+ if((*i).size()>2)\r
{\r
- m_inreplyto[count++]=(*i);\r
+ // get rid of < and > and any whitespace\r
+ (*i)=StringFunctions::Replace((*i),"<","");\r
+ (*i)=StringFunctions::Replace((*i),">","");\r
+ (*i)=StringFunctions::TrimWhitespace((*i));\r
+ /*\r
+ // erase @ and everything after\r
+ if((*i).find("@")!=std::string::npos)\r
+ {\r
+ (*i).erase((*i).find("@"));\r
+ }\r
+ */\r
+ // only erase after @ if message is old type with @freenetproject.org\r
+ if((*i).find("@freenetproject.org")!=std::string::npos)\r
+ {\r
+ (*i).erase((*i).find("@"));\r
+ }\r
+ if((*i)!="")\r
+ {\r
+ m_inreplyto[count++]=(*i);\r
+ }\r
}\r
}\r
}\r
projects / fms.git / blobdiff