version 0.2.6

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

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index ea01cc4..9429ede 100644 (file)
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -165,7 +165,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        }\r
 \r
        content+="<h2>Peer Trust</h2>";\r
-       content+="Message Trust is how much you trust the identity to post good messages. Trust List Trust is how much weight you want the trust list of that identity to have when calculating the total. The local trust levels are set by you, and the peer trust levels are calculated by a weighted average using other identities' trust lists.";\r
+       content+="Message Trust is how much you trust the identity to post good messages. Trust List Trust is how much weight you want the trust list of that identity to have when calculating the total. The local trust levels are set by you, and the peer trust levels are calculated by a weighted average using other identities' trust lists.  Trust is recalculated once an hour from received trust lists.";\r
        content+="<div style=\"text-align:center;\">";\r
        content+="<form name=\"frmsearch\" method=\"POST\" action=\"peertrust.htm\">";\r
        content+="<input type=\"text\" name=\"namesearch\" value=\""+SanitizeOutput(namesearch)+"\">";\r
@@ -194,7 +194,11 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        sql="SELECT COUNT(*) FROM tblIdentity";\r
        if(namesearch!="")\r
        {\r
-               sql+=" WHERE Name LIKE '%' || ? || '%'";\r
+               sql+=" WHERE Name LIKE '%' || ? || '%' AND tblIdentity.Hidden='false'";\r
+       }\r
+       else\r
+       {\r
+               sql+=" WHERE tblIdentity.Hidden='false'";       \r
        }\r
        sql+=";";\r
        SQLite3DB::Statement st=m_db->Prepare(sql);\r
@@ -209,7 +213,11 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        sql="SELECT tblIdentity.IdentityID,Name,LocalMessageTrust,PeerMessageTrust,LocalTrustListTrust,PeerTrustListTrust,PublicKey,MessageTrustComment,TrustListTrustComment,COUNT(MessageID) AS 'MessageCount' FROM tblIdentity LEFT JOIN tblMessage ON tblIdentity.IdentityID=tblMessage.IdentityID";\r
        if(namesearch!="")\r
        {\r
-               sql+=" WHERE Name LIKE  '%' || ? || '%'";\r
+               sql+=" WHERE (Name LIKE  '%' || ? || '%' OR PublicKey LIKE '%' || ? || '%') AND tblIdentity.Hidden='false'";\r
+       }\r
+       else\r
+       {\r
+               sql+=" WHERE tblIdentity.Hidden='false'";       \r
        }\r
        sql+=" GROUP BY tblIdentity.IdentityID";\r
        sql+=" ORDER BY";\r
@@ -230,6 +238,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
        if(namesearch!="")\r
        {\r
                st.Bind(0,namesearch);\r
+               st.Bind(1,namesearch);\r
        }\r
        st.Step();\r
 \r