version 0.3.12

diff --git a/include/global.h b/include/global.h
index 55d8857..572cb25 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -7,7 +7,7 @@
 \r
 #define VERSION_MAJOR          "0"\r
 #define VERSION_MINOR          "3"\r
 \r
 #define VERSION_MAJOR          "0"\r
 #define VERSION_MINOR          "3"\r

-#define VERSION_RELEASE                "11"\r
+#define VERSION_RELEASE                "12"\r

 #define FMS_VERSION                    VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE\r
 \r
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;\r
 #define FMS_VERSION                    VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE\r
 \r
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;\r

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index f22b25a..9ef9b61 100644 (file)
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -4,6 +4,7 @@
 #include "../../include/freenet/trustlistxml.h"\r
 \r
 #include <Poco/DateTimeFormatter.h>\r
 #include "../../include/freenet/trustlistxml.h"\r
 \r
 #include <Poco/DateTimeFormatter.h>\r

+#include <Poco/Timespan.h>\r

 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r


@@ -56,6 +57,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 \r
        // get count of identities added in last 24 hours\r
        st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");\r
 \r
        // get count of identities added in last 24 hours\r
        st=m_db->Prepare("SELECT COUNT(*) FROM tblIdentity WHERE DateAdded>=?;");\r

+       now-=Poco::Timespan(1,0,0,0,0);\r

        st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
        st.Step();\r
        if(st.RowReturned())\r
        st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));\r
        st.Step();\r
        if(st.RowReturned())\r


@@ -69,6 +71,7 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
        {\r
                m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");\r
        }\r
        {\r
                m_log->error("TrustListRequester::HandleAllData couldn't get count of identities added in last 24 hours");\r
        }\r

+       now=Poco::DateTime();\r

 \r
        // parse file into xml and update the database\r
        if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
 \r
        // parse file into xml and update the database\r
        if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r

diff --git a/src/http/pages/homepage.cpp b/src/http/pages/homepage.cpp
index a37d50f..d74a30e 100644 (file)
--- 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
 \r
        if(showgenericupdate)\r
        {\r
 \r
        if(showgenericupdate)\r
        {\r

-               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>";\r
+               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>";\r

        }\r
 \r
        content+="Use these pages to administer your FMS installation.";\r
        }\r
 \r
        content+="Use these pages to administer your FMS installation.";\r

diff --git a/src/optionssetup.cpp b/src/optionssetup.cpp
index bfa73df..6cb16b4 100644 (file)
--- a/src/optionssetup.cpp
+++ b/src/optionssetup.cpp
@@ -68,7 +68,7 @@ void SetupDefaultOptions()
        upd.Reset();\r
 \r
        st.Bind(0,"FMSVersionEdition");\r
        upd.Reset();\r
 \r
        st.Bind(0,"FMSVersionEdition");\r

-       st.Bind(1,"11");\r
+       st.Bind(1,"12");\r

        st.Step();\r
        st.Reset();\r
        upd.Bind(0,"Program");\r
        st.Step();\r
        st.Reset();\r
        upd.Bind(0,"Program");\r