X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;h=fc522b09628248f96f0a8982d84d78196da64206;hb=5c0453c8697cfaa843dd7f799e5404733ee56e13;hp=7f06fd2eb51142d72224cad67eb87a084adcf4b7;hpb=4430e7762844c66428b6f822288beb71b7f82b95;p=fms.git

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 7f06fd2..fc522b0 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -1,5 +1,6 @@
 #include "../../../include/http/pages/peerdetailspage.h"
 #include "../../../include/stringfunctions.h"
+#include "../../../include/option.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -17,6 +18,9 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	std::string keypart="";
 	std::string lastseen="";
 	std::string dateadded="";
+	std::string addedmethod="";
+	std::string usk="";
+	std::string fcphost="";
 
 	if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
 	{
@@ -31,7 +35,9 @@ 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=?;");
+	Option::Instance()->Get("FCPHost",fcphost);
+
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod FROM tblIdentity WHERE IdentityID=?;");
 	st.Bind(0,identityid);
 	st.Step();
 
@@ -42,11 +48,21 @@ 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);
+
+		usk=publickey;
+		if(usk.find("SSK@")==0)
+		{
+			usk.erase(0,3);
+			usk="USK"+usk+"/fms/0/";
+		}
 
 		content+="<tr><td>Name</td><td>"+SanitizeOutput(name)+"</td></tr>";
 		content+="<tr><td>Public Key</td><td class=\"smaller\">"+SanitizeOutput(publickey)+"</td></tr>";
+		content+="<tr><td>Freesite</td><td class=\"smaller\"><a href=\"http://"+fcphost+":8888/"+SanitizeOutput(usk)+"\">"+SanitizeOutput(usk)+"</a></td></tr>";
 		content+="<tr><td>Date Added</td><td>"+dateadded+"</td></tr>";
 		content+="<tr><td>Last Seen</td><td>"+lastseen+"</td></tr>";
+		content+="<tr><td>Added Method</td><td class=\"smaller\">"+SanitizeOutput(addedmethod)+"</td></tr>";
 	}
 
 	// get message count posted by this identity
@@ -73,24 +89,28 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	content+="</table>";
 
 
-	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();
 
 	content+="<table>";
-	content+="<tr><th colspan=\"3\">";
+	content+="<tr><th colspan=\"5\">";
 	content+="Trust List of this identity";
 	content+="</th></tr>";
-	content+="<tr><td></td><th>Message Trust</th><th>Trust List Trust</th></tr>";
+	content+="<tr><td></td><th>Message Trust</th><th>Message Comment</th><th>Trust List Trust</th><th>Trust Comment</th></tr>";
 	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 +120,35 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		content+="<tr>";
 		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";
 		content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";
+		content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";
 		content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";
+		content+="<td>"+SanitizeOutput(trustlisttrustcomment)+"</td>";
 		content+="</tr>\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+="<tr><th colspan=\"3\">";
+	content+="<tr><th colspan=\"5\">";
 	content+="Trust of this identity from other identities";
 	content+="</th></tr>";
-	content+="<tr><td></td><th>Message Trust</th><th>Trust List Trust</th></tr>";
+	content+="<tr><td></td><th>Message Trust</th><th>Message Comment</th><th>Trust List Trust</th><th>Trust Comment</th></tr>";
 	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 +158,9 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		content+="<tr>";
 		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";
 		content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";
+		content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";
 		content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";
+		content+="<td>"+SanitizeOutput(trustlisttrustcomment)+"</td>";
 		content+="</tr>";
 
 		st.Step();