X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Fpeertrustpage.cpp;h=ea01cc40aae1d50c959288e446e357e46b4d485f;hp=0cb0d42da3d411e73a653857fe1f5b85eb75ba76;hb=5c0453c8697cfaa843dd7f799e5404733ee56e13;hpb=8a0a83a78390f22f99d4487cda2569909dfbc28e

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index 0cb0d42..ea01cc4 100644
--- a/src/http/pages/peertrustpage.cpp
+++ b/src/http/pages/peertrustpage.cpp
@@ -179,14 +179,16 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	{
 		content+="<input type=\"hidden\" name=\"namesearch\" value=\""+SanitizeOutput(namesearch)+"\">";
 	}
-	content+="<table>";
+	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>Trust Comment</th>";
-	content+="<th><a href=\"peertrust.htm?"+BuildQueryString(startrow,namesearch,"PeerTrustListTrust",ReverseSort("PeerTrustListTrust",sortby,sortorder))+"\">Peer Trust List Trust</a></th></tr>";
+	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";
@@ -204,11 +206,12 @@ 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,MessageTrustComment,TrustListTrustComment 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+=" GROUP BY tblIdentity.IdentityID";
 	sql+=" ORDER BY";
 	if(sortby=="Name")
 	{
@@ -242,6 +245,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		std::string keypart="";
 		std::string messagetrustcomment="";
 		std::string trustlisttrustcomment="";
+		std::string messagecountstr="";
 
 		StringFunctions::Convert(count,countstr);
 
@@ -254,6 +258,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		st.ResultText(6,publickey);
 		st.ResultText(7,messagetrustcomment);
 		st.ResultText(8,trustlisttrustcomment);
+		st.ResultText(9,messagecountstr);
 
 		if(publickey.size()>8)
 		{
@@ -276,23 +281,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\">";
+		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\">";
+		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++;
 	}
@@ -311,7 +317,7 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		}
 		if(startrow+rowsperpage<identitycount)
 		{
-			while(cols<4)
+			while(cols<5)
 			{
 				content+="<td></td>";
 				cols++;