X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=d145a54fff22a7eb5c3de59113911caf609ea480;hb=bae54a5dae027ad0a6b0126ec9eeecd3bd2739eb;hp=035cdc3dfebb89a864b2169adcdfc47727c1ce86;hpb=5c0453c8697cfaa843dd7f799e5404733ee56e13;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index 035cdc3..d145a54 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -19,6 +19,22 @@
 
 bool wantshutdown=false;
 
+std::string CreateShortIdentityName(const std::string &name, const std::string &publickey)
+{
+	std::string result="";
+	std::vector<std::string> keyparts;
+
+	StringFunctions::SplitMultiple(publickey,"@,",keyparts);
+
+	result+=name;
+	if(keyparts.size()>1 && keyparts[1].size()>8)
+	{
+		result+="@"+keyparts[1].substr(0,4)+"...";
+	}
+
+	return result;
+}
+
 void SetupDB()
 {
 
@@ -27,7 +43,7 @@ void SetupDB()
 
 	db->Open("fms.db3");
 	db->SetBusyTimeout(10000);		// set timeout to 10 seconds
-	db->Execute("VACUUM;");
+	//db->Execute("VACUUM;");		// not needed every startup
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblDBVersion(\
 				Major				INTEGER,\
@@ -73,13 +89,19 @@ void SetupDB()
 			major=1;
 			minor=6;
 		}
+		if(major==1 && minor==6)
+		{
+			ConvertDB0106To0107();
+			major=1;
+			minor=7;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,6);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,7);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=6;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=7;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
@@ -156,7 +178,8 @@ void SetupDB()
 				PeerTrustListTrust		INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
 				AddedMethod				TEXT,\
 				MessageTrustComment		TEXT,\
-				TrustListTrustComment	TEXT\
+				TrustListTrustComment	TEXT,\
+				Hidden					BOOL CHECK(Hidden IN('true','false')) DEFAULT 'false'\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -185,6 +208,35 @@ void SetupDB()
 				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityTrust(\
+				LocalIdentityID			INTEGER,\
+				IdentityID				INTEGER,\
+				LocalMessageTrust		INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				MessageTrustComment		TEXT,\
+				LocalTrustListTrust		INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				TrustListTrustComment	TEXT\
+				);");
+
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxIdentityTrust_IDs ON tblIdentityTrust(LocalIdentityID,IdentityID);");
+
+	db->Execute("CREATE TRIGGER IF NOT EXISTS trgInsertOnIdentityTrust AFTER INSERT ON tblIdentityTrust \
+				FOR EACH ROW \
+				BEGIN \
+					UPDATE tblIdentity SET LocalMessageTrust=(SELECT MAX(LocalMessageTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=new.IdentityID GROUP BY tblIdentityTrust.IdentityID), LocalTrustListTrust=(SELECT MAX(LocalTrustListTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=new.IdentityID GROUP BY tblIdentityTrust.IdentityID) WHERE tblIdentity.IdentityID=new.IdentityID; \
+				END;");
+
+	db->Execute("CREATE TRIGGER IF NOT EXISTS trgUpdateOnIdentityTrust AFTER UPDATE OF LocalMessageTrust,LocalTrustListTrust ON tblIdentityTrust \
+				FOR EACH ROW \
+				BEGIN \
+					UPDATE tblIdentity SET LocalMessageTrust=(SELECT MAX(LocalMessageTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=new.IdentityID GROUP BY tblIdentityTrust.IdentityID), LocalTrustListTrust=(SELECT MAX(LocalTrustListTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=new.IdentityID GROUP BY tblIdentityTrust.IdentityID) WHERE tblIdentity.IdentityID=new.IdentityID; \
+				END;");
+
+	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteOnIdentityTrust AFTER DELETE ON tblIdentityTrust \
+				FOR EACH ROW \
+				BEGIN \
+					UPDATE tblIdentity SET LocalMessageTrust=(SELECT MAX(LocalMessageTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=old.IdentityID GROUP BY tblIdentityTrust.IdentityID), LocalTrustListTrust=(SELECT MAX(LocalTrustListTrust) FROM tblIdentityTrust WHERE tblIdentityTrust.IdentityID=old.IdentityID GROUP BY tblIdentityTrust.IdentityID) WHERE tblIdentity.IdentityID=old.IdentityID; \
+				END;");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblPeerTrust(\
 				IdentityID				INTEGER,\
 				TargetIdentityID		INTEGER,\
@@ -202,13 +254,14 @@ void SetupDB()
 				BoardName				TEXT UNIQUE,\
 				BoardDescription		TEXT,\
 				DateAdded				DATETIME,\
-				SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true'\
+				SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true',\
+				AddedMethod				TEXT\
 				);");
 
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01 12:00:00');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('freenet','Discussion about Freenet','2007-12-01 12:00:00');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('public','Public discussion','2007-12-01 12:00:00');");
-	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('test','Test board','2007-12-01 12:00:00');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,AddedMethod) VALUES('fms','Freenet Message System','2007-12-01 12:00:00','Initial Board');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,AddedMethod) VALUES('freenet','Discussion about Freenet','2007-12-01 12:00:00','Initialt Board');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,AddedMethod) VALUES('public','Public discussion','2007-12-01 12:00:00','Initial Board');");
+	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded,AddedMethod) VALUES('test','Test board','2007-12-01 12:00:00','Initial Board');");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessage(\
 				MessageID			INTEGER PRIMARY KEY,\
@@ -231,11 +284,14 @@ void SetupDB()
 				ReplyOrder			INTEGER\
 				);");
 
+	db->Execute("CREATE INDEX IF NOT EXISTS idxMessageReplyTo_MessageID ON tblMessageReplyTo (MessageID);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageBoard(\
 				MessageID			INTEGER,\
 				BoardID				INTEGER\
 				);");
 
+	db->Execute("CREATE INDEX IF NOT EXISTS idxMessageBoard_MessageID ON tblMessageBoard (MessageID);");
 	db->Execute("CREATE INDEX IF NOT EXISTS idxMessageBoard_BoardID ON tblMessageBoard (BoardID);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageListRequests(\
@@ -364,6 +420,7 @@ void SetupDB()
 					DELETE FROM tblMessageReplyTo WHERE tblMessageReplyTo.MessageID=old.MessageID;\
 				END;");
 
+	db->Execute("DROP TRIGGER IF EXISTS trgDeleteIdentity;");
 	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteIdentity AFTER DELETE ON tblIdentity \
 				FOR EACH ROW \
 				BEGIN \
@@ -373,8 +430,10 @@ void SetupDB()
 					DELETE FROM tblMessageRequests WHERE IdentityID=old.IdentityID;\
 					DELETE FROM tblPeerTrust WHERE IdentityID=old.IdentityID;\
 					DELETE FROM tblTrustListRequests WHERE IdentityID=old.IdentityID;\
+					DELETE FROM tblIdentityTrust WHERE IdentityID=old.IdentityID;\
 				END;");
 
+	db->Execute("DROP TRIGGER IF EXISTS trgDeleteLocalIdentity;");
 	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteLocalIdentity AFTER DELETE ON tblLocalIdentity \
 				FOR EACH ROW \
 				BEGIN \
@@ -384,6 +443,7 @@ void SetupDB()
 					DELETE FROM tblMessageInserts WHERE LocalIdentityID=old.LocalIdentityID;\
 					DELETE FROM tblMessageListInserts WHERE LocalIdentityID=old.LocalIdentityID;\
 					DELETE FROM tblTrustListInserts WHERE LocalIdentityID=old.LocalIdentityID;\
+					DELETE FROM tblIdentityTrust WHERE LocalIdentityID=old.LocalIdentityID;\
 				END;");
 
 	db->Execute("CREATE TRIGGER IF NOT EXISTS trgDeleteBoard AFTER DELETE ON tblBoard \
@@ -403,11 +463,11 @@ 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")+"',50);");
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,LocalTrustListTrust,AddedMethod) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"',50,'Initial Identity');");
 	// 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")+"');");
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@~mimyB1kmH4f7Cgsd2wM2Qv2NxrZHRMM6IY8~7EWRVQ,fxTKkR0TYhgMYb-vEGAv55sMOxCGD2xhE4ZxWHxdPz4,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
 	// insert garfield's public key
-	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@T8l1IEGU4-PoASFzgc2GYhIgRzUvZsKdoQWeuLHuTmM,QLxAPfkGis8l5NafNpSCdbxzXhBlu9WL8svcqJw9Mpo,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@T8l1IEGU4-PoASFzgc2GYhIgRzUvZsKdoQWeuLHuTmM,QLxAPfkGis8l5NafNpSCdbxzXhBlu9WL8svcqJw9Mpo,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
 
 	// TODO remove sometime after 0.1.17
 	FixCapitalBoardNames();
@@ -508,6 +568,16 @@ void ConvertDB0105To0106()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=6;");
 }
 
+void ConvertDB0106To0107()
+{
+	// add AddedMethod to tblBoard
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblBoard ADD COLUMN AddedMethod TEXT;");
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN Hidden BOOL CHECK(Hidden IN('true','false')) DEFAULT 'false';");
+	db->Execute("UPDATE tblIdentity SET Hidden='false' WHERE Hidden IS NULL;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=7;");
+}
+
 void SetupDefaultOptions()
 {
 	// OptionValue should always be inserted as a string, even if the option really isn't a string - just to keep the field data type consistent
@@ -777,7 +847,7 @@ void FixCapitalBoardNames()
 
 	SQLite3DB::Statement st=db->Prepare("SELECT BoardID,BoardName FROM tblBoard WHERE BoardID NOT IN (SELECT BoardID FROM tblAdministrationBoard);");
 	SQLite3DB::Statement st2=db->Prepare("SELECT BoardID FROM tblBoard WHERE BoardName=?;");
-	SQLite3DB::Statement del=db->Prepare("DELTE FROM tblBoard WHERE BoardID=?;");
+	SQLite3DB::Statement del=db->Prepare("DELETE FROM tblBoard WHERE BoardID=?;");
 	SQLite3DB::Statement upd=db->Prepare("UPDATE tblBoard SET BoardName=? WHERE BoardID=?;");
 	SQLite3DB::Statement upd2=db->Prepare("UPDATE tblMessage SET ReplyBoardID=? WHERE ReplyBoardID=?;");
 	SQLite3DB::Statement upd3=db->Prepare("UPDATE tblMessageBoard SET BoardID=? WHERE BoardID=?;");