m_fromname=mime.GetFieldValue("From");\r
// remove any path folding\r
m_fromname=StringFunctions::Replace(m_fromname,"\r\n","");\r
+ m_fromname=StringFunctions::Replace(m_fromname,"\t","");\r
// strip off everything between () and <> and any whitespace\r
std::string::size_type startpos=m_fromname.find("(");\r
std::string::size_type endpos;\r
std::string temp=mime.GetFieldValue("Newsgroups");\r
// remove any path folding\r
temp=StringFunctions::Replace(temp,"\r\n","");\r
+ temp=StringFunctions::Replace(temp,"\t","");\r
std::vector<std::string> parts;\r
StringFunctions::SplitMultiple(temp,", \t",parts);\r
for(std::vector<std::string>::iterator i=parts.begin(); i!=parts.end(); i++)\r
m_replyboardname=mime.GetFieldValue("Followup-To");\r
// remove any path folding\r
m_replyboardname=StringFunctions::Replace(m_replyboardname,"\r\n","");\r
+ m_replyboardname=StringFunctions::Replace(m_replyboardname,"\t","");\r
}\r
else\r
{\r
m_subject=mime.GetFieldValue("Subject");\r
// remove any path folding\r
m_subject=StringFunctions::Replace(m_subject,"\r\n","");\r
+ m_subject=StringFunctions::Replace(m_subject,"\t","");\r
#if DO_CHARSET_CONVERSION\r
if(mime.GetFieldCharset("Subject"))\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
std::vector<std::string> parts;\r
int count=0;\r
StringFunctions::SplitMultiple(temp,", \t",parts);\r
xml.SetSubject(m_subject);\r
xml.SetBody(m_body);\r
xml.SetReplyBoard(m_replyboardname);\r
- xml.SetDate(m_datetime.Format("%Y-%m-%d"));\r
- xml.SetTime(m_datetime.Format("%H:%M:%S"));\r
\r
for(std::vector<std::string>::iterator i=m_boards.begin(); i!=m_boards.end(); i++)\r
{\r
return false;\r
}\r
\r
- SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML) VALUES(?,?,?);");\r
+ // add the message delay if there is one\r
+ SQLite3DB::Statement st=m_db->Prepare("SELECT MinMessageDelay,MaxMessageDelay FROM tblLocalIdentity WHERE LocalIdentityID=?;");\r
+ st.Bind(0,localidentityid);\r
+ st.Step();\r
+ if(st.RowReturned())\r
+ {\r
+ int min=0;\r
+ int max=0;\r
+ st.ResultInt(0,min);\r
+ st.ResultInt(1,max);\r
+\r
+ min<0 ? min=0 : false;\r
+ max<0 ? max=0 : false;\r
+ min>max ? min=max : false;\r
+\r
+ if(min==max)\r
+ {\r
+ m_datetime.Add(0,min);\r
+ }\r
+ else if(max>min)\r
+ {\r
+ int delay=(rand()%(max-min))+min;\r
+ m_datetime.Add(0,delay);\r
+ }\r
+\r
+ }\r
+ st.Finalize();\r
+\r
+ // set date in xml file AFTER we set the delay\r
+ xml.SetDate(m_datetime.Format("%Y-%m-%d"));\r
+ xml.SetTime(m_datetime.Format("%H:%M:%S"));\r
+\r
+ st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML,SendDate) VALUES(?,?,?,?);");\r
st.Bind(0,localidentityid);\r
st.Bind(1,m_messageuuid);\r
st.Bind(2,xml.GetXML());\r
+ st.Bind(3,m_datetime.Format("%Y-%m-%d %H:%M:%S"));\r
st.Step();\r
\r
// insert file attachments into database\r