X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=0698703e317a621729bfc2a6724016224ca7ed21;hb=1dee4e3cd008a27789bbce05b0eb47b0eb5d121a;hp=5515e1ad85b9b6dd7e0f752e727193e8e78b38c8;hpb=ee580d19b7920904587e18d72a3465d52eab6204;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index 5515e1a..0698703 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -58,13 +58,19 @@ void SetupDB()
 			major=1;
 			minor=3;
 		}
+		if(major==1 && minor==3)
+		{
+			ConvertDB0103To0104();
+			major=1;
+			minor=4;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,1);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,4);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
@@ -89,7 +95,8 @@ void SetupDB()
 				InsertingBoardList		BOOL CHECK(InsertingBoardList IN('true','false')) DEFAULT 'false',\
 				LastInsertedBoardList	DATETIME,\
 				InsertingMessageList	BOOL CHECK(InsertingMessageList IN('true','false')) DEFAULT 'false',\
-				LastInsertedMessageList	DATETIME\
+				LastInsertedMessageList	DATETIME,\
+				DateCreated				DATETIME\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblLocalIdentityInserts(\
@@ -193,7 +200,8 @@ void SetupDB()
 				Subject				TEXT,\
 				MessageUUID			TEXT UNIQUE,\
 				ReplyBoardID		INTEGER,\
-				Body				TEXT\
+				Body				TEXT,\
+				MessageIndex		INTEGER\
 				);");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageReplyTo(\
@@ -222,6 +230,8 @@ void SetupDB()
 				Found				BOOL CHECK(Found IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageInserts(\
 				LocalIdentityID		INTEGER,\
 				Day					DATE,\
@@ -376,6 +386,9 @@ void SetupDB()
 	// 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")+"');");
 
+	// TODO remove sometime after 0.1.17
+	FixCapitalBoardNames();
+
 }
 
 void ConvertDB0100To0101()
@@ -437,6 +450,19 @@ void ConvertDB0101To0103()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=3;");
 }
 
+void ConvertDB0103To0104()
+{
+	// add MessageIndex to tblMessage
+	DateTime date;
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblMessage ADD COLUMN MessageIndex	INTEGER;");
+	db->Execute("CREATE UNIQUE INDEX IF NOT EXISTS idxMessageRequest ON tblMessageRequests(IdentityID,Day,RequestIndex);");
+	db->Execute("ALTER TABLE tblLocalIdentity ADD COLUMN DateCreated DATETIME;");
+	date.SetToGMTime();
+	db->Execute("UPDATE tblLocalIdentity SET DateCreated='"+date.Format("%Y-%m-%d %H:%M:%S")+"' WHERE DateCreated IS NULL;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=4;");
+}
+
 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
@@ -493,6 +519,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.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 as host.");
+	st.Step();
+	st.Reset();
+
 	// StartFreenetUpdater
 	st.Bind(0,"StartFreenetUpdater");
 	st.Bind(1,"true");
@@ -622,6 +654,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.Reset();
 
+	st.Bind(0,"DeleteMessagesOlderThan");
+	st.Bind(1,"180");
+	st.Bind(2,"Automatically delete messages older than this many days.");
+	st.Step();
+	st.Reset();
+
 }
 
 void SetupLogFile()
@@ -747,3 +785,67 @@ void StartThreads(std::vector<PThread::Thread *> &threads)
 
 }
 */
+
+void FixCapitalBoardNames()
+{
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+
+	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 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=?;");
+
+	st.Step();
+	while(st.RowReturned())
+	{
+		int boardid=0;
+		int newboardid=0;
+		std::string name="";
+		std::string lowername="";
+
+		st.ResultInt(0,boardid);
+		st.ResultText(1,name);
+
+		lowername=name;
+		StringFunctions::LowerCase(lowername,lowername);
+       
+		if(name!=lowername)
+		{
+			st2.Bind(0,lowername);
+			st2.Step();
+
+			if(st2.RowReturned())
+			{
+				st2.ResultInt(0,newboardid);
+
+				upd2.Bind(0,newboardid);
+				upd2.Bind(1,boardid);
+				upd2.Step();
+				upd2.Reset();
+
+				upd3.Bind(0,newboardid);
+				upd3.Bind(1,boardid);
+				upd3.Step();
+				upd3.Reset();
+
+				del.Bind(0,boardid);
+				del.Step();
+				del.Reset();
+			}
+			else
+			{
+				upd.Bind(0,lowername);
+				upd.Bind(1,boardid);
+				upd.Step();
+				upd.Reset();
+			}
+
+			st2.Reset();
+		}
+       
+		st.Step();
+	}
+
+}