X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fhttp%2Fpages%2Flocalidentitiespage.cpp;h=f3a4967203015e480c48a5a521ccdd5c21e93ff3;hb=6836fbb5db8464f56e682989996b2210b14231d0;hp=84c28b322969641963c22283d215f3d8bef28cff;hpb=f60495a029c54358f82956482fe203fe2b7b5b23;p=fms.git

diff --git a/src/http/pages/localidentitiespage.cpp b/src/http/pages/localidentitiespage.cpp
index 84c28b3..f3a4967 100644
--- a/src/http/pages/localidentitiespage.cpp
+++ b/src/http/pages/localidentitiespage.cpp
@@ -1,33 +1,12 @@
 #include "../../../include/http/pages/localidentitiespage.h"
 #include "../../../include/stringfunctions.h"
 #include "../../../include/http/identityexportxml.h"
+#include "../../../include/global.h"
 
 #ifdef XMEM
 	#include <xmem.h>
 #endif
 
-const std::string LocalIdentitiesPage::CreateTrueFalseDropDown(const std::string &name, const std::string &selected)
-{
-	std::string rval="";
-
-	rval+="<select name=\""+name+"\">";
-	rval+="<option value=\"true\"";
-	if(selected=="true")
-	{
-		rval+=" SELECTED";
-	}
-	rval+=">true</option>";
-	rval+="<option value=\"false\"";
-	if(selected=="false")
-	{
-		rval+=" SELECTED";
-	}
-	rval+=">false</option>";
-	rval+="</select>";
-
-	return rval;
-}
-
 const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, const std::map<std::string,std::string> &queryvars)
 {
 	int count;
@@ -40,22 +19,38 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		std::vector<std::string> ids;
 		std::vector<std::string> singleuse;
 		std::vector<std::string> publishtrustlist;
+		std::vector<std::string> publishboardlist;
+		std::vector<std::string> publishfreesite;
+		std::vector<std::string> mindelay;
+		std::vector<std::string> maxdelay;
 
 		CreateArgArray(queryvars,"chkidentityid",ids);
 		CreateArgArray(queryvars,"singleuse",singleuse);
 		CreateArgArray(queryvars,"publishtrustlist",publishtrustlist);
+		CreateArgArray(queryvars,"publishboardlist",publishboardlist);
+		CreateArgArray(queryvars,"publishfreesite",publishfreesite);
+		CreateArgArray(queryvars,"mindelay",mindelay);
+		CreateArgArray(queryvars,"maxdelay",maxdelay);
 
 		if((*queryvars.find("formaction")).second=="update")
 		{
-			SQLite3DB::Statement update=m_db->Prepare("UPDATE tblLocalIdentity SET SingleUse=?, PublishTrustList=? WHERE LocalIdentityID=?;");
+			SQLite3DB::Statement update=m_db->Prepare("UPDATE tblLocalIdentity SET SingleUse=?, PublishTrustList=?, PublishBoardList=?, PublishFreesite=?, MinMessageDelay=?, MaxMessageDelay=? WHERE LocalIdentityID=?;");
 			for(int i=0; i<ids.size(); i++)
 			{
 				if(ids[i]!="")
 				{
+					int minmessagedelay=0;
+					int maxmessagedelay=0;
 					StringFunctions::Convert(ids[i],id);
+					StringFunctions::Convert(mindelay[i],minmessagedelay);
+					StringFunctions::Convert(maxdelay[i],maxmessagedelay);
 					update.Bind(0,singleuse[i]);
 					update.Bind(1,publishtrustlist[i]);
-					update.Bind(2,id);
+					update.Bind(2,publishboardlist[i]);
+					update.Bind(3,publishfreesite[i]);
+					update.Bind(4,minmessagedelay);
+					update.Bind(5,maxmessagedelay);
+					update.Bind(6,id);
 					update.Step();
 					update.Reset();
 				}
@@ -78,7 +73,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		if((*queryvars.find("formaction")).second=="export")
 		{
 			IdentityExportXML xml;
-			SQLite3DB::Statement exp=m_db->Prepare("SELECT Name,PublicKey,PrivateKey,SingleUse,PublishTrustList,PublishBoardList FROM tblLocalIdentity WHERE PublicKey IS NOT NULL AND PrivateKey IS NOT NULL;");
+			SQLite3DB::Statement exp=m_db->Prepare("SELECT Name,PublicKey,PrivateKey,SingleUse,PublishTrustList,PublishBoardList,PublishFreesite FROM tblLocalIdentity WHERE PublicKey IS NOT NULL AND PrivateKey IS NOT NULL;");
 			exp.Step();
 			while(exp.RowReturned())
 			{
@@ -89,6 +84,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 				bool singleuse=false;
 				bool publishtrustlist=false;
 				bool publishboardlist=false;
+				bool publishfreesite=false;
 
 				exp.ResultText(0,name);
 				exp.ResultText(1,publickey);
@@ -108,8 +104,13 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 				{
 					publishboardlist=true;
 				}
+				exp.ResultText(6,tempval);
+				if(tempval=="true")
+				{
+					publishfreesite=true;
+				}
 
-				xml.AddIdentity(name,publickey,privatekey,singleuse,publishtrustlist,publishboardlist);
+				xml.AddIdentity(name,publickey,privatekey,singleuse,publishtrustlist,publishboardlist,publishfreesite);
 
 				exp.Step();
 			}
@@ -122,7 +123,7 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 				IdentityExportXML xml;
 				if(xml.ParseXML((*queryvars.find("file")).second))
 				{
-					SQLite3DB::Statement imp=m_db->Prepare("INSERT INTO tblLocalIdentity(Name,PublicKey,PrivateKey,SingleUse,PublishTrustList,PublishBoardList) VALUES(?,?,?,?,?,?);");
+					SQLite3DB::Statement imp=m_db->Prepare("INSERT INTO tblLocalIdentity(Name,PublicKey,PrivateKey,SingleUse,PublishTrustList,PublishBoardList,PublishFreesite) VALUES(?,?,?,?,?,?,?);");
 					for(int i=0; i<xml.GetCount(); i++)
 					{
 						std::string tempval="false";
@@ -156,6 +157,15 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 							tempval="false";
 						}
 						imp.Bind(5,tempval);
+						if(xml.GetPublishFreesite(i))
+						{
+							tempval="true";
+						}
+						else
+						{
+							tempval="false";
+						}
+						imp.Bind(6,tempval);
 						imp.Step();
 						imp.Reset();
 					}
@@ -180,40 +190,66 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 	content+="</form>";
 	content+="</td></tr></table>";
 
-	content+="<form name=\"frmlocalidentity\" method=\"POST\">";
-	content+="<input type=\"hidden\" name=\"formaction\" value=\"update\">";
-	content+="<table><tr><td></td><th>Name</th><th>Single Use</th><th>Publish Trust List</th><th>Announced? *</th></tr>";
+	content+="<hr>";
+
+//	content+="<form name=\"frmlocalidentity\" method=\"POST\">";
+//	content+="<input type=\"hidden\" name=\"formaction\" value=\"update\">";
+	content+="<table><tr><th>Name</th><th>Single Use</th><th>Publish Trust List</th><th>Publish Board List</th><th>Publish Freesite</th><th>Min Message Delay</th><th>Max Message Delay</th><th>Announced? *</th></tr>";
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID,tblLocalIdentity.Name,tblLocalIdentity.PublicKey,tbLLocalIdentity.PublishTrustList,tblLocalIdentity.SingleUse,tblLocalIdentity.PublishBoardList,tblIdentity.IdentityID FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey ORDER BY tblLocalIdentity.Name;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID,tblLocalIdentity.Name,tblLocalIdentity.PublicKey,tbLLocalIdentity.PublishTrustList,tblLocalIdentity.SingleUse,tblLocalIdentity.PublishBoardList,tblIdentity.IdentityID,tblLocalIdentity.PublishFreesite,tblLocalIdentity.MinMessageDelay,tblLocalIdentity.MaxMessageDelay FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey ORDER BY tblLocalIdentity.Name;");
 	st.Step();
 
+	SQLite3DB::Statement trustst=m_db->Prepare("SELECT COUNT(*) FROM tblPeerTrust LEFT JOIN tblIdentity ON tblPeerTrust.TargetIdentityID=tblIdentity.IdentityID WHERE tblIdentity.PublicKey=? GROUP BY tblPeerTrust.TargetIdentityID;");
+
 	count=0;
 	while(st.RowReturned())
 	{
 		StringFunctions::Convert(count,countstr);
-		std::string id;
-		std::string name;
-		std::string publickey;
-		std::string publishtrustlist;
-		std::string singleuse;
-		std::string keypart;
+		std::string id="";
+		std::string name="";
+		std::string publickey="";
+		std::string publishtrustlist="";
+		std::string singleuse="";
+		std::string publishboardlist="";
+		std::string publishfreesite="";
+		std::string minmessagedelay="0";
+		std::string maxmessagedelay="0";
 
 		st.ResultText(0,id);
 		st.ResultText(1,name);
 		st.ResultText(2,publickey);
 		st.ResultText(3,publishtrustlist);
 		st.ResultText(4,singleuse);
-
-		if(publickey.size()>8)
-		{
-			keypart=publickey.substr(3,5);
-		}
+		st.ResultText(5,publishboardlist);
+		st.ResultText(7,publishfreesite);
+		st.ResultText(8,minmessagedelay);
+		st.ResultText(9,maxmessagedelay);
 
 		content+="<tr>";
-		content+="<td><input type=\"checkbox\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\"></td>";
-		content+="<td title=\""+publickey+"\">"+SanitizeOutput(name+keypart)+"...</td>";
+//		content+="<td><input type=\"checkbox\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\"></td>";
+		content+="<td title=\""+publickey+"\"><form name=\"frmupdate\""+countstr+"\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"update\"><input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\">"+SanitizeOutput(CreateShortIdentityName(name,publickey))+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("singleuse["+countstr+"]",singleuse)+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("publishtrustlist["+countstr+"]",publishtrustlist)+"</td>";
+		content+="<td>"+CreateTrueFalseDropDown("publishboardlist["+countstr+"]",publishboardlist)+"</td>";
+		content+="<td>"+CreateTrueFalseDropDown("publishfreesite["+countstr+"]",publishfreesite)+"</td>";
+		content+="<td><input type=\"text\" size=\"2\" name=\"mindelay["+countstr+"]\" value=\""+minmessagedelay+"\"></td>";
+		content+="<td><input type=\"text\" size=\"2\" name=\"maxdelay["+countstr+"]\" value=\""+maxmessagedelay+"\"></td>";
+		
+		trustst.Bind(0,publickey);
+		trustst.Step();
+		if(trustst.RowReturned())
+		{
+			std::string numlists="";
+			trustst.ResultText(0,numlists);
+			content+="<td>Yes ("+numlists+")</td>";
+		}
+		else
+		{
+			content+="<td>No</td>";
+		}
+		trustst.Reset();
+
+/*
 		if(st.ResultNull(6))
 		{
 			content+="<td>No</td>";
@@ -222,14 +258,21 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		{
 			content+="<td>Yes</td>";
 		}
+*/
+
+		content+="<td><input type=\"submit\" value=\"Update\"></form></td>";
+		content+="<td><form name=\"frmdel\""+countstr+"\" method=\"POST\"><input type=\"hidden\" name=\"formaction\" value=\"delete\"><input type=\"hidden\" name=\"chkidentityid["+countstr+"]\" value=\""+id+"\"><input type=\"submit\" value=\"Delete\"></form></td>";
 		content+="</tr>";
+		content+="<tr><td></td><td colspan=\"7\" class=\"smaller\">"+publickey+"</td></tr>";
 		st.Step();
 		count++;
 	}
 
-	content+="<tr><td colspan=\"4\"><center><input type=\"submit\" value=\"Update Selected\"> <input type=\"submit\" value=\"Delete Selected\" onClick=\"if(confirm('Delete Selected Identities?')){frmlocalidentity.formaction.value='delete';}else{return false;}\"></td></tr>";
+//	content+="<tr><td colspan=\"5\"><center><input type=\"submit\" value=\"Update Selected\"> <input type=\"submit\" value=\"Delete Selected\" onClick=\"if(confirm('Delete Selected Identities?')){frmlocalidentity.formaction.value='delete';}else{return false;}\"></td></tr>";
 	content+="</table>";
-	content+="<p class=\"paragraph=\">* An identity is considered successfully announced when you have downloaded a trust list from someone that contains the identity.</p>";
+	content+="<p class=\"paragraph\">* An identity is considered successfully announced when you have downloaded a trust list from someone that contains the identity.  The number in parenthesis is how many trust lists that identity appears in.</p>";
+	content+="<p class=\"paragraph\">Single Use Identities will automatically be deleted 7 days after creation.</p>";
+	content+="<p class=\"paragraph\">Messages that each identity sends may be delayed by a random number of minutes between min and max.  Set both to 0 to send messages as soon as possible.</p>";
 
 	return "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"+StringFunctions::Replace(m_template,"[CONTENT]",content);
 }