version 0.3.17

diff --git a/include/freenet/captcha/alternatecaptchafonts.h b/include/freenet/captcha/alternatecaptchafonts.h
index 741d0b2..e681285 100644 (file)
--- a/include/freenet/captcha/alternatecaptchafonts.h
+++ b/include/freenet/captcha/alternatecaptchafonts.h
@@ -3,11 +3,12 @@
 \r
 #ifdef ALTERNATE_CAPTCHA\r
 \r
+#include "../../ilogger.h"\r
 #include "freeimage/bitmap.h"\r
 #include "freeimage/font.h"\r
 #include <vector>\r
 \r
-class AlternateCaptchaFonts\r
+class AlternateCaptchaFonts:public ILogger\r
 {\r
 public:\r
        AlternateCaptchaFonts();\r

diff --git a/include/freenet/captcha/freeimage/bitmap.h b/include/freenet/captcha/freeimage/bitmap.h
index 9e00af3..406ca4b 100644 (file)
--- a/include/freenet/captcha/freeimage/bitmap.h
+++ b/include/freenet/captcha/freeimage/bitmap.h
@@ -61,6 +61,6 @@ private:
 \r
 };\r
 \r
-}\r
+}      // namespace\r
 \r
 #endif // _freeimage_bitmap_\r

diff --git a/include/global.h b/include/global.h
index 182dafe..2a9478d 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
-#define VERSION_RELEASE                "16"\r
+#define VERSION_RELEASE                "17"\r
 #define FMS_VERSION                    VERSION_MAJOR"."VERSION_MINOR"."VERSION_RELEASE\r
 \r
 typedef Poco::ScopedLock<Poco::FastMutex> Guard;\r

diff --git a/src/freenet/captcha/alternatecaptcha1.cpp b/src/freenet/captcha/alternatecaptcha1.cpp
index 83b2ca5..0b9db08 100644 (file)
--- a/src/freenet/captcha/alternatecaptcha1.cpp
+++ b/src/freenet/captcha/alternatecaptcha1.cpp
@@ -1,6 +1,7 @@
 #include "../../../include/freenet/captcha/alternatecaptcha1.h"\r
 \r
 #include <cmath>\r
+#include <cstdlib>\r
 \r
 #ifdef ALTERNATE_CAPTCHA\r
 \r
@@ -12,6 +13,11 @@ AlternateCaptcha1::AlternateCaptcha1()
 \r
 void AlternateCaptcha1::Generate()\r
 {\r
+       if(m_fonts.size()==0)\r
+       {\r
+               return;\r
+       }\r
+\r
        std::string puzzlestring=GenerateRandomString(5);\r
        FreeImage::Bitmap tempchar(50,50,32);\r
        tempchar.SetTransparent();\r
@@ -50,7 +56,7 @@ void AlternateCaptcha1::Generate()
        white.rgbGreen=255;\r
        white.rgbBlue=255;\r
        white.rgbReserved=255;\r
-       int numlines=(rand()%5)+10;\r
+       int numlines=(rand()%5)+5;\r
        for(int i=0; i<numlines; i++)\r
        {\r
                // draw 4 short lines very close to each other\r

diff --git a/src/freenet/captcha/alternatecaptcha2.cpp b/src/freenet/captcha/alternatecaptcha2.cpp
index 08cbdd6..7495f36 100644 (file)
--- a/src/freenet/captcha/alternatecaptcha2.cpp
+++ b/src/freenet/captcha/alternatecaptcha2.cpp
@@ -5,6 +5,7 @@
 \r
 #include <cmath>\r
 #include <vector>\r
+#include <cstdlib>\r
 \r
 #ifdef ALTERNATE_CAPTCHA\r
 \r
@@ -16,6 +17,11 @@ AlternateCaptcha2::AlternateCaptcha2()
 \r
 void AlternateCaptcha2::Generate()\r
 {\r
+       if(m_fonts.size()==0)\r
+       {\r
+               return;\r
+       }\r
+\r
        std::string puzzlestring=GenerateRandomString(6);\r
        std::vector<int> fontnums(puzzlestring.size(),0);\r
        \r
@@ -42,9 +48,9 @@ void AlternateCaptcha2::Generate()
        for(int i=0; i<numlines; i++)\r
        {\r
                int x1=rand()%150;\r
-               int y1=(rand()%100)+100;\r
+               int y1=(rand()%80)+110;\r
                int x2=(rand()%150)+150;\r
-               int y2=(rand()%100)+100;\r
+               int y2=(rand()%80)+110;\r
                bigbmp.Line(x1,y1,x2,y2,white);\r
                bigbmp.Line(x1+1,y1,x2+1,y2,white);\r
        }\r
@@ -78,7 +84,7 @@ void AlternateCaptcha2::Generate()
        }\r
 \r
        // rotate the big bitmap back to (almost) horizontal\r
-       bigbmp.Rotate(-lastrot+((rand()%10)-5),0,0,150,150);\r
+       bigbmp.Rotate(-lastrot+((rand()%20)-10),0,0,150,150);\r
 \r
        // grab the center of the big bitmap as the final bitmap\r
        FreeImage::Bitmap bmp(110,50,32);\r

diff --git a/src/freenet/captcha/alternatecaptchafonts.cpp b/src/freenet/captcha/alternatecaptchafonts.cpp
index da7b267..1941a43 100644 (file)
--- a/src/freenet/captcha/alternatecaptchafonts.cpp
+++ b/src/freenet/captcha/alternatecaptchafonts.cpp
@@ -4,6 +4,7 @@
 \r
 #include <Poco/Path.h>\r
 #include <Poco/DirectoryIterator.h>\r
+#include <Poco/Exception.h>\r
 \r
 bool AlternateCaptchaFonts::m_fontsloaded(false);\r
 std::vector<FreeImage::Font> AlternateCaptchaFonts::m_fonts;\r
@@ -21,19 +22,34 @@ AlternateCaptchaFonts::AlternateCaptchaFonts()
 void AlternateCaptchaFonts::LoadFonts()\r
 {\r
 \r
-       FreeImage::Bitmap bmp;\r
-       Poco::Path path("fonts");\r
-       Poco::DirectoryIterator di(path);\r
-       Poco::DirectoryIterator end;\r
-\r
-       while(di!=end)\r
+       try\r
        {\r
-               if(di.name().find("bmp")!=std::string::npos)\r
+               FreeImage::Bitmap bmp;\r
+               Poco::Path path("fonts");\r
+               Poco::DirectoryIterator di(path);\r
+               Poco::DirectoryIterator end;\r
+\r
+               while(di!=end)\r
+               {\r
+                       if(di.name().find("bmp")!=std::string::npos)\r
+                       {\r
+                               bmp.Load("bmp",di.path().toString());\r
+                               m_fonts.push_back(FreeImage::Font(bmp));\r
+                       }\r
+                       ++di;\r
+               }\r
+               if(m_fonts.size()==0)\r
                {\r
-                       bmp.Load("bmp",di.path().toString());\r
-                       m_fonts.push_back(FreeImage::Font(bmp));\r
+                       m_log->fatal("AlternateCaptchaFonts::LoadFonts You have no loadable fonts in the font directory!");\r
                }\r
-               ++di;\r
+       }\r
+       catch(Poco::Exception &e)\r
+       {\r
+               m_log->error("AlternateCaptchaFonts::LoadFonts caught "+e.displayText());\r
+       }\r
+       catch(...)\r
+       {\r
+               m_log->error("AlternateCaptchaFonts::LoadFonts caught unknown exception");\r
        }\r
 \r
 }\r

diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index 60f7bb6..cac3879 100644 (file)
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -87,8 +87,7 @@ void IntroductionPuzzleInserter::GenerateCaptcha(std::string &encodeddata, std::
        }\r
        m_log->trace("IntroductionPuzzleInserter::GenerateCaptcha using alternate captcha generator");\r
 #else\r
-       SimpleCaptcha captcha;\r
-       cap=&captcha;\r
+       cap=new SimpleCaptcha();\r
 #endif\r
        std::vector<unsigned char> puzzle;\r
        std::vector<unsigned char> puzzlesolution;\r

diff --git a/src/http/pages/peermaintenancepage.cpp b/src/http/pages/peermaintenancepage.cpp
index 573306b..240c12e 100644 (file)
--- a/src/http/pages/peermaintenancepage.cpp
+++ b/src/http/pages/peermaintenancepage.cpp
@@ -39,7 +39,7 @@ const std::string PeerMaintenancePage::GeneratePage(const std::string &method, c
                {\r
                        date=Poco::Timestamp();\r
                        date-=Poco::Timespan(20,0,0,0,0);\r
-                       st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage GROUP BY IdentityID WHERE IdentityID IS NOT NULL) AND LastSeen<?;");\r
+                       st=m_db->Prepare("DELETE FROM tblIdentity WHERE IdentityID NOT IN (SELECT IdentityID FROM tblMessage WHERE IdentityID IS NOT NULL GROUP BY IdentityID) AND LastSeen<?;");\r
                        st.Bind(0,Poco::DateTimeFormatter::format(date,"%Y-%m-%d %H:%M:%S"));\r
                        st.Step();\r
                }\r

diff --git a/src/optionssetup.cpp b/src/optionssetup.cpp
index 89fca04..91ddcbc 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
-       st.Bind(1,"16");\r
+       st.Bind(1,"19");\r
        st.Step();\r
        st.Reset();\r
        upd.Bind(0,"Program");\r