From: SomeDude <SomeDude@NuBL7aaJ6Cn4fB7GXFb9Zfi8w1FhPyW3oKgU9TweZMw>
Date: Sat, 19 Jul 2008 09:33:00 +0000 (+0200)
Subject: version 0.3.12
X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=commitdiff_plain;h=a558b16c8034966d14e1d63db44dcb952d849618

version 0.3.12
---

diff --git a/include/global.h b/include/global.h
index 55d8857..572cb25 100644
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 
 #define VERSION_MAJOR		"0"
 #define VERSION_MINOR		"3"
-#define VERSION_RELEASE		"11"
+#define VERSION_RELEASE		"12"
 #define FMS_VERSION			VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE
 
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;
diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index f22b25a..9ef9b61 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -4,6 +4,7 @@
 #include "../../include/freenet/trustlistxml.h"
 
 #include <Poco/DateTimeFormatter.h>
+#include <Poco/Timespan.h>
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -56,6 +57,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 
 	// get count of identities added in last 24 hours
 	st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");
+	now-=Poco::Timespan(1,0,0,0,0);
 	st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
 	st.Step();
 	if(st.RowReturned())
@@ -69,6 +71,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 	{
 		m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");
 	}
+	now=Poco::DateTime();
 
 	// parse file into xml and update the database
 	if(xml.ParseXML(std::string(data.begin(),data.end()))==true)
diff --git a/src/http/pages/homepage.cpp b/src/http/pages/homepage.cpp
index a37d50f..d74a30e 100644
--- a/src/http/pages/homepage.cpp
+++ b/src/http/pages/homepage.cpp
@@ -71,7 +71,7 @@ const std::string HomePage::GeneratePage(const std::string &method, const std::m
 
 	if(showgenericupdate)
 	{
-		content+="Check for new versions at the <a href=\"http://"+fcphost+":"+fproxyport+"/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/69/\">FMS Freesite</a><br>";
+		content+="Check for new versions at the <a href=\"http://"+fcphost+":"+fproxyport+"/USK@0npnMrqZNKRCRoGojZV93UNHCMN-6UU3rRSAmP6jNLE,~BG-edFtdCC1cSH4O3BWdeIYa8Sw5DfyrSV-TKdO5ec,AQACAAE/fms/71/\">FMS Freesite</a><br>";
 	}
 
 	content+="Use these pages to administer your FMS installation.";
diff --git a/src/optionssetup.cpp b/src/optionssetup.cpp
index bfa73df..6cb16b4 100644
--- a/src/optionssetup.cpp
+++ b/src/optionssetup.cpp
@@ -68,7 +68,7 @@ void SetupDefaultOptions()
 	upd.Reset();
 
 	st.Bind(0,"FMSVersionEdition");
-	st.Bind(1,"11");
+	st.Bind(1,"12");
 	st.Step();
 	st.Reset();
 	upd.Bind(0,"Program");