X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;fp=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;h=ea3892543ea189b6f06d6a6f56883cb9d9f3e7de;hb=9a14c0d9f7f7c319e539583b93664953764e83b7;hp=afb1c4211a269b0f13876cf5cb29f3f9aef57f65;hpb=14fff12d9df0ee30e2df4bf9d22c2e83065816df;p=fms.git diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp index afb1c42..ea38925 100644 --- a/src/http/pages/peerdetailspage.cpp +++ b/src/http/pages/peerdetailspage.cpp @@ -23,9 +23,12 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const std::string fcphost=""; std::string hidden=""; int freesiteedition=-1; + std::string publishtrustlist=""; + std::string messagebase=""; std::string fproxyport="8888"; Option::Instance()->Get("FProxyPort",fproxyport); + Option::Instance()->Get("MessageBase",messagebase); if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="") { @@ -56,7 +59,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const Option::Instance()->Get("FCPHost",fcphost); - SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden,FreesiteEdition FROM tblIdentity WHERE IdentityID=?;"); + SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden,FreesiteEdition,PublishTrustList FROM tblIdentity WHERE IdentityID=?;"); st.Bind(0,identityid); st.Step(); @@ -73,13 +76,12 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const { st.ResultInt(6,freesiteedition); } + st.ResultText(7,publishtrustlist); usk=publickey; if(freesiteedition>=0 && usk.find("SSK@")==0) { - std::string messagebase=""; std::string editionstr=""; - Option::Instance()->Get("MessageBase",messagebase); usk.erase(0,3); StringFunctions::Convert(freesiteedition,editionstr); usk="USK"+usk+messagebase+"/"+editionstr+"/"; @@ -95,6 +97,15 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const { content+="Freesite"+SanitizeOutput(usk)+""; } + if(publishtrustlist=="true") + { + std::string lastseendate=lastseen; + if(lastseendate.size()>=10) + { + lastseendate=lastseendate.substr(0,10); + } + content+="Trust List XMLTrust List"; + } content+="Date Added"+dateadded+""; content+="Last Seen"+lastseen+""; content+="Added Method"+SanitizeOutput(addedmethod)+"";