version 0.2.5

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

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