X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;h=4148c575f0e9a2c45a0ab477e4b641c577f2a1b0;hb=05ef25de71be91442b4cbd22dc7cc45629c5d5bb;hp=afb1c4211a269b0f13876cf5cb29f3f9aef57f65;hpb=52581afffd81f5a71c129d87e3ac822d9522f12d;p=fms.git diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp index afb1c42..4148c57 100644 --- a/src/http/pages/peerdetailspage.cpp +++ b/src/http/pages/peerdetailspage.cpp @@ -20,12 +20,15 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const std::string dateadded=""; std::string addedmethod=""; std::string usk=""; - std::string fcphost=""; + std::string fcphost="127.0.0.1"; 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!="") { @@ -33,21 +36,21 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const StringFunctions::Convert((*queryvars.find("identityid")).second,identityid); } - if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="deletemessages") + if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="deletemessages" && ValidateFormPassword(queryvars)) { SQLite3DB::Statement del=m_db->Prepare("DELETE FROM tblMessage WHERE IdentityID=?;"); del.Bind(0,identityid); del.Step(); } - if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="hide") + if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="hide" && ValidateFormPassword(queryvars)) { SQLite3DB::Statement del=m_db->Prepare("UPDATE tblIdentity SET Hidden='true' WHERE IdentityID=?;"); del.Bind(0,identityid); del.Step(); } - if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="show") + if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="show" && ValidateFormPassword(queryvars)) { SQLite3DB::Statement del=m_db->Prepare("UPDATE tblIdentity SET Hidden='false' WHERE IdentityID=?;"); del.Bind(0,identityid); @@ -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,12 +97,22 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const { content+="