X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeerdetailspage.cpp;h=afb1c4211a269b0f13876cf5cb29f3f9aef57f65;hb=52581afffd81f5a71c129d87e3ac822d9522f12d;hp=6d05231d75d5921ea846c51b97f1675e36355dd0;hpb=107bd97018964d48425306026d06afd038e84db0;p=fms.git

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 6d05231..afb1c42 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,13 +16,16 @@ 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="";
+	int freesiteedition=-1;
+
+	std::string fproxyport="8888";
+	Option::Instance()->Get("FProxyPort",fproxyport);
 
 	if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
 	{
@@ -52,7 +56,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 FROM tblIdentity WHERE IdentityID=?;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod,Hidden,FreesiteEdition FROM tblIdentity WHERE IdentityID=?;");
 	st.Bind(0,identityid);
 	st.Step();
 
@@ -65,17 +69,32 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		st.ResultText(3,lastseen);
 		st.ResultText(4,addedmethod);
 		st.ResultText(5,hidden);
+		if(st.ResultNull(6)==false)
+		{
+			st.ResultInt(6,freesiteedition);
+		}
 
 		usk=publickey;
-		if(usk.find("SSK@")==0)
+		if(freesiteedition>=0 && usk.find("SSK@")==0)
 		{
+			std::string messagebase="";
+			std::string editionstr="";
+			Option::Instance()->Get("MessageBase",messagebase);
 			usk.erase(0,3);
-			usk="USK"+usk+"fms/0/";
+			StringFunctions::Convert(freesiteedition,editionstr);
+			usk="USK"+usk+messagebase+"/"+editionstr+"/";
+		}
+		else
+		{
+			usk="";
 		}
 
 		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>";
+		if(usk!="")
+		{
+			content+="<tr><td>Freesite</td><td class=\"smaller\"><a href=\"http://"+fcphost+":"+fproxyport+"/"+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>";
@@ -144,13 +163,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>";
@@ -182,14 +196,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>";