version 0.1.3

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

diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index 056900d..22b4b0b 100644 (file)
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -66,7 +66,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
        if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
 \r
-               st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=? WHERE IdentityID=?");\r
+               st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=? WHERE IdentityID=?");\r
                st.Bind(0,xml.GetName());\r
                if(xml.GetSingleUse()==true)\r
                {\r
@@ -77,7 +77,23 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                        st.Bind(1,"false");\r
                }\r
                st.Bind(2,now.Format("%Y-%m-%d %H:%M:%S"));\r
-               st.Bind(3,identityid);\r
+               if(xml.GetPublishTrustList()==true)\r
+               {\r
+                       st.Bind(3,"true");\r
+               }\r
+               else\r
+               {\r
+                       st.Bind(3,"false");\r
+               }\r
+               if(xml.GetPublishBoardList()==true)\r
+               {\r
+                       st.Bind(4,"true");\r
+               }\r
+               else\r
+               {\r
+                       st.Bind(4,"false");\r
+               }\r
+               st.Bind(5,identityid);\r
                st.Step();\r
                st.Finalize();\r
 \r
@@ -88,7 +104,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" parsed Identity XML file : "+message["Identifier"]);\r
+               m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"IdentityRequester::HandleAllData parsed Identity XML file : "+message["Identifier"]);\r
        }\r
        else\r
        {\r
@@ -100,7 +116,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" error parsing Identity XML file : "+message["Identifier"]);\r
+               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleAllData error parsing Identity XML file : "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -133,7 +149,7 @@ const bool IdentityRequester::HandleGetFailed(FCPMessage &message)
                st.Step();\r
                st.Finalize();\r
 \r
-               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" fatal error requesting "+message["Identifier"]);\r
+               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IdentityRequester::HandleGetFailed fatal error requesting "+message["Identifier"]);\r
        }\r
 \r
        // remove this identityid from request list\r
@@ -181,7 +197,7 @@ const bool IdentityRequester::HandleMessage(FCPMessage &message)
 void IdentityRequester::Initialize()\r
 {\r
        std::string tempval="";\r
-       Option::instance()->Get("MaxIdentityRequests",tempval);\r
+       Option::Instance()->Get("MaxIdentityRequests",tempval);\r
        StringFunctions::Convert(tempval,m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
@@ -192,7 +208,7 @@ void IdentityRequester::Initialize()
        {\r
                m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxIdentityRequests is currently set at "+tempval+".  This value might be incorrectly configured.");\r
        }\r
-       Option::instance()->Get("MessageBase",m_messagebase);\r
+       Option::Instance()->Get("MessageBase",m_messagebase);\r
        m_tempdate.SetToGMTime();\r
 }\r
 \r