From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Sun, 30 Mar 2008 07:17:00 +0000 (+0200)
Subject: version 0.2.5
X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=commitdiff_plain;h=5c0453c8697cfaa843dd7f799e5404733ee56e13

version 0.2.5
---

diff --git a/include/global.h b/include/global.h
index 0c1be3b..f2b227b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include "pthreadwrapper/thread.h"
 
-#define FMS_VERSION	"0.2.4"
+#define FMS_VERSION	"0.2.5"
 
 // opens database and creates tables and initial inserts if necessary
 void SetupDB();
diff --git a/readme.txt b/readme.txt
index c9cca81..e853ecb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -72,7 +72,8 @@ template by placing an HTML file called identityname-template.htm in the same
 directory as the fms binary.  In the template, the string [LINKS] will be
 replaced by a <ul> list of links and [CONTENT] will be replaced by the page
 content.  The Freesite will be inserted once a day and contain your last 10
-posts and your trust list if you are publishing it.
+posts and your trust list if you are publishing it.  The site will be inserted
+to a USK accessible via: USK@yourpublickey.../fms/0/
 
 TRUST
 -----
diff --git a/src/freenet/identityrequester.cpp b/src/freenet/identityrequester.cpp
index b12fe08..e464cfb 100644
--- a/src/freenet/identityrequester.cpp
+++ b/src/freenet/identityrequester.cpp
@@ -28,6 +28,7 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 	IdentityXML xml;
 	long identityid;
 	long index;
+	std::string name="";
 
 	now.SetToGMTime();
 	StringFunctions::Split(message["Identifier"],"|",idparts);
@@ -56,7 +57,12 @@ const bool IdentityRequester::HandleAllData(FCPMessage &message)
 	{
 
 		st=m_db->Prepare("UPDATE tblIdentity SET Name=?, SingleUse=?, LastSeen=?, PublishTrustList=?, PublishBoardList=? WHERE IdentityID=?");
-		st.Bind(0,xml.GetName());
+		name=xml.GetName();
+		if(name.size()>40)
+		{
+			name.erase(40);
+		}
+		st.Bind(0,name);
 		if(xml.GetSingleUse()==true)
 		{
 			st.Bind(1,"true");
diff --git a/src/global.cpp b/src/global.cpp
index d241f06..035cdc3 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -194,6 +194,9 @@ void SetupDB()
 				TrustListTrustComment	TEXT\
 				);");
 
+	db->Execute("CREATE INDEX IF NOT EXISTS idxPeerTrust_IdentityID ON tblPeerTrust (IdentityID);");
+	db->Execute("CREATE INDEX IF NOT EXISTS idxPeerTrust_TargetIdentityID ON tblPeerTrust (TargetIdentityID);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblBoard(\
 				BoardID					INTEGER PRIMARY KEY,\
 				BoardName				TEXT UNIQUE,\
@@ -220,6 +223,8 @@ void SetupDB()
 				MessageIndex		INTEGER\
 				);");
 
+	db->Execute("CREATE INDEX IF NOT EXISTS idxMessage_IdentityID ON tblMessage (IdentityID);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageReplyTo(\
 				MessageID			INTEGER,\
 				ReplyToMessageUUID	TEXT,\
@@ -231,6 +236,8 @@ void SetupDB()
 				BoardID				INTEGER\
 				);");
 
+	db->Execute("CREATE INDEX IF NOT EXISTS idxMessageBoard_BoardID ON tblMessageBoard (BoardID);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageListRequests(\
 				IdentityID			INTEGER,\
 				Day					DATE,\
@@ -298,7 +305,7 @@ void SetupDB()
 				GROUP BY tblBoard.BoardID;");
 
 	// calculates peer trust
-	// do the (MessageTrust+1)*LocalTrustListTrust/(MessageTrust+1)/100.0 - so it MessageTrust or TrustListTrust is NULL, the calc will be NULL and it won't be included at all in the average
+	// do the (MessageTrust+1)*LocalTrustListTrust/(MessageTrust+1)/100.0 - so if MessageTrust or TrustListTrust is NULL, the calc will be NULL and it won't be included at all in the average
 	// need the +1 so that when the values are 0 the result is not 0
 	db->Execute("DROP VIEW IF EXISTS vwCalculatedPeerTrust;");
 	db->Execute("CREATE VIEW IF NOT EXISTS vwCalculatedPeerTrust AS \
@@ -396,7 +403,7 @@ void SetupDB()
 
 	date.SetToGMTime();
 	// insert SomeDude's public key
-	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,LocalTrustListTrust) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"',51);");
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,LocalTrustListTrust) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"',50);");
 	// insert Shadow Panther's public key
 	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@~mimyB1kmH4f7Cgsd2wM2Qv2NxrZHRMM6IY8~7EWRVQ,fxTKkR0TYhgMYb-vEGAv55sMOxCGD2xhE4ZxWHxdPz4,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
 	// insert garfield's public key
diff --git a/src/http/pages/boardspage.cpp b/src/http/pages/boardspage.cpp
index ed8d469..dce33b8 100644
--- a/src/http/pages/boardspage.cpp
+++ b/src/http/pages/boardspage.cpp
@@ -63,7 +63,7 @@ const std::string BoardsPage::GeneratePage(const std::string &method, const std:
 		}
 		if((*queryvars.find("formaction")).second=="remove0messages")
 		{
-			m_db->Execute("DELETE FROM tblBoard WHERE BoardID IN (SELECT BoardID FROM vwBoardStats WHERE MessageCount=0);");
+			m_db->Execute("DELETE FROM tblBoard WHERE BoardID IN (SELECT BoardID FROM vwBoardStats WHERE MessageCount=0 AND BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard));");
 		}
 		if((*queryvars.find("formaction")).second=="update")
 		{
diff --git a/src/http/pages/createidentitypage.cpp b/src/http/pages/createidentitypage.cpp
index c28fa64..8d67e07 100644
--- a/src/http/pages/createidentitypage.cpp
+++ b/src/http/pages/createidentitypage.cpp
@@ -33,7 +33,7 @@ const std::string CreateIdentityPage::GeneratePage(const std::string &method, co
 		content+="<h2>Create Identity</h2>";
 		content+="<form name=\"frmcreateidentity\" method=\"POST\">";
 		content+="<input type=\"hidden\" name=\"formaction\" value=\"create\">";
-		content+="Name : <input type=\"text\" name=\"name\">";
+		content+="Name : <input type=\"text\" name=\"name\" maxlength=\"40\">";
 		content+=" <input type=\"submit\" value=\"Create\">";
 		content+="</form>";
 	}
diff --git a/src/http/pages/localidentitiespage.cpp b/src/http/pages/localidentitiespage.cpp
index 8b6afcb..f84362e 100644
--- a/src/http/pages/localidentitiespage.cpp
+++ b/src/http/pages/localidentitiespage.cpp
@@ -203,9 +203,9 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 
 	content+="<hr>";
 
-	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>Publish Board List</th><th>Publish Freesite</th><th>Announced? *</th></tr>";
+//	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>Announced? *</th></tr>";
 
 	SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID,tblLocalIdentity.Name,tblLocalIdentity.PublicKey,tbLLocalIdentity.PublishTrustList,tblLocalIdentity.SingleUse,tblLocalIdentity.PublishBoardList,tblIdentity.IdentityID,tblLocalIdentity.PublishFreesite FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey ORDER BY tblLocalIdentity.Name;");
 	st.Step();
@@ -237,8 +237,8 @@ const std::string LocalIdentitiesPage::GeneratePage(const std::string &method, c
 		}
 
 		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(name+keypart)+"...</td>";
 		content+="<td>"+CreateTrueFalseDropDown("singleuse["+countstr+"]",singleuse)+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("publishtrustlist["+countstr+"]",publishtrustlist)+"</td>";
 		content+="<td>"+CreateTrueFalseDropDown("publishboardlist["+countstr+"]",publishboardlist)+"</td>";
@@ -251,12 +251,14 @@ 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>";
 		st.Step();
 		count++;
 	}
 
-	content+="<tr><td colspan=\"5\"><center><input type=\"submit\" value=\"Update Selected\"> <input type=\"submit\" value=\"Delete Selected\"></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\">Single Use Identities will automatically be deleted 7 days after creation.</p>";
diff --git a/src/http/pages/peerdetailspage.cpp b/src/http/pages/peerdetailspage.cpp
index 9a8fd1b..fc522b0 100644
--- a/src/http/pages/peerdetailspage.cpp
+++ b/src/http/pages/peerdetailspage.cpp
@@ -1,5 +1,6 @@
 #include "../../../include/http/pages/peerdetailspage.h"
 #include "../../../include/stringfunctions.h"
+#include "../../../include/option.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -18,6 +19,8 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 	std::string lastseen="";
 	std::string dateadded="";
 	std::string addedmethod="";
+	std::string usk="";
+	std::string fcphost="";
 
 	if(queryvars.find("identityid")!=queryvars.end() && (*queryvars.find("identityid")).second!="")
 	{
@@ -32,6 +35,8 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		del.Step();
 	}
 
+	Option::Instance()->Get("FCPHost",fcphost);
+
 	SQLite3DB::Statement st=m_db->Prepare("SELECT Name,PublicKey,DateAdded,LastSeen,AddedMethod FROM tblIdentity WHERE IdentityID=?;");
 	st.Bind(0,identityid);
 	st.Step();
@@ -45,8 +50,16 @@ const std::string PeerDetailsPage::GeneratePage(const std::string &method, const
 		st.ResultText(3,lastseen);
 		st.ResultText(4,addedmethod);
 
+		usk=publickey;
+		if(usk.find("SSK@")==0)
+		{
+			usk.erase(0,3);
+			usk="USK"+usk+"/fms/0/";
+		}
+
 		content+="<tr><td>Name</td><td>"+SanitizeOutput(name)+"</td></tr>";
 		content+="<tr><td>Public Key</td><td class=\"smaller\">"+SanitizeOutput(publickey)+"</td></tr>";
+		content+="<tr><td>Freesite</td><td class=\"smaller\"><a href=\"http://"+fcphost+":8888/"+SanitizeOutput(usk)+"\">"+SanitizeOutput(usk)+"</a></td></tr>";
 		content+="<tr><td>Date Added</td><td>"+dateadded+"</td></tr>";
 		content+="<tr><td>Last Seen</td><td>"+lastseen+"</td></tr>";
 		content+="<tr><td>Added Method</td><td class=\"smaller\">"+SanitizeOutput(addedmethod)+"</td></tr>";
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++;
diff --git a/template.htm b/template.htm
index 1320715..c35813c 100644
--- a/template.htm
+++ b/template.htm
@@ -201,6 +201,18 @@ form	{ display:inline; }
 th		{ padding-left:5px; padding-right:5px; }
 td		{ padding-left:5px; padding-right:5px; }
 
+.small90	{
+				font-size:90%;
+			}
+
+.small80	{
+				font-size:80%;
+			}
+			
+.small70	{
+				font-size:70%;
+			}
+
 </style>
 </head>