version 0.3.32

[fms.git] / src / freenet / messagerequester.cpp

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 043d2bf..fefe898 100644 (file)
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -11,6 +11,8 @@
        #include <xmem.h>\r
 #endif\r
 \r
+std::string MessageRequester::m_validuuidchars="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890~@_-";\r
+\r
 MessageRequester::MessageRequester(SQLite3DB::DB *db):IIndexRequester<std::string>(db)\r
 {\r
        Initialize();\r
@@ -172,7 +174,7 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                        StringFunctions::SplitMultiple(publickey,"@,",keyparts);\r
                        StringFunctions::SplitMultiple(xml.GetMessageID(),"@",uuidparts);\r
 \r
-                       if(uuidparts.size()>1 && keyparts.size()>1)\r
+                       if(uuidparts.size()>1 && keyparts.size()>1 && xml.GetMessageID().find_first_not_of(m_validuuidchars)==std::string::npos)\r
                        {\r
                                keypart=StringFunctions::Replace(StringFunctions::Replace(keyparts[1],"-",""),"~","");\r
                                if(keypart!=uuidparts[1])\r
@@ -226,7 +228,7 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
 \r
                        m_db->Execute("BEGIN;");\r
 \r
-                       st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");\r
+                       st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex,InsertDate) VALUES(?,?,?,?,?,?,?,?,?,?);");\r
                        st.Bind(0,identityid);\r
                        st.Bind(1,GetIdentityName(identityid));\r
                        st.Bind(2,xml.GetDate());\r
@@ -236,8 +238,9 @@ const bool MessageRequester::HandleAllData(FCPv2::Message &message)
                        st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));\r
                        st.Bind(7,nntpbody);\r
                        st.Bind(8,index);\r
+                       st.Bind(9,idparts[3]);\r
                        inserted=st.Step(true);\r
-                       int messageid=st.GetLastInsertRowID();\r
+                       long messageid=st.GetLastInsertRowID();\r
 \r
                        if(inserted==true)\r
                        {\r