X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeertrustpage.cpp;h=9429ede25a745e135869ebd410467d2f790761ad;hb=107bd97018964d48425306026d06afd038e84db0;hp=48a19e89e2d1cc580b639ec2f0bb511b15d36750;hpb=ee580d19b7920904587e18d72a3465d52eab6204;p=fms.git

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index 48a19e8..9429ede 100644
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -71,6 +71,10 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		std::vector<std::string> lmt;
 		std::vector<std::string> oldltlt;
 		std::vector<std::string> ltlt;
+		std::vector<std::string> oldmtc;
+		std::vector<std::string> mtc;
+		std::vector<std::string> oldtltc;
+		std::vector<std::string> tltc;
 		int localmessagetrust=0;
 		int localtrustlisttrust=0;
 		int identityid;
@@ -80,12 +84,16 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		CreateArgArray(queryvars,"localmessagetrust",lmt);
 		CreateArgArray(queryvars,"oldlocaltrustlisttrust",oldltlt);
 		CreateArgArray(queryvars,"localtrustlisttrust",ltlt);
+		CreateArgArray(queryvars,"oldmessagetrustcomment",oldmtc);
+		CreateArgArray(queryvars,"messagetrustcomment",mtc);
+		CreateArgArray(queryvars,"oldtrustlisttrustcomment",oldtltc);
+		CreateArgArray(queryvars,"trustlisttrustcomment",tltc);
 		
-		SQLite3DB::Statement update=m_db->Prepare("UPDATE tblIdentity SET LocalMessageTrust=?, LocalTrustListTrust=? WHERE IdentityID=?;");
+		SQLite3DB::Statement update=m_db->Prepare("UPDATE tblIdentity SET LocalMessageTrust=?, LocalTrustListTrust=?, MessageTrustComment=?, TrustListTrustComment=? WHERE IdentityID=?;");
 
 		for(int i=0; i<identityids.size(); i++)
 		{
-			if(oldlmt[i]!=lmt[i] || oldltlt[i]!=ltlt[i])
+			if(oldlmt[i]!=lmt[i] || oldltlt[i]!=ltlt[i] || oldmtc[i]!=mtc[i] || oldtltc[i]!=tltc[i])
 			{
 				StringFunctions::Convert(lmt[i],localmessagetrust);
 				StringFunctions::Convert(ltlt[i],localtrustlisttrust);
@@ -107,7 +115,9 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 				{
 					update.Bind(1);
 				}
-				update.Bind(2,identityid);
+				update.Bind(2,mtc[i]);
+				update.Bind(3,tltc[i]);
+				update.Bind(4,identityid);
 				update.Step();
 				update.Reset();
 			}
@@ -155,7 +165,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	}
 
 	content+="<h2>Peer Trust</h2>";
-	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.";
+	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.";
 	content+="<div style=\"text-align:center;\">";
 	content+="<form name=\"frmsearch\" method=\"POST\" action=\"peertrust.htm\">";
 	content+="<input type=\"text\" name=\"namesearch\" value=\""+SanitizeOutput(namesearch)+"\">";
@@ -165,18 +175,30 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	content+="<form name=\"frmtrust\" method=\"POST\">";
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"update\">";
 	content+="<input type=\"hidden\" name=\"startrow\" value=\""+startrowstr+"\">";
-	content+="<table>";
+	if(namesearch!="")
+	{
+		content+="<input type=\"hidden\" name=\"namesearch\" value=\""+SanitizeOutput(namesearch)+"\">";
+	}
+	content+="<table class=\"small90\">";
 	content+="<tr><th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"Name",ReverseSort("Name",sortby,sortorder))+"\">Name</a></th>";
 	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"LocalMessageTrust",ReverseSort("LocalMessageTrust",sortby,sortorder))+"\">Local Message Trust</a></th>";
+	content+="<th>Message Comment</th>";
 	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"PeerMessageTrust",ReverseSort("PeerMessageTrust",sortby,sortorder))+"\">Peer Message Trust</a></th>";
 	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"LocalTrustListTrust",ReverseSort("LocalTrustListTrust",sortby,sortorder))+"\">Local Trust List Trust</a></th>";
-	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"PeerTrustListTrust",ReverseSort("PeerTrustListTrust",sortby,sortorder))+"\">Peer Trust List Trust</a></th></tr>";
+	content+="<th>Trust Comment</th>";
+	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"PeerTrustListTrust",ReverseSort("PeerTrustListTrust",sortby,sortorder))+"\">Peer Trust List Trust</a></th>";
+	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"MessageCount",ReverseSort("MessageCount",sortby,sortorder))+"\">Message Count</a></th>";
+	content+="</tr>\r\n";
 	
 	// get count of identities we are showing
 	sql="SELECT COUNT(*) FROM tblIdentity";
 	if(namesearch!="")
 	{
-		sql+=" WHERE Name LIKE '%' || ? || '%'";
+		sql+=" WHERE Name LIKE '%' || ? || '%' AND tblIdentity.Hidden='false'";
+	}
+	else
+	{
+		sql+=" WHERE tblIdentity.Hidden='false'";	
 	}
 	sql+=";";
 	SQLite3DB::Statement st=m_db->Prepare(sql);
@@ -188,11 +210,16 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	st.ResultInt(0,identitycount);
 	st.Finalize();
 
-	sql="SELECT IdentityID,Name,LocalMessageTrust,PeerMessageTrust,LocalTrustListTrust,PeerTrustListTrust,PublicKey FROM tblIdentity";
+	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";
 	if(namesearch!="")
 	{
-		sql+=" WHERE Name LIKE  '%' || ? || '%'";
+		sql+=" WHERE (Name LIKE  '%' || ? || '%' OR PublicKey LIKE '%' || ? || '%') AND tblIdentity.Hidden='false'";
 	}
+	else
+	{
+		sql+=" WHERE tblIdentity.Hidden='false'";	
+	}
+	sql+=" GROUP BY tblIdentity.IdentityID";
 	sql+=" ORDER BY";
 	if(sortby=="Name")
 	{
@@ -211,6 +238,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	if(namesearch!="")
 	{
 		st.Bind(0,namesearch);
+		st.Bind(1,namesearch);
 	}
 	st.Step();
 
@@ -224,6 +252,9 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		std::string peertrustlisttrust;
 		std::string publickey;
 		std::string keypart="";
+		std::string messagetrustcomment="";
+		std::string trustlisttrustcomment="";
+		std::string messagecountstr="";
 
 		StringFunctions::Convert(count,countstr);
 
@@ -234,6 +265,9 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		st.ResultText(4,localtrustlisttrust);
 		st.ResultText(5,peertrustlisttrust);
 		st.ResultText(6,publickey);
+		st.ResultText(7,messagetrustcomment);
+		st.ResultText(8,trustlisttrustcomment);
+		st.ResultText(9,messagecountstr);
 
 		if(publickey.size()>8)
 		{
@@ -256,15 +290,24 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		content+="</td>";
 		content+="<td "+GetClassString(localmessagetrust)+">";
 		content+="<input type=\"hidden\" name=\"oldlocalmessagetrust["+countstr+"]\" value=\""+localmessagetrust+"\">";
-		content+="<input type=\"text\" name=\"localmessagetrust["+countstr+"]\" value=\""+localmessagetrust+"\" size=\"2\" maxlength=\"3\"></td>";
+		content+="<input type=\"text\" name=\"localmessagetrust["+countstr+"]\" value=\""+localmessagetrust+"\" size=\"2\" maxlength=\"3\" class=\"small90\"></td>";
+		content+="<td "+GetClassString(localmessagetrust)+">";
+		content+="<input type=\"hidden\" name=\"oldmessagetrustcomment["+countstr+"]\" value=\""+SanitizeOutput(messagetrustcomment)+"\">";
+		content+="<input type=\"text\" name=\"messagetrustcomment["+countstr+"]\" value=\""+SanitizeOutput(messagetrustcomment)+"\" maxlength=\"50\" class=\"small90\">";
+		content+="</td>";		
 		content+="<td "+GetClassString(peermessagetrust)+">";
 		content+=peermessagetrust+"</td>";
 		content+="<td "+GetClassString(localtrustlisttrust)+">";
 		content+="<input type=\"hidden\" name=\"oldlocaltrustlisttrust["+countstr+"]\" value=\""+localtrustlisttrust+"\">";
-		content+="<input type=\"text\" name=\"localtrustlisttrust["+countstr+"]\" value=\""+localtrustlisttrust+"\" size=\"2\" maxlength=\"3\"></td>";
+		content+="<input type=\"text\" name=\"localtrustlisttrust["+countstr+"]\" value=\""+localtrustlisttrust+"\" size=\"2\" maxlength=\"3\" class=\"small90\"></td>";
+		content+="<td "+GetClassString(localtrustlisttrust)+">";
+		content+="<input type=\"hidden\" name=\"oldtrustlisttrustcomment["+countstr+"]\" value=\""+SanitizeOutput(trustlisttrustcomment)+"\">";
+		content+="<input type=\"text\" name=\"trustlisttrustcomment["+countstr+"]\" value=\""+SanitizeOutput(trustlisttrustcomment)+"\" maxlength=\"50\" class=\"small90\">";
+		content+="</td>";
 		content+="<td "+GetClassString(peertrustlisttrust)+">";
 		content+=peertrustlisttrust+"</td>";
-		content+="</tr>";
+		content+="<td>"+messagecountstr+"</td>";
+		content+="</tr>\r\n";
 		st.Step();
 		count++;
 	}
@@ -278,17 +321,17 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		if(startrow>0)
 		{
 			StringFunctions::Convert(startrow-rowsperpage,tempstr);
-			content+="<td colspan=\"2\" align=\"left\"><a href=\"peertrust.htm?"+BuildQueryString(startrow-rowsperpage,namesearch,sortby,sortorder)+"\"><-- Previous Page</a></td>";
-			cols+=2;
+			content+="<td colspan=\"3\" align=\"left\"><a href=\"peertrust.htm?"+BuildQueryString(startrow-rowsperpage,namesearch,sortby,sortorder)+"\"><-- Previous Page</a></td>";
+			cols+=3;
 		}
 		if(startrow+rowsperpage<identitycount)
 		{
-			while(cols<3)
+			while(cols<5)
 			{
 				content+="<td></td>";
 				cols++;
 			}
-			content+="<td colspan=\"2\" align=\"right\"><a href=\"peertrust.htm?"+BuildQueryString(startrow+rowsperpage,namesearch,sortby,sortorder)+"\">Next Page --></a></td>";
+			content+="<td colspan=\"3\" align=\"right\"><a href=\"peertrust.htm?"+BuildQueryString(startrow+rowsperpage,namesearch,sortby,sortorder)+"\">Next Page --></a></td>";
 		}
 		content+="</tr>";
 	}