projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.2.6
[fms.git]
/
src
/
freenet
/
messagerequester.cpp
diff --git
a/src/freenet/messagerequester.cpp
b/src/freenet/messagerequester.cpp
index
e298271
..
5b6d271
100644
(file)
--- a/
src/freenet/messagerequester.cpp
+++ b/
src/freenet/messagerequester.cpp
@@
-17,7
+17,7
@@
MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
Initialize();
\r
}
\r
\r
Initialize();
\r
}
\r
\r
-const long MessageRequester::GetBoardID(const std::string &boardname)
\r
+const long MessageRequester::GetBoardID(const std::string &boardname
, const std::string &identityname
)
\r
{
\r
std::string lowerboard=boardname;
\r
StringFunctions::LowerCase(lowerboard,lowerboard);
\r
{
\r
std::string lowerboard=boardname;
\r
StringFunctions::LowerCase(lowerboard,lowerboard);
\r
@@
-35,7
+35,7
@@
const long MessageRequester::GetBoardID(const std::string &boardname)
{
\r
DateTime now;
\r
now.SetToGMTime();
\r
{
\r
DateTime now;
\r
now.SetToGMTime();
\r
- st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages
) VALUES(
?,?,?);");
\r
+ st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages
,AddedMethod) VALUES(?,
?,?,?);");
\r
st.Bind(0,boardname);
\r
st.Bind(1,now.Format("%Y-%m-%d %H:%M:%S"));
\r
if(m_savemessagesfromnewboards)
\r
st.Bind(0,boardname);
\r
st.Bind(1,now.Format("%Y-%m-%d %H:%M:%S"));
\r
if(m_savemessagesfromnewboards)
\r
@@
-46,6
+46,7
@@
const long MessageRequester::GetBoardID(const std::string &boardname)
{
\r
st.Bind(2,"false");
\r
}
\r
{
\r
st.Bind(2,"false");
\r
}
\r
+ st.Bind(3,"Message from "+identityname);
\r
st.Step(true);
\r
return st.GetLastInsertRowID();
\r
}
\r
st.Step(true);
\r
return st.GetLastInsertRowID();
\r
}
\r
@@
-212,7
+213,7
@@
const bool MessageRequester::HandleAllData(FCPMessage &message)
st.Bind(3,xml.GetTime());
\r
st.Bind(4,xml.GetSubject());
\r
st.Bind(5,xml.GetMessageID());
\r
st.Bind(3,xml.GetTime());
\r
st.Bind(4,xml.GetSubject());
\r
st.Bind(5,xml.GetMessageID());
\r
- st.Bind(6,GetBoardID(xml.GetReplyBoard()));
\r
+ st.Bind(6,GetBoardID(xml.GetReplyBoard()
,GetIdentityName(identityid)
));
\r
st.Bind(7,xml.GetBody());
\r
st.Bind(8,index);
\r
inserted=st.Step(true);
\r
st.Bind(7,xml.GetBody());
\r
st.Bind(8,index);
\r
inserted=st.Step(true);
\r
@@
-227,7
+228,7
@@
const bool MessageRequester::HandleAllData(FCPMessage &message)
if(SaveToBoard((*i)))
\r
{
\r
st.Bind(0,messageid);
\r
if(SaveToBoard((*i)))
\r
{
\r
st.Bind(0,messageid);
\r
- st.Bind(1,GetBoardID((*i)));
\r
+ st.Bind(1,GetBoardID((*i)
,GetIdentityName(identityid)
));
\r
st.Step();
\r
st.Reset();
\r
}
\r
st.Step();
\r
st.Reset();
\r
}
\r