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

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 5aa8006..842df31 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -22,6 +22,7 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	std::string usk="";
 	std::string fcphost="";
 	std::string hidden="";
+	int freesiteedition=-1;
 
 	if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
 	{
@@ -52,7 +53,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,19 +66,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+messagebase+"/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+":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>";