version 0.2.8

[fms.git] / src / http / pages / peerdetailspage.cpp

diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 6d05231..5aa8006 100644 (file)
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -1,6 +1,7 @@
 #include "../../../include/http/pages/peerdetailspage.h"\r
 #include "../../../include/stringfunctions.h"\r
 #include "../../../include/option.h"\r
+#include "../../../include/global.h"\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
@@ -15,7 +16,6 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
        std::string publickey;\r
        std::string messagetrust;\r
        std::string trustlisttrust;\r
-       std::string keypart="";\r
        std::string lastseen="";\r
        std::string dateadded="";\r
        std::string addedmethod="";\r
@@ -69,8 +69,10 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
                usk=publickey;\r
                if(usk.find("SSK@")==0)\r
                {\r
+                       std::string messagebase="";\r
+                       Option::Instance()->Get("MessageBase",messagebase);\r
                        usk.erase(0,3);\r
-                       usk="USK"+usk+"fms/0/";\r
+                       usk="USK"+usk+messagebase+"/0/";\r
                }\r
 \r
                content+="<tr><td>Name</td><td>"+SanitizeOutput(name)+"</td></tr>";\r
@@ -144,13 +146,8 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
                st.ResultText(5,messagetrustcomment);\r
                st.ResultText(6,trustlisttrustcomment);\r
 \r
-               if(publickey.size()>8)\r
-               {\r
-                       keypart=publickey.substr(3,5);\r
-               }\r
-\r
                content+="<tr>";\r
-               content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";\r
+               content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</a></td>";\r
                content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";\r
                content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";\r
                content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";\r
@@ -182,14 +179,9 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
                st.ResultText(4,thisid);\r
                st.ResultText(5,messagetrustcomment);\r
                st.ResultText(6,trustlisttrustcomment);\r
-               \r
-               if(publickey.size()>8)\r
-               {\r
-                       keypart=publickey.substr(3,5);\r
-               }\r
 \r
                content+="<tr>";\r
-               content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(name+keypart)+"...</a></td>";\r
+               content+="<td><a href=\"peerdetails.htm?identityid="+thisid+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</a></td>";\r
                content+="<td "+GetClassString(messagetrust)+">"+messagetrust+"</td>";\r
                content+="<td>"+SanitizeOutput(messagetrustcomment)+"</td>";\r
                content+="<td "+GetClassString(trustlisttrust)+">"+trustlisttrust+"</td>";\r