diff --git a/core/Makefile.dep b/core/Makefile.dep
index b243df8..aae0da7 100755
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -3,10 +3,10 @@
 acceptbaseparser.o: acceptbaseparser.h
 app.o: app.h config.h ../../pikotools/space/spaceparser.h
 app.o: ../../pikotools/space/space.h htmlfilter.h system.h job.h basethread.h
-app.o: synchro.h ../../pikotools/space/space.h dirs.h item.h dircontainer.h
-app.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-app.o: ../core/textstream.h misc.h requesttypes.h ../../pikotools/date/date.h
-app.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
+app.o: synchro.h ../../pikotools/space/space.h dirs.h item.h
+app.o: ../../pikotools/date/date.h dircontainer.h ../db/db.h ../db/dbbase.h
+app.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
+app.o: requesttypes.h ../core/error.h ../db/dbitemquery.h ../core/item.h
 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
@@ -48,16 +48,16 @@ basethread.o: basethread.h synchro.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
 compress.o: compress.h log.h textstream.h logmanipulators.h slog.h cur.h
 compress.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
-compress.o: error.h config.h ../../pikotools/space/spaceparser.h
-compress.o: ../../pikotools/space/space.h htmlfilter.h
-compress.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-compress.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-compress.o: mount.h ../templates/locale.h
+compress.o: ../../pikotools/date/date.h error.h config.h
+compress.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+compress.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+compress.o: misc.h session.h user.h plugindata.h rebus.h mount.h
+compress.o: ../templates/locale.h
 config.o: config.h ../../pikotools/space/spaceparser.h
 config.o: ../../pikotools/space/space.h htmlfilter.h log.h textstream.h
 config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
-config.o: ../../pikotools/space/space.h error.h ../templates/htmltextstream.h
-config.o: ../core/textstream.h misc.h ../../pikotools/date/date.h session.h
+config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h
+config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
 config.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h plugin.h
 config.o: pluginmsg.h system.h job.h basethread.h synchro.h dirs.h
 config.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@@ -97,30 +97,28 @@ config.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 crypt.o: crypt.h run.h config.h ../../pikotools/space/spaceparser.h
 crypt.o: ../../pikotools/space/space.h htmlfilter.h user.h
 crypt.o: ../../pikotools/utf8/utf8.h misc.h item.h
-crypt.o: ../../pikotools/space/space.h requesttypes.h log.h textstream.h
-crypt.o: logmanipulators.h slog.h cur.h request.h error.h
-crypt.o: ../templates/htmltextstream.h ../core/textstream.h
-crypt.o: ../../pikotools/date/date.h session.h plugindata.h rebus.h mount.h
-crypt.o: ../templates/locale.h
-dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h log.h
-dircontainer.o: textstream.h logmanipulators.h slog.h cur.h request.h
-dircontainer.o: requesttypes.h error.h config.h
-dircontainer.o: ../../pikotools/space/spaceparser.h
+crypt.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+crypt.o: requesttypes.h log.h textstream.h logmanipulators.h slog.h cur.h
+crypt.o: request.h error.h ../templates/htmltextstream.h ../core/textstream.h
+crypt.o: session.h plugindata.h rebus.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 slog.h cur.h request.h requesttypes.h
+dircontainer.o: error.h config.h ../../pikotools/space/spaceparser.h
 dircontainer.o: ../../pikotools/space/space.h htmlfilter.h
 dircontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-dircontainer.o: ../../pikotools/date/date.h session.h user.h plugindata.h
-dircontainer.o: rebus.h mount.h ../templates/locale.h
-dirs.o: dirs.h item.h ../../pikotools/space/space.h dircontainer.h ../db/db.h
-dirs.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-dirs.o: ../core/textstream.h misc.h requesttypes.h
-dirs.o: ../../pikotools/date/date.h ../core/error.h
-dirs.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-dirs.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-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 session.h user.h plugindata.h rebus.h
-dirs.o: mount.h ../templates/locale.h ../notify/notify.h
+dircontainer.o: session.h user.h plugindata.h rebus.h mount.h
+dircontainer.o: ../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
+dirs.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
+dirs.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
+dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+dirs.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
+dirs.o: logmanipulators.h slog.h cur.h request.h error.h config.h
+dirs.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
+dirs.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
 dirs.o: ../notify/notifypool.h ../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
@@ -131,21 +129,20 @@ dirs.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
 dirs.o: ugcontainer.h lastcontainer.h
 groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
 groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
-groups.o: item.h ../../pikotools/space/space.h requesttypes.h
-groups.o: ../../pikotools/date/date.h ../core/error.h
-groups.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-groups.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-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 session.h user.h plugindata.h rebus.h
-groups.o: mount.h ../templates/locale.h
+groups.o: item.h ../../pikotools/space/space.h ../../pikotools/date/date.h
+groups.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h
+groups.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
+groups.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+groups.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
+groups.o: logmanipulators.h slog.h cur.h request.h error.h config.h
+groups.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
+groups.o: plugindata.h rebus.h mount.h ../templates/locale.h
 htmlfilter.o: htmlfilter.h
 httpsimpleparser.o: httpsimpleparser.h
 image.o: image.h basethread.h synchro.h textstream.h ../db/db.h
 image.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 image.o: ../core/textstream.h misc.h item.h ../../pikotools/space/space.h
-image.o: requesttypes.h ../../pikotools/date/date.h ../core/error.h
+image.o: ../../pikotools/date/date.h requesttypes.h ../core/error.h
 image.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 image.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 image.o: ../core/user.h ../core/group.h ../core/dircontainer.h
@@ -183,19 +180,20 @@ 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
-item.o: item.h ../../pikotools/space/space.h misc.h requesttypes.h crypt.h
-item.o: run.h config.h ../../pikotools/space/spaceparser.h
-item.o: ../../pikotools/space/space.h htmlfilter.h user.h
+item.o: item.h ../../pikotools/space/space.h ../../pikotools/date/date.h
+item.o: misc.h requesttypes.h crypt.h run.h config.h
+item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+item.o: htmlfilter.h user.h
 job.o: job.h basethread.h synchro.h ../../pikotools/space/space.h plugin.h
 job.o: pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h
-job.o: request.h requesttypes.h item.h error.h config.h
-job.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-job.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
-job.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-job.o: mount.h ../templates/locale.h system.h dirs.h dircontainer.h
-job.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-job.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
-job.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+job.o: request.h requesttypes.h item.h ../../pikotools/date/date.h error.h
+job.o: config.h ../../pikotools/space/spaceparser.h
+job.o: ../../pikotools/space/space.h htmlfilter.h
+job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
+job.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h
+job.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+job.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
+job.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 job.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
 job.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
 job.o: ../templates/localefilter.h ../../ezc/src/ezc.h
@@ -227,35 +225,36 @@ job.o: ../templates/templates.h ../templates/patterncacher.h
 job.o: ../templates/indexpatterns.h ../templates/patterns.h
 job.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 job.o: ../core/sessionmanager.h
-lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h
-lastcontainer.o: cur.h request.h requesttypes.h item.h
-lastcontainer.o: ../../pikotools/space/space.h error.h config.h
-lastcontainer.o: ../../pikotools/space/spaceparser.h
+lastcontainer.o: lastcontainer.h ../../pikotools/date/date.h log.h
+lastcontainer.o: textstream.h logmanipulators.h slog.h cur.h request.h
+lastcontainer.o: requesttypes.h item.h ../../pikotools/space/space.h error.h
+lastcontainer.o: config.h ../../pikotools/space/spaceparser.h
 lastcontainer.o: ../../pikotools/space/space.h htmlfilter.h
 lastcontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-lastcontainer.o: ../../pikotools/date/date.h session.h user.h plugindata.h
-lastcontainer.o: rebus.h mount.h ../templates/locale.h
+lastcontainer.o: session.h user.h plugindata.h rebus.h mount.h
+lastcontainer.o: ../templates/locale.h
 loadavg.o: loadavg.h log.h textstream.h logmanipulators.h slog.h cur.h
 loadavg.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
-loadavg.o: error.h config.h ../../pikotools/space/spaceparser.h
-loadavg.o: ../../pikotools/space/space.h htmlfilter.h
-loadavg.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-loadavg.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-loadavg.o: mount.h ../templates/locale.h
+loadavg.o: ../../pikotools/date/date.h error.h config.h
+loadavg.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+loadavg.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+loadavg.o: misc.h session.h user.h plugindata.h rebus.h mount.h
+loadavg.o: ../templates/locale.h
 log.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
-log.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+log.o: requesttypes.h item.h ../../pikotools/space/space.h
+log.o: ../../pikotools/date/date.h error.h config.h
 log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 log.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
-log.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-log.o: mount.h ../templates/locale.h ../../pikotools/utf8/utf8.h
-misc.o: misc.h item.h ../../pikotools/space/space.h requesttypes.h log.h
-misc.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h
-misc.o: config.h ../../pikotools/space/spaceparser.h
-misc.o: ../../pikotools/space/space.h htmlfilter.h
-misc.o: ../templates/htmltextstream.h ../core/textstream.h
-misc.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-misc.o: mount.h ../templates/locale.h ../templates/templates.h
-misc.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
+log.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
+log.o: ../../pikotools/utf8/utf8.h
+misc.o: misc.h item.h ../../pikotools/space/space.h
+misc.o: ../../pikotools/date/date.h requesttypes.h log.h textstream.h
+misc.o: logmanipulators.h slog.h cur.h request.h error.h config.h
+misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+misc.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+misc.o: session.h user.h plugindata.h rebus.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 ../../pikotools/utf8/utf8.h
 misc.o: ../templates/patterncacher.h ../core/item.h
@@ -267,11 +266,12 @@ misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h
 misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-mount.o: mount.h misc.h item.h ../../pikotools/space/space.h requesttypes.h
+mount.o: mount.h misc.h item.h ../../pikotools/space/space.h
+mount.o: ../../pikotools/date/date.h requesttypes.h
 mountparser.o: mountparser.h mount.h item.h ../../pikotools/space/space.h
-mountparser.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-mountparser.o: ../db/dbtextstream.h ../core/textstream.h misc.h
-mountparser.o: requesttypes.h ../../pikotools/date/date.h ../core/error.h
+mountparser.o: ../../pikotools/date/date.h dirs.h dircontainer.h ../db/db.h
+mountparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
 mountparser.o: ../../pikotools/space/spaceparser.h
 mountparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
@@ -289,27 +289,27 @@ 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
 mounts.o: mounts.h mount.h error.h dirs.h item.h
-mounts.o: ../../pikotools/space/space.h dircontainer.h ../db/db.h
-mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-mounts.o: ../core/textstream.h misc.h requesttypes.h
-mounts.o: ../../pikotools/date/date.h ../core/error.h
-mounts.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-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: session.h user.h plugindata.h rebus.h ../templates/locale.h
-mounts.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
-mounts.o: ../templates/locale.h ../templates/localefilter.h
-mounts.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
-mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-mounts.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
-mounts.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h
-mounts.o: ../core/users.h ugcontainer.h lastcontainer.h mountparser.h
-mounts.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h crypt.h
-mounts.o: run.h users.h groups.h group.h loadavg.h image.h threadmanager.h
-mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
+mounts.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+mounts.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+mounts.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h
+mounts.o: ../core/error.h ../../pikotools/space/spaceparser.h
+mounts.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h
+mounts.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
+mounts.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
+mounts.o: logmanipulators.h slog.h cur.h request.h config.h htmlfilter.h
+mounts.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
+mounts.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
+mounts.o: ../templates/patterns.h ../templates/locale.h
+mounts.o: ../templates/localefilter.h ../../ezc/src/ezc.h
+mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+mounts.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
+mounts.o: ../notify/notifythread.h ../core/basethread.h
+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 sessionmanager.h
+mounts.o: sessioncontainer.h ../functions/functions.h
 mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
 mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -332,12 +332,12 @@ mounts.o: ../templates/patterns.h ../templates/changepatterns.h
 mounts.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h
 plugin.o: cur.h request.h requesttypes.h item.h ../../pikotools/space/space.h
-plugin.o: error.h config.h ../../pikotools/space/spaceparser.h
-plugin.o: ../../pikotools/space/space.h htmlfilter.h
-plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-plugin.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-plugin.o: mount.h ../templates/locale.h system.h job.h basethread.h synchro.h
-plugin.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+plugin.o: ../../pikotools/date/date.h error.h config.h
+plugin.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
+plugin.o: misc.h session.h user.h plugindata.h rebus.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
@@ -373,30 +373,29 @@ plugin.o: ../templates/patterns.h ../templates/changepatterns.h
 plugin.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h
 plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
-plugindata.o: ../../pikotools/space/space.h error.h config.h
-plugindata.o: ../../pikotools/space/spaceparser.h
+plugindata.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+plugindata.o: error.h config.h ../../pikotools/space/spaceparser.h
 plugindata.o: ../../pikotools/space/space.h htmlfilter.h
 plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-plugindata.o: ../../pikotools/date/date.h session.h user.h rebus.h mount.h
-plugindata.o: ../templates/locale.h system.h job.h basethread.h synchro.h
-plugindata.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
-plugindata.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
-plugindata.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
-plugindata.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
-plugindata.o: ../notify/notify.h ../notify/notifypool.h
-plugindata.o: ../templates/patterns.h ../templates/locale.h
-plugindata.o: ../templates/localefilter.h ../../ezc/src/ezc.h
-plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
-plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
-plugindata.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h
-plugindata.o: ../notify/notifythread.h ../core/basethread.h
-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 sessionmanager.h sessioncontainer.h
-plugindata.o: ../functions/functions.h ../functions/functionbase.h
-plugindata.o: ../core/request.h ../core/system.h ../core/synchro.h
-plugindata.o: ../functions/functionparser.h ../core/cur.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: ../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
+plugindata.o: ../notify/notifypool.h ../templates/patterns.h
+plugindata.o: ../templates/locale.h ../templates/localefilter.h
+plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
+plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
+plugindata.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
+plugindata.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h
+plugindata.o: ../core/basethread.h ../notify/templatesnotify.h
+plugindata.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
+plugindata.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h
+plugindata.o: loadavg.h image.h threadmanager.h sessionmanager.h
+plugindata.o: sessioncontainer.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
 plugindata.o: ../functions/privchanger.h ../functions/chown.h
 plugindata.o: ../functions/ckeditor.h ../functions/cp.h
@@ -420,23 +419,23 @@ plugindata.o: ../core/sessionmanager.h
 postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
 postmultiparser.o: ../../pikotools/space/spaceparser.h
 postmultiparser.o: ../../pikotools/space/space.h htmlfilter.h misc.h item.h
-postmultiparser.o: ../../pikotools/space/space.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/date/date.h session.h user.h plugindata.h
-postmultiparser.o: rebus.h mount.h ../templates/locale.h
-postmultiparser.o: ../../pikotools/utf8/utf8.h
+postmultiparser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+postmultiparser.o: log.h textstream.h logmanipulators.h slog.h cur.h
+postmultiparser.o: request.h ../templates/htmltextstream.h
+postmultiparser.o: ../core/textstream.h session.h user.h plugindata.h rebus.h
+postmultiparser.o: mount.h ../templates/locale.h ../../pikotools/utf8/utf8.h
 rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h
-rebus.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+rebus.o: requesttypes.h item.h ../../pikotools/space/space.h
+rebus.o: ../../pikotools/date/date.h error.h config.h
 rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
-rebus.o: misc.h ../../pikotools/date/date.h session.h user.h plugindata.h
-rebus.o: rebus.h mount.h ../templates/locale.h
+rebus.o: misc.h session.h user.h plugindata.h rebus.h mount.h
+rebus.o: ../templates/locale.h
 request.o: request.h requesttypes.h item.h ../../pikotools/space/space.h
-request.o: error.h config.h ../../pikotools/space/spaceparser.h
-request.o: ../../pikotools/space/space.h htmlfilter.h textstream.h
-request.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-request.o: ../../pikotools/date/date.h log.h logmanipulators.h slog.h cur.h
+request.o: ../../pikotools/date/date.h error.h config.h
+request.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
+request.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
+request.o: ../core/textstream.h misc.h log.h logmanipulators.h slog.h cur.h
 request.o: session.h user.h plugindata.h rebus.h mount.h
 request.o: ../templates/locale.h plugin.h pluginmsg.h system.h job.h
 request.o: basethread.h synchro.h dirs.h dircontainer.h ../db/db.h
@@ -475,17 +474,17 @@ request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 request.o: ../templates/patterns.h ../templates/changepatterns.h
 request.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h
-run.o: requesttypes.h item.h ../../pikotools/space/space.h error.h config.h
+run.o: requesttypes.h item.h ../../pikotools/space/space.h
+run.o: ../../pikotools/date/date.h error.h config.h
 run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 run.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h
-run.o: ../../pikotools/date/date.h session.h user.h plugindata.h rebus.h
-run.o: mount.h ../templates/locale.h
-session.o: session.h item.h ../../pikotools/space/space.h error.h user.h
-session.o: plugindata.h rebus.h textstream.h ../../pikotools/date/date.h
-session.o: misc.h requesttypes.h
+run.o: session.h user.h plugindata.h rebus.h mount.h ../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
 sessioncontainer.o: sessioncontainer.h session.h item.h
-sessioncontainer.o: ../../pikotools/space/space.h error.h user.h plugindata.h
-sessioncontainer.o: rebus.h textstream.h ../../pikotools/date/date.h cur.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 config.h
 sessioncontainer.o: ../../pikotools/space/spaceparser.h
 sessioncontainer.o: ../../pikotools/space/space.h htmlfilter.h
@@ -493,8 +492,8 @@ sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessioncontainer.o: mount.h log.h logmanipulators.h slog.h
 sessioncontainer.o: ../templates/locale.h
 sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
-sessionmanager.o: ../../pikotools/space/space.h error.h user.h plugindata.h
-sessionmanager.o: rebus.h textstream.h ../../pikotools/date/date.h cur.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 config.h
 sessionmanager.o: ../../pikotools/space/spaceparser.h
 sessionmanager.o: ../../pikotools/space/space.h htmlfilter.h
@@ -542,8 +541,8 @@ sessionmanager.o: ../templates/indexpatterns.h ../templates/patterns.h
 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 error.h user.h plugindata.h
-sessionparser.o: rebus.h textstream.h ../../pikotools/date/date.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: sessioncontainer.h cur.h request.h requesttypes.h config.h
 sessionparser.o: ../../pikotools/space/spaceparser.h
 sessionparser.o: ../../pikotools/space/space.h htmlfilter.h
@@ -551,17 +550,17 @@ sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
 sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h
 sessionparser.o: ../templates/locale.h
 slog.o: slog.h cur.h request.h requesttypes.h item.h
-slog.o: ../../pikotools/space/space.h error.h config.h
-slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
-slog.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
-slog.o: ../core/textstream.h misc.h ../../pikotools/date/date.h session.h
+slog.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h
+slog.o: config.h ../../pikotools/space/spaceparser.h
+slog.o: ../../pikotools/space/space.h htmlfilter.h textstream.h
+slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h
 slog.o: user.h plugindata.h rebus.h mount.h logmanipulators.h
 slog.o: ../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 dircontainer.h ../db/db.h ../db/dbbase.h
-system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
-system.o: requesttypes.h ../../pikotools/date/date.h ../core/error.h
+system.o: dirs.h item.h ../../pikotools/date/date.h dircontainer.h ../db/db.h
+system.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
 system.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 system.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 system.o: ../core/user.h ../core/group.h ../core/dircontainer.h
@@ -600,19 +599,18 @@ system.o: ../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
-textstream.o: textstream.h misc.h item.h ../../pikotools/space/space.h
-textstream.o: requesttypes.h
 threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h
 threadmanager.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
-threadmanager.o: item.h ../../pikotools/space/space.h error.h config.h
+threadmanager.o: item.h ../../pikotools/space/space.h
+threadmanager.o: ../../pikotools/date/date.h error.h config.h
 threadmanager.o: ../../pikotools/space/spaceparser.h
 threadmanager.o: ../../pikotools/space/space.h htmlfilter.h
 threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
-threadmanager.o: ../../pikotools/date/date.h session.h user.h plugindata.h
-threadmanager.o: rebus.h mount.h ../templates/locale.h
+threadmanager.o: session.h user.h plugindata.h rebus.h mount.h
+threadmanager.o: ../templates/locale.h
 users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h
-users.o: ../../pikotools/space/space.h error.h user.h plugindata.h rebus.h
-users.o: textstream.h ../../pikotools/date/date.h cur.h request.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: requesttypes.h config.h ../../pikotools/space/spaceparser.h
 users.o: ../../pikotools/space/space.h htmlfilter.h
 users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h mount.h
diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep
index b515053..df31016 100755
--- 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 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 textstream.o threadmanager.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 item.o job.o lastcontainer.o loadavg.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 users.o 
diff --git a/core/app.cpp b/core/app.cpp
index 4540a82..79b01a8 100755
--- a/core/app.cpp
+++ b/core/app.cpp
@@ -612,8 +612,7 @@ void App::PrepareSessionCookie()
 	}
 	else
 	{
-		time_t t = std::time(0) + config.session_remember_max_idle;
-		tm expires = Time(t);
+		PT::Date expires = cur.request->start_time + config.session_remember_max_idle;
 		cur.request->SetCookie(config.http_session_id_name.c_str(), cur.session->id, &expires);
 	}
 }
diff --git a/core/item.cpp b/core/item.cpp
index 73bedd6..b7aabe9 100755
--- a/core/item.cpp
+++ b/core/item.cpp
@@ -25,14 +25,14 @@ Item::Item()
 // may setting the date should be completetly removed from here?
 void Item::SetDateToNow()
 {
-	date_creation     = Time(std::time(0));
+	date_creation     = std::time(0);
 	date_modification = date_creation;
 }
 
 
 void Item::SetDateModifyToNow()
 {
-	date_modification = Time(std::time(0));
+	date_modification = std::time(0);
 }
 
 
diff --git a/core/item.h b/core/item.h
index 6d00287..0dcca59 100755
--- a/core/item.h
+++ b/core/item.h
@@ -12,6 +12,8 @@
 
 #include <string>
 #include "space/space.h"
+#include "date/date.h"
+
 
 
 #define WINIX_ITEM_FILETYPE_NONE		0
@@ -37,8 +39,8 @@ struct Item
 
 	int privileges;
 
-	tm date_creation;
-	tm date_modification;
+	PT::Date date_creation;
+	PT::Date date_modification;
 
 	std::wstring subject;
 	std::wstring content;
diff --git a/core/lastcontainer.cpp b/core/lastcontainer.cpp
index 58e10fd..200ebfc 100755
--- a/core/lastcontainer.cpp
+++ b/core/lastcontainer.cpp
@@ -18,23 +18,12 @@ LastItem::LastItem()
 	user_id    = 0;
 	ip         = 0;
 	session_id = 0;
-	memset((char*)&start, 0, sizeof(start));
-	memset((char*)&end,   0, sizeof(end));
 }
 
 
 bool LastItem::IsLoggedOut()
 {
-	if( end.tm_sec  == 0 &&
-	    end.tm_min  == 0 &&
-	    end.tm_hour == 0 &&
-	    end.tm_mday == 0 &&
-	    end.tm_mon  == 0 &&
-	    end.tm_year == 0 )
-	    
-	    return false;
-	
-return true;
+	return end.year > 1970;
 }
 
 
@@ -87,7 +76,7 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id);
 	li.name       = name;
 	li.ip         = ip;
 	li.session_id = session_id;
-	li.start      = Time(std::time(0));
+	li.start      = std::time(0);
 
 	last_tab.insert(last_tab.end(), li);
 	
@@ -103,7 +92,7 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id);
 	
 	if( i != last_tab.end() )
 	{
-		i->end = Time(std::time(0));
+		i->end = std::time(0);
 	}
 	else
 	{
diff --git a/core/lastcontainer.h b/core/lastcontainer.h
index 27f4eb4..ea4847b 100755
--- a/core/lastcontainer.h
+++ b/core/lastcontainer.h
@@ -14,6 +14,7 @@
 #include <list>
 #include <cstring>
 #include <ctime>
+#include "date/date.h"
 
 
 
@@ -37,8 +38,8 @@ struct LastItem
 	long session_id;
 
 	// start logging and end logging
-	tm start;
-	tm end;
+	PT::Date start;
+	PT::Date end;
 
 
 	LastItem();
diff --git a/core/misc.cpp b/core/misc.cpp
index 30646f7..165f68f 100755
--- a/core/misc.cpp
+++ b/core/misc.cpp
@@ -438,43 +438,34 @@ static wchar_t buffer[100];
 }
 
 
-const wchar_t * DateToStr(const tm * ptm)
-{
-	return DateToStr(ptm->tm_year + 1900, ptm->tm_mon+1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-}
 
 
-const wchar_t * DateToStr(const tm & rtm)
+const wchar_t * DateToStr(const PT::Date & d)
 {
-	return DateToStr(rtm.tm_year + 1900, rtm.tm_mon+1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	return DateToStr(d.year, d.month, d.day, d.hour, d.min, d.sec);
 }
 
 
 const wchar_t * DateToStr(time_t t)
 {
-	tm rtm = Time(t);
+	PT::Date date = t;
 	
-return DateToStr(rtm);
+return DateToStr(date);
 }
 
 
-const wchar_t * DateToStrWithoutHours(const tm * ptm)
-{
-	return DateToStr(ptm->tm_year + 1900, ptm->tm_mon+1, ptm->tm_mday);
-}
 
-
-const wchar_t * DateToStrWithoutHours(const tm & rtm)
+const wchar_t * DateToStrWithoutHours(const PT::Date & d)
 {
-	return DateToStr(rtm.tm_year + 1900, rtm.tm_mon+1, rtm.tm_mday);
+	return DateToStr(d.year, d.month, d.day);
 }
 
 
 const wchar_t * DateToStrWithoutHours(time_t t)
 {
-	tm rtm = Time(t);
+	PT::Date date = t;
 	
-return DateToStrWithoutHours(rtm);
+return DateToStrWithoutHours(date);
 }
 
 
@@ -499,23 +490,19 @@ return buffer;
 }
 
 
-const char * DateToStrCookie(const tm * ptm)
-{
-	return DateToStrCookie(ptm->tm_year + 1900, ptm->tm_mon+1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-}
 
 
-const char * DateToStrCookie(const tm & rtm)
+const char * DateToStrCookie(const PT::Date & d)
 {
-	return DateToStrCookie(rtm.tm_year + 1900, rtm.tm_mon+1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	return DateToStrCookie(d.year, d.month, d.day, d.hour, d.min, d.sec);
 }
 
 
 const char * DateToStrCookie(time_t t)
 {
-	tm rtm = Time(t);
+	PT::Date date = t;
 	
-return DateToStrCookie(rtm);
+return DateToStrCookie(date);
 }
 
 
@@ -986,51 +973,6 @@ int SelectFileType(const std::wstring & file_name)
 }
 
 
-time_t Time(const tm & par)
-{
-tm t;
-
-	memset(&t, 0, sizeof(t));
-
-	t.tm_year = par.tm_year;
-	t.tm_mon  = par.tm_mon;
-	t.tm_mday = par.tm_mday;
-	t.tm_hour = par.tm_hour;
-	t.tm_min  = par.tm_min;
-	t.tm_sec  = par.tm_sec;
-
-return timegm(&t);
-}
-
-
-time_t Time(const tm * par)
-{
-	return Time(*par);
-}
-
-
-tm Time(time_t par)
-{
-	tm * ptm = gmtime(&par);
-	tm res;	
-
-	memset(&res, 0, sizeof(res));
-
-	if( ptm )
-	{
-		res.tm_year = ptm->tm_year;
-		res.tm_mon  = ptm->tm_mon;
-		res.tm_mday = ptm->tm_mday;
-		res.tm_hour = ptm->tm_hour;
-		res.tm_min  = ptm->tm_min;
-		res.tm_sec  = ptm->tm_sec;
-		res.tm_wday = ptm->tm_wday;
-		res.tm_yday = ptm->tm_yday;
-	}
-
-return res;
-}
-
 
 
 
diff --git a/core/misc.h b/core/misc.h
index 99d2d5f..3a405b1 100755
--- a/core/misc.h
+++ b/core/misc.h
@@ -17,6 +17,7 @@
 #include <cstdio>
 #include "item.h"
 #include "requesttypes.h"
+#include "date/date.h"
 
 
 
@@ -170,16 +171,13 @@ void CorrectUrlOnlyAllowedChar(std::wstring & url);
 
 const wchar_t * DateToStr(int year, int month, int day);
 const wchar_t * DateToStr(int year, int month, int day, int hour, int min, int sec);
-const wchar_t * DateToStr(const tm * ptm);
-const wchar_t * DateToStr(const tm & rtm);
+const wchar_t * DateToStr(const PT::Date & d);
 const wchar_t * DateToStr(time_t t);
-const wchar_t * DateToStrWithoutHours(const tm * ptm);
-const wchar_t * DateToStrWithoutHours(const tm & rtm);
+const wchar_t * DateToStrWithoutHours(const PT::Date & d);
 const wchar_t * DateToStrWithoutHours(time_t t);
 
 const char * DateToStrCookie(int year, int month, int day, int hour, int min, int sec);
-const char * DateToStrCookie(const tm * ptm);
-const char * DateToStrCookie(const tm & rtm);
+const char * DateToStrCookie(const PT::Date & d);
 const char * DateToStrCookie(time_t t);
 
 const wchar_t * IpToStr(unsigned int ip_);
@@ -667,10 +665,6 @@ int SelectFileType(const wchar_t * file_name);
 int SelectFileType(const std::wstring & file_name);
 
 
-time_t Time(const tm & par);
-time_t Time(const tm * par);
-tm     Time(time_t par);
-
 
 
 template<class StringType>
diff --git a/core/request.cpp b/core/request.cpp
index 2f068ad..22118e6 100755
--- a/core/request.cpp
+++ b/core/request.cpp
@@ -104,7 +104,7 @@ void Request::RequestStarts()
 
 
 // value can be null
-void Request::SetCookie(const char * name, const char * value, tm * expires)
+void Request::SetCookie(const char * name, const char * value, PT::Date * expires)
 {
 	headers << "Set-Cookie: " << name << "=";
 	
@@ -114,7 +114,7 @@ void Request::SetCookie(const char * name, const char * value, tm * expires)
 		headers << "\"\"";
 
 	if( expires )
-		headers << "; expires=" << DateToStrCookie(expires) << " GMT";
+		headers << "; expires=" << DateToStrCookie(*expires) << " GMT";
 
 	headers << "; path=/; domain=" << config->base_url << "\r\n";
 	
@@ -129,12 +129,12 @@ void Request::SetCookie(const char * name, const char * value, tm * expires)
 
 
 
-void Request::SetCookie(const char * name, long value, tm * expires)
+void Request::SetCookie(const char * name, long value, PT::Date * expires)
 {
 	headers << "Set-Cookie: " << name << "=" << value;
 
 	if( expires )
-		headers << "; expires=" << DateToStrCookie(expires) << " GMT";
+		headers << "; expires=" << DateToStrCookie(*expires) << " GMT";
 
 	headers << "; path=/; domain=" << config->base_url << "\r\n";
 }
diff --git a/core/request.h b/core/request.h
index 49d7b9e..4c77f83 100755
--- a/core/request.h
+++ b/core/request.h
@@ -153,8 +153,8 @@ struct Request
 	const std::wstring & ParamValue(const wchar_t * param_name);      // returns an empty string if there is no such a parameter
 	const std::wstring & ParamValue(const std::wstring & param_name); // returns an empty string if there is no such a parameter
 
-	void SetCookie(const char * name, const char * value, tm * expires = 0);
-	void SetCookie(const char * name, long value,         tm * expires = 0);
+	void SetCookie(const char * name, const char * value, PT::Date * expires = 0);
+	void SetCookie(const char * name, long value,         PT::Date * expires = 0);
 
 	bool IsPostVar(const wchar_t * var);
 	bool IsPostVar(const std::wstring & var);
diff --git a/core/system.cpp b/core/system.cpp
index 3d20bcb..f466e2c 100755
--- a/core/system.cpp
+++ b/core/system.cpp
@@ -870,6 +870,7 @@ return status;
 }
 
 
+// !! IMPROVE ME will be removed or changed
 time_t System::LocalTime(time_t gmt_time)
 {
 int time_offset;
@@ -883,24 +884,18 @@ return gmt_time + (time_t)time_offset;
 }
 
 
-tm System::LocalTime(const tm * ptm)
+// !! IMPROVE ME will be removed or changed
+PT::Date System::LocalTime(const PT::Date & date)
 {
 time_t t;
-tm rtm;
 
-	t = Time(ptm);
+	t = date.ToTime();
 	t = LocalTime(t);
-	rtm = Time(t);
 
-return rtm;
+return PT::Date(t);
 }
 
 
-tm System::LocalTime(const tm & ptm)
-{
-	return LocalTime(&ptm);
-}
-
 
 
 /*
diff --git a/core/system.h b/core/system.h
index 626f9b5..6643d19 100755
--- a/core/system.h
+++ b/core/system.h
@@ -135,9 +135,9 @@ public:
 	Error EditFile(Item & item, bool with_url = true, int notify_code = 0, bool call_plugins = true);
 
 	// converting GMT time to local time (different for each user)
-	time_t LocalTime(time_t gmt_time);
-	tm     LocalTime(const tm * ptm);
-	tm     LocalTime(const tm & ptm);
+	// !! IMPROVE ME will be removed or changed
+	time_t   LocalTime(time_t gmt_time);
+	PT::Date LocalTime(const PT::Date & date);
 
 	int FollowLink(const std::vector<Item*> & current_dir_tab, const std::wstring & link_to,
 				   std::vector<Item*> & out_dir_tab, Item & out_item);
diff --git a/core/textstream.cpp b/core/textstream.cpp
deleted file mode 100755
index db311c7..0000000
--- a/core/textstream.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010, Tomasz Sowa
- * All rights reserved.
- * 
- */
- 
-#include "textstream.h"
-#include "misc.h"
-
-
diff --git a/db/Makefile.dep b/db/Makefile.dep
index 506d525..0c07a1f 100755
--- a/db/Makefile.dep
+++ b/db/Makefile.dep
@@ -2,7 +2,7 @@
 
 db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
 db.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
-db.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+db.o: ../../pikotools/date/date.h ../core/requesttypes.h ../core/error.h
 db.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h
 db.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -13,20 +13,21 @@ db.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h
 db.o: ../core/mount.h ../templates/locale.h ../core/log.h ../core/misc.h
 dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
 dbbase.o: ../core/misc.h ../core/item.h ../../pikotools/space/space.h
-dbbase.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+dbbase.o: ../../pikotools/date/date.h ../core/requesttypes.h ../core/error.h
 dbbase.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 dbbase.o: ../core/log.h ../core/misc.h ../../pikotools/utf8/utf8.h
 dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
-dbconn.o: ../core/item.h ../../pikotools/space/space.h ../core/requesttypes.h
-dbconn.o: ../../pikotools/date/date.h ../core/log.h ../core/error.h
+dbconn.o: ../core/item.h ../../pikotools/space/space.h
+dbconn.o: ../../pikotools/date/date.h ../core/requesttypes.h ../core/log.h
+dbconn.o: ../core/error.h
 dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h
 dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/misc.h
 dbitemcolumns.o: ../core/item.h ../../pikotools/space/space.h
-dbitemcolumns.o: ../core/requesttypes.h ../../pikotools/date/date.h
+dbitemcolumns.o: ../../pikotools/date/date.h ../core/requesttypes.h
 dbitemcolumns.o: ../core/error.h ../../pikotools/space/spaceparser.h
 dbitemcolumns.o: ../../pikotools/space/space.h ../core/log.h
 dbitemquery.o: dbitemquery.h ../core/item.h
 dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h
 dbtextstream.o: ../core/item.h ../../pikotools/space/space.h
-dbtextstream.o: ../core/requesttypes.h ../../pikotools/date/date.h
+dbtextstream.o: ../../pikotools/date/date.h ../core/requesttypes.h
 dbtextstream.o: ../../pikotools/utf8/utf8.h
diff --git a/db/dbbase.cpp b/db/dbbase.cpp
index deaedf9..f5a542c 100755
--- a/db/dbbase.cpp
+++ b/db/dbbase.cpp
@@ -223,6 +223,14 @@ tm DbBase::AssertValueTm(PGresult * r, int row, int col)
 }
 
 
+PT::Date DbBase::AssertValueDate(PGresult * r, int row, int col)
+{
+	PT::Date date = AssertValue(r, row, col);
+
+return date;
+}
+
+
 bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single)
 {
 	const char * res = AssertValue(r, row, col);
@@ -354,8 +362,6 @@ tm t;
 	t.tm_hour = Toi(str + 11);           /* hours (0 - 23) */
 	t.tm_min  = Toi(str + 14);           /* minutes (0 - 59) */
 	t.tm_sec  = Toi(str + 17);           /* seconds (0 - 60) */
-	
-	t = Time(Time(t));
 
 	// t.tm_wday  = 0;   /* day of week (Sunday = 0) */
 	// t.tm_yday  = 0;   /* day of year (0 - 365) */
diff --git a/db/dbbase.h b/db/dbbase.h
index 8e491da..22446eb 100755
--- a/db/dbbase.h
+++ b/db/dbbase.h
@@ -17,6 +17,8 @@
 #include <string>
 #include "core/error.h"
 #include "space/spaceparser.h"
+#include "date/date.h"
+
 
 
 class DbBase
@@ -49,6 +51,7 @@ public:
 	static unsigned long AssertValueULong(PGresult * r, int row, int col);
 	static unsigned int  AssertValueUInt(PGresult * r, int row, int col);
 	static tm            AssertValueTm(PGresult * r, int row, int col);
+	static PT::Date      AssertValueDate(PGresult * r, int row, int col);
 	
 	// non static assignments
 	bool AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single = true);
diff --git a/db/dbtextstream.cpp b/db/dbtextstream.cpp
index 89373f9..a5cc88f 100755
--- a/db/dbtextstream.cpp
+++ b/db/dbtextstream.cpp
@@ -588,12 +588,12 @@ return buffer;
 
 DbTextStream & DbTextStream::operator<<(const PT::Space & space)
 {
-	space_stream.Clear();
+	tmp_stream.Clear();
 	// !! IMPROVE ME
 	// we can calculate how much memory is needed before serializing
-	space.Serialize(space_stream, true, false);
-	operator<<(space_stream.Str());
-	space_stream.Clear();
+	space.Serialize(tmp_stream, true, false);
+	operator<<(tmp_stream.Str());
+	tmp_stream.Clear();
 
 return *this;
 }
@@ -601,13 +601,10 @@ return *this;
 
 DbTextStream & DbTextStream::operator<<(const PT::Date & date)
 {
-	if( was_param )
-		buffer += ", ";
-
-	buffer += '\'';
-	date.Serialize(*this);
-	buffer += '\'';
-	was_param = true;
+	tmp_stream.Clear();
+	date.Serialize(tmp_stream);
+	operator<<(tmp_stream.Str());
+	tmp_stream.Clear();
 
 return *this;
 }
diff --git a/db/dbtextstream.h b/db/dbtextstream.h
index f5d4fb0..c519196 100755
--- a/db/dbtextstream.h
+++ b/db/dbtextstream.h
@@ -163,9 +163,7 @@ private:
 
 	bool was_param;
 	bool ext_escape;
-
-	// a temporarily stream used when serializing spaces
-	TextStream<std::wstring> space_stream;
+	TextStream<std::wstring> tmp_stream;
 
 };
 
diff --git a/functions/Makefile.dep b/functions/Makefile.dep
index ab419c6..7b389dc 100755
--- a/functions/Makefile.dep
+++ b/functions/Makefile.dep
@@ -1,10 +1,10 @@
 # DO NOT DELETE
 
 adduser.o: adduser.h functionbase.h ../core/item.h
-adduser.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-adduser.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-adduser.o: ../../pikotools/date/date.h ../core/error.h
+adduser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+adduser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+adduser.o: ../core/textstream.h ../core/misc.h ../core/item.h
+adduser.o: ../core/requesttypes.h ../core/error.h
 adduser.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 adduser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -39,9 +39,9 @@ adduser.o: ../templates/indexpatterns.h ../templates/patterns.h
 adduser.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 adduser.o: ../core/sessionmanager.h ../core/misc.h
 cat.o: cat.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-cat.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-cat.o: ../core/textstream.h ../core/misc.h ../core/item.h
-cat.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+cat.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+cat.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+cat.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 cat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 cat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 cat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -68,9 +68,9 @@ cat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 cat.o: ../core/group.h ../core/loadavg.h ../core/image.h
 cat.o: ../core/threadmanager.h ../core/synchro.h
 chmod.o: chmod.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-chmod.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-chmod.o: ../core/textstream.h ../core/misc.h ../core/item.h
-chmod.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+chmod.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+chmod.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+chmod.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 chmod.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 chmod.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 chmod.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -98,9 +98,9 @@ chmod.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 chmod.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 chmod.o: ../core/threadmanager.h ../core/synchro.h
 chown.o: chown.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-chown.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-chown.o: ../core/textstream.h ../core/misc.h ../core/item.h
-chown.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+chown.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+chown.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+chown.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 chown.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 chown.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 chown.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -128,10 +128,10 @@ chown.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 chown.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 chown.o: ../core/threadmanager.h ../core/synchro.h
 ckeditor.o: ckeditor.h functionbase.h ../core/item.h
-ckeditor.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-ckeditor.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-ckeditor.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-ckeditor.o: ../../pikotools/date/date.h ../core/error.h
+ckeditor.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+ckeditor.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h
+ckeditor.o: ../core/requesttypes.h ../core/error.h
 ckeditor.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 ckeditor.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 ckeditor.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -160,9 +160,9 @@ ckeditor.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 ckeditor.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
 cp.o: cp.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-cp.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-cp.o: ../core/textstream.h ../core/misc.h ../core/item.h
-cp.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+cp.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+cp.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+cp.o: ../core/requesttypes.h ../core/error.h
 cp.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 cp.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 cp.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -195,10 +195,10 @@ cp.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 cp.o: ../templates/patterns.h ../templates/changepatterns.h
 cp.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 default.o: default.h functionbase.h ../core/item.h
-default.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-default.o: ../../pikotools/date/date.h ../core/error.h
+default.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+default.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+default.o: ../core/textstream.h ../core/misc.h ../core/item.h
+default.o: ../core/requesttypes.h ../core/error.h
 default.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 default.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 default.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -227,10 +227,10 @@ default.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 default.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 default.o: ../core/synchro.h
 download.o: download.h functionbase.h ../core/item.h
-download.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-download.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-download.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-download.o: ../../pikotools/date/date.h ../core/error.h
+download.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+download.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+download.o: ../core/textstream.h ../core/misc.h ../core/item.h
+download.o: ../core/requesttypes.h ../core/error.h
 download.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 download.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 download.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -259,9 +259,9 @@ download.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 download.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 download.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
 emacs.o: emacs.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-emacs.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-emacs.o: ../core/textstream.h ../core/misc.h ../core/item.h
-emacs.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+emacs.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+emacs.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+emacs.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 emacs.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 emacs.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 emacs.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -292,9 +292,9 @@ emacs.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 emacs.o: ../templates/patterns.h ../templates/changepatterns.h
 emacs.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 env.o: env.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-env.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-env.o: ../core/textstream.h ../core/misc.h ../core/item.h
-env.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+env.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+env.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+env.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 env.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 env.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -321,9 +321,9 @@ env.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 env.o: ../core/group.h ../core/loadavg.h ../core/image.h
 env.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h
 functionbase.o: functionbase.h ../core/item.h ../../pikotools/space/space.h
-functionbase.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-functionbase.o: ../core/textstream.h ../core/misc.h ../core/item.h
-functionbase.o: ../core/requesttypes.h ../../pikotools/date/date.h
+functionbase.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h
+functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+functionbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
 functionbase.o: ../core/error.h ../../pikotools/space/spaceparser.h
 functionbase.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functionbase.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
@@ -357,7 +357,7 @@ functionbase.o: ../core/synchro.h
 functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
 functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
 functionparser.o: ../core/item.h ../core/requesttypes.h
-functionparser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+functionparser.o: ../../pikotools/date/date.h ../../pikotools/space/space.h
 functionparser.o: ../core/error.h ../../pikotools/space/spaceparser.h
 functionparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functionparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
@@ -391,10 +391,10 @@ functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 functionparser.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
 functionparser.o: ../core/cur.h ../core/log.h
 functions.o: functions.h functionbase.h ../core/item.h
-functions.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-functions.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-functions.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-functions.o: ../../pikotools/date/date.h ../core/error.h
+functions.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+functions.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+functions.o: ../core/textstream.h ../core/misc.h ../core/item.h
+functions.o: ../core/requesttypes.h ../core/error.h
 functions.o: ../../pikotools/space/spaceparser.h
 functions.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 functions.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
@@ -431,9 +431,9 @@ functions.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 functions.o: ../templates/patterns.h ../templates/changepatterns.h
 functions.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 last.o: last.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-last.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-last.o: ../core/textstream.h ../core/misc.h ../core/item.h
-last.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+last.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+last.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+last.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 last.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -461,9 +461,9 @@ last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 last.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 last.o: ../core/synchro.h
 ln.o: ln.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-ln.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-ln.o: ../core/textstream.h ../core/misc.h ../core/item.h
-ln.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+ln.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+ln.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+ln.o: ../core/requesttypes.h ../core/error.h
 ln.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 ln.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 ln.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -491,9 +491,9 @@ ln.o: ../core/group.h ../core/loadavg.h ../core/image.h
 ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
 ln.o: ../functions/functions.h
 login.o: login.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-login.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-login.o: ../core/textstream.h ../core/misc.h ../core/item.h
-login.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+login.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+login.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+login.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 login.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -521,10 +521,10 @@ login.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 login.o: ../core/threadmanager.h ../core/synchro.h
 logout.o: logout.h functionbase.h ../core/item.h
-logout.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-logout.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-logout.o: ../../pikotools/date/date.h ../core/error.h
+logout.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+logout.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+logout.o: ../core/textstream.h ../core/misc.h ../core/item.h
+logout.o: ../core/requesttypes.h ../core/error.h
 logout.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 logout.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 logout.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -553,9 +553,9 @@ logout.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 logout.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 logout.o: ../core/synchro.h
 ls.o: ls.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-ls.o: ../core/textstream.h ../core/misc.h ../core/item.h
-ls.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+ls.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+ls.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+ls.o: ../core/requesttypes.h ../core/error.h
 ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -582,9 +582,9 @@ ls.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 ls.o: ../core/group.h ../core/loadavg.h ../core/image.h
 ls.o: ../core/threadmanager.h ../core/synchro.h
 man.o: man.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-man.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-man.o: ../core/textstream.h ../core/misc.h ../core/item.h
-man.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+man.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+man.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+man.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 man.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 man.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -612,9 +612,9 @@ man.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 man.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 man.o: ../core/synchro.h
 meta.o: meta.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-meta.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-meta.o: ../core/textstream.h ../core/misc.h ../core/item.h
-meta.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+meta.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+meta.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+meta.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 meta.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 meta.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 meta.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -642,9 +642,9 @@ meta.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 meta.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 meta.o: ../core/synchro.h ../core/log.h
 mkdir.o: mkdir.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-mkdir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-mkdir.o: ../core/textstream.h ../core/misc.h ../core/item.h
-mkdir.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+mkdir.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+mkdir.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+mkdir.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 mkdir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 mkdir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 mkdir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -678,9 +678,9 @@ mkdir.o: ../templates/indexpatterns.h ../templates/patterns.h
 mkdir.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 mkdir.o: ../core/sessionmanager.h
 mount.o: mount.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-mount.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-mount.o: ../core/textstream.h ../core/misc.h ../core/item.h
-mount.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+mount.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+mount.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+mount.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 mount.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -708,9 +708,9 @@ mount.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 mount.o: ../core/threadmanager.h ../core/synchro.h
 mv.o: mv.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-mv.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-mv.o: ../core/textstream.h ../core/misc.h ../core/item.h
-mv.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+mv.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+mv.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+mv.o: ../core/requesttypes.h ../core/error.h
 mv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 mv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 mv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -743,10 +743,10 @@ mv.o: ../templates/indexpatterns.h ../templates/patterns.h
 mv.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 mv.o: ../core/sessionmanager.h
 nicedit.o: nicedit.h functionbase.h ../core/item.h
-nicedit.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-nicedit.o: ../../pikotools/date/date.h ../core/error.h
+nicedit.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+nicedit.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+nicedit.o: ../core/textstream.h ../core/misc.h ../core/item.h
+nicedit.o: ../core/requesttypes.h ../core/error.h
 nicedit.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 nicedit.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 nicedit.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -775,9 +775,9 @@ nicedit.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 nicedit.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 nicedit.o: ../core/synchro.h
 node.o: node.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-node.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-node.o: ../core/textstream.h ../core/misc.h ../core/item.h
-node.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+node.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+node.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+node.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 node.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 node.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 node.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -805,10 +805,10 @@ node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 node.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 node.o: ../core/synchro.h
 passwd.o: passwd.h functionbase.h ../core/item.h
-passwd.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-passwd.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-passwd.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-passwd.o: ../../pikotools/date/date.h ../core/error.h
+passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+passwd.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+passwd.o: ../core/textstream.h ../core/misc.h ../core/item.h
+passwd.o: ../core/requesttypes.h ../core/error.h
 passwd.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 passwd.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 passwd.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -837,9 +837,9 @@ passwd.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 passwd.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 passwd.o: ../core/synchro.h ../core/slog.h ../functions/functions.h
 priv.o: priv.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-priv.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-priv.o: ../core/textstream.h ../core/misc.h ../core/item.h
-priv.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+priv.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+priv.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+priv.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 priv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -900,9 +900,9 @@ privchanger.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 privchanger.o: ../core/image.h ../core/threadmanager.h
 pw.o: pw.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-pw.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-pw.o: ../core/textstream.h ../core/misc.h ../core/item.h
-pw.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+pw.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+pw.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+pw.o: ../core/requesttypes.h ../core/error.h
 pw.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 pw.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 pw.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -930,10 +930,10 @@ pw.o: ../core/group.h ../core/loadavg.h ../core/image.h
 pw.o: ../core/threadmanager.h ../core/synchro.h ../core/log.h ../core/misc.h
 pw.o: ../functions/functions.h
 reload.o: reload.h functionbase.h ../core/item.h
-reload.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-reload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-reload.o: ../../pikotools/date/date.h ../core/error.h
+reload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+reload.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+reload.o: ../core/textstream.h ../core/misc.h ../core/item.h
+reload.o: ../core/requesttypes.h ../core/error.h
 reload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 reload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 reload.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -965,9 +965,9 @@ reload.o: ../templates/patterncacher.h ../templates/indexpatterns.h
 reload.o: ../templates/patterns.h ../templates/changepatterns.h
 reload.o: ../templates/htmltextstream.h ../core/sessionmanager.h
 rm.o: rm.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-rm.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-rm.o: ../core/textstream.h ../core/misc.h ../core/item.h
-rm.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+rm.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+rm.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ../core/item.h
+rm.o: ../core/requesttypes.h ../core/error.h
 rm.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 rm.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1000,10 +1000,10 @@ rm.o: ../templates/indexpatterns.h ../templates/patterns.h
 rm.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 rm.o: ../core/sessionmanager.h ../core/misc.h
 rmuser.o: rmuser.h functionbase.h ../core/item.h
-rmuser.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-rmuser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-rmuser.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-rmuser.o: ../../pikotools/date/date.h ../core/error.h
+rmuser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+rmuser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+rmuser.o: ../core/textstream.h ../core/misc.h ../core/item.h
+rmuser.o: ../core/requesttypes.h ../core/error.h
 rmuser.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 rmuser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 rmuser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1038,9 +1038,9 @@ rmuser.o: ../templates/indexpatterns.h ../templates/patterns.h
 rmuser.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 rmuser.o: ../core/sessionmanager.h
 run.o: run.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-run.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-run.o: ../core/textstream.h ../core/misc.h ../core/item.h
-run.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+run.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+run.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+run.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 run.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 run.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1067,9 +1067,9 @@ run.o: ../core/mountparser.h ../core/crypt.h ../core/users.h ../core/groups.h
 run.o: ../core/group.h ../core/loadavg.h ../core/image.h
 run.o: ../core/threadmanager.h ../core/synchro.h
 sort.o: sort.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-sort.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-sort.o: ../core/textstream.h ../core/misc.h ../core/item.h
-sort.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+sort.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+sort.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+sort.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 sort.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 sort.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 sort.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1102,10 +1102,10 @@ sort.o: ../templates/indexpatterns.h ../templates/patterns.h
 sort.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 sort.o: ../core/sessionmanager.h
 specialdefault.o: specialdefault.h functionbase.h ../core/item.h
-specialdefault.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-specialdefault.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-specialdefault.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-specialdefault.o: ../../pikotools/date/date.h ../core/error.h
+specialdefault.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+specialdefault.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h
+specialdefault.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+specialdefault.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 specialdefault.o: ../../pikotools/space/spaceparser.h
 specialdefault.o: ../../pikotools/space/space.h ../db/dbitemquery.h
 specialdefault.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
@@ -1137,9 +1137,9 @@ specialdefault.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h
 specialdefault.o: ../core/image.h ../core/threadmanager.h ../core/synchro.h
 stat.o: stat.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-stat.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-stat.o: ../core/textstream.h ../core/misc.h ../core/item.h
-stat.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+stat.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+stat.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+stat.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 stat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1166,10 +1166,10 @@ stat.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 stat.o: ../core/threadmanager.h ../core/synchro.h
 subject.o: subject.h functionbase.h ../core/item.h
-subject.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-subject.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-subject.o: ../../pikotools/date/date.h ../core/error.h
+subject.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+subject.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+subject.o: ../core/textstream.h ../core/misc.h ../core/item.h
+subject.o: ../core/requesttypes.h ../core/error.h
 subject.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 subject.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 subject.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1198,10 +1198,10 @@ subject.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 subject.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 subject.o: ../core/synchro.h
 template.o: template.h functionbase.h ../core/item.h
-template.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-template.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-template.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-template.o: ../../pikotools/date/date.h ../core/error.h
+template.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+template.o: ../core/textstream.h ../core/misc.h ../core/item.h
+template.o: ../core/requesttypes.h ../core/error.h
 template.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 template.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1231,10 +1231,10 @@ template.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 template.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 template.o: ../core/synchro.h ../core/misc.h
 tinymce.o: tinymce.h functionbase.h ../core/item.h
-tinymce.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-tinymce.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-tinymce.o: ../../pikotools/date/date.h ../core/error.h
+tinymce.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+tinymce.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+tinymce.o: ../core/textstream.h ../core/misc.h ../core/item.h
+tinymce.o: ../core/requesttypes.h ../core/error.h
 tinymce.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 tinymce.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 tinymce.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1263,9 +1263,9 @@ tinymce.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 tinymce.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 tinymce.o: ../core/synchro.h
 uname.o: uname.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-uname.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-uname.o: ../core/textstream.h ../core/misc.h ../core/item.h
-uname.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+uname.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+uname.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+uname.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 uname.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 uname.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 uname.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1293,10 +1293,10 @@ uname.o: ../core/mountparser.h ../core/crypt.h ../core/users.h
 uname.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/image.h
 uname.o: ../core/threadmanager.h ../core/synchro.h
 upload.o: upload.h functionbase.h ../core/item.h
-upload.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-upload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-upload.o: ../../pikotools/date/date.h ../core/error.h
+upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+upload.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+upload.o: ../core/textstream.h ../core/misc.h ../core/item.h
+upload.o: ../core/requesttypes.h ../core/error.h
 upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 upload.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1331,10 +1331,10 @@ upload.o: ../templates/indexpatterns.h ../templates/patterns.h
 upload.o: ../templates/changepatterns.h ../templates/htmltextstream.h
 upload.o: ../core/sessionmanager.h
 uptime.o: uptime.h functionbase.h ../core/item.h
-uptime.o: ../../pikotools/space/space.h ../db/db.h ../db/dbbase.h
-uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
-uptime.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
-uptime.o: ../../pikotools/date/date.h ../core/error.h
+uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+uptime.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+uptime.o: ../core/textstream.h ../core/misc.h ../core/item.h
+uptime.o: ../core/requesttypes.h ../core/error.h
 uptime.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 uptime.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1363,9 +1363,9 @@ uptime.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 uptime.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 uptime.o: ../core/synchro.h
 vim.o: vim.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-vim.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-vim.o: ../core/textstream.h ../core/misc.h ../core/item.h
-vim.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+vim.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+vim.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+vim.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 vim.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 vim.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 vim.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -1393,9 +1393,9 @@ vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
 vim.o: ../core/loadavg.h ../core/image.h ../core/threadmanager.h
 vim.o: ../core/synchro.h
 who.o: who.h functionbase.h ../core/item.h ../../pikotools/space/space.h
-who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
-who.o: ../core/textstream.h ../core/misc.h ../core/item.h
-who.o: ../core/requesttypes.h ../../pikotools/date/date.h ../core/error.h
+who.o: ../../pikotools/date/date.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
+who.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
+who.o: ../core/item.h ../core/requesttypes.h ../core/error.h
 who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
 who.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
diff --git a/main/Makefile.dep b/main/Makefile.dep
index 7f2bf9f..e91409d 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -1,8 +1,8 @@
 # DO NOT DELETE
 
 main.o: ../core/log.h ../core/textstream.h ../core/misc.h ../core/item.h
-main.o: ../../pikotools/space/space.h ../core/requesttypes.h
-main.o: ../../pikotools/date/date.h ../core/logmanipulators.h ../core/slog.h
+main.o: ../../pikotools/space/space.h ../../pikotools/date/date.h
+main.o: ../core/requesttypes.h ../core/logmanipulators.h ../core/slog.h
 main.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h
 main.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h
 main.o: ../core/htmlfilter.h ../templates/htmltextstream.h
diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep
index 066dd10..3d880e2 100755
--- a/plugins/export/Makefile.dep
+++ b/plugins/export/Makefile.dep
@@ -2,8 +2,8 @@
 
 edb.o: edb.h ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
 edb.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-edb.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
-edb.o: ../../../pikotools/date/date.h ../../core/error.h
+edb.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+edb.o: ../../core/requesttypes.h ../../core/error.h
 edb.o: ../../../pikotools/space/spaceparser.h
 edb.o: ../../../pikotools/space/space.h export.h ../../core/dirs.h
 edb.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -28,10 +28,10 @@ edb.o: ../../core/lastcontainer.h ../../core/log.h
 exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
 exportinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
 exportinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
-exportinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
-exportinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
-exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h
-exportinfo.o: ../../../pikotools/date/date.h ../../core/group.h
+exportinfo.o: ../../core/item.h ../../../pikotools/date/date.h
+exportinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+exportinfo.o: ../../db/dbitemquery.h ../../core/item.h
+exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 exportinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
 exportinfo.o: ../../core/log.h ../../core/textstream.h
 exportinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
@@ -61,39 +61,40 @@ exportinfo.o: ../../core/dirs.h message.h exportthread.h
 exportthread.o: exportthread.h ../../core/basethread.h ../../core/synchro.h
 exportthread.o: message.h ../../core/log.h ../../core/misc.h
 exportthread.o: ../../core/item.h ../../../pikotools/space/space.h
-exportthread.o: ../../core/requesttypes.h ../../../pikotools/utf8/utf8.h
+exportthread.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
+exportthread.o: ../../../pikotools/utf8/utf8.h
 init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
 init.o: ../../core/requesttypes.h ../../core/item.h
-init.o: ../../../pikotools/space/space.h ../../core/error.h
-init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+init.o: ../../core/error.h ../../core/config.h
+init.o: ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../../pikotools/date/date.h ../../core/session.h
-init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
-init.o: ../../core/mount.h ../../templates/locale.h ../../core/system.h
-init.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
-init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-init.o: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
-init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
-init.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
-init.o: ../../notify/notifythread.h ../../core/basethread.h
-init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
-init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
-init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
-init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
-init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
-init.o: ../../core/threadmanager.h ../../core/sessionmanager.h
-init.o: ../../core/sessioncontainer.h ../../functions/functions.h
-init.o: ../../functions/functionbase.h ../../core/request.h
-init.o: ../../core/system.h ../../core/synchro.h
+init.o: ../../core/misc.h ../../core/session.h ../../core/user.h
+init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
+init.o: ../../templates/locale.h ../../core/system.h ../../core/job.h
+init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
+init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+init.o: ../../core/ugcontainer.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
+init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
+init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
+init.o: ../../../pikotools/utf8/utf8.h ../../notify/notifythread.h
+init.o: ../../core/basethread.h ../../notify/templatesnotify.h
+init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
+init.o: ../../core/lastcontainer.h ../../core/mounts.h
+init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
+init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
+init.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
+init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+init.o: ../../functions/functions.h ../../functions/functionbase.h
+init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
 init.o: ../../functions/functionparser.h ../../core/cur.h
 init.o: ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep
index 1d9e4db..fd2f907 100755
--- a/plugins/gallery/Makefile.dep
+++ b/plugins/gallery/Makefile.dep
@@ -1,10 +1,10 @@
 # DO NOT DELETE
 
 gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-gallery.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
-gallery.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
-gallery.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-gallery.o: ../../../pikotools/date/date.h ../../core/error.h
+gallery.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+gallery.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+gallery.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+gallery.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
 gallery.o: ../../../pikotools/space/spaceparser.h
 gallery.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 gallery.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -33,11 +33,12 @@ gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
 gallery.o: ../../core/synchro.h galleryinfo.h
 galleryinfo.o: galleryinfo.h ../../core/item.h
 galleryinfo.o: ../../../pikotools/space/space.h
+galleryinfo.o: ../../../pikotools/date/date.h
 init.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
-init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-init.o: ../../../pikotools/date/date.h ../../core/error.h
+init.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
 init.o: ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -90,10 +91,10 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h
 templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h
-templates.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
-templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
-templates.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-templates.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+templates.o: ../../db/dbtextstream.h ../../core/textstream.h
+templates.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
 templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep
index 1ea7f50..65ff7ab 100755
--- a/plugins/group/Makefile.dep
+++ b/plugins/group/Makefile.dep
@@ -2,13 +2,13 @@
 
 groupinfo.o: groupinfo.h groups.h ../../../pikotools/space/spaceparser.h
 groupinfo.o: ../../../pikotools/space/space.h ../../core/item.h
-groupinfo.o: ../../../pikotools/space/space.h ../../core/system.h
-groupinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
-groupinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
-groupinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
-groupinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
-groupinfo.o: ../../core/misc.h ../../core/requesttypes.h
-groupinfo.o: ../../../pikotools/date/date.h ../../core/error.h
+groupinfo.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+groupinfo.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+groupinfo.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
+groupinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+groupinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
+groupinfo.o: ../../core/textstream.h ../../core/misc.h
+groupinfo.o: ../../core/requesttypes.h ../../core/error.h
 groupinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
 groupinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
 groupinfo.o: ../../core/ugcontainer.h ../../core/log.h
@@ -40,31 +40,31 @@ init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
 init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../../pikotools/space/space.h
-init.o: ../../../pikotools/date/date.h ../../core/session.h ../../core/user.h
-init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-init.o: ../../templates/locale.h ../../core/system.h ../../core/job.h
-init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
-init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
-init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-init.o: ../../core/ugcontainer.h ../../notify/notify.h
-init.o: ../../notify/notifypool.h ../../templates/patterns.h
-init.o: ../../templates/locale.h ../../templates/localefilter.h
-init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
-init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-init.o: ../../../pikotools/utf8/utf8.h ../../notify/notifythread.h
-init.o: ../../core/basethread.h ../../notify/templatesnotify.h
-init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
-init.o: ../../core/lastcontainer.h ../../core/mounts.h
-init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-init.o: ../../core/users.h groups.h ../../core/loadavg.h ../../core/image.h
-init.o: ../../core/threadmanager.h ../../core/sessionmanager.h
-init.o: ../../core/sessioncontainer.h ../../functions/functions.h
-init.o: ../../functions/functionbase.h ../../core/request.h
-init.o: ../../core/system.h ../../core/synchro.h
+init.o: ../../core/misc.h ../../../pikotools/date/date.h
+init.o: ../../../pikotools/space/space.h ../../core/session.h
+init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+init.o: ../../core/mount.h ../../templates/locale.h ../../core/system.h
+init.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
+init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
+init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+init.o: ../../core/error.h ../../db/dbitemquery.h ../../core/item.h
+init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+init.o: ../../notify/notify.h ../../notify/notifypool.h
+init.o: ../../templates/patterns.h ../../templates/locale.h
+init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
+init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+init.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
+init.o: ../../notify/notifythread.h ../../core/basethread.h
+init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
+init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
+init.o: ../../core/run.h ../../core/users.h groups.h ../../core/loadavg.h
+init.o: ../../core/image.h ../../core/threadmanager.h
+init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+init.o: ../../functions/functions.h ../../functions/functionbase.h
+init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
 init.o: ../../functions/functionparser.h ../../core/cur.h
 init.o: ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -92,17 +92,18 @@ templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
 templates.o: ../../core/item.h ../../../ezc/src/functions.h
 templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
-templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
-templates.o: ../../core/item.h ../../../pikotools/space/space.h
-templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
-templates.o: ../../templates/locale.h ../../templates/changepatterns.h
+templates.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+templates.o: ../../templates/patterncacher.h ../../core/item.h
+templates.o: ../../../pikotools/space/space.h ../../templates/indexpatterns.h
+templates.o: ../../templates/patterns.h ../../templates/locale.h
+templates.o: ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
 templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
 templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
 templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
 templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-templates.o: ../../core/textstream.h ../../../pikotools/date/date.h
-templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+templates.o: ../../core/textstream.h ../../core/error.h
+templates.o: ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep
index dcd5440..8d8effe 100755
--- a/plugins/menu/Makefile.dep
+++ b/plugins/menu/Makefile.dep
@@ -1,11 +1,11 @@
 # DO NOT DELETE
 
 cache.o: cache.h ../../core/item.h ../../../pikotools/space/space.h
-cache.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
-cache.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
-cache.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
-cache.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
-cache.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+cache.o: ../../../pikotools/date/date.h ../../core/dirs.h ../../core/item.h
+cache.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+cache.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
+cache.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
+cache.o: ../../../pikotools/space/spaceparser.h
 cache.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 cache.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 cache.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
@@ -31,32 +31,33 @@ init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
 init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../../pikotools/space/space.h
-init.o: ../../../pikotools/date/date.h ../../core/session.h ../../core/user.h
-init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-init.o: ../../templates/locale.h ../../core/plugin.h ../../core/pluginmsg.h
-init.o: ../../core/log.h ../../core/system.h ../../core/job.h
-init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
-init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
-init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-init.o: ../../core/ugcontainer.h ../../notify/notify.h
-init.o: ../../notify/notifypool.h ../../templates/patterns.h
-init.o: ../../templates/locale.h ../../templates/localefilter.h
-init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
-init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
-init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-init.o: ../../../pikotools/utf8/utf8.h ../../notify/notifythread.h
-init.o: ../../core/basethread.h ../../notify/templatesnotify.h
-init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
-init.o: ../../core/lastcontainer.h ../../core/mounts.h
-init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
-init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
-init.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
-init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
-init.o: ../../functions/functions.h ../../functions/functionbase.h
-init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
+init.o: ../../core/misc.h ../../../pikotools/date/date.h
+init.o: ../../../pikotools/space/space.h ../../core/session.h
+init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+init.o: ../../core/mount.h ../../templates/locale.h ../../core/plugin.h
+init.o: ../../core/pluginmsg.h ../../core/log.h ../../core/system.h
+init.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
+init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
+init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+init.o: ../../core/error.h ../../db/dbitemquery.h ../../core/item.h
+init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+init.o: ../../notify/notify.h ../../notify/notifypool.h
+init.o: ../../templates/patterns.h ../../templates/locale.h
+init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
+init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
+init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+init.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
+init.o: ../../notify/notifythread.h ../../core/basethread.h
+init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
+init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
+init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
+init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
+init.o: ../../core/group.h ../../core/loadavg.h ../../core/image.h
+init.o: ../../core/threadmanager.h ../../core/sessionmanager.h
+init.o: ../../core/sessioncontainer.h ../../functions/functions.h
+init.o: ../../functions/functionbase.h ../../core/request.h
+init.o: ../../core/system.h ../../core/synchro.h
 init.o: ../../functions/functionparser.h ../../core/cur.h
 init.o: ../../functions/adduser.h ../../functions/cat.h
 init.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -84,17 +85,17 @@ templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
 templates.o: ../../core/item.h ../../../ezc/src/functions.h
 templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
-templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
-templates.o: ../../core/item.h ../../../pikotools/space/space.h
-templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
-templates.o: ../../templates/locale.h ../../templates/changepatterns.h
+templates.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+templates.o: ../../templates/patterncacher.h ../../core/item.h
+templates.o: ../../../pikotools/space/space.h ../../templates/indexpatterns.h
+templates.o: ../../templates/patterns.h ../../templates/locale.h
+templates.o: ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
 templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
 templates.o: ../../core/sessionmanager.h ../../core/htmlfilter.h
 templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
 templates.o: ../../db/dbtextstream.h ../../core/textstream.h
-templates.o: ../../../pikotools/date/date.h ../../core/error.h
-templates.o: ../../../pikotools/space/spaceparser.h
+templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep
index 3b169d4..1f14bec 100755
--- a/plugins/stats/Makefile.dep
+++ b/plugins/stats/Makefile.dep
@@ -3,7 +3,7 @@
 bot.o: bot.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h
 init.o: ../../core/item.h ../../../pikotools/space/space.h
-init.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+init.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
 init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 init.o: ../../core/request.h ../../core/error.h ../../core/config.h
 init.o: ../../../pikotools/space/spaceparser.h
@@ -58,7 +58,7 @@ init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h
 stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h
 stats.o: ../../core/misc.h ../../core/item.h ../../../pikotools/space/space.h
-stats.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+stats.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
 stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
 stats.o: ../../core/request.h ../../core/error.h ../../core/config.h
 stats.o: ../../../pikotools/space/spaceparser.h
@@ -72,13 +72,13 @@ templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h
 templates.o: ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 templates.o: ../../core/request.h ../../core/requesttypes.h ../../core/item.h
-templates.o: ../../../pikotools/space/space.h ../../core/error.h
-templates.o: ../../core/textstream.h ../../core/misc.h
-templates.o: ../../../pikotools/date/date.h ../../templates/htmltextstream.h
-templates.o: ../../core/textstream.h ../../core/system.h ../../core/job.h
-templates.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-templates.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
+templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+templates.o: ../../core/error.h ../../core/textstream.h ../../core/misc.h
+templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
+templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
+templates.o: ../../core/synchro.h ../../core/dirs.h ../../core/dircontainer.h
+templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+templates.o: ../../db/dbtextstream.h ../../core/error.h
 templates.o: ../../db/dbitemquery.h ../../core/item.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep
index 9b8a481..a3455be 100755
--- a/plugins/thread/Makefile.dep
+++ b/plugins/thread/Makefile.dep
@@ -2,10 +2,10 @@
 
 createthread.o: createthread.h ../../functions/functionbase.h
 createthread.o: ../../core/item.h ../../../pikotools/space/space.h
-createthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
-createthread.o: ../../db/dbtextstream.h ../../core/textstream.h
-createthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-createthread.o: ../../../pikotools/date/date.h ../../core/error.h
+createthread.o: ../../../pikotools/date/date.h ../../db/db.h
+createthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+createthread.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
+createthread.o: ../../core/requesttypes.h ../../core/error.h
 createthread.o: ../../../pikotools/space/spaceparser.h
 createthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 createthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -58,11 +58,11 @@ createthread.o: ../../functions/uname.h ../../functions/upload.h
 createthread.o: ../../functions/uptime.h ../../functions/who.h
 createthread.o: ../../functions/vim.h ../../core/htmlfilter.h
 funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h
+funthread.o: ../../../pikotools/date/date.h funthread.h
+funthread.o: ../../functions/functionbase.h ../../core/item.h
 funthread.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
 funthread.o: ../../db/dbconn.h ../../db/dbtextstream.h
-funthread.o: ../../core/textstream.h ../../core/misc.h
-funthread.o: ../../../pikotools/date/date.h ../../core/error.h
+funthread.o: ../../core/textstream.h ../../core/misc.h ../../core/error.h
 funthread.o: ../../../pikotools/space/spaceparser.h
 funthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 funthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -92,10 +92,11 @@ funthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
 funthread.o: ../../db/dbbase.h threadinfo.h
 init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.h
 init.o: ../../functions/functionbase.h ../../core/item.h
-init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
-init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
-init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-init.o: ../../../pikotools/date/date.h ../../../pikotools/space/spaceparser.h
+init.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+init.o: ../../core/item.h ../../core/requesttypes.h
+init.o: ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
@@ -147,10 +148,10 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
 init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
 init.o: ../../core/sessionmanager.h templates.h
 reply.o: reply.h ../../functions/functionbase.h ../../core/item.h
-reply.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
-reply.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
-reply.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
-reply.o: ../../../pikotools/date/date.h ../../core/error.h
+reply.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
+reply.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
 reply.o: ../../../pikotools/space/spaceparser.h
 reply.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 reply.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -203,11 +204,12 @@ reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
 reply.o: ../../templates/patterns.h ../../templates/changepatterns.h
 reply.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h
-showthreads.o: ../../../pikotools/space/space.h ../../db/db.h
-showthreads.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+showthreads.o: ../../../pikotools/space/space.h
+showthreads.o: ../../../pikotools/date/date.h ../../db/db.h ../../db/dbbase.h
+showthreads.o: ../../db/dbconn.h ../../db/dbtextstream.h
 showthreads.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-showthreads.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
-showthreads.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+showthreads.o: ../../core/requesttypes.h ../../core/error.h
+showthreads.o: ../../../pikotools/space/spaceparser.h
 showthreads.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 showthreads.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 showthreads.o: ../../core/dircontainer.h ../../core/ugcontainer.h
@@ -238,13 +240,13 @@ showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
 showthreads.o: threadinfo.h
 tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
 templates.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
-templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
-templates.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
-templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
-templates.o: ../../core/textstream.h ../../core/misc.h
-templates.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
-templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+templates.o: ../../../pikotools/date/date.h ../../core/system.h
+templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
+templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
+templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+templates.o: ../../db/dbtextstream.h ../../core/textstream.h
+templates.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
+templates.o: ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
@@ -298,13 +300,13 @@ templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
 templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
 templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 threadinfo.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
-threadinfo.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
-threadinfo.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
-threadinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-threadinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
-threadinfo.o: ../../core/textstream.h ../../core/misc.h
-threadinfo.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
-threadinfo.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
+threadinfo.o: ../../../pikotools/date/date.h ../../core/system.h
+threadinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
+threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
+threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
+threadinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
+threadinfo.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
+threadinfo.o: ../../../pikotools/space/spaceparser.h
 threadinfo.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
 threadinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
 threadinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
diff --git a/plugins/thread/showthreads.cpp b/plugins/thread/showthreads.cpp
index 51a64bc..a459350 100755
--- a/plugins/thread/showthreads.cpp
+++ b/plugins/thread/showthreads.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -61,13 +61,7 @@ bool ShowThreads::Sort::operator()(const Item * item1, const Item * item2)
 	else
 	{
 		// sorting by date
-		tm tm1 = item1->date_creation;
-		tm tm2 = item2->date_creation;
-
-		time_t time1 = Time(tm1);
-		time_t time2 = Time(tm2);
-
-		return time1 > time2;
+		return item1->date_creation > item2->date_creation;
 	}
 }
 
diff --git a/plugins/thread/templates.cpp b/plugins/thread/templates.cpp
index c192bdc..90e5b66 100755
--- a/plugins/thread/templates.cpp
+++ b/plugins/thread/templates.cpp
@@ -270,8 +270,8 @@ void thread_sort_tab_date_creation(Info & i)
 {
 	if( item_sort_index < thread_info.item_sort_tab.size() )
 	{
-		tm rtm = system->LocalTime(thread_info.item_sort_tab[item_sort_index]->date_creation);
-		i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+		PT::Date date = system->LocalTime(thread_info.item_sort_tab[item_sort_index]->date_creation);
+		i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 	}
 }
 
@@ -280,8 +280,8 @@ void thread_sort_tab_date_modification(Info & i)
 {
 	if( item_sort_index < thread_info.item_sort_tab.size() )
 	{
-		tm rtm = system->LocalTime(thread_info.item_sort_tab[item_sort_index]->date_modification);
-		i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+		PT::Date date = system->LocalTime(thread_info.item_sort_tab[item_sort_index]->date_modification);
+		i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 	}
 }
 
@@ -309,15 +309,10 @@ void thread_sort_tab_dates_equal(Info & i)
 {
 	if( item_sort_index < thread_info.item_sort_tab.size() )
 	{
-		tm * ptm1 = &thread_info.item_sort_tab[item_sort_index]->date_creation;
-		tm * ptm2 = &thread_info.item_sort_tab[item_sort_index]->date_modification;
+		PT::Date & date1 = thread_info.item_sort_tab[item_sort_index]->date_creation;
+		PT::Date & date2 = thread_info.item_sort_tab[item_sort_index]->date_modification;
 		
-		i.res = ptm1->tm_year == ptm2->tm_year &&
-				ptm1->tm_mon  == ptm2->tm_mon  &&
-				ptm1->tm_mday == ptm2->tm_mday && 
-				ptm1->tm_hour == ptm2->tm_hour && 
-				ptm1->tm_min  == ptm2->tm_min  && 
-				ptm1->tm_sec  == ptm2->tm_sec;
+		i.res = date1 == date2;
 	}
 }
 
diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep
index 84536bc..945470f 100755
--- a/plugins/ticket/Makefile.dep
+++ b/plugins/ticket/Makefile.dep
@@ -3,9 +3,9 @@
 createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h
 createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
 createticket.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-createticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
-createticket.o: ../../../pikotools/date/date.h ../../core/error.h
-createticket.o: ../../../pikotools/space/spaceparser.h
+createticket.o: ../../../pikotools/space/space.h
+createticket.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
+createticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 createticket.o: ../../../pikotools/space/space.h
 createticket.o: ../../functions/functionbase.h ../../core/item.h
 createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
@@ -61,8 +61,8 @@ createticket.o: ../../core/plugindata.h ../../functions/rm.h
 editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 editticket.o: ../../core/misc.h ../../core/item.h
-editticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
-editticket.o: ../../../pikotools/date/date.h ../../core/error.h
+editticket.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+editticket.o: ../../core/requesttypes.h ../../core/error.h
 editticket.o: ../../../pikotools/space/spaceparser.h
 editticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
 editticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
@@ -118,8 +118,8 @@ editticket.o: ../../functions/rm.h
 funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 funticket.o: ../../core/misc.h ../../core/item.h
-funticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
-funticket.o: ../../../pikotools/date/date.h ../../core/error.h
+funticket.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+funticket.o: ../../core/requesttypes.h ../../core/error.h
 funticket.o: ../../../pikotools/space/spaceparser.h
 funticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
 funticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
@@ -179,7 +179,7 @@ funticket.o: ../../plugins/thread/pluginmsg.h
 init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
 init.o: ../../core/item.h ../../../pikotools/space/space.h
-init.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+init.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
 init.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 init.o: ../../../pikotools/space/space.h funticket.h ticketinfo.h
 init.o: ../../core/item.h ../../core/system.h ../../core/job.h
@@ -240,9 +240,9 @@ sessiondata.o: ../../functions/rm.h ../../../pikotools/space/space.h
 showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h
 showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h
 showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-showtickets.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
-showtickets.o: ../../../pikotools/date/date.h ../../core/error.h
-showtickets.o: ../../../pikotools/space/spaceparser.h
+showtickets.o: ../../../pikotools/space/space.h
+showtickets.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
+showtickets.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 showtickets.o: ../../../pikotools/space/space.h ticketinfo.h
 showtickets.o: ../../core/item.h ../../core/system.h ../../core/job.h
 showtickets.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
@@ -304,24 +304,24 @@ showtickets.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
 tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
 tdb.o: ../../core/item.h ../../../pikotools/space/space.h
-tdb.o: ../../core/requesttypes.h ../../../pikotools/date/date.h
+tdb.o: ../../../pikotools/date/date.h ../../core/requesttypes.h
 tdb.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
 tdb.o: ../../../pikotools/space/space.h ../../core/log.h
 templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 templates.o: ../../../ezc/src/pattern.h ../../core/item.h
-templates.o: ../../../pikotools/space/space.h ../../../ezc/src/functions.h
-templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
-templates.o: ../../../pikotools/utf8/utf8.h ticketinfo.h ticket.h
-templates.o: ../../core/item.h ../../core/system.h ../../core/job.h
-templates.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
-templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
-templates.o: ../../core/user.h ../../../pikotools/date/date.h
-templates.o: ../../core/group.h ../../core/dircontainer.h
-templates.o: ../../core/ugcontainer.h ../../core/log.h
-templates.o: ../../core/textstream.h ../../core/logmanipulators.h
-templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h
+templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
+templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
+templates.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
+templates.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
+templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
+templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
+templates.o: ../../db/dbbase.h ../../db/dbitemquery.h
+templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
+templates.o: ../../core/log.h ../../core/textstream.h
+templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
+templates.o: ../../core/request.h ../../core/requesttypes.h
+templates.o: ../../core/error.h ../../core/config.h
 templates.o: ../../../pikotools/space/spaceparser.h
 templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
@@ -374,16 +374,15 @@ templates.o: ../../templates/templates.h
 ticketinfo.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
 ticketinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
 ticketinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
-ticketinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
-ticketinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h
-ticketinfo.o: ../../db/dbitemcolumns.h ../../core/user.h
-ticketinfo.o: ../../../pikotools/date/date.h ../../core/group.h
-ticketinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-ticketinfo.o: ../../core/log.h ../../core/textstream.h
-ticketinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-ticketinfo.o: ../../core/request.h ../../core/requesttypes.h
-ticketinfo.o: ../../core/error.h ../../core/config.h
-ticketinfo.o: ../../../pikotools/space/spaceparser.h
+ticketinfo.o: ../../core/item.h ../../../pikotools/date/date.h
+ticketinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+ticketinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
+ticketinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+ticketinfo.o: ../../core/ugcontainer.h ../../core/log.h
+ticketinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
+ticketinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+ticketinfo.o: ../../core/requesttypes.h ../../core/error.h
+ticketinfo.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
 ticketinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
 ticketinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
 ticketinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
diff --git a/plugins/ticket/showtickets.cpp b/plugins/ticket/showtickets.cpp
index 12cc8af..4de79a5 100755
--- a/plugins/ticket/showtickets.cpp
+++ b/plugins/ticket/showtickets.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -56,13 +56,7 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2)
 	else
 	{
 		// sorting by date
-		tm tm1 = item1->date_creation;
-		tm tm2 = item2->date_creation;
-
-		time_t time1 = Time(tm1);
-		time_t time2 = Time(tm2);
-
-		return time1 > time2;
+		return item1->date_creation > item2->date_creation;
 	}
 }
 
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 7587dac..28e9df4 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -318,7 +318,7 @@ localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 localefilter.o: ../../pikotools/utf8/utf8.h ../core/misc.h
-localefilter.o: ../core/requesttypes.h
+localefilter.o: ../core/requesttypes.h ../../pikotools/date/date.h
 login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
 login.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
 login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -498,16 +498,16 @@ mount.o: ../core/threadmanager.h ../core/sessionmanager.h
 mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h
 mount.o: ../core/misc.h ../core/mounts.h
 patterncacher.o: patterncacher.h ../core/item.h ../../pikotools/space/space.h
-patterncacher.o: misc.h localefilter.h locale.h
+patterncacher.o: ../../pikotools/date/date.h misc.h localefilter.h locale.h
 patterncacher.o: ../../pikotools/space/spaceparser.h
 patterncacher.o: ../../pikotools/space/space.h ../../ezc/src/ezc.h
 patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 patterncacher.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
 patterncacher.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
 patterncacher.o: ../../pikotools/utf8/utf8.h htmltextstream.h
-patterncacher.o: ../core/textstream.h ../../pikotools/date/date.h
-patterncacher.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
-patterncacher.o: ../core/slog.h ../core/cur.h ../templates/locale.h
+patterncacher.o: ../core/textstream.h ../core/log.h ../core/textstream.h
+patterncacher.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
+patterncacher.o: ../templates/locale.h
 patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h
 patterns.o: ../../pikotools/space/space.h localefilter.h ../../ezc/src/ezc.h
 patterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
diff --git a/templates/dir.cpp b/templates/dir.cpp
index ff859d5..d374e99 100755
--- a/templates/dir.cpp
+++ b/templates/dir.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -340,15 +340,15 @@ void dir_last_url_is(Info & i)
 
 void dir_last_date_creation(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->dir_tab.back()->date_creation);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->dir_tab.back()->date_creation);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
 void dir_last_date_modification(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->dir_tab.back()->date_modification);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->dir_tab.back()->date_modification);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
@@ -367,15 +367,10 @@ void dir_last_date_modification_nice(Info & i)
 
 void dir_last_dates_equal(Info & i)
 {
-	tm * ptm1 = &cur->request->dir_tab.back()->date_creation;
-	tm * ptm2 = &cur->request->dir_tab.back()->date_modification;
+	PT::Date & date1 = cur->request->dir_tab.back()->date_creation;
+	PT::Date & date2 = cur->request->dir_tab.back()->date_modification;
 	
-	i.res =	ptm1->tm_year == ptm2->tm_year &&
-			ptm1->tm_mon  == ptm2->tm_mon  &&
-			ptm1->tm_mday == ptm2->tm_mday && 
-			ptm1->tm_hour == ptm2->tm_hour && 
-			ptm1->tm_min  == ptm2->tm_min  && 
-			ptm1->tm_sec  == ptm2->tm_sec;
+	i.res =	date1 == date2;
 }
 
 
diff --git a/templates/htmltextstream.cpp b/templates/htmltextstream.cpp
index 869cdda..83389c2 100755
--- a/templates/htmltextstream.cpp
+++ b/templates/htmltextstream.cpp
@@ -412,12 +412,12 @@ return *this;
 
 HtmlTextStream & HtmlTextStream::operator<<(const PT::Space & space)
 {
-	space_stream.Clear();
+	tmp_stream.Clear();
 	// !! IMPROVE ME
 	// we can calculate how many memory is needed beforehand
-	space.Serialize(space_stream, true, false);
-	operator<<(space_stream.Str());
-	space_stream.Clear();
+	space.Serialize(tmp_stream, true, false);
+	operator<<(tmp_stream.Str());
+	tmp_stream.Clear();
 
 return *this;
 }
@@ -425,7 +425,12 @@ return *this;
 
 HtmlTextStream & HtmlTextStream::operator<<(const PT::Date & date)
 {
-	date.Serialize(*this);
+	tmp_stream.Clear();
+	// !! IMPROVE ME
+	// we can calculate how many memory is needed beforehand
+	date.Serialize(tmp_stream);
+	operator<<(tmp_stream.Str());
+	tmp_stream.Clear();
 
 return *this;
 }
diff --git a/templates/htmltextstream.h b/templates/htmltextstream.h
index 17f3a3b..873ca4d 100755
--- a/templates/htmltextstream.h
+++ b/templates/htmltextstream.h
@@ -149,7 +149,7 @@ public:
 
 private:
 
-	TextStream<std::wstring> space_stream; // for serializing spaces
+	TextStream<std::wstring> tmp_stream;
 
 };
 
diff --git a/templates/item.cpp b/templates/item.cpp
index 15c8748..20925f1 100755
--- a/templates/item.cpp
+++ b/templates/item.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -244,15 +244,15 @@ void item_users_different(Info & i)
 
 void item_date_creation(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->item.date_creation);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->item.date_creation);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
 void item_date_modification(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->item.date_modification);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->item.date_modification);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
@@ -270,15 +270,10 @@ void item_date_modification_nice(Info & i)
 
 void item_dates_equal(Info & i)
 {
-	tm * ptm1 = &cur->request->item.date_creation;
-	tm * ptm2 = &cur->request->item.date_modification;
+	PT::Date & date1 = cur->request->item.date_creation;
+	PT::Date & date2 = cur->request->item.date_modification;
 	
-	i.res = ptm1->tm_year == ptm2->tm_year &&
-			   ptm1->tm_mon  == ptm2->tm_mon  &&
-			   ptm1->tm_mday == ptm2->tm_mday && 
-			   ptm1->tm_hour == ptm2->tm_hour && 
-			   ptm1->tm_min  == ptm2->tm_min  && 
-			   ptm1->tm_sec  == ptm2->tm_sec;
+	i.res = date1 == date2;
 }
 
 
@@ -601,8 +596,8 @@ void item_tab_date_creation(Info & i)
 {
 	if( item_index < cur->request->item_tab.size() )
 	{
-		tm rtm = system->LocalTime(cur->request->item_tab[item_index].date_creation);
-		i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+		PT::Date date = system->LocalTime(cur->request->item_tab[item_index].date_creation);
+		i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 	}
 }
 
@@ -611,8 +606,8 @@ void item_tab_date_modification(Info & i)
 {
 	if( item_index < cur->request->item_tab.size() )
 	{
-		tm rtm = system->LocalTime(cur->request->item_tab[item_index].date_modification);
-		i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+		PT::Date date = system->LocalTime(cur->request->item_tab[item_index].date_modification);
+		i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 	}
 }
 
@@ -640,15 +635,10 @@ void item_tab_dates_equal(Info & i)
 {
 	if( item_index < cur->request->item_tab.size() )
 	{
-		tm * ptm1 = &cur->request->item_tab[item_index].date_creation;
-		tm * ptm2 = &cur->request->item_tab[item_index].date_modification;
+		PT::Date & date1 = cur->request->item_tab[item_index].date_creation;
+		PT::Date & date2 = cur->request->item_tab[item_index].date_modification;
 		
-		i.res = ptm1->tm_year == ptm2->tm_year &&
-				ptm1->tm_mon  == ptm2->tm_mon  &&
-				ptm1->tm_mday == ptm2->tm_mday && 
-				ptm1->tm_hour == ptm2->tm_hour && 
-				ptm1->tm_min  == ptm2->tm_min  && 
-				ptm1->tm_sec  == ptm2->tm_sec;
+		i.res = date1 == date2;
 	}
 }
 
diff --git a/templates/last.cpp b/templates/last.cpp
index 54b8c85..0ae9352 100755
--- a/templates/last.cpp
+++ b/templates/last.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * Copyright (c) 2008-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -68,7 +68,7 @@ void last_tab_start(Info & i)
 	if( !last_init() )
 		return;
 	
-	i.out << DateToStr(&last_iterator->start);
+	i.out << DateToStr(last_iterator->start);
 }
 
 
@@ -78,7 +78,7 @@ void last_tab_end(Info & i)
 		return;
 	
 	if( last_iterator->IsLoggedOut() )
-		i.out << DateToStr(&last_iterator->end);
+		i.out << DateToStr(last_iterator->end);
 }
 
 
diff --git a/templates/misc.cpp b/templates/misc.cpp
index d8a73dc..09fa815 100755
--- a/templates/misc.cpp
+++ b/templates/misc.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -62,18 +62,15 @@ int was_enter = 0; // how many enteres there were before
 
 
 
-void print_date_nice(Info & i, const tm & rtm)
+void print_date_nice(Info & i, const PT::Date & date)
 {
-	time_t t       = Time(rtm);
-	time_t now     = std::time(0);
 	time_t one_day = 60 * 60 * 24;
-	
-	tm ltm = system->LocalTime(rtm);
+	PT::Date ltm   = system->LocalTime(date);
 
-	if( t + one_day > now )
-		i.out << DateToStr(ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday, ltm.tm_hour, ltm.tm_min, ltm.tm_sec);
+	if( date + one_day > cur->request->start_time )
+		i.out << DateToStr(ltm.year, ltm.month, ltm.day, ltm.hour, ltm.min, ltm.sec);
 	else
-		i.out << DateToStr(ltm.tm_year + 1900, ltm.tm_mon + 1, ltm.tm_mday);
+		i.out << DateToStr(ltm.year, ltm.month, ltm.day);
 }
 
 
diff --git a/templates/misc.h b/templates/misc.h
index 4253f6a..34d8e8c 100755
--- a/templates/misc.h
+++ b/templates/misc.h
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -38,7 +38,7 @@ HtmlTextStream::RawText<RawType> R(const RawType & par)
 void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in);
 
 
-void print_date_nice(Info & i, const tm & rtm);
+void print_date_nice(Info & i, const PT::Date & date);
 void print_user_name(Info & i, const User * puser, const std::wstring & guest_name);
 
 
diff --git a/templates/stat.cpp b/templates/stat.cpp
index d1229ed..fced4d0 100755
--- a/templates/stat.cpp
+++ b/templates/stat.cpp
@@ -71,15 +71,15 @@ void stat_item_privileges(Info & i)
 
 void stat_item_date_creation(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->last_item->date_creation);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->last_item->date_creation);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
 void stat_item_date_modification(Info & i)
 {
-	tm rtm = system->LocalTime(cur->request->last_item->date_modification);
-	i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	PT::Date date = system->LocalTime(cur->request->last_item->date_modification);
+	i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
 }
 
 
diff --git a/templates/winix.cpp b/templates/winix.cpp
index f3a782d..9663f0f 100755
--- a/templates/winix.cpp
+++ b/templates/winix.cpp
@@ -30,9 +30,9 @@ void winix_cur_time(Info & i)
 {
 static char buffer[100];
 
-	tm rtm = Time(std::time(0));
+	PT::Date & date = cur->request->start_date;
 
-	sprintf(buffer, "%02d:%02d:%02d", rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
+	sprintf(buffer, "%02d:%02d:%02d", date.hour, date.min, date.sec);
 	i.out << buffer;
 }