From 047cea32f848d605c549ec123c12c1c400dd7ec1 Mon Sep 17 00:00:00 2001 From: SomeDude Date: Sat, 28 Jun 2008 19:53:00 +0200 Subject: [PATCH] version 0.3.1 --- src/freenet/introductionpuzzleinserter.cpp | 4 +++- src/freenet/trustlistxml.cpp | 2 +- src/message.cpp | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp index e422d29..409a0f7 100644 --- a/src/freenet/introductionpuzzleinserter.cpp +++ b/src/freenet/introductionpuzzleinserter.cpp @@ -202,7 +202,9 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid) } xml.SetType("captcha"); - xml.SetUUID(uuid.toString()+"@"+keypart); + std::string uuidstr=uuid.toString(); + StringFunctions::UpperCase(uuidstr,uuidstr); + xml.SetUUID(uuidstr+"@"+keypart); xml.SetPuzzleData(encodedpuzzle); xml.SetMimeType("image/bmp"); diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp index 20fa730..9132427 100644 --- a/src/freenet/trustlistxml.cpp +++ b/src/freenet/trustlistxml.cpp @@ -218,7 +218,7 @@ const bool TrustListXML::ParseXML(const std::string &xml) m_log->error("TrustListXML::ParseXML malformed Trust in TrustList.xml"); } - trustel=XMLGetNextSibling(root,"Trust"); + trustel=XMLGetNextSibling(trustel,"Trust"); } parsed=true; diff --git a/src/message.cpp b/src/message.cpp index 526dbd2..897ceed 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -250,7 +250,9 @@ void Message::HandleAdministrationMessage() insert.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d")); insert.Bind(1,Poco::DateTimeFormatter::format(now,"%H:%M:%S")); insert.Bind(2,identityname+" Trust Changed"); - insert.Bind(3,uuid.toString()); + std::string uuidstr=uuid.toString(); + StringFunctions::UpperCase(uuidstr,uuidstr); + insert.Bind(3,uuidstr); insert.Bind(4,boardid); insert.Bind(5,messagebody); insert.Step(true); @@ -557,6 +559,8 @@ const bool Message::ParseNNTPMessage(const std::string &nntpmessage) try { uuid=uuidgen.createRandom(); + m_messageuuid=uuid.toString(); + StringFunctions::UpperCase(m_messageuuid,m_messageuuid); } catch(...) { -- 2.7.4