X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fglobal.cpp;h=aed8c3e91f52703aa8a79f6b2bff402c478a42d2;hb=52581afffd81f5a71c129d87e3ac822d9522f12d;hp=2dea27b565b22547f9b2657fcb4006169531e52f;hpb=e773b0ecb8a35c67cde5b2e82bbebb05224f34d0;p=fms.git

diff --git a/src/global.cpp b/src/global.cpp
index 2dea27b..aed8c3e 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -101,13 +101,25 @@ void SetupDB()
 			major=1;
 			minor=8;
 		}
+		if(major==1 && minor==8)
+		{
+			ConvertDB0108To0109();
+			major=1;
+			minor=9;
+		}
+		if(major==1 && minor==9)
+		{
+			ConvertDB0109To0110();
+			major=1;
+			minor=10;
+		}
 	}
 	else
 	{
-		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,8);");
+		db->Execute("INSERT INTO tblDBVersion(Major,Minor) VALUES(1,10);");
 	}
 
-	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=8;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=10;");
 
 	db->Execute("CREATE TABLE IF NOT EXISTS tblOption(\
 				Option				TEXT UNIQUE,\
@@ -328,6 +340,16 @@ void SetupDB()
 				Inserted			BOOL CHECK(Inserted IN('true','false')) DEFAULT 'false'\
 				);");
 
+	db->Execute("CREATE TABLE IF NOT EXISTS tblFileInserts(\
+				FileInsertID		INTEGER PRIMARY KEY,\
+				MessageUUID			TEXT,\
+				FileName			TEXT,\
+				Key					TEXT,\
+				Size				INTEGER,\
+				MimeType			TEXT,\
+				Data				BLOB\
+				);");
+
 	db->Execute("CREATE TABLE IF NOT EXISTS tblMessageListInserts(\
 				LocalIdentityID		INTEGER,\
 				Day					DATE,\
@@ -476,6 +498,16 @@ void SetupDB()
 	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,AddedMethod) VALUES('SSK@T8l1IEGU4-PoASFzgc2GYhIgRzUvZsKdoQWeuLHuTmM,QLxAPfkGis8l5NafNpSCdbxzXhBlu9WL8svcqJw9Mpo,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert alek's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@lTjeI6V0lQsktXqaqJ6Iwk4TdsHduQI54rdUpHfhGbg,0oTYfrxxx8OmdU1~60gqpf3781qzEicM4Sz97mJsBM4,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert Luke771's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@mdXK~ZVlfTZhF1SLBrvZ--i0vOsOpa~w9wv~~psQ-04,gXonsXKc7aexKSO8Gt8Fwre4Qgmmbt2WueO7VzxNKkk,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert falafel's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@IxVqeqM0LyYdTmYAf5z49SJZUxr7NtQkOqVYG0hvITw,RM2wnMn5zAufCMt5upkkgq25B1elfBAxc7htapIWg1c,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert cptn_insano's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@bloE1LJ~qzSYUkU2nt7sB9kq060D4HTQC66pk5Q8NpA,DOOASUnp0kj6tOdhZJ-h5Tk7Ka50FSrUgsH7tCG1usU,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
+	// insert Flink's public key
+	db->Execute("INSERT INTO tblIdentity(PublicKey,DateAdded,AddedMethod) VALUES('SSK@q2TtkNBOuuniyJ56~8NSopCs3ttwe5KlB31ugZtWmXA,6~PzIupS8YK7L6oFNpXGKJmHT2kBMDfwTg73nHdNur8,AQACAAE/','"+date.Format("%Y-%m-%d %H:%M:%S")+"','Initial Identity');");
 
 	// TODO remove sometime after 0.1.17
 	FixCapitalBoardNames();
@@ -598,6 +630,27 @@ void ConvertDB0107To0108()
 	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=8;");
 }
 
+void ConvertDB0108To0109()
+{
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("CREATE TABLE IF NOT EXISTS tblFileInserts(\
+			FileInsertID		INTEGER PRIMARY KEY,\
+			MessageUUID			TEXT,\
+			FileName			TEXT,\
+			Key					TEXT,\
+			Size				INTEGER,\
+			Data				BLOB\
+			);");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=9;");
+}
+
+void ConvertDB0109To0110()
+{
+	SQLite3DB::DB *db=SQLite3DB::DB::Instance();
+	db->Execute("ALTER TABLE tblFileInserts ADD COLUMN MimeType TEXT;");
+	db->Execute("UPDATE tblDBVersion SET Major=1, Minor=10;");
+}
+
 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
@@ -656,7 +709,7 @@ void SetupDefaultOptions()
 
 	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.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();
 
@@ -681,6 +734,12 @@ void SetupDefaultOptions()
 	st.Step();
 	st.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.");