added: IP ban mechanism (not finished yet -- we need a winix function to remove a ban)

now after some incorrent login attempts your IP can be banned or blocked (see new config variables) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@902 e52654a7-88a9-db11-a3e9-0013d4bc506e
2012-10-27 07:44:26 +00:00
parent 53b4175d00
commit 099dd55d0c
54 changed files with 2691 additions and 1266 deletions
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -16,9 +16,10 @@ app.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 app.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
 app.o: logmanipulators.h slog.h cur.h request.h error.h
 app.o: ../templates/htmltextstream.h ../../pikotools/space/spacetojson.h
-app.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-app.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-app.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
+app.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+app.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+app.o: ../templates/patterns.h ../templates/locale.h
+app.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 app.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
@@ -26,7 +27,7 @@ app.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
 app.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h
 app.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h
 app.o: threadmanager.h timezones.h timezone.h sessionmanager.h
-app.o: sessioncontainer.h ../functions/functions.h
+app.o: sessioncontainer.h ipbancontainer.h ../functions/functions.h
 app.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -62,7 +63,7 @@ compress.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 compress.o: ../../pikotools/textstream/types.h htmlfilter.h
 compress.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 compress.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-compress.o: session.h user.h plugindata.h rebus.h mount.h
+compress.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 compress.o: ../templates/locale.h
 config.o: config.h ../../pikotools/space/spaceparser.h
 config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
@@ -76,22 +77,23 @@ config.o: ../../pikotools/textstream/types.h slog.h cur.h request.h
 config.o: requesttypes.h item.h error.h ../templates/htmltextstream.h
 config.o: ../core/textstream.h misc.h ../../pikotools/utf8/utf8.h
 config.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h
-config.o: rebus.h mount.h ../templates/locale.h plugin.h pluginmsg.h system.h
-config.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
-config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-config.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-config.o: ../core/user.h ../core/group.h ../core/dircontainer.h
-config.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
-config.o: ../templates/patterns.h ../templates/locale.h
-config.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
-config.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
-config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
-config.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h
-config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
-config.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h
-config.o: sessioncontainer.h ../functions/functions.h
+config.o: rebus.h ipban.h mount.h ../templates/locale.h plugin.h pluginmsg.h
+config.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h
+config.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+config.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
+config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
+config.o: ../notify/notifypool.h ../templates/patterns.h
+config.o: ../templates/locale.h ../templates/localefilter.h
+config.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
+config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
+config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
+config.o: ../notify/notifythread.h ../core/basethread.h
+config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
+config.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
+config.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
+config.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h
+config.o: ipbancontainer.h ../functions/functions.h
 config.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -122,7 +124,7 @@ crypt.o: ../../pikotools/membuffer/membuffer.h
 crypt.o: ../../pikotools/textstream/types.h slog.h cur.h request.h
 crypt.o: requesttypes.h item.h error.h ../templates/htmltextstream.h
 crypt.o: ../core/textstream.h misc.h ../../pikotools/space/spacetojson.h
-crypt.o: session.h plugindata.h rebus.h mount.h ../templates/locale.h
+crypt.o: session.h plugindata.h rebus.h ipban.h mount.h ../templates/locale.h
 dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h
 dircontainer.o: ../../pikotools/date/date.h log.h textstream.h
 dircontainer.o: logmanipulators.h ../../pikotools/textstream/textstream.h
@@ -137,7 +139,7 @@ dircontainer.o: ../../pikotools/textstream/types.h htmlfilter.h
 dircontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 dircontainer.o: ../../pikotools/utf8/utf8.h
 dircontainer.o: ../../pikotools/space/spacetojson.h session.h user.h
-dircontainer.o: plugindata.h rebus.h mount.h ../templates/locale.h
+dircontainer.o: plugindata.h rebus.h ipban.h mount.h ../templates/locale.h
 dirs.o: dirs.h item.h ../../pikotools/space/space.h
 dirs.o: ../../pikotools/date/date.h dircontainer.h ../db/db.h ../db/dbbase.h
 dirs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
@@ -152,9 +154,10 @@ dirs.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 dirs.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
 dirs.o: cur.h request.h error.h config.h htmlfilter.h
 dirs.o: ../templates/htmltextstream.h ../../pikotools/space/spacetojson.h
-dirs.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-dirs.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-dirs.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
+dirs.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+dirs.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+dirs.o: ../templates/patterns.h ../templates/locale.h
+dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 dirs.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
@@ -175,7 +178,8 @@ groups.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 groups.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
 groups.o: cur.h request.h error.h config.h htmlfilter.h
 groups.o: ../templates/htmltextstream.h ../../pikotools/space/spacetojson.h
-groups.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+groups.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+groups.o: ../templates/locale.h
 htmlfilter.o: htmlfilter.h
 httpsimpleparser.o: httpsimpleparser.h
 image.o: image.h basethread.h synchro.h textstream.h ../db/db.h
@@ -193,8 +197,8 @@ image.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 image.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h cur.h request.h
 image.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
 image.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h
-image.o: rebus.h mount.h ../templates/locale.h ../core/config.h system.h
-image.o: job.h dirs.h dircontainer.h ../notify/notify.h
+image.o: rebus.h ipban.h mount.h ../templates/locale.h ../core/config.h
+image.o: system.h job.h dirs.h dircontainer.h ../notify/notify.h
 image.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
 image.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 image.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -204,26 +208,42 @@ image.o: ../core/basethread.h ../notify/templatesnotify.h ../core/users.h
 image.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
 image.o: users.h groups.h group.h loadavg.h threadmanager.h timezones.h
 image.o: timezone.h plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
-image.o: ../functions/functions.h ../functions/functionbase.h
-image.o: ../core/request.h ../core/system.h ../core/synchro.h
-image.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
-image.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-image.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
-image.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
-image.o: ../functions/env.h ../functions/last.h ../functions/login.h
-image.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
-image.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
-image.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
-image.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h
-image.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h
-image.o: ../functions/sort.h ../functions/specialdefault.h
-image.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+image.o: ipbancontainer.h ../functions/functions.h
+image.o: ../functions/functionbase.h ../core/request.h ../core/system.h
+image.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+image.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+image.o: ../functions/privchanger.h ../functions/chown.h
+image.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
+image.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
+image.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+image.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
+image.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
+image.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
+image.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
+image.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
+image.o: ../functions/specialdefault.h ../functions/stat.h
+image.o: ../functions/subject.h ../functions/template.h
 image.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 image.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 image.o: ../core/htmlfilter.h ../templates/templates.h
 image.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 image.o: ../templates/patterns.h ../templates/changepatterns.h
 image.o: ../templates/htmltextstream.h ../core/sessionmanager.h
+ipbancontainer.o: ipbancontainer.h ipban.h log.h textstream.h
+ipbancontainer.o: logmanipulators.h ../../pikotools/textstream/textstream.h
+ipbancontainer.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+ipbancontainer.o: ../../pikotools/convert/convert.h
+ipbancontainer.o: ../../pikotools/convert/inttostr.h
+ipbancontainer.o: ../../pikotools/membuffer/membuffer.h
+ipbancontainer.o: ../../pikotools/textstream/types.h slog.h cur.h request.h
+ipbancontainer.o: requesttypes.h item.h error.h config.h
+ipbancontainer.o: ../../pikotools/space/spaceparser.h
+ipbancontainer.o: ../../pikotools/space/space.h
+ipbancontainer.o: ../../pikotools/textstream/types.h htmlfilter.h
+ipbancontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
+ipbancontainer.o: ../../pikotools/utf8/utf8.h
+ipbancontainer.o: ../../pikotools/space/spacetojson.h session.h user.h
+ipbancontainer.o: plugindata.h rebus.h mount.h ../templates/locale.h
 item.o: item.h ../../pikotools/space/space.h ../../pikotools/date/date.h
 item.o: misc.h requesttypes.h ../../pikotools/textstream/textstream.h
 item.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
@@ -243,9 +263,9 @@ job.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 job.o: ../../pikotools/textstream/types.h htmlfilter.h
 job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 job.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-job.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-job.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
-job.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+job.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+job.o: ../templates/locale.h system.h dirs.h dircontainer.h ../db/db.h
+job.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 job.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 job.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 job.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
@@ -258,7 +278,7 @@ job.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
 job.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h
 job.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h
 job.o: threadmanager.h timezones.h timezone.h sessionmanager.h
-job.o: sessioncontainer.h ../functions/functions.h
+job.o: sessioncontainer.h ipbancontainer.h ../functions/functions.h
 job.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 job.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 job.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -294,7 +314,7 @@ lastcontainer.o: ../../pikotools/textstream/types.h htmlfilter.h
 lastcontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 lastcontainer.o: ../../pikotools/utf8/utf8.h
 lastcontainer.o: ../../pikotools/space/spacetojson.h session.h user.h
-lastcontainer.o: plugindata.h rebus.h mount.h ../templates/locale.h
+lastcontainer.o: plugindata.h rebus.h ipban.h mount.h ../templates/locale.h
 loadavg.o: loadavg.h log.h textstream.h logmanipulators.h
 loadavg.o: ../../pikotools/textstream/textstream.h
 loadavg.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -307,7 +327,7 @@ loadavg.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 loadavg.o: ../../pikotools/textstream/types.h htmlfilter.h
 loadavg.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 loadavg.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-loadavg.o: session.h user.h plugindata.h rebus.h mount.h
+loadavg.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 loadavg.o: ../templates/locale.h
 lock.o: lock.h synchro.h
 log.o: log.h textstream.h logmanipulators.h
@@ -321,8 +341,8 @@ log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 log.o: ../../pikotools/textstream/types.h htmlfilter.h
 log.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 log.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-log.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-log.o: timezones.h timezone.h
+log.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+log.o: ../templates/locale.h timezones.h timezone.h
 misc.o: misc.h item.h ../../pikotools/space/space.h
 misc.o: ../../pikotools/date/date.h requesttypes.h
 misc.o: ../../pikotools/textstream/textstream.h
@@ -334,8 +354,9 @@ misc.o: config.h ../../pikotools/space/spaceparser.h
 misc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
 misc.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
 misc.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h
-misc.o: rebus.h mount.h ../templates/locale.h ../templates/templates.h
-misc.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
+misc.o: rebus.h ipban.h mount.h ../templates/locale.h
+misc.o: ../templates/templates.h ../../ezc/src/ezc.h
+misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 misc.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h
 misc.o: ../core/item.h ../templates/indexpatterns.h ../templates/patterns.h
@@ -369,15 +390,15 @@ mountparser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
 mountparser.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
 mountparser.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
 mountparser.o: ../../pikotools/space/spacetojson.h session.h user.h
-mountparser.o: plugindata.h rebus.h ../templates/locale.h ../notify/notify.h
-mountparser.o: ../notify/notifypool.h ../templates/patterns.h
-mountparser.o: ../templates/locale.h ../templates/localefilter.h
-mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-mountparser.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-mountparser.o: ../notify/notifythread.h ../core/basethread.h
-mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-mountparser.o: ugcontainer.h lastcontainer.h
+mountparser.o: plugindata.h rebus.h ipban.h ../templates/locale.h
+mountparser.o: ../notify/notify.h ../notify/notifypool.h
+mountparser.o: ../templates/patterns.h ../templates/locale.h
+mountparser.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+mountparser.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+mountparser.o: ../core/basethread.h ../notify/templatesnotify.h
+mountparser.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
 mounts.o: mounts.h mount.h error.h dirs.h item.h
 mounts.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 mounts.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@@ -394,7 +415,7 @@ mounts.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 mounts.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
 mounts.o: cur.h request.h config.h htmlfilter.h ../templates/htmltextstream.h
 mounts.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h
-mounts.o: rebus.h ../templates/locale.h ../notify/notify.h
+mounts.o: rebus.h ipban.h ../templates/locale.h ../notify/notify.h
 mounts.o: ../notify/notifypool.h ../templates/patterns.h
 mounts.o: ../templates/locale.h ../templates/localefilter.h
 mounts.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
@@ -405,7 +426,7 @@ mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h
 mounts.o: system.h job.h basethread.h synchro.h crypt.h run.h users.h
 mounts.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h
-mounts.o: timezone.h sessionmanager.h sessioncontainer.h
+mounts.o: timezone.h sessionmanager.h sessioncontainer.h ipbancontainer.h
 mounts.o: ../functions/functions.h ../functions/functionbase.h
 mounts.o: ../core/request.h ../core/system.h ../core/synchro.h
 mounts.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
@@ -438,11 +459,11 @@ plugin.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 plugin.o: ../../pikotools/textstream/types.h htmlfilter.h
 plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 plugin.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-plugin.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-plugin.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h
-plugin.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-plugin.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
-plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+plugin.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+plugin.o: ../templates/locale.h system.h job.h basethread.h synchro.h dirs.h
+plugin.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+plugin.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
 plugin.o: ../notify/notifypool.h ../templates/patterns.h
 plugin.o: ../templates/locale.h ../templates/localefilter.h
@@ -454,20 +475,21 @@ plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 plugin.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
 plugin.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
 plugin.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h
-plugin.o: ../functions/functions.h ../functions/functionbase.h
-plugin.o: ../core/request.h ../core/system.h ../core/synchro.h
-plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
-plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
-plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
-plugin.o: ../functions/env.h ../functions/last.h ../functions/login.h
-plugin.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
-plugin.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
-plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
-plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h
-plugin.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h
-plugin.o: ../functions/sort.h ../functions/specialdefault.h
-plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+plugin.o: ipbancontainer.h ../functions/functions.h
+plugin.o: ../functions/functionbase.h ../core/request.h ../core/system.h
+plugin.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+plugin.o: ../functions/privchanger.h ../functions/chown.h
+plugin.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
+plugin.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
+plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+plugin.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
+plugin.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
+plugin.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
+plugin.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
+plugin.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
+plugin.o: ../functions/specialdefault.h ../functions/stat.h
+plugin.o: ../functions/subject.h ../functions/template.h
 plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 plugin.o: ../core/htmlfilter.h ../templates/templates.h
@@ -487,9 +509,9 @@ plugindata.o: ../../pikotools/space/space.h
 plugindata.o: ../../pikotools/textstream/types.h htmlfilter.h
 plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 plugindata.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h system.h
-plugindata.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
-plugindata.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+plugindata.o: session.h user.h rebus.h ipban.h mount.h ../templates/locale.h
+plugindata.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h
+plugindata.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
@@ -503,7 +525,7 @@ plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 plugindata.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h
 plugindata.o: run.h users.h groups.h group.h loadavg.h image.h
 plugindata.o: threadmanager.h timezones.h timezone.h sessionmanager.h
-plugindata.o: sessioncontainer.h ../functions/functions.h
+plugindata.o: sessioncontainer.h ipbancontainer.h ../functions/functions.h
 plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 plugindata.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -540,7 +562,7 @@ postmultiparser.o: item.h ../../pikotools/utf8/utf8.h log.h textstream.h
 postmultiparser.o: logmanipulators.h slog.h cur.h request.h
 postmultiparser.o: ../templates/htmltextstream.h ../core/textstream.h
 postmultiparser.o: ../../pikotools/space/spacetojson.h session.h user.h
-postmultiparser.o: plugindata.h rebus.h mount.h ../templates/locale.h
+postmultiparser.o: plugindata.h rebus.h ipban.h mount.h ../templates/locale.h
 rebus.o: log.h textstream.h logmanipulators.h
 rebus.o: ../../pikotools/textstream/textstream.h
 rebus.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -552,7 +574,8 @@ rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 rebus.o: ../../pikotools/textstream/types.h htmlfilter.h
 rebus.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 rebus.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-rebus.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+rebus.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+rebus.o: ../templates/locale.h
 request.o: request.h requesttypes.h ../../pikotools/textstream/textstream.h
 request.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
 request.o: ../../pikotools/convert/convert.h
@@ -564,7 +587,7 @@ request.o: ../../pikotools/textstream/types.h htmlfilter.h textstream.h
 request.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 request.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
 request.o: log.h logmanipulators.h slog.h cur.h session.h user.h plugindata.h
-request.o: rebus.h mount.h ../templates/locale.h plugin.h pluginmsg.h
+request.o: rebus.h ipban.h mount.h ../templates/locale.h plugin.h pluginmsg.h
 request.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h
 request.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 request.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
@@ -580,19 +603,19 @@ request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 request.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
 request.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
 request.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h
-request.o: ../functions/functions.h ../functions/functionbase.h
-request.o: ../core/request.h ../core/system.h ../core/synchro.h
-request.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
-request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
-request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
-request.o: ../functions/default.h ../functions/download.h
-request.o: ../functions/emacs.h ../functions/env.h ../functions/last.h
-request.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
-request.o: ../functions/ls.h ../functions/man.h ../functions/meta.h
-request.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
-request.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
-request.o: ../functions/pw.h ../functions/reload.h ../functions/rm.h
-request.o: ../functions/rmuser.h ../functions/sort.h
+request.o: ipbancontainer.h ../functions/functions.h
+request.o: ../functions/functionbase.h ../core/request.h ../core/system.h
+request.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
+request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
+request.o: ../functions/privchanger.h ../functions/chown.h
+request.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
+request.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
+request.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+request.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
+request.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
+request.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
+request.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
+request.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
 request.o: ../functions/specialdefault.h ../functions/stat.h
 request.o: ../functions/subject.h ../functions/template.h
 request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
@@ -612,10 +635,11 @@ run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 run.o: ../../pikotools/textstream/types.h htmlfilter.h
 run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 run.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-run.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+run.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+run.o: ../templates/locale.h
 session.o: session.h item.h ../../pikotools/space/space.h
 session.o: ../../pikotools/date/date.h error.h user.h plugindata.h rebus.h
-session.o: textstream.h misc.h requesttypes.h
+session.o: textstream.h ipban.h misc.h requesttypes.h
 session.o: ../../pikotools/textstream/textstream.h
 session.o: ../../pikotools/convert/convert.h
 session.o: ../../pikotools/convert/inttostr.h
@@ -623,8 +647,8 @@ session.o: ../../pikotools/membuffer/membuffer.h
 session.o: ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.h
 sessioncontainer.o: sessioncontainer.h session.h item.h
 sessioncontainer.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
-sessioncontainer.o: error.h user.h plugindata.h rebus.h textstream.h cur.h
-sessioncontainer.o: request.h requesttypes.h
+sessioncontainer.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h
+sessioncontainer.o: cur.h request.h requesttypes.h
 sessioncontainer.o: ../../pikotools/textstream/textstream.h
 sessioncontainer.o: ../../pikotools/convert/convert.h
 sessioncontainer.o: ../../pikotools/convert/inttostr.h
@@ -639,8 +663,8 @@ sessioncontainer.o: ../../pikotools/space/spacetojson.h mount.h log.h
 sessioncontainer.o: logmanipulators.h slog.h ../templates/locale.h
 sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
 sessionmanager.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
-sessionmanager.o: error.h user.h plugindata.h rebus.h textstream.h cur.h
-sessionmanager.o: request.h requesttypes.h
+sessionmanager.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h
+sessionmanager.o: cur.h request.h requesttypes.h
 sessionmanager.o: ../../pikotools/textstream/textstream.h
 sessionmanager.o: ../../pikotools/convert/convert.h
 sessionmanager.o: ../../pikotools/convert/inttostr.h
@@ -651,27 +675,27 @@ sessionmanager.o: ../../pikotools/space/space.h
 sessionmanager.o: ../../pikotools/textstream/types.h htmlfilter.h
 sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessionmanager.o: ../../pikotools/utf8/utf8.h
-sessionmanager.o: ../../pikotools/space/spacetojson.h mount.h lastcontainer.h
-sessionmanager.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h
-sessionmanager.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h
-sessionmanager.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-sessionmanager.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
-sessionmanager.o: ../core/group.h ../core/dircontainer.h
-sessionmanager.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h
-sessionmanager.o: ../templates/locale.h ../notify/notify.h
-sessionmanager.o: ../notify/notifypool.h ../templates/patterns.h
-sessionmanager.o: ../templates/locale.h ../templates/localefilter.h
-sessionmanager.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-sessionmanager.o: ../notify/notifythread.h ../core/basethread.h
-sessionmanager.o: ../notify/templatesnotify.h ../core/config.h
-sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mountparser.h
-sessionmanager.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h
-sessionmanager.o: threadmanager.h timezones.h timezone.h sessionparser.h
-sessionmanager.o: plugin.h pluginmsg.h ../functions/functions.h
-sessionmanager.o: ../functions/functionbase.h ../core/request.h
-sessionmanager.o: ../core/system.h ../core/synchro.h
+sessionmanager.o: ../../pikotools/space/spacetojson.h mount.h
+sessionmanager.o: ipbancontainer.h lastcontainer.h system.h job.h
+sessionmanager.o: basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
+sessionmanager.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+sessionmanager.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
+sessionmanager.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+sessionmanager.o: ../core/dircontainer.h ../core/ugcontainer.h log.h
+sessionmanager.o: logmanipulators.h slog.h ../templates/locale.h
+sessionmanager.o: ../notify/notify.h ../notify/notifypool.h
+sessionmanager.o: ../templates/patterns.h ../templates/locale.h
+sessionmanager.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+sessionmanager.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+sessionmanager.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+sessionmanager.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+sessionmanager.o: ../core/basethread.h ../notify/templatesnotify.h
+sessionmanager.o: ../core/config.h ../core/users.h ugcontainer.h mounts.h
+sessionmanager.o: mountparser.h crypt.h run.h users.h groups.h group.h
+sessionmanager.o: loadavg.h image.h threadmanager.h timezones.h timezone.h
+sessionmanager.o: sessionparser.h plugin.h pluginmsg.h
+sessionmanager.o: ../functions/functions.h ../functions/functionbase.h
+sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h
 sessionmanager.o: ../functions/functionparser.h ../core/cur.h
 sessionmanager.o: ../functions/adduser.h ../functions/cat.h
 sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h
@@ -696,7 +720,7 @@ sessionmanager.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 sessionmanager.o: ../core/sessionmanager.h
 sessionparser.o: sessionparser.h session.h item.h
 sessionparser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
-sessionparser.o: error.h user.h plugindata.h rebus.h textstream.h
+sessionparser.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h
 sessionparser.o: sessioncontainer.h cur.h request.h requesttypes.h
 sessionparser.o: ../../pikotools/textstream/textstream.h
 sessionparser.o: ../../pikotools/convert/convert.h
@@ -720,8 +744,8 @@ slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 slog.o: ../../pikotools/textstream/types.h htmlfilter.h textstream.h
 slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 slog.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-slog.o: session.h user.h plugindata.h rebus.h mount.h logmanipulators.h
-slog.o: ../templates/locale.h
+slog.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+slog.o: logmanipulators.h ../templates/locale.h
 synchro.o: synchro.h
 system.o: system.h job.h basethread.h synchro.h ../../pikotools/space/space.h
 system.o: dirs.h item.h ../../pikotools/date/date.h dircontainer.h ../db/db.h
@@ -739,38 +763,39 @@ system.o: ../core/user.h ../core/group.h ../core/dircontainer.h
 system.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h
 system.o: cur.h request.h error.h config.h htmlfilter.h
 system.o: ../templates/htmltextstream.h ../../pikotools/space/spacetojson.h
-system.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
-system.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-system.o: ../templates/locale.h ../templates/localefilter.h
-system.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-system.o: ../notify/notifythread.h ../core/basethread.h
-system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
-system.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h
-system.o: users.h groups.h group.h loadavg.h image.h threadmanager.h
-system.o: timezones.h timezone.h ../templates/templates.h
-system.o: ../templates/patterncacher.h ../templates/indexpatterns.h
-system.o: ../templates/patterns.h ../templates/changepatterns.h
-system.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h
-system.o: ../core/sessionmanager.h ../core/htmlfilter.h
-system.o: ../functions/functions.h ../functions/functionbase.h
-system.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h
-system.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
-system.o: ../functions/privchanger.h ../functions/chown.h
-system.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
-system.o: ../functions/download.h ../functions/emacs.h ../functions/env.h
-system.o: ../functions/last.h ../functions/login.h ../functions/logout.h
-system.o: ../functions/ln.h ../functions/ls.h ../functions/man.h
-system.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
-system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
-system.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h
-system.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h
-system.o: ../functions/specialdefault.h ../functions/stat.h
-system.o: ../functions/subject.h ../functions/template.h
+system.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
+system.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+system.o: ../templates/patterns.h ../templates/locale.h
+system.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+system.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+system.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
+system.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
+system.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h
+system.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
+system.o: image.h threadmanager.h timezones.h timezone.h
+system.o: ../templates/templates.h ../templates/patterncacher.h
+system.o: ../templates/indexpatterns.h ../templates/patterns.h
+system.o: ../templates/changepatterns.h ../templates/htmltextstream.h
+system.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h
+system.o: ../core/htmlfilter.h ../functions/functions.h
+system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h
+system.o: ../functions/functionparser.h ../functions/adduser.h
+system.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
+system.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
+system.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
+system.o: ../functions/env.h ../functions/last.h ../functions/login.h
+system.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
+system.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h
+system.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
+system.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h
+system.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h
+system.o: ../functions/sort.h ../functions/specialdefault.h
+system.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
+system.o: ipbancontainer.h
 threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h
 threadmanager.o: logmanipulators.h ../../pikotools/textstream/textstream.h
 threadmanager.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
@@ -785,7 +810,7 @@ threadmanager.o: ../../pikotools/textstream/types.h htmlfilter.h
 threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 threadmanager.o: ../../pikotools/utf8/utf8.h
 threadmanager.o: ../../pikotools/space/spacetojson.h session.h user.h
-threadmanager.o: plugindata.h rebus.h mount.h ../templates/locale.h
+threadmanager.o: plugindata.h rebus.h ipban.h mount.h ../templates/locale.h
 timezone.o: timezone.h ../../pikotools/date/date.h
 timezone.o: ../../pikotools/space/space.h misc.h item.h requesttypes.h
 timezone.o: ../../pikotools/textstream/textstream.h
@@ -806,12 +831,12 @@ timezones.o: ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.h
 timezones.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
 timezones.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
 timezones.o: ../core/textstream.h ../../pikotools/space/spacetojson.h
-timezones.o: session.h user.h plugindata.h rebus.h mount.h
+timezones.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
 timezones.o: ../templates/locale.h
 user.o: user.h
 users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h
 users.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h
-users.o: user.h plugindata.h rebus.h textstream.h cur.h request.h
+users.o: user.h plugindata.h rebus.h textstream.h ipban.h cur.h request.h
 users.o: requesttypes.h ../../pikotools/textstream/textstream.h
 users.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h
 users.o: ../../pikotools/membuffer/membuffer.h
@@ -820,13 +845,14 @@ users.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 users.o: ../../pikotools/textstream/types.h htmlfilter.h
 users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 users.o: ../../pikotools/utf8/utf8.h ../../pikotools/space/spacetojson.h
-users.o: mount.h lastcontainer.h system.h job.h basethread.h synchro.h dirs.h
-users.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-users.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-users.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
-users.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h
-users.o: slog.h ../templates/locale.h ../notify/notify.h
-users.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
+users.o: mount.h ipbancontainer.h lastcontainer.h system.h job.h basethread.h
+users.o: synchro.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
+users.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
+users.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
+users.o: ../core/user.h ../core/group.h ../core/dircontainer.h
+users.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h
+users.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+users.o: ../templates/patterns.h ../templates/locale.h
 users.o: ../templates/localefilter.h ../../ezc/src/ezc.h
 users.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 users.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
--- a/core/Makefile.o.dep
+++ b/core/Makefile.o.dep
@@ -1 +1 @@
-o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o 
+o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o 
--- a/core/app.cpp
+++ b/core/app.cpp
@@ -15,6 +15,8 @@
 #include <cstdio>
 #include <fetch.h>
 #include <signal.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>

 #include "app.h"
 #include "plugin.h"
@@ -55,6 +57,7 @@ App::App()
 	functions.SetSystem(&system);
 	functions.SetTemplates(&templates);
 	functions.SetSynchro(&synchro);
+	functions.SetSessionManager(&session_manager);

 	system.SetConfig(&config);
 	system.SetCur(&cur);
@@ -149,6 +152,7 @@ bool App::Init()

 	// init notify after templates (it uses locales from templates)
 	system.notify.ReadTemplates();
+	session_manager.InitBanList();
 	session_manager.InitTmpSession();
 	session_manager.LoadSessions();

@@ -461,6 +465,7 @@ void App::CheckPostRedirect()

 // zmienic nazwe np na ProcessRequest
 // !! ta nazwa chyba juz zajeta...
+// !! IMPROVE ME need some refactoring
 void App::Make()
 {
 	if( cur.request->dir_tab.empty() )
@@ -469,6 +474,16 @@ void App::Make()
 		return;
 	}
 	
+	if( cur.session->ip_ban && cur.session->ip_ban->IsIPBanned() )
+	{
+		PT::Date date(cur.session->ip_ban->expires);
+
+		log << log2 << "App: this IP address is banned until to: " << date << " UTC" << logend;
+		slog << logerror << T("this_ip_is_banned_until") << ' ' << date << " UTC" << logend;
+
+		cur.request->status = WINIX_ERR_PERMISSION_DENIED;
+	}
+
 	// cur.request->status can be changed by function_parser
 	if( cur.request->status == WINIX_ERR_OK )
 		plugin.Call(WINIX_PREPARE_REQUEST);
@@ -553,7 +568,7 @@ void App::ReadRequest()
 	CheckKonqueror();

 	if( cur.request->using_ssl )
-		log << log3 << "App: SSL enabled" << logend;
+		log << log3 << "App: connection secure through SSL" << logend;

 	if( cur.request->role == Request::authorizer )
 		log << log3 << "App: fast cgi role: authorizer" << logend;
@@ -588,6 +603,8 @@ void App::ReadEnvVariables()
 	SetEnv(cur.request->env_content_type,			"CONTENT_TYPE");
 	SetEnv(cur.request->env_http_accept_encoding,	"HTTP_ACCEPT_ENCODING");
 	SetEnv(cur.request->env_https,					"HTTPS");
+
+	cur.request->ip = (int)inet_addr(cur.request->env_remote_addr);
 }


--- a/core/config.cpp
+++ b/core/config.cpp
@@ -246,6 +246,18 @@ void Config::AssignValues(bool stdout_is_closed)
 	etc_dir					= Text(L"etc_dir", L"");
 	time_zones_file 		= Text(L"time_zones_file", L"time_zones.conf");

+	use_ban_list			= Bool(L"use_ban_list", true);
+	ban_list_soft_max_size	= Size(L"ban_list_soft_max_size", 50000);
+	ban_list_max_size		= Size(L"ban_list_max_size", 51000);
+	ban_level_1_delay		= Size(L"ban_level_1_delay", 1800);
+	ban_level_2_delay		= Size(L"ban_level_2_delay", 86400);
+	ban_level_3_delay		= Size(L"ban_level_3_delay", 604800);
+
+	incorrect_login_min_time_between_get_post	= Size(L"incorrect_login_min_time_between_get_post", 2);
+	incorrect_login_captcha_treshold			= Size(L"incorrect_login_captcha_treshold", 3);
+	incorrect_login_cannot_login_mode			= Int(L"incorrect_login_cannot_login_mode", 0);
+	incorrect_login_cannot_login_treshold		= Size(L"incorrect_login_cannot_login_treshold", 20);
+	incorrect_login_cannot_login_delay			= Size(L"incorrect_login_cannot_login_delay", 1800);
 }


--- a/core/config.h
+++ b/core/config.h
@@ -523,6 +523,68 @@ public:
 	// each time zone is in a seperate space
 	std::wstring time_zones_file;

+ 	// turn on the IP ban mechanizm
+ 	// we have got three levels of bans (level 1, level 2, and the highest level 3)
+ 	// default: true
+ 	bool use_ban_list;
+
+ 	// the so called 'soft' max size
+ 	// read below description for explanation
+ 	// this is introduced to avoid deleting only one record from the ban list
+ 	// default: 50000
+ 	size_t ban_list_soft_max_size;
+
+ 	// this is the 'hard' max size of an IP's ban list
+ 	// if there are more records than this value
+ 	// then some of them will be removed (until the size will be ban_list_soft_max_size equal)
+ 	// this value should be a little larger from ban_list_soft_max_size
+ 	// default: 51000
+ 	size_t ban_list_max_size;
+
+ 	// delay in seconds of the first level ban
+ 	// default: 1800 (30 minutes)
+ 	// it means withing the next 30 minutes you see only 'you are banned...' message on your webbrowser
+ 	size_t ban_level_1_delay;
+
+ 	// delay in seconds of the second level ban
+ 	// default: 86400 (24 hours)
+ 	size_t ban_level_2_delay;
+
+ 	// delay in seconds of the third level ban
+ 	// default: 604800 (7 days)
+ 	size_t ban_level_3_delay;
+
+ 	// the minimum time in seconds which has to pass between the first GET request
+ 	// (showing your the login form) and the second POST request (which sends the
+ 	// login and password to the server)
+ 	// if the time is shorter then the login attempt is treated as incorrect
+ 	// (the same as if you provide incorrect user/password)
+ 	// default: 2
+ 	size_t incorrect_login_min_time_between_get_post;
+
+ 	// how many incorrect logins there must have been passed to display a captcha
+ 	// next to the login form
+ 	// default: 3
+ 	size_t incorrect_login_captcha_treshold;
+
+ 	// the way how we prevent to login if there are too many incorrect login attempts
+ 	// 0 - 'block logging' - do not show the login form in 'login' winix function
+ 	//     (instead a warning message will be printed)
+ 	// 1 - add to ban list (warning: people from this IP will not be able to see your site and do anything)
+ 	// default: 0
+ 	int incorrect_login_cannot_login_mode;
+
+ 	// after how many incorrect login attempts we do the incorrect_login_cannot_login_mode action
+ 	// default: 20
+ 	size_t incorrect_login_cannot_login_treshold;
+
+ 	// used when incorrect_login_cannot_login_mode is zero
+ 	// it is the time which should be passed to allow logging
+ 	// default: 1800 (30 minutes)
+ 	// if incorrect_login_cannot_login_mode is one then ban_level_X_delay times
+ 	// will be taken accordingly
+ 	size_t incorrect_login_cannot_login_delay;
+


 	Config();
--- a/core/ipban.h
+++ b/core/ipban.h
@@ -0,0 +1,148 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ *
+ * Copyright (c) 2012, Tomasz Sowa
+ * All rights reserved.
+ *
+ */
+
+#ifndef headerfile_winix_core_ipban
+#define headerfile_winix_core_ipban
+
+
+// telling if the IPBan record is active
+// we have two records: active and non active
+// non active records is something like a history
+// it is used to remember the last ban level
+// so based on this in the future a next greater ban can be calculated
+#define WINIX_IPBAN_FLAG_ACTIVE					1
+
+// current ban level
+// (if one of these flag is set and the record is active then it means the IP is banned at the moment)
+// level 1: banned for short time
+// level 2: can be set after level 1 has expired and the attacker still have not given up
+//          banned for some longer time in level 1
+// level 3: can be set after level 2
+//          banned for much more time
+#define WINIX_IPBAN_FLAG_BAN_LEVEL1				2
+#define WINIX_IPBAN_FLAG_BAN_LEVEL2				4
+#define WINIX_IPBAN_FLAG_BAN_LEVEL3				8
+
+
+
+
+
+/*
+	struct defining some restrictions to an IP address
+*/
+struct IPBan
+{
+	// at the moment only IPv4 are supported
+	int ip;
+
+	// one or more flags from WINIX_IPBAN_FLAG_*
+	int flags;
+
+	// when this record was last used
+	time_t last_used;
+
+	// when the restrictions (ban) should be removed
+	// valid only if some of WINIX_IPBAN_FLAG_BAN_LEVELX flags are set
+	// actually we do not remove the record but unsets WINIX_IPBAN_FLAG_ACTIVE flag
+	// so in the future we can check whether we need to change
+	// the ban level to a greater value
+	time_t expires;
+
+	// how many incorrect login attempts there are
+	unsigned int incorrect_login_events;
+
+	// in the future there can be more *_events fields
+
+
+
+	bool HasFlag(int flag) const
+	{
+		return (flags & flag) != 0;
+	}
+
+
+	void SetFlag(int flag)
+	{
+		flags = flags | flag;
+	}
+
+
+	void ClearFlag(int flag)
+	{
+		flags = flags & (~flag);
+	}
+
+
+	bool IsIPBanned() const
+	{
+		if( !HasFlag(WINIX_IPBAN_FLAG_ACTIVE) )
+			return false;
+
+		return  HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL1) ||
+				HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL2) ||
+				HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL3);
+	}
+
+
+	void AddNextBanLevel(time_t level1_expires, time_t level2_expires, time_t level3_expires)
+	{
+		if( HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL3) )
+		{
+			expires = level3_expires;
+			return;
+		}
+		else
+		if( HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL2) )
+		{
+			SetFlag(WINIX_IPBAN_FLAG_BAN_LEVEL3);
+			expires = level3_expires;
+			return;
+		}
+		else
+		if( HasFlag(WINIX_IPBAN_FLAG_BAN_LEVEL1) )
+		{
+			SetFlag(WINIX_IPBAN_FLAG_BAN_LEVEL2);
+			expires = level2_expires;
+			return;
+		}
+		else
+		{
+			SetFlag(WINIX_IPBAN_FLAG_BAN_LEVEL1);
+			expires = level1_expires;
+		}
+	}
+
+
+	IPBan()
+	{
+		Clear();
+	}
+
+
+	void Clear()
+	{
+		ip 			= 0;
+		flags 		= 0;
+		last_used	= 0;
+		expires		= 0;
+		incorrect_login_events = 0;
+	}
+
+
+	void ClearAfterRemovingBan()
+	{
+		ClearFlag(WINIX_IPBAN_FLAG_ACTIVE);
+		incorrect_login_events = 0;
+		expires = 0;
+	}
+
+};
+
+
+#endif
--- a/core/ipbancontainer.cpp
+++ b/core/ipbancontainer.cpp
@@ -0,0 +1,208 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ *
+ * Copyright (c) 2012, Tomasz Sowa
+ * All rights reserved.
+ *
+ */
+
+#include <algorithm>
+#include "ipbancontainer.h"
+#include "log.h"
+#include "date/date.h"
+
+
+
+IPBanContainer::IPBanContainer()
+{
+	is_ipban_tab_sorted	= false;
+	soft_max_size 		= 100;
+	max_size 			= 110;
+}
+
+
+void IPBanContainer::SetMaxSize(size_t soft_size, size_t size)
+{
+	soft_max_size = soft_size;
+	max_size      = size;
+
+	if( max_size < soft_max_size )
+		max_size = soft_max_size + 1;
+
+	ipban_tab.reserve(max_size);
+	sort_helper_tab.reserve(max_size);
+}
+
+
+// returning a reference to the added (or existed) record
+IPBan & IPBanContainer::AddIP(int ip)
+{
+	IPBan * old_ip_ban = FindIP(ip);
+
+	if( !old_ip_ban )
+	{
+		IPBan ip_ban;
+		ip_ban.ip = ip;
+
+		if( ipban_tab.size() >= max_size )
+			RemoveOldRecords();
+
+		ipban_tab.push_back(ip_ban);
+		return ipban_tab.back();
+	}
+	else
+	{
+		return *old_ip_ban;
+	}
+}
+
+
+// we need to remove some old records for the size of the container
+// to be less or equal to soft_max_size
+void IPBanContainer::RemoveOldRecords()
+{
+	PrintTab();
+
+	size_t to_remove = 0;
+
+	if( ipban_tab.size() >= soft_max_size )
+		to_remove = ipban_tab.size() - soft_max_size;
+
+	if( to_remove > 0 )
+	{
+		log << log4 << "we are going to remove: " << to_remove << " records" << logend;
+
+		sort_helper_tab.resize(ipban_tab.size());
+
+		for(size_t i=0 ; i<ipban_tab.size() ; ++i)
+			sort_helper_tab[i] = i;
+
+		std::sort(sort_helper_tab.begin(), sort_helper_tab.end(), SortByLastUsedHelper(this));
+		PrintTab2();
+		sort_helper_tab.resize(to_remove);
+		std::sort(sort_helper_tab.begin(), sort_helper_tab.end());
+		PrintTab2();
+
+
+		while( to_remove-- > 0 )
+		{
+			log << log4 << "removing record index: " << sort_helper_tab[to_remove] << ", last_used: ";
+			PT::Date date(ipban_tab[sort_helper_tab[to_remove]].last_used);
+			log << date << logend;
+
+			ipban_tab.erase(ipban_tab.begin() + sort_helper_tab[to_remove]);
+		}
+
+		log << log4 << "after removing we have: " << logend;
+		PrintTab();
+	}
+}
+
+
+void IPBanContainer::PrintTab()
+{
+	log << log4 << "ipban_tab (size: " << ipban_tab.size() << ")" << logend;
+
+	for(size_t i=0 ; i<ipban_tab.size() ; ++i)
+	{
+		log << log4 << i << ": ip: " << ipban_tab[i].ip << ", flags: " << ipban_tab[i].flags << ", last_used: ";
+
+		PT::Date date(ipban_tab[i].last_used);
+		log << date << ", expires: ";
+
+		date = ipban_tab[i].expires;
+		log << date << logend;
+	}
+}
+
+void IPBanContainer::PrintTab2()
+{
+	log << log4 << "sort_helper_tab (size: " << sort_helper_tab.size() << ")" << logend;
+
+	for(size_t i=0 ; i<sort_helper_tab.size() ; ++i)
+	{
+		IPBan & ipban = ipban_tab[sort_helper_tab[i]];
+
+		log << log4 << i << ": ip: " << ipban.ip << ", flags: " << ipban.flags << ", last_used: ";
+
+		PT::Date date(ipban.last_used);
+		log << date << ", expires: ";
+
+		date = ipban.expires;
+		log << date << logend;
+	}
+}
+
+
+bool IPBanContainer::SortByLastUsedHelper::operator()(size_t index1, size_t index2)
+{
+	if( index1 < container->ipban_tab.size() &&
+		index2 < container->ipban_tab.size() )
+	{
+		IPBan & ip1 = container->ipban_tab[index1];
+		IPBan & ip2 = container->ipban_tab[index2];
+
+		// prefer to select records which do not have WINIX_IPBAN_FLAG_ACTIVE
+		if( ip1.HasFlag(WINIX_IPBAN_FLAG_ACTIVE) !=
+			ip2.HasFlag(WINIX_IPBAN_FLAG_ACTIVE) )
+		{
+			return ip2.HasFlag(WINIX_IPBAN_FLAG_ACTIVE);
+		}
+
+		return ip1.last_used < ip2.last_used;
+	}
+
+return false;
+}
+
+
+
+IPBan * IPBanContainer::FindIP(int ip)
+{
+	// !! IMPROVE ME add binary search if is_ipban_tab_sorted is true
+
+	for(size_t i=0 ; i<ipban_tab.size() ; ++i)
+	{
+		if( ipban_tab[i].ip == ip )
+		{
+			return &ipban_tab[i];
+		}
+	}
+
+return 0;
+}
+
+
+IPBan & IPBanContainer::GetIPBan(size_t index)
+{
+	return ipban_tab[index];
+}
+
+
+void IPBanContainer::Sort()
+{
+	std::sort(ipban_tab.begin(), ipban_tab.end(), SortIPBansFunction);
+	is_ipban_tab_sorted = true;
+}
+
+
+
+size_t IPBanContainer::Size()
+{
+	return ipban_tab.size();
+}
+
+
+
+bool IPBanContainer::SortIPBansFunction(const IPBan & ip1, const IPBan & ip2)
+{
+	return ip1.ip < ip2.ip;
+}
+
+
+
+
+
+
+
--- a/core/ipbancontainer.h
+++ b/core/ipbancontainer.h
@@ -0,0 +1,56 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ *
+ * Copyright (c) 2012, Tomasz Sowa
+ * All rights reserved.
+ *
+ */
+
+#ifndef headerfile_winix_core_ipbancontainer
+#define headerfile_winix_core_ipbancontainer
+
+#include <vector>
+#include "ipban.h"
+
+
+
+class IPBanContainer
+{
+public:
+
+	IPBanContainer();
+
+	IPBan & AddIP(int ip);
+	IPBan * FindIP(int ip);
+	void    Sort();
+	size_t  Size();
+	IPBan & GetIPBan(size_t index);
+	void    SetMaxSize(size_t soft_size, size_t size);
+
+
+private:
+
+	std::vector<IPBan> ipban_tab;
+	bool is_ipban_tab_sorted;
+	size_t soft_max_size, max_size;
+	std::vector<size_t> sort_helper_tab;
+
+	static bool SortIPBansFunction(const IPBan & ip1, const IPBan & ip2);
+	void RemoveOldRecords();
+	void PrintTab();
+	void PrintTab2();
+
+	struct SortByLastUsedHelper
+	{
+		IPBanContainer * container;
+
+		SortByLastUsedHelper(IPBanContainer * c) : container(c) {}
+		bool operator()(size_t index1, size_t index2);
+	};
+
+};
+
+
+#endif
+
--- a/core/log.h
+++ b/core/log.h
@@ -142,16 +142,8 @@ size_t min_size = value.size() < max_size ? value.size() : max_size;
 template<typename char_type, size_t stack_size, size_t heap_block_size>
 Log & Log::operator<<(const PT::TextStreamBase<char_type, stack_size, heap_block_size> & buf)
 {
-	if( current_level > log_level )
-		return *this;
-
-	typename PT::TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator i = buf.begin();
-
-	// in the future we change buffer to PT::TextStreamBuffer
-	// so then there'll be << operator
-
-	for( ; i != buf.end() ; ++i)
-		buffer << *i;
+	if( current_level <= log_level )
+		buffer << buf;

 return *this;
 }
--- a/core/misc.cpp
+++ b/core/misc.cpp
@@ -526,6 +526,29 @@ return buffer;



+PT::WTextStream IPToStr(unsigned int ip)
+{
+PT::WTextStream buf;
+
+	for(int i=0 ; i<4 ; ++i, ip >>= 8)
+	{
+		buf << (ip & 0xff);
+
+		if( i<3 )
+			buf << '.';
+	}
+
+return buf;
+}
+
+
+PT::WTextStream IPToStr(int ip)
+{
+	return IPToStr(static_cast<unsigned int>(ip));
+}
+
+
+
 /*
 	we do not treat a new line character (10) as a white character
 */
--- a/core/misc.h
+++ b/core/misc.h
@@ -224,8 +224,16 @@ const char * DateToStrCookie(int year, int month, int day, int hour, int min, in
 const char * DateToStrCookie(const PT::Date & d);
 const char * DateToStrCookie(time_t t);

+// depracated
+// not thread safe
 const wchar_t * IpToStr(unsigned int ip_);

+// in a new code we can use WTextStream in such a way
+// DateToStr() etc can use it too
+PT::WTextStream IPToStr(unsigned int ip);
+PT::WTextStream IPToStr(int ip);
+
+
 bool IsWhite(wchar_t s);
 bool IsWhite(const wchar_t * str, 		bool treat_new_line_as_white = false);
 bool IsWhite(const std::wstring & str, 	bool treat_new_line_as_white = false);
--- a/core/request.cpp
+++ b/core/request.cpp
@@ -127,6 +127,8 @@ void Request::Clear()
 	gen_trim_white			= false;
 	gen_skip_new_line		= false;
 	gen_use_special_chars	= false;
+
+	ip = 0;
 }


--- a/core/request.h
+++ b/core/request.h
@@ -89,6 +89,10 @@ struct Request
 	const char * env_content_type;
 	const char * env_https;
 	
+	// current IP address of the remote host (read from REMOTE_ADDR environment variable)
+	// (at the moment only IPv4 are supported)
+	int ip;
+
 	// true if the browser is Microsoft Internet Explorer
 	bool browser_msie;
 	
--- a/core/session.cpp
+++ b/core/session.cpp
@@ -78,6 +78,7 @@ void Session::Clear(bool clear_plugin_data)

 	log_buffer.Clear();
 	last_css.clear();
+	ip_ban = 0;

 	if( clear_plugin_data )
 		plugin_data.Resize(0);
--- a/core/session.h
+++ b/core/session.h
@@ -20,6 +20,7 @@
 #include "rebus.h"
 #include "textstream.h"
 #include "date/date.h"
+#include "ipban.h"



@@ -50,7 +51,7 @@ struct Session
 	PT::Date last_date;

 	// when there was a last get request
-	// (used to calculate spam)
+	// (used to calculate spam or invalid login attempts etc.)
 	time_t last_time_get;
 	

@@ -84,6 +85,11 @@ struct Session
 	// used by some javascript wysiwyg editors (ckeditor, tinymce)
 	std::vector<std::wstring> last_css;

+	// pointer to IPBan struct if exists for this IP
+	// many sessions can pointer to the same IPBan struct
+	// (it can be null)
+	IPBan * ip_ban;
+
 };


--- a/core/sessionmanager.cpp
+++ b/core/sessionmanager.cpp
@@ -57,6 +57,11 @@ void SessionManager::SetLastContainer(LastContainer * plast_container)
 }


+void SessionManager::InitBanList()
+{
+	ban_tab.SetMaxSize(config->ban_list_soft_max_size, config->ban_list_max_size);
+}
+

 size_t SessionManager::Size()
 {
@@ -136,15 +141,20 @@ SessionContainer::Iterator i = session_tab.End();
 	{
 		// there is a problem with generating a new session id
 		// we do not set a session cookie
-		session = &temporary_session;
-		session->Clear(false);
-		session->SetTimesTo(cur->request->start_time);
-		session->new_session = false; // temporary session was initialized at the beginning
 		log << log1 << "SM: cannot create a session id (temporary used: with id 0)" << logend;
+		SetTemporarySession();
 	}
 }


+void SessionManager::SetTemporarySession()
+{
+	session = &temporary_session;
+	session->Clear(false);
+	session->SetTimesTo(cur->request->start_time);
+	session->new_session = false; // temporary session was initialized at the beginning
+}
+


 bool SessionManager::SetSessionFromCookie(const std::string & cookie)
@@ -178,6 +188,24 @@ return true;

 void SessionManager::SetSession()
 {
+	current_ip_ban = ban_tab.FindIP(cur->request->ip);
+
+	if( current_ip_ban && current_ip_ban->IsIPBanned() )
+	{
+		if( current_ip_ban->expires != 0 && cur->request->start_time >= current_ip_ban->expires )
+		{
+			log << log2 << "SM: removing a ban from this IP and resetting events counter" << logend;
+			current_ip_ban->ClearAfterRemovingBan();
+		}
+		else
+		{
+			log << log2 << "SM: this ip is bannned, using a temporary session" << logend;
+			SetTemporarySession();
+			session->ip_ban = current_ip_ban;
+			return;
+		}
+	}
+
 	CookieTab::iterator i = cur->request->cookie_tab.find(config->http_session_id_name);

 	if( i == cur->request->cookie_tab.end() )
@@ -196,9 +224,12 @@ void SessionManager::SetSession()
 			CreateSession();
 		}
 	}
+
+	session->ip_ban = current_ip_ban;
 }


+
 Session * SessionManager::FindSession(long id)
 {
 	SessionContainer::Iterator i = session_tab.FindById(id);
@@ -411,6 +442,26 @@ return how_many;
 }


+IPBan & SessionManager::AddIPToBanList(int ip)
+{
+	return ban_tab.AddIP(ip);
+}
+
+
+size_t SessionManager::BanListSize()
+{
+	return ban_tab.Size();
+}
+
+
+IPBan & SessionManager::GetIPBan(size_t index)
+{
+	return ban_tab.GetIPBan(index);
+}
+
+
+
+


 /*
--- a/core/sessionmanager.h
+++ b/core/sessionmanager.h
@@ -14,6 +14,7 @@
 #include <ctime>

 #include "sessioncontainer.h"
+#include "ipbancontainer.h"
 #include "config.h"
 #include "request.h"
 #include "lastcontainer.h"
@@ -34,6 +35,7 @@ public:
 	void SetSystem(System * psystem);
 	void SetLastContainer(LastContainer * plast_container);

+
 	// can return a null pointer
 	Session * FindSession(long id);

@@ -41,6 +43,7 @@ public:
 	void DeleteSessions(); // deleting all sessions
 	bool ChangeSessionId(long old_id);

+	void InitBanList();
 	void InitTmpSession();
 	void UninitTmpSession();

@@ -56,6 +59,11 @@ public:
 	size_t Size();
 	size_t MarkAllSessionsToRemove(long user_id);

+	IPBan & AddIPToBanList(int ip);
+	size_t  BanListSize();
+	IPBan & GetIPBan(size_t index);
+
+
 private:

 	Config  * config;
@@ -68,6 +76,9 @@ private:
 	Session * session;

 	SessionContainer session_tab;
+	IPBanContainer   ban_tab;
+
+	IPBan * current_ip_ban;

 	// session with id 0
 	Session temporary_session;
@@ -77,7 +88,7 @@ private:
 	long CreateSessionId();
 	void CreateSession();
 	bool SetSessionFromCookie(const std::string & cookie);
-
+	void SetTemporarySession();

 	// second thread
 	int deleted;
--- a/core/slog.cpp
+++ b/core/slog.cpp
@@ -2,7 +2,7 @@
 * This file is a part of Winix
 * and is not publicly distributed
 * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
 * All rights reserved.
 * 
 */
@@ -114,6 +114,13 @@ SLog & SLog::operator<<(double s)
 }


+SLog & SLog::operator<<(const PT::Date & date)
+{
+	return PutLog(date);
+}
+
+
+
 SLog & SLog::operator<<(LogManipulators m)
 {
 	if( cur && cur->session )
--- a/core/slog.h
+++ b/core/slog.h
@@ -2,7 +2,7 @@
 * This file is a part of Winix
 * and is not publicly distributed
 * 
- * Copyright (c) 2011, Tomasz Sowa
+ * Copyright (c) 2011-2012, Tomasz Sowa
 * All rights reserved.
 * 
 */
@@ -13,6 +13,7 @@
 #include "cur.h"
 #include "logmanipulators.h"
 #include "templates/locale.h"
+#include "textstream/textstream.h"


 #define WINIX_SLOG_MAX_LOG_SIZE 10240
@@ -68,6 +69,11 @@ public:
 	SLog & operator<<(size_t s);
 	SLog & operator<<(double s);
 	SLog & operator<<(LogManipulators m);
+	SLog & operator<<(const PT::Date & date);
+
+	template<typename char_type, size_t stack_size, size_t heap_block_size>
+	SLog & operator<<(const PT::TextStreamBase<char_type, stack_size, heap_block_size> & buf);
+

 	SLog & TranslateText(const char * str);
 	SLog & TranslateText(const wchar_t * str);
@@ -95,7 +101,7 @@ public:
 private:

 	template<class LogParam>
-	SLog & PutLog(LogParam par);
+	SLog & PutLog(const LogParam & par);

 	Cur * cur;
 	Locale * locale;
@@ -111,8 +117,15 @@ SLog::TranslateTextHelper<RawType> T(const RawType & par)
 }


+template<typename char_type, size_t stack_size, size_t heap_block_size>
+SLog & SLog::operator<<(const PT::TextStreamBase<char_type, stack_size, heap_block_size> & buf)
+{
+	return PutLog(buf);
+}
+
+
 template<class LogParam>
-SLog & SLog::PutLog(LogParam par)
+SLog & SLog::PutLog(const LogParam & par)
 {
 	if( cur && cur->session )
 		cur->session->log_buffer << par;
--- a/core/textstream.h
+++ b/core/textstream.h
@@ -15,6 +15,7 @@
 #include "misc.h"
 #include "space/space.h"
 #include "date/date.h"
+#include "textstream/textstream.h"



@@ -62,6 +63,9 @@ public:
 	TextStream & operator<<(const PT::Space & space);
 	TextStream & operator<<(const PT::Date & date);

+	template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
+	TextStream & operator<<(const PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg);
+
 	TextStream & Write(const char * buf, size_t len);
 	TextStream & Write(const wchar_t * buf, size_t len);
 	TextStream & write(const char * buf, size_t len);     // for compatibility with standard library (Ezc uses it)
@@ -327,6 +331,19 @@ return *this;
 }


+template<class StringType>
+template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
+TextStream<StringType> & TextStream<StringType>::operator<<(
+				const PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg)
+{
+typename PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size>::const_iterator i;
+
+	for(i=arg.begin() ; i != arg.end() ; ++i)
+		buffer += static_cast<char_type>(*i);
+
+return *this;
+}
+

 #endif

--- a/core/version.h
+++ b/core/version.h
@@ -13,7 +13,7 @@

 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		5
-#define WINIX_VER_REVISION	0
+#define WINIX_VER_REVISION	1


 #endif