X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreenet%2Ftrustlistxml.cpp;h=95d3c5e1e74b82efe15566f2b2bf94e826b66bd8;hb=76805933f794915a72b7f0a21b12af6654759f4f;hp=91324274a3716d44d4ea8bc40b8c291520d4b4e6;hpb=047cea32f848d605c549ec123c12c1c400dd7ec1;p=fms.git

diff --git a/src/freenet/trustlistxml.cpp b/src/freenet/trustlistxml.cpp
index 9132427..95d3c5e 100644
--- a/src/freenet/trustlistxml.cpp
+++ b/src/freenet/trustlistxml.cpp
@@ -80,16 +80,9 @@ std::string TrustListXML::GetTrustListTrustComment(const long index)
 std::string TrustListXML::GetXML()
 {
 	Poco::AutoPtr<Poco::XML::Document> doc=new Poco::XML::Document;
-	//TiXmlDocument td;
-	//TiXmlDeclaration *tdec=new TiXmlDeclaration("1.0","UTF-8","");
-	Poco::XML::Element *root=doc->createElement("TrustList");
-	//TiXmlElement *tid;
-	//TiXmlPrinter tp;
+	Poco::AutoPtr<Poco::XML::Element> root=doc->createElement("TrustList");
 
 	doc->appendChild(root);
-	//td.LinkEndChild(tdec);
-	//tid=new TiXmlElement("TrustList");
-	//td.LinkEndChild(tid);
 
 	for(std::vector<trust>::iterator i=m_trust.begin(); i!=m_trust.end(); i++)
 	{
@@ -97,36 +90,27 @@ std::string TrustListXML::GetXML()
 		std::string trustlisttrust;
 		StringFunctions::Convert((*i).m_messagetrust,messagetrust);
 		StringFunctions::Convert((*i).m_trustlisttrust,trustlisttrust);
-		Poco::XML::Element *tr=doc->createElement("Trust");
-		//TiXmlElement *tr=new TiXmlElement("Trust");
+		Poco::AutoPtr<Poco::XML::Element> tr=doc->createElement("Trust");
 		root->appendChild(tr);
-		//tid->LinkEndChild(tr);
 		tr->appendChild(XMLCreateCDATAElement(doc,"Identity",(*i).m_identity));
-		//tr->LinkEndChild(XMLCreateCDATAElement("Identity",(*i).m_identity));
 		if((*i).m_messagetrust>=0)
 		{
 			tr->appendChild(XMLCreateTextElement(doc,"MessageTrustLevel",messagetrust));
-			//tr->LinkEndChild(XMLCreateTextElement("MessageTrustLevel",messagetrust));
 		}
 		if((*i).m_trustlisttrust>=0)
 		{
 			tr->appendChild(XMLCreateTextElement(doc,"TrustListTrustLevel",trustlisttrust));
-			//tr->LinkEndChild(XMLCreateTextElement("TrustListTrustLevel",trustlisttrust));
 		}
 		if((*i).m_messagetrustcomment!="")
 		{
 			tr->appendChild(XMLCreateTextElement(doc,"MessageTrustComment",(*i).m_messagetrustcomment));
-			//tr->LinkEndChild(XMLCreateCDATAElement("MessageTrustComment",(*i).m_messagetrustcomment));
 		}
 		if((*i).m_trustlisttrustcomment!="")
 		{
 			tr->appendChild(XMLCreateTextElement(doc,"TrustListTrustComment",(*i).m_trustlisttrustcomment));
-			//tr->LinkEndChild(XMLCreateCDATAElement("TrustListTrustComment",(*i).m_trustlisttrustcomment));
 		}
 	}
 
-	//td.Accept(&tp);
-	//return std::string(tp.CStr());
 	return GenerateXML(doc);
 }
 
@@ -228,93 +212,4 @@ const bool TrustListXML::ParseXML(const std::string &xml)
 	}
 
 	return parsed;
-
-	/*
-	TiXmlDocument td;
-	td.Parse(xml.c_str());
-
-	if(!td.Error())
-	{
-		std::string identity;
-		std::string messagetruststr;
-		std::string trustlisttruststr;
-		std::string messagetrustcomment="";
-		std::string trustlisttrustcomment="";
-		long messagetrust;
-		long trustlisttrust;
-		TiXmlText *txt;
-		TiXmlHandle hnd(&td);
-		TiXmlNode *node;
-		std::vector<std::string> m_foundkeys;
-
-		Initialize();
-
-		node=hnd.FirstChild("TrustList").FirstChild("Trust").ToElement();
-		while(node)
-		{
-			identity="";
-			messagetrust=-1;
-			trustlisttrust=-1;
-			messagetrustcomment="";
-			trustlisttrustcomment="";
-
-			TiXmlHandle hnd2(node);
-			txt=hnd2.FirstChild("Identity").FirstChild().ToText();
-			if(txt)
-			{
-				identity=SanitizeSingleString(txt->ValueStr());
-			}
-			txt=hnd2.FirstChild("MessageTrustLevel").FirstChild().ToText();
-			if(txt)
-			{
-				messagetruststr=SanitizeSingleString(txt->ValueStr());
-				if(messagetruststr!="")
-				{
-					StringFunctions::Convert(messagetruststr,messagetrust);
-				}
-			}
-			txt=hnd2.FirstChild("TrustListTrustLevel").FirstChild().ToText();
-			if(txt)
-			{
-				trustlisttruststr=SanitizeSingleString(txt->ValueStr());
-				if(trustlisttruststr!="")
-				{
-					StringFunctions::Convert(trustlisttruststr,trustlisttrust);
-				}
-			}
-			txt=hnd2.FirstChild("MessageTrustComment").FirstChild().ToText();
-			if(txt)
-			{
-				messagetrustcomment=txt->ValueStr();
-			}
-			txt=hnd2.FirstChild("TrustListTrustComment").FirstChild().ToText();
-			if(txt)
-			{
-				trustlisttrustcomment=txt->ValueStr();
-			}
-
-			if(identity!="" && messagetrust>=-1 && messagetrust<=100 && trustlisttrust>=-1 && trustlisttrust<=100)
-			{
-				// check so we don't add the same identity multiple times from a trust list
-				if(std::find(m_foundkeys.begin(),m_foundkeys.end(),identity)==m_foundkeys.end())
-				{
-					m_foundkeys.push_back(identity);
-					m_trust.push_back(trust(identity,messagetrust,trustlisttrust,messagetrustcomment,trustlisttrustcomment));
-				}
-			}
-			else
-			{
-				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"TrustListXML::ParseXML malformed Trust in TrustList.xml");
-			}
-			
-			node=node->NextSibling("Trust");
-		}
-		return true;
-
-	}
-	else
-	{
-		return false;
-	}
-	*/
 }