X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeertrustpage.cpp;h=667595d126c42572369f84445588ad9ff73e2554;hp=b353243972d0d9e482c0b5cf40f1a531016d7cbe;hb=52c0819bfc1d083c6e0738f75f0d7eeba521295a;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index b353243..667595d 100644
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -5,6 +5,48 @@
 	#include <xmem.h>
 #endif
 
+const std::string PeerTrustPage::BuildQueryString(const long startrow, const std::string &namesearch, const std::string &sortby, const std::string &sortorder)
+{
+	std::string returnval="";
+	std::string tempval="";
+	
+	if(startrow>=0)
+	{
+		StringFunctions::Convert(startrow,tempval);
+		returnval+="startrow="+tempval;
+	}
+
+	if(namesearch!="")
+	{
+		if(returnval!="")
+		{
+			returnval+="&";
+		}
+		returnval+="namesearch="+namesearch;
+	}
+
+	if(sortby!="")
+	{
+		if(returnval!="")
+		{
+			returnval+="&";
+		}
+		returnval+="sortby="+sortby;
+	}
+
+	if(sortorder!="")
+	{
+		if(returnval!="")
+		{
+			returnval+="&";
+		}
+		returnval+="sortorder="+sortorder;
+	}
+
+	return returnval;
+
+}
+
 const std::string PeerTrustPage::GeneratePage(const std::string &method, const std::map<std::string,std::string> &queryvars)
 {
 	int count=0;
@@ -15,6 +57,10 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	std::string rowsperpagestr;
 	int startrow=0;
 	std::string startrowstr="0";
+	std::string namesearch="";
+	std::string sql;
+	std::string sortby="";
+	std::string sortorder="";
 
 	StringFunctions::Convert(rowsperpage,rowsperpagestr);
 
@@ -68,20 +114,90 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		StringFunctions::Convert(startrow,startrowstr);
 	}
 
+	// sort by
+	if(queryvars.find("sortby")!=queryvars.end())
+	{
+		sortby=(*queryvars.find("sortby")).second;
+	}
+	else
+	{
+		sortby="Name";
+	}
+
+	// sort order
+	if(queryvars.find("sortorder")!=queryvars.end())
+	{
+		sortorder=(*queryvars.find("sortorder")).second;
+	}
+	else
+	{
+		sortorder="ASC";
+	}
+
+	// if we are searching by name
+	if(queryvars.find("namesearch")!=queryvars.end())
+	{
+		namesearch=(*queryvars.find("namesearch")).second;
+	}
+
 	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.";
+	content+="<div style=\"text-align:center;\">";
+	content+="<form name=\"frmsearch\" method=\"POST\" action=\"peertrust.htm\">";
+	content+="<input type=\"text\" name=\"namesearch\">";
+	content+="<input type=\"submit\" value=\"Search\">";
+	content+="</form>";
+	content+="</div>";
 	content+="<form name=\"frmtrust\" method=\"POST\">";
 	content+="<input type=\"hidden\" name=\"formaction\" value=\"update\">";
 	content+="<input type=\"hidden\" name=\"startrow\" value=\""+startrowstr+"\">";
 	content+="<table>";
-	content+="<tr><th>Name</th><th>Local Message Trust</th><th>Peer Message Trust</th><th>Local Trust List Trust</th><th>Peer Trust List Trust</th></tr>";
+	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><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>";
 	
-	SQLite3DB::Statement st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity;");
+	// get count of identities we are showing
+	sql="SELECT COUNT(*) FROM tblIdentity";
+	if(namesearch!="")
+	{
+		sql+=" WHERE Name LIKE '%' || ? || '%'";
+	}
+	sql+=";";
+	SQLite3DB::Statement st=m_db->Prepare(sql);
+	if(namesearch!="")
+	{
+		st.Bind(0,namesearch);
+	}
 	st.Step();
 	st.ResultInt(0,identitycount);
 	st.Finalize();
 
-	st=m_db->Prepare("SELECT IdentityID,Name,LocalMessageTrust,PeerMessageTrust,LocalTrustListTrust,PeerTrustListTrust,PublicKey FROM tblIdentity ORDER BY Name COLLATE NOCASE LIMIT "+startrowstr+","+rowsperpagestr+";");
+	sql="SELECT IdentityID,Name,LocalMessageTrust,PeerMessageTrust,LocalTrustListTrust,PeerTrustListTrust,PublicKey FROM tblIdentity";
+	if(namesearch!="")
+	{
+		sql+=" WHERE Name LIKE  '%' || ? || '%'";
+	}
+	sql+=" ORDER BY";
+	if(sortby=="Name")
+	{
+		sql+=" Name COLLATE NOCASE";
+	}
+	else
+	{
+		sql+=" "+sortby;
+	}
+	if(sortorder!="")
+	{
+		sql+=" "+sortorder;
+	}
+	sql+=" LIMIT "+startrowstr+","+rowsperpagestr+";";
+	st=m_db->Prepare(sql);
+	if(namesearch!="")
+	{
+		st.Bind(0,namesearch);
+	}
 	st.Step();
 
 	while(st.RowReturned())
@@ -113,6 +229,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		content+="<tr>";
 		content+="<td title=\""+publickey+"\">";
 		content+="<input type=\"hidden\" name=\"identityid["+countstr+"]\" value=\""+identityid+"\">";
+		content+="<a href=\"peerdetails.htm?identityid="+identityid+"\">";
 		if(name!="")
 		{
 			content+=SanitizeOutput(name+keypart)+"...";
@@ -121,6 +238,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		{
 			content+="[Unknown Name]";
 		}
+		content+="</a>";
 		content+="</td>";
 		content+="<td "+GetClassString(localmessagetrust)+">";
 		content+="<input type=\"hidden\" name=\"oldlocalmessagetrust["+countstr+"]\" value=\""+localmessagetrust+"\">";
@@ -146,18 +264,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?startrow="+tempstr+"\"><-- Previous Page</a></td>";
+			content+="<td colspan=\"2\" align=\"left\"><a href=\"peertrust.htm?"+BuildQueryString(startrow-rowsperpage,namesearch,sortby,sortorder)+"\"><-- Previous Page</a></td>";
 			cols+=2;
 		}
 		if(startrow+rowsperpage<identitycount)
 		{
-			StringFunctions::Convert(startrow+rowsperpage,tempstr);
 			while(cols<3)
 			{
 				content+="<td></td>";
 				cols++;
 			}
-			content+="<td colspan=\"2\" align=\"right\"><a href=\"peertrust.htm?startrow="+tempstr+"\">Next Page --></a></td>";
+			content+="<td colspan=\"2\" align=\"right\"><a href=\"peertrust.htm?"+BuildQueryString(startrow+rowsperpage,namesearch,sortby,sortorder)+"\">Next Page --></a></td>";
 		}
 		content+="</tr>";
 	}
@@ -188,6 +305,25 @@ const std::string PeerTrustPage::GetClassString(const std::string &trustlevel)
 	}
 }
 
+const std::string PeerTrustPage::ReverseSort(const std::string &sortname, const std::string &currentsortby, const std::string &currentsortorder)
+{
+	if(sortname==currentsortby)
+	{
+		if(currentsortorder=="ASC")
+		{
+			return "DESC";
+		}
+		else
+		{
+			return "ASC";
+		}
+	}
+	else
+	{
+		return currentsortorder;
+	}
+}
+
 const bool PeerTrustPage::WillHandleURI(const std::string &uri)
 {
 	if(uri.find("peertrust.")!=std::string::npos)