X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fglobal.cpp;h=5515e1ad85b9b6dd7e0f752e727193e8e78b38c8;hp=0c6f913ddbb19d57ddf9c4bdbdff1fca782d004e;hb=ee580d19b7920904587e18d72a3465d52eab6204;hpb=52c0819bfc1d083c6e0738f75f0d7eeba521295a

diff --git a/src/global.cpp b/src/global.cpp
index 0c6f913..5515e1a 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -52,13 +52,19 @@ void SetupDB()
 			major=1;
 			minor=1;
 		}
+		if(major==1 && (minor==1 || minor==2))
+		{
+			ConvertDB0101To0103();
+			major=1;
+			minor=3;
+		}
 	}
 	else
 	{
 		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,1);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=2;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
@@ -126,10 +132,10 @@ void SetupDB()
 				PublishBoardList	BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
 				DateAdded			DATETIME,\
 				LastSeen			DATETIME,\
-				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT 50,\
-				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT 50\
+				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -166,10 +172,11 @@ void SetupDB()
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblBoard(\
-				BoardID				INTEGER PRIMARY KEY,\
-				BoardName			TEXT UNIQUE,\
-				BoardDescription	TEXT,\
-				DateAdded			DATETIME\
+				BoardID					INTEGER PRIMARY KEY,\
+				BoardName				TEXT UNIQUE,\
+				BoardDescription		TEXT,\
+				DateAdded				DATETIME,\
+				SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true'\
 				);");
 
 	db->Execute("INSERT INTO tblBoard(BoardName,BoardDescription,DateAdded) VALUES('fms','Freenet Message System','2007-12-01 12:00:00');");
@@ -265,10 +272,13 @@ 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
+	// 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 \
 				SELECT TargetIdentityID, \
-				ROUND(SUM(MessageTrust*(LocalMessageTrust/100.0))/SUM(LocalMessageTrust/100.0),0) AS 'PeerMessageTrust', \
-				ROUND(SUM(TrustListTrust*(LocalTrustListTrust/100.0))/SUM(LocalTrustListTrust/100.0),0) AS 'PeerTrustListTrust' \
+				ROUND(SUM(MessageTrust*(LocalTrustListTrust/100.0))/SUM(((MessageTrust+1)*LocalTrustListTrust/(MessageTrust+1))/100.0),0) AS 'PeerMessageTrust', \
+				ROUND(SUM(TrustListTrust*(LocalTrustListTrust/100.0))/SUM(((TrustListTrust+1)*LocalTrustListTrust/(TrustListTrust+1))/100.0),0) AS 'PeerTrustListTrust' \
 				FROM tblPeerTrust INNER JOIN tblIdentity ON tblPeerTrust.IdentityID=tblIdentity.IdentityID \
 				WHERE LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') \
 				AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') ) \
@@ -360,7 +370,7 @@ void SetupDB()
 
 	date.SetToGMTime();
 	// insert SomeDude's public key
-	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"');");
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,LocalTrustListTrust) VALUES('SSK@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw,iXez4j3qCpd596TxXiJgZyTq9o-CElEuJxm~jNNZAuA,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"',51);");
 	// 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
@@ -398,6 +408,35 @@ void ConvertDB0100To0101()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=1;");
 }
 
+void ConvertDB0101To0103()
+{
+	// remove default 50 from trust fields and set default to NULL
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("CREATE TEMPORARY TABLE tblIdentityTemp AS SELECT * FROM tblIdentity;");
+	db->Execute("DROP TABLE IF EXISTS tblIdentity;");
+	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentity(\
+				IdentityID			INTEGER PRIMARY KEY,\
+				PublicKey			TEXT UNIQUE,\
+				Name				TEXT,\
+				SingleUse			BOOL CHECK(SingleUse IN('true','false')) DEFAULT 'false',\
+				PublishTrustList	BOOL CHECK(PublishTrustList IN('true','false')) DEFAULT 'false',\
+				PublishBoardList	BOOL CHECK(PublishBoardList IN('true','false')) DEFAULT 'false',\
+				DateAdded			DATETIME,\
+				LastSeen			DATETIME,\
+				LocalMessageTrust	INTEGER CHECK(LocalMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerMessageTrust	INTEGER CHECK(PeerMessageTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				LocalTrustListTrust	INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
+				PeerTrustListTrust	INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL\
+				);");
+	db->Execute("INSERT INTO tblIdentity SELECT * FROM tblIdentityTemp;");
+	db->Execute("DROP TABLE IF EXISTS tblIdentityTemp;");
+
+	// add SaveReceivedMessages field to tblBoard
+	db->Execute("ALTER TABLE tblBoard ADD COLUMN SaveReceivedMessages	BOOL CHECK(SaveReceivedMessages IN('true','false')) DEFAULT 'true';");
+
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
+}
+
 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
@@ -577,6 +616,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"AddNewPostFromIdentities");
+	st.Bind(1,"false");
+	st.Bind(2,"Set to true to automatically create new identities when you send a message using a new name.  If you set this to false, posting messages will fail until you manually create the identity.");
+	st.Step();
+	st.Reset();
+
 }
 
 void SetupLogFile()