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

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index fc522b0..5aa8006 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -1,6 +1,7 @@
 #include "../../../include/http/pages/peerdetailspage.h"
 #include "../../../include/stringfunctions.h"
 #include "../../../include/option.h"
+#include "../../../include/global.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -15,12 +16,12 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	std::string publickey;
 	std::string messagetrust;
 	std::string trustlisttrust;
-	std::string keypart="";
 	std::string lastseen="";
 	std::string dateadded="";
 	std::string addedmethod="";
 	std::string usk="";
 	std::string fcphost="";
+	std::string hidden="";
 
 	if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
 	{
@@ -35,9 +36,23 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		del.Step();
 	}
 
+	if(identityid!=0 && queryvars.find("formaction")!=queryvars.end() && (*queryvars.find("formaction")).second=="hide")
+	{
+		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")
+	{
+		SQLite3DB::Statement del=m_db->Prepare("UPDATE tblIdentity SET Hidden='false' WHERE IdentityID=?;");
+		del.Bind(0,identityid);
+		del.Step();
+	}
+
 	Option::Instance()->Get("FCPHost",fcphost);
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod FROM tblIdentity WHERE IdentityID=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden FROM tblIdentity WHERE IdentityID=?;");
 	st.Bind(0,identityid);
 	st.Step();
 
@@ -49,12 +64,15 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		st.ResultText(2,dateadded);
 		st.ResultText(3,lastseen);
 		st.ResultText(4,addedmethod);
+		st.ResultText(5,hidden);
 
 		usk=publickey;
 		if(usk.find("SSK@")==0)
 		{
+			std::string messagebase="";
+			Option::Instance()->Get("MessageBase",messagebase);
 			usk.erase(0,3);
-			usk="USK"+usk+"/fms/0/";
+			usk="USK"+usk+messagebase+"/0/";
 		}
 
 		content+="<tr><td>Name</td><td>"+SanitizeOutput(name)+"</td></tr>";
@@ -63,6 +81,22 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		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>";
+		content+="<tr><td>Hidden in Main Peer Trust Page</td>";
+		content+="<td>"+hidden;
+		content+="&nbsp;<form name=\"frmhidden\" method=\"POST\">";
+		content+="<input type=\"hidden\" name=\"identityid\" value=\""+identityidstr+"\">";
+		if(hidden=="false")
+		{
+			content+="<input type=\"hidden\" name=\"formaction\" value=\"hide\">";
+			content+="<input type=\"submit\" value=\"Hide\">";
+		}
+		else
+		{
+			content+="<input type=\"hidden\" name=\"formaction\" value=\"show\">";
+			content+="<input type=\"submit\" value=\"Show\">";
+		}
+		content+="</form>";
+		content+="</td></tr>";
 	}
 
 	// get message count posted by this identity
@@ -112,13 +146,8 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		st.ResultText(5,messagetrustcomment);
 		st.ResultText(6,trustlisttrustcomment);
 
-		if(publickey.size()>8)
-		{
-			keypart=publickey.substr(3,5);
-		}
-
 		content+="<tr>";
-		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";
+		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</a></td>";
 		content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";
 		content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";
 		content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";
@@ -132,6 +161,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	st.Bind(0,identityid);
 	st.Step();
 
+	content+="<tr><th colspan=\"5\"><hr></th></tr>";
 	content+="<tr><th colspan=\"5\">";
 	content+="Trust of this identity from other identities";
 	content+="</th></tr>";
@@ -149,14 +179,9 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		st.ResultText(4,thisid);
 		st.ResultText(5,messagetrustcomment);
 		st.ResultText(6,trustlisttrustcomment);
-		
-		if(publickey.size()>8)
-		{
-			keypart=publickey.substr(3,5);
-		}
 
 		content+="<tr>";
-		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";
+		content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</a></td>";
 		content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";
 		content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";
 		content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";