m_body+=bodypart;\r
}\r
// add a binary file attachment\r
- else if((*i)->GetName()!="" && (*i)->GetLength()>0 && (*i)->GetContent())\r
+ else if(((*i)->GetName()!="" || (*i)->GetFilename()!="") && (*i)->GetLength()>0 && (*i)->GetContent())\r
{\r
+ std::string filename="";\r
std::string contenttype="";\r
std::vector<unsigned char> data((*i)->GetContent(),(*i)->GetContent()+(*i)->GetContentLength());\r
if((*i)->GetContentType())\r
contenttype.erase(endpos);\r
}\r
}\r
- m_fileattachments.push_back(fileattachment((*i)->GetName(),contenttype,data));\r
+ filename=(*i)->GetFilename();\r
+ if(filename=="")\r
+ {\r
+ filename=(*i)->GetName();\r
+ }\r
+ m_fileattachments.push_back(fileattachment(filename,contenttype,data));\r
}\r
}\r
\r
MessageXML xml;\r
int localidentityid=-1;\r
\r
- xml.SetMessageID(m_messageuuid);\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
StripAdministrationBoards();\r
- for(std::vector<std::string>::iterator i=m_boards.begin(); i!=m_boards.end(); i++)\r
- {\r
- xml.AddBoard((*i));\r
- }\r
- \r
- for(std::map<long,std::string>::iterator j=m_inreplyto.begin(); j!=m_inreplyto.end(); j++)\r
- {\r
- xml.AddInReplyTo((*j).first,(*j).second);\r
- }\r
\r
- localidentityid=FindLocalIdentityID(m_fromname);\r
- if(localidentityid==-1)\r
+ if(m_boards.size()>0)\r
{\r
- return false;\r
- }\r
\r
- SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML) VALUES(?,?,?);");\r
- st.Bind(0,localidentityid);\r
- st.Bind(1,m_messageuuid);\r
- st.Bind(2,xml.GetXML());\r
- st.Step();\r
+ xml.SetMessageID(m_messageuuid);\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
+ xml.AddBoard((*i));\r
+ }\r
+ \r
+ for(std::map<long,std::string>::iterator j=m_inreplyto.begin(); j!=m_inreplyto.end(); j++)\r
+ {\r
+ xml.AddInReplyTo((*j).first,(*j).second);\r
+ }\r
\r
- // insert file attachments into database\r
- st=m_db->Prepare("INSERT INTO tblFileInserts(MessageUUID,FileName,Size,MimeType,Data) VALUES(?,?,?,?,?);");\r
- for(std::vector<fileattachment>::iterator i=m_fileattachments.begin(); i!=m_fileattachments.end(); i++)\r
- {\r
- st.Bind(0,m_messageuuid);\r
- st.Bind(1,(*i).m_filename);\r
- st.Bind(2,(long)(*i).m_data.size());\r
- st.Bind(3,(*i).m_mimetype);\r
- st.Bind(4,&((*i).m_data[0]),(*i).m_data.size());\r
+ localidentityid=FindLocalIdentityID(m_fromname);\r
+ if(localidentityid==-1)\r
+ {\r
+ return false;\r
+ }\r
+\r
+ SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML) VALUES(?,?,?);");\r
+ st.Bind(0,localidentityid);\r
+ st.Bind(1,m_messageuuid);\r
+ st.Bind(2,xml.GetXML());\r
st.Step();\r
- st.Reset();\r
- }\r
\r
- HandleChangeTrust();\r
+ // insert file attachments into database\r
+ st=m_db->Prepare("INSERT INTO tblFileInserts(MessageUUID,FileName,Size,MimeType,Data) VALUES(?,?,?,?,?);");\r
+ for(std::vector<fileattachment>::iterator i=m_fileattachments.begin(); i!=m_fileattachments.end(); i++)\r
+ {\r
+ st.Bind(0,m_messageuuid);\r
+ st.Bind(1,(*i).m_filename);\r
+ st.Bind(2,(long)(*i).m_data.size());\r
+ st.Bind(3,(*i).m_mimetype);\r
+ st.Bind(4,&((*i).m_data[0]),(*i).m_data.size());\r
+ st.Step();\r
+ st.Reset();\r
+ }\r
+\r
+ HandleChangeTrust();\r
+\r
+ }\r
\r
return true;\r
\r