X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fglobal.cpp;h=872dfb7c26378568a2803fb610e30834dfbc88a3;hp=cfd458c624eb42d6f553ed4b0a261a04b4ea96aa;hb=18b45335ba24f3b6b6d4f4acfe8c5a5ae845ce00;hpb=0236076defe60bcd4b3a25c23efa53c21993a48e

diff --git a/src/global.cpp b/src/global.cpp
index cfd458c..872dfb7 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -126,18 +126,27 @@ void SetupDB()
 			major=1;
 			minor=11;
 		}
+		if(major==1 && minor==11)
+		{
+			ConvertDB0111To0112();
+			major=1;
+			minor=12;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,11);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,12);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=11;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=12;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
 				OptionValue			TEXT NOT NULL,\
-				OptionDescription	TEXT\
+				OptionDescription	TEXT,\
+				Section				TEXT,\
+				SortOrder			INTEGER,\
+				ValidValues			TEXT\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentity(\
@@ -210,7 +219,8 @@ void SetupDB()
 				LocalTrustListTrust		INTEGER CHECK(LocalTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
 				PeerTrustListTrust		INTEGER CHECK(PeerTrustListTrust BETWEEN 0 AND 100) DEFAULT NULL,\
 				AddedMethod				TEXT,\
-				Hidden					BOOL CHECK(Hidden IN('true','false')) DEFAULT 'false'\
+				Hidden					BOOL CHECK(Hidden IN('true','false')) DEFAULT 'false',\
+				PurgeDate				DATETIME\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblIdentityRequests(\
@@ -395,6 +405,11 @@ void SetupDB()
 				Date				DATETIME\
 				);");
 
+	// A temporary table that will hold a local identity id of the last identity who was loaded in the trust list page
+	db->Execute("CREATE TEMPORARY TABLE IF NOT EXISTS tmpLocalIdentityPeerTrustPage(\
+				LocalIdentityID		INTEGER\
+				);");
+
 	// low / high / message count for each board
 	db->Execute("CREATE VIEW IF NOT EXISTS vwBoardStats AS \
 				SELECT tblBoard.BoardID AS 'BoardID', IFNULL(MIN(MessageID),0) AS 'LowMessageID', IFNULL(MAX(MessageID),0) AS 'HighMessageID', COUNT(MessageID) AS 'MessageCount' \
@@ -739,6 +754,23 @@ void ConvertDB0110To0111()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=11;");
 }
 
+void ConvertDB0111To0112()
+{
+	/*
+		Add Section, SortOrder, ValidValues to tblOption
+		Add PurgeDate to tblIdentity
+	*/
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+
+	db->Execute("ALTER TABLE tblOption ADD COLUMN Section TEXT;");
+	db->Execute("ALTER TABLE tblOption ADD COLUMN SortOrder INTEGER;");
+	db->Execute("ALTER TABLE tblOption ADD COLUMN ValidValues TEXT;");
+
+	db->Execute("ALTER TABLE tblIdentity ADD COLUMN PurgeDate DATETIME;");
+
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=12;");
+}
+
 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
@@ -746,6 +778,8 @@ void SetupDefaultOptions()
 	std::ostringstream tempstr;	// must set tempstr to "" between db inserts
 	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
 	SQLite3DB::Statement st=db->Prepare("INSERT INTO tblOption(Option,OptionValue,OptionDescription) VALUES(?,?,?);");
+	SQLite3DB::Statement upd=db->Prepare("UPDATE tblOption SET Section=?, SortOrder=?, ValidValues=? WHERE Option=?;");
+	int order=0;
 
 	// LogLevel
 	tempstr.str("");
@@ -755,6 +789,49 @@ void SetupDefaultOptions()
 	st.Bind(2,"The maximum logging level that will be written to file.  0=Fatal Errors, 1=Errors, 2=Warnings, 3=Informational Messages, 4=Debug Messages.  Higher levels will include all messages from the previous levels.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Program");
+	upd.Bind(1,order++);
+	upd.Bind(2,"0|0 - Fatal Errors|1|1 - Errors|2|2 - Warnings|3|3 - Informational Messages|4|4 - Debug Messages");
+	upd.Bind(3,"LogLevel");
+	upd.Step();
+	upd.Reset();
+
+	st.Bind(0,"VacuumOnStartup");
+	st.Bind(1,"false");
+	st.Bind(2,"VACUUM the database every time FMS starts.  This will defragment the free space in the database and create a smaller database file.  Vacuuming the database can be CPU and disk intensive.");
+	st.Step();
+	st.Reset();
+	upd.Bind(0,"Program");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"VacuumOnStartup");
+	upd.Step();
+	upd.Reset();
+
+	st.Bind(0,"MessageBase");
+	st.Bind(1,"fms");
+	st.Bind(2,"A unique string shared by all clients who want to communicate with each other.  This should not be changed unless you want to create your own separate communications network.");
+	st.Step();
+	st.Reset();
+	upd.Bind(0,"Program");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MessageBase");
+	upd.Step();
+	upd.Reset();
+
+	// StartNNTP
+	st.Bind(0,"StartNNTP");
+	st.Bind(1,"true");
+	st.Bind(2,"Start NNTP server.");
+	st.Step();
+	st.Reset();
+	upd.Bind(0,"NNTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"StartNNTP");
+	upd.Step();
+	upd.Reset();
 
 	// NNTPListenPort
 	st.Bind(0,"NNTPListenPort");
@@ -762,6 +839,12 @@ void SetupDefaultOptions()
 	st.Bind(2,"The port that the NNTP service will listen for incoming connections.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"NNTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"NNTPListenPort");
+	upd.Step();
+	upd.Reset();
 
 	// NNTPBindAddresses
 	st.Bind(0,"NNTPBindAddresses");
@@ -769,37 +852,60 @@ void SetupDefaultOptions()
 	st.Bind(2,"A comma separated list of valid IPv4 or IPv6 addresses/hostnames that the NNTP service will try to bind to.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"NNTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"NNTPBindAddresses");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"NNTPAllowPost");
 	st.Bind(1,"true");
 	st.Bind(2,"Allow posting messages from NNTP.  Setting to false will make the newsgroups read only.");
 	st.Step();
 	st.Reset();
-
-	// StartNNTP
-	st.Bind(0,"StartNNTP");
-	st.Bind(1,"true");
-	st.Bind(2,"Start NNTP server.");
-	st.Step();
-	st.Reset();
+	upd.Bind(0,"NNTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"NNTPAllowPost");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"StartHTTP");
 	st.Bind(1,"true");
 	st.Bind(2,"Start HTTP server.  WARNING: If you turn this off, you won't be able to access the administration pages.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"HTTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"StartHTTP");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"HTTPListenPort");
 	st.Bind(1,"8080");
 	st.Bind(2,"Port HTTP server will listen on.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"HTTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"HTTPListenPort");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"HTTPAccessControl");
 	st.Bind(1,"-0.0.0.0/0,+127.0.0.1");
 	st.Bind(2,"Comma separated list of addresses and/or subnet masks that are allowed access to the administration pages.  Default is localhost only. + allows a host, - denies a host.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"HTTP Server");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"HTTPAccessControl");
+	upd.Step();
+	upd.Reset();
 
 	// StartFreenetUpdater
 	st.Bind(0,"StartFreenetUpdater");
@@ -807,6 +913,12 @@ void SetupDefaultOptions()
 	st.Bind(2,"Set to true to start the Freenet Updater thread and connect to Freenet.  Set to false to prevent communication with Freenet.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Freenet Connection");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"StartFreenetUpdater");
+	upd.Step();
+	upd.Reset();
 
 	// FCPHost
 	st.Bind(0,"FCPHost");
@@ -814,6 +926,12 @@ void SetupDefaultOptions()
 	st.Bind(2,"Host name or address of Freenet node.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Freenet Connection");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"FCPHost");
+	upd.Step();
+	upd.Reset();
 
 	// FCPPort
 	st.Bind(0,"FCPPort");
@@ -821,144 +939,264 @@ void SetupDefaultOptions()
 	st.Bind(2,"The port that Freenet is listening for FCP connections on.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Freenet Connection");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"FCPPort");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"FProxyPort");
 	st.Bind(1,"8888");
 	st.Bind(2,"The port that Freenet is listening for http connections on.");
 	st.Step();
 	st.Reset();
-
-	st.Bind(0,"MessageBase");
-	st.Bind(1,"fms");
-	st.Bind(2,"A unique string shared by all clients who want to communicate with each other.  This should not be changed unless you want to create your own separate communications network.");
-	st.Step();
-	st.Reset();
+	upd.Bind(0,"Freenet Connection");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"FProxyPort");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxIdentityRequests");
 	st.Bind(1,"5");
 	st.Bind(2,"Maximum number of concurrent requests for new Identity xml files");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxIdentityRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxIdentityIntroductionRequests");
 	st.Bind(1,"5");
 	st.Bind(2,"Maximum number of concurrent identities requesting IdentityIntroduction xml files.  Each identity may have multiple requests pending.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxIdentityIntroductionRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxIntroductionPuzzleRequests");
 	st.Bind(1,"5");
 	st.Bind(2,"Maximum number of concurrent requests for new IntroductionPuzzle xml files");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxIntroductionPuzzleRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxTrustListRequests");
 	st.Bind(1,"5");
 	st.Bind(2,"Maximum number of concurrent requests for new Trust Lists");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxTrustListRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxMessageListRequests");
 	st.Bind(1,"5");
 	st.Bind(2,"Maximum number of concurrent requests for new Message Lists");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxMessageListRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxMessageRequests");
 	st.Bind(1,"20");
 	st.Bind(2,"Maximum number of concurrent requests for new Messages");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxMessageRequests");
+	upd.Step();
+	upd.Reset();
+
+	st.Bind(0,"MaxBoardListRequests");
+	st.Bind(1,"5");
+	st.Bind(2,"The maximum number of concurrent requests for new Board Lists.  Set to 0 to disable.");
+	st.Step();
+	st.Reset();
+	upd.Bind(0,"Requests");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxBoardListRequests");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MinLocalMessageTrust");
 	st.Bind(1,"50");
 	st.Bind(2,"Specifies a local message trust level that a peer must have before its messages will be downloaded.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Trust");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MinLocalMessageTrust");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MinPeerMessageTrust");
 	st.Bind(1,"30");
 	st.Bind(2,"Specifies a peer message trust level that a peer must have before its messages will be downloaded.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Trust");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MinPeerMessageTrust");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MinLocalTrustListTrust");
 	st.Bind(1,"50");
 	st.Bind(2,"Specifies a local trust list trust level that a peer must have before its trust list will be included in the weighted average.  Any peers below this number will be excluded from the results.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Trust");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MinLocalTrustListTrust");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MinPeerTrustListTrust");
 	st.Bind(1,"30");
 	st.Bind(2,"Specifies a peer trust list trust level that a peer must have before its trust list will be included in the weighted average.  Any peers below this number will be excluded from the results.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Trust");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MinPeerTrustListTrust");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"LocalTrustOverridesPeerTrust");
 	st.Bind(1,"false");
 	st.Bind(2,"Set to true if you want your local trust levels to override the peer levels when determining which identities you will poll.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Trust");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"LocalTrustOverridesPeerTrust");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MessageDownloadMaxDaysBackward");
 	st.Bind(1,"5");
 	st.Bind(2,"The maximum number of days backward that messages will be downloaded from each identity");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MessageDownloadMaxDaysBackward");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MessageListDaysBackward");
 	st.Bind(1,"5");
 	st.Bind(2,"The number of days backward that messages you have inserted will appear in your MessageLists");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MessageListDaysBackward");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxPeerMessagesPerDay");
 	st.Bind(1,"200");
 	st.Bind(2,"The maximum number of messages you will download from each peer on a given day.");
 	st.Step();
 	st.Reset();
-
-	st.Bind(0,"MaxBoardListRequests");
-	st.Bind(1,"5");
-	st.Bind(2,"The maximum number of concurrent requests for new Board Lists.  Set to 0 to disable.");
-	st.Step();
-	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxPeerMessagesPerDay");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"MaxBoardsPerMessage");
 	st.Bind(1,"8");
 	st.Bind(2,"The maximum number of boards a received message may be sent to.  Boards over this limit will be ignored.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"MaxBoardsPerMessage");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"SaveMessagesFromNewBoards");
 	st.Bind(1,"true");
 	st.Bind(2,"Set to true to automatically save messages posted to new boards.  Set to false to ignore messages to new boards.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"SaveMessagesFromNewBoards");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"ChangeMessageTrustOnReply");
 	st.Bind(1,"0");
 	st.Bind(2,"How much the local message trust level of an identity should change when you reply to one of their messages.");
 	st.Step();
 	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"ChangeMessageTrustOnReply");
+	upd.Step();
+	upd.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();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2,"true|true|false|false");
+	upd.Bind(3,"AddNewPostFromIdentities");
+	upd.Step();
+	upd.Reset();
 
 	st.Bind(0,"DeleteMessagesOlderThan");
 	st.Bind(1,"180");
 	st.Bind(2,"Automatically delete messages older than this many days.");
 	st.Step();
 	st.Reset();
-
-	st.Bind(0,"VacuumOnStartup");
-	st.Bind(1,"false");
-	st.Bind(2,"VACUUM the database every time FMS starts.  This will defragment the free space in the database and create a smaller database file.  Vacuuming the database can be CPU and disk intensive.");
-	st.Step();
-	st.Reset();
+	upd.Bind(0,"Messages");
+	upd.Bind(1,order++);
+	upd.Bind(2);
+	upd.Bind(3,"DeleteMessagesOlderThan");
+	upd.Step();
+	upd.Reset();
 
 }