X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;h=1ff0493504d4a93b0b10279de4752149829ca48a;hb=175f098e7e712b839db433b93fe8649a402c6784;hp=7f06fd2eb51142d72224cad67eb87a084adcf4b7;hpb=4430e7762844c66428b6f822288beb71b7f82b95;p=fms.git
diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 7f06fd2..1ff0493 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -17,6 +17,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
std::string keypart="";
std::string lastseen="";
std::string dateadded="";
+ std::string addedmethod="";
if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
{
@@ -31,7 +32,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
del.Step();
}
- SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen FROM tblIdentity WHERE IdentityID=?;");
+ SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod FROM tblIdentity WHERE IdentityID=?;");
st.Bind(0,identityid);
st.Step();
@@ -42,11 +43,13 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
st.ResultText(1,publickey);
st.ResultText(2,dateadded);
st.ResultText(3,lastseen);
+ st.ResultText(4,addedmethod);
content+="
Name | "+SanitizeOutput(name)+" |
";
content+="Public Key | "+SanitizeOutput(publickey)+" |
";
content+="Date Added | "+dateadded+" |
";
content+="Last Seen | "+lastseen+" |
";
+ content+="Added Method | "+SanitizeOutput(addedmethod)+" |
";
}
// get message count posted by this identity
@@ -73,7 +76,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
content+="";
- st=m_db->Prepare("SELECT Name,PublicKey,MessageTrust,TrustListTrust,tblIdentity.IdentityID FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.TargetIdentityID=tblIdentity.IdentityID WHERE tblPeerTrust.IdentityID=? ORDER BY Name COLLATE NOCASE;");
+ st=m_db->Prepare("SELECT Name,PublicKey,MessageTrust,TrustListTrust,tblIdentity.IdentityID,tblPeerTrust.MessageTrustComment,tblPeerTrust.TrustListTrustComment FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.TargetIdentityID=tblIdentity.IdentityID WHERE tblPeerTrust.IdentityID=? ORDER BY Name COLLATE NOCASE;");
st.Bind(0,identityid);
st.Step();
@@ -81,16 +84,20 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
content+="";
content+="Trust List of this identity";
content+=" |
";
- content+=" | Message Trust | Trust List Trust |
";
+ content+=" | Message Trust | Message Comment | Trust List Trust | Trust Comment |
";
while(st.RowReturned())
{
std::string thisid="";
+ std::string messagetrustcomment="";
+ std::string trustlisttrustcomment="";
st.ResultText(0,name);
st.ResultText(1,publickey);
st.ResultText(2,messagetrust);
st.ResultText(3,trustlisttrust);
st.ResultText(4,thisid);
+ st.ResultText(5,messagetrustcomment);
+ st.ResultText(6,trustlisttrustcomment);
if(publickey.size()>8)
{
@@ -100,29 +107,35 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
content+="";
content+=""+SanitizeOutput(name+keypart)+"... | ";
content+=""+messagetrust+" | ";
+ content+=""+SanitizeOutput(messagetrustcomment)+" | ";
content+=""+trustlisttrust+" | ";
+ content+=""+SanitizeOutput(trustlisttrustcomment)+" | ";
content+="
\r\n";
st.Step();
}
- st=m_db->Prepare("SELECT Name,PublicKey,MessageTrust,TrustListTrust,tblIdentity.IdentityID FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.IdentityID=tblIdentity.IdentityID WHERE tblPeerTrust.TargetIdentityID=? ORDER BY Name COLLATE NOCASE;");
+ st=m_db->Prepare("SELECT Name,PublicKey,MessageTrust,TrustListTrust,tblIdentity.IdentityID,tblPeerTrust.MessageTrustComment,tblPeerTrust.TrustListTrustComment FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.IdentityID=tblIdentity.IdentityID WHERE tblPeerTrust.TargetIdentityID=? ORDER BY Name COLLATE NOCASE;");
st.Bind(0,identityid);
st.Step();
content+="";
content+="Trust of this identity from other identities";
content+=" |
";
- content+=" | Message Trust | Trust List Trust |
";
+ content+=" | Message Trust | Message Comment | Trust List Trust | Trust Comment |
";
while(st.RowReturned())
{
std::string thisid="";
+ std::string messagetrustcomment="";
+ std::string trustlisttrustcomment="";
st.ResultText(0,name);
st.ResultText(1,publickey);
st.ResultText(2,messagetrust);
st.ResultText(3,trustlisttrust);
st.ResultText(4,thisid);
+ st.ResultText(5,messagetrustcomment);
+ st.ResultText(6,trustlisttrustcomment);
if(publickey.size()>8)
{
@@ -132,7 +145,9 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
content+="";
content+=""+SanitizeOutput(name+keypart)+"... | ";
content+=""+messagetrust+" | ";
+ content+=""+SanitizeOutput(messagetrustcomment)+" | ";
content+=""+trustlisttrust+" | ";
+ content+=""+SanitizeOutput(trustlisttrustcomment)+" | ";
content+="
";
st.Step();