X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeertrustpage.cpp;h=0cb0d42da3d411e73a653857fe1f5b85eb75ba76;hb=175f098e7e712b839db433b93fe8649a402c6784;hp=4a451ed2dd37bf469fafe7ac05bfab8b1c88615c;hpb=37a8d59548287dcad78ef00e7b18058721eb9935;p=fms.git

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index 4a451ed..0cb0d42 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);
 
@@ -25,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;
@@ -34,20 +84,40 @@ 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);
 				StringFunctions::Convert(identityids[i],identityid);
 
-				update.Bind(0,localmessagetrust);
-				update.Bind(1,localtrustlisttrust);
-				update.Bind(2,identityid);
+				if(lmt[i]!="")
+				{
+					update.Bind(0,localmessagetrust);
+				}
+				else
+				{
+					update.Bind(0);
+				}
+				if(ltlt[i]!="")
+				{
+					update.Bind(1,localtrustlisttrust);
+				}
+				else
+				{
+					update.Bind(1);
+				}
+				update.Bind(2,mtc[i]);
+				update.Bind(3,tltc[i]);
+				update.Bind(4,identityid);
 				update.Step();
 				update.Reset();
 			}
@@ -68,20 +138,96 @@ 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\" value=\""+SanitizeOutput(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+"\">";
+	if(namesearch!="")
+	{
+		content+="<input type=\"hidden\" name=\"namesearch\" value=\""+SanitizeOutput(namesearch)+"\">";
+	}
 	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>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>Trust Comment</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,MessageTrustComment,TrustListTrustComment 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())
@@ -93,6 +239,9 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		std::string localtrustlisttrust;
 		std::string peertrustlisttrust;
 		std::string publickey;
+		std::string keypart="";
+		std::string messagetrustcomment="";
+		std::string trustlisttrustcomment="";
 
 		StringFunctions::Convert(count,countstr);
 
@@ -103,27 +252,44 @@ 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);
+
+		if(publickey.size()>8)
+		{
+			keypart=publickey.substr(3,5);
+		}
 
 		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+=name;
+			content+=SanitizeOutput(name+keypart)+"...";
 		}
 		else
 		{
 			content+="[Unknown Name]";
 		}
+		content+="</a>";
 		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+="<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\">";
+		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+="<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\">";
+		content+="</td>";
 		content+="<td "+GetClassString(peertrustlisttrust)+">";
 		content+=peertrustlisttrust+"</td>";
 		content+="</tr>";
@@ -133,7 +299,6 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	
 	if(startrow>0 || startrow+rowsperpage<identitycount)
 	{
-		int tempint;
 		std::string tempstr;
 		int cols=0;
 
@@ -141,23 +306,22 @@ 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>";
-			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)
 		{
-			StringFunctions::Convert(startrow+rowsperpage,tempstr);
-			while(cols<3)
+			while(cols<4)
 			{
 				content+="<td></td>";
 				cols++;
 			}
-			content+="<td colspan=\"2\" align=\"right\"><a href=\"peertrust.htm?startrow="+tempstr+"\">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>";
 	}
 
-	content+="<tr><td colspan=\"5\"><input type=\"submit\" value=\"Update Trust\"></td></tr>";
+	content+="<tr><td colspan=\"5\"><center><input type=\"submit\" value=\"Update Trust\"></center></td></tr>";
 	content+="</table>";
 	content+="</form>";
 
@@ -183,6 +347,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)