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

diff --git a/src/http/pages/peertrustpage.cpp b/src/http/pages/peertrustpage.cpp
index ee087f3..0cb0d42 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();
 			}
@@ -172,8 +182,10 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 	content+="<table>";
 	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>";
 	
 	// get count of identities we are showing
@@ -192,7 +204,7 @@ 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 IdentityID,Name,LocalMessageTrust,PeerMessageTrust,LocalTrustListTrust,PeerTrustListTrust,PublicKey,MessageTrustComment,TrustListTrustComment FROM tblIdentity";
 	if(namesearch!="")
 	{
 		sql+=" WHERE Name LIKE  '%' || ? || '%'";
@@ -228,6 +240,8 @@ 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="";
 
 		StringFunctions::Convert(count,countstr);
 
@@ -238,6 +252,8 @@ 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)
 		{
@@ -261,11 +277,19 @@ const std::string PeerTrustPage::GeneratePage(const std::string &method, const s
 		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>";
@@ -282,17 +306,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<4)
 			{
 				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>";
 	}