From 1230cc420c955e75051d011d964bc68f061ba08c Mon Sep 17 00:00:00 2001 From: SomeDude Date: Wed, 28 May 2008 19:02:00 +0200 Subject: [PATCH] version 0.2.18 --- include/freenet/messagelistrequester.h | 1 + include/global.h | 2 +- include/ifmsxmldocument.h | 11 +++++ include/nntp/extensiontrust.h | 2 + readme.txt | 2 + site-template.htm | 4 +- src/freenet/identityintroductionxml.cpp | 2 +- src/freenet/identityxml.cpp | 2 +- src/freenet/introductionpuzzlexml.cpp | 6 +-- src/freenet/messagelistrequester.cpp | 78 +++++++++++++++++++++++++------- src/freenet/messagelistxml.cpp | 57 +++++++++++++++++++++-- src/freenet/messagexml.cpp | 20 ++++----- src/freenet/trustlistinserter.cpp | 2 +- src/freenet/trustlistxml.cpp | 6 +-- src/global.cpp | 4 +- src/message.cpp | 5 +++ src/nntp/extensiontrust.cpp | 80 +++++++++++++++++++++++++++++++-- src/nntp/nntpconnection.cpp | 18 +++++++- 18 files changed, 255 insertions(+), 47 deletions(-) diff --git a/include/freenet/messagelistrequester.h b/include/freenet/messagelistrequester.h index e8463ff..73bddf2 100644 --- a/include/freenet/messagelistrequester.h +++ b/include/freenet/messagelistrequester.h @@ -13,6 +13,7 @@ private: void Initialize(); void PopulateIDList(); void StartRequest(const long &id); + void StartRedirectRequest(FCPMessage &message); const bool HandleAllData(FCPMessage &message); const bool HandleGetFailed(FCPMessage &message); diff --git a/include/global.h b/include/global.h index 30ad90d..912021c 100644 --- a/include/global.h +++ b/include/global.h @@ -5,7 +5,7 @@ #include #include "pthreadwrapper/thread.h" -#define FMS_VERSION "0.2.17" +#define FMS_VERSION "0.2.18" // opens database and creates tables and initial inserts if necessary void SetupDB(); diff --git a/include/ifmsxmldocument.h b/include/ifmsxmldocument.h index 8e04c3c..ae555a1 100644 --- a/include/ifmsxmldocument.h +++ b/include/ifmsxmldocument.h @@ -90,6 +90,17 @@ protected: } return false; } + + const std::string SanitizeSingleString(const std::string &text) + { + std::string returntext=text; + // remove bogus chars from text string + for(char i=1; i<32; i++) + { + returntext=StringFunctions::Replace(returntext,std::string(1,i),""); + } + return returntext; + } }; diff --git a/include/nntp/extensiontrust.h b/include/nntp/extensiontrust.h index b7a3bab..3ff45ef 100644 --- a/include/nntp/extensiontrust.h +++ b/include/nntp/extensiontrust.h @@ -13,6 +13,8 @@ public: const bool GetMessageTrust(const std::string &nntpname, int &trust); const bool GetTrustListTrust(const std::string &nntpname, int &trust); + const bool GetPeerMessageTrust(const std::string &nntpname, int &trust); + const bool GetPeerTrustListTrust(const std::string &nntpname, int &trust); const bool SetMessageTrust(const std::string &nntpname, const int trust); const bool SetTrustListTrust(const std::string &nntpname, const int trust); diff --git a/readme.txt b/readme.txt index 021bc83..4874179 100644 --- a/readme.txt +++ b/readme.txt @@ -124,6 +124,8 @@ Responses: XGETTRUST MESSAGE userid@keypart XGETTRUST TRUSTLIST userid@keypart +XGETTRUST PEERMESSAGE userid@keypart +XGETTRUST PEERTRUSTLIST userid@keypart Responses: 2xx val diff --git a/site-template.htm b/site-template.htm index c7efff9..4e14439 100644 --- a/site-template.htm +++ b/site-template.htm @@ -1,7 +1,9 @@ -FMS : Freenet Message System +FMS Site of [IDENTITYNAME] + +