diff --git a/content/Makefile.dep b/content/Makefile.dep
index 9d1aab5..c6496f8 100755
--- a/content/Makefile.dep
+++ b/content/Makefile.dep
@@ -9,12 +9,13 @@ adduser.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 adduser.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-adduser.o: ../core/rebus.h ../core/function.h ../core/compress.h
-adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-adduser.o: ../core/dirs.h ../core/users.h ../core/groups.h
-adduser.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-adduser.o: ../core/mount.h ../core/loadavg.h
+adduser.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+adduser.o: ../core/compress.h ../core/acceptencodingparser.h
+adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+adduser.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+adduser.o: ../core/users.h ../core/groups.h ../core/functions.h
+adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+adduser.o: ../core/loadavg.h
 cat.o: content.h ../core/item.h ../templates/templates.h
 cat.o: ../templates/patterncacher.h ../templates/misc.h
 cat.o: ../templates/localefilter.h ../core/locale.h
@@ -24,12 +25,13 @@ cat.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 cat.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 cat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 cat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-cat.o: ../core/rebus.h ../core/function.h ../core/compress.h
-cat.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-cat.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-cat.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-cat.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-cat.o: ../core/mount.h ../core/loadavg.h
+cat.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+cat.o: ../core/compress.h ../core/acceptencodingparser.h
+cat.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+cat.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+cat.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+cat.o: ../core/loadavg.h
 content.o: content.h ../core/item.h ../templates/templates.h
 content.o: ../templates/patterncacher.h ../templates/misc.h
 content.o: ../templates/localefilter.h ../core/locale.h
@@ -39,10 +41,11 @@ content.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 content.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 content.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 content.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-content.o: ../core/rebus.h ../core/function.h ../core/compress.h
-content.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-content.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-content.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
+content.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+content.o: ../core/compress.h ../core/acceptencodingparser.h
+content.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+content.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+content.o: ../core/dirs.h ../core/users.h ../core/groups.h
 content.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
 content.o: ../core/mount.h ../core/loadavg.h ../core/misc.h ../core/plugin.h
 content.o: ../core/request.h ../core/data.h ../core/pluginmsg.h
@@ -55,13 +58,14 @@ createthread.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 createthread.o: ../core/group.h ../core/thread.h ../core/error.h
 createthread.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
 createthread.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-createthread.o: ../core/session.h ../core/rebus.h ../core/function.h
-createthread.o: ../core/compress.h ../core/acceptencodingparser.h
-createthread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-createthread.o: ../core/postmultiparser.h ../core/error.h ../core/mount.h
-createthread.o: ../core/data.h ../core/dirs.h ../core/users.h
-createthread.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-createthread.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h
+createthread.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
+createthread.o: ../core/function.h ../core/compress.h
+createthread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+createthread.o: ../core/htmlfilter.h ../core/postmultiparser.h
+createthread.o: ../core/error.h ../core/mount.h ../core/data.h ../core/dirs.h
+createthread.o: ../core/users.h ../core/groups.h ../core/functions.h
+createthread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+createthread.o: ../core/loadavg.h
 createticket.o: content.h ../core/item.h ../templates/templates.h
 createticket.o: ../templates/patterncacher.h ../templates/misc.h
 createticket.o: ../templates/localefilter.h ../core/locale.h
@@ -71,13 +75,14 @@ createticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 createticket.o: ../core/group.h ../core/thread.h ../core/error.h
 createticket.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
 createticket.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-createticket.o: ../core/session.h ../core/rebus.h ../core/function.h
-createticket.o: ../core/compress.h ../core/acceptencodingparser.h
-createticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-createticket.o: ../core/postmultiparser.h ../core/error.h ../core/mount.h
-createticket.o: ../core/data.h ../core/dirs.h ../core/users.h
-createticket.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-createticket.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h
+createticket.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
+createticket.o: ../core/function.h ../core/compress.h
+createticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+createticket.o: ../core/htmlfilter.h ../core/postmultiparser.h
+createticket.o: ../core/error.h ../core/mount.h ../core/data.h ../core/dirs.h
+createticket.o: ../core/users.h ../core/groups.h ../core/functions.h
+createticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+createticket.o: ../core/loadavg.h
 default.o: content.h ../core/item.h ../templates/templates.h
 default.o: ../templates/patterncacher.h ../templates/misc.h
 default.o: ../templates/localefilter.h ../core/locale.h
@@ -87,10 +92,11 @@ default.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 default.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 default.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 default.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-default.o: ../core/rebus.h ../core/function.h ../core/compress.h
-default.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-default.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-default.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
+default.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+default.o: ../core/compress.h ../core/acceptencodingparser.h
+default.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+default.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+default.o: ../core/dirs.h ../core/users.h ../core/groups.h
 default.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
 default.o: ../core/mount.h ../core/loadavg.h
 download.o: content.h ../core/item.h ../templates/templates.h
@@ -102,12 +108,13 @@ download.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 download.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 download.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 download.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-download.o: ../core/rebus.h ../core/function.h ../core/compress.h
-download.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-download.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-download.o: ../core/dirs.h ../core/users.h ../core/groups.h
-download.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-download.o: ../core/mount.h ../core/loadavg.h
+download.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+download.o: ../core/compress.h ../core/acceptencodingparser.h
+download.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+download.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+download.o: ../core/users.h ../core/groups.h ../core/functions.h
+download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+download.o: ../core/loadavg.h
 editticket.o: content.h ../core/item.h ../templates/templates.h
 editticket.o: ../templates/patterncacher.h ../templates/misc.h
 editticket.o: ../templates/localefilter.h ../core/locale.h
@@ -117,12 +124,13 @@ editticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 editticket.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 editticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 editticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-editticket.o: ../core/rebus.h ../core/function.h ../core/compress.h
-editticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-editticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-editticket.o: ../core/mount.h ../core/data.h ../core/dirs.h ../core/users.h
-editticket.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-editticket.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h
+editticket.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+editticket.o: ../core/compress.h ../core/acceptencodingparser.h
+editticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+editticket.o: ../core/postmultiparser.h ../core/error.h ../core/mount.h
+editticket.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
+editticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
+editticket.o: ../core/mount.h ../core/loadavg.h
 emacs.o: content.h ../core/item.h ../templates/templates.h
 emacs.o: ../templates/patterncacher.h ../templates/misc.h
 emacs.o: ../templates/localefilter.h ../core/locale.h
@@ -132,12 +140,13 @@ emacs.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 emacs.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 emacs.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 emacs.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-emacs.o: ../core/rebus.h ../core/function.h ../core/compress.h
-emacs.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-emacs.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-emacs.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-emacs.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-emacs.o: ../core/mount.h ../core/loadavg.h ../core/notify.h
+emacs.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+emacs.o: ../core/compress.h ../core/acceptencodingparser.h
+emacs.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+emacs.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+emacs.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+emacs.o: ../core/loadavg.h ../core/notify.h
 emacs.o: ../templatesnotify/templatesnotify.h ../core/mount.h
 emacs.o: ../templates/misc.h ../core/misc.h
 last.o: content.h ../core/item.h ../templates/templates.h
@@ -157,12 +166,13 @@ login.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 login.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 login.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 login.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-login.o: ../core/rebus.h ../core/function.h ../core/compress.h
-login.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-login.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-login.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-login.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-login.o: ../core/mount.h ../core/loadavg.h
+login.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+login.o: ../core/compress.h ../core/acceptencodingparser.h
+login.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+login.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+login.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+login.o: ../core/loadavg.h
 logout.o: content.h ../core/item.h ../templates/templates.h
 logout.o: ../templates/patterncacher.h ../templates/misc.h
 logout.o: ../templates/localefilter.h ../core/locale.h
@@ -172,10 +182,11 @@ logout.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 logout.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 logout.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 logout.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-logout.o: ../core/rebus.h ../core/function.h ../core/compress.h
-logout.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-logout.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-logout.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+logout.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+logout.o: ../core/compress.h ../core/acceptencodingparser.h
+logout.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+logout.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+logout.o: ../core/users.h ../core/groups.h ../core/functions.h
 logout.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 logout.o: ../core/loadavg.h
 ls.o: content.h ../core/item.h ../templates/templates.h
@@ -187,9 +198,9 @@ ls.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 ls.o: ../core/error.h ../core/log.h ../core/dircontainer.h
 ls.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
 ls.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
-ls.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h
-ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-ls.o: ../core/postmultiparser.h
+ls.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+ls.o: ../core/htmlfilter.h ../core/postmultiparser.h
 misc_item.o: content.h ../core/item.h ../templates/templates.h
 misc_item.o: ../templates/patterncacher.h ../templates/misc.h
 misc_item.o: ../templates/localefilter.h ../core/locale.h
@@ -199,9 +210,10 @@ misc_item.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 misc_item.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 misc_item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 misc_item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-misc_item.o: ../core/rebus.h ../core/function.h ../core/compress.h
-misc_item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-misc_item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/misc.h
+misc_item.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+misc_item.o: ../core/compress.h ../core/acceptencodingparser.h
+misc_item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+misc_item.o: ../core/postmultiparser.h ../core/misc.h
 misc_specialfile.o: content.h ../core/item.h ../templates/templates.h
 misc_specialfile.o: ../templates/patterncacher.h ../templates/misc.h
 misc_specialfile.o: ../templates/localefilter.h ../core/locale.h
@@ -213,11 +225,11 @@ misc_specialfile.o: ../core/user.h ../core/group.h ../core/thread.h
 misc_specialfile.o: ../core/error.h ../core/log.h ../core/dircontainer.h
 misc_specialfile.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
 misc_specialfile.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
-misc_specialfile.o: ../core/function.h ../core/compress.h
-misc_specialfile.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-misc_specialfile.o: ../core/htmlfilter.h ../core/postmultiparser.h
-misc_specialfile.o: ../core/data.h ../core/dirs.h ../core/users.h
-misc_specialfile.o: ../core/groups.h ../core/functions.h
+misc_specialfile.o: ../core/plugindata.h ../core/function.h
+misc_specialfile.o: ../core/compress.h ../core/acceptencodingparser.h
+misc_specialfile.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+misc_specialfile.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+misc_specialfile.o: ../core/users.h ../core/groups.h ../core/functions.h
 misc_specialfile.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 misc_specialfile.o: ../core/loadavg.h
 mkdir.o: content.h ../core/item.h ../templates/templates.h
@@ -229,12 +241,13 @@ mkdir.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 mkdir.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 mkdir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 mkdir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-mkdir.o: ../core/rebus.h ../core/function.h ../core/compress.h
-mkdir.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-mkdir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-mkdir.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-mkdir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-mkdir.o: ../core/mount.h ../core/loadavg.h ../core/notify.h
+mkdir.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+mkdir.o: ../core/compress.h ../core/acceptencodingparser.h
+mkdir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+mkdir.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+mkdir.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+mkdir.o: ../core/loadavg.h ../core/notify.h
 mkdir.o: ../templatesnotify/templatesnotify.h ../core/mount.h
 mkdir.o: ../templates/misc.h
 mv.o: content.h ../core/item.h ../templates/templates.h
@@ -246,11 +259,12 @@ mv.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 mv.o: ../core/error.h ../core/log.h ../core/dircontainer.h
 mv.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
 mv.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
-mv.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h
-mv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-mv.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h ../core/users.h
-mv.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-mv.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h
+mv.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+mv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+mv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
+mv.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+mv.o: ../core/loadavg.h
 node.o: content.h ../core/item.h ../templates/templates.h
 node.o: ../templates/patterncacher.h ../templates/misc.h
 node.o: ../templates/localefilter.h ../core/locale.h
@@ -260,9 +274,10 @@ node.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 node.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 node.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 node.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-node.o: ../core/rebus.h ../core/function.h ../core/compress.h
-node.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-node.o: ../core/htmlfilter.h ../core/postmultiparser.h
+node.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+node.o: ../core/compress.h ../core/acceptencodingparser.h
+node.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+node.o: ../core/postmultiparser.h
 priv.o: content.h ../core/item.h ../templates/templates.h
 priv.o: ../templates/patterncacher.h ../templates/misc.h
 priv.o: ../templates/localefilter.h ../core/locale.h
@@ -272,12 +287,13 @@ priv.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 priv.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-priv.o: ../core/rebus.h ../core/function.h ../core/compress.h
-priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-priv.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-priv.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
-priv.o: ../core/mount.h ../core/loadavg.h
+priv.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+priv.o: ../core/compress.h ../core/acceptencodingparser.h
+priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+priv.o: ../core/postmultiparser.h ../core/error.h ../core/data.h
+priv.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+priv.o: ../core/loadavg.h
 reload.o: content.h ../core/item.h ../templates/templates.h
 reload.o: ../templates/patterncacher.h ../templates/misc.h
 reload.o: ../templates/localefilter.h ../core/locale.h
@@ -287,11 +303,12 @@ reload.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 reload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 reload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 reload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-reload.o: ../core/rebus.h ../core/function.h ../core/compress.h
-reload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-reload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
-reload.o: ../core/notify.h ../templatesnotify/templatesnotify.h
-reload.o: ../core/mount.h ../templates/misc.h
+reload.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+reload.o: ../core/compress.h ../core/acceptencodingparser.h
+reload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+reload.o: ../core/postmultiparser.h ../core/error.h ../core/notify.h
+reload.o: ../templatesnotify/templatesnotify.h ../core/mount.h
+reload.o: ../templates/misc.h
 rm.o: content.h ../core/item.h ../templates/templates.h
 rm.o: ../templates/patterncacher.h ../templates/misc.h
 rm.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h
@@ -301,12 +318,12 @@ rm.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
 rm.o: ../core/error.h ../core/log.h ../core/dircontainer.h
 rm.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
 rm.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
-rm.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h
-rm.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-rm.o: ../core/postmultiparser.h ../core/error.h ../core/data.h ../core/dirs.h
-rm.o: ../core/users.h ../core/groups.h ../core/functions.h
-rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
-rm.o: ../core/loadavg.h
+rm.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+rm.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+rm.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
+rm.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
+rm.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
+rm.o: ../core/mount.h ../core/loadavg.h
 run.o: content.h ../core/item.h ../templates/templates.h
 run.o: ../templates/patterncacher.h ../templates/misc.h
 run.o: ../templates/localefilter.h ../core/locale.h
@@ -316,9 +333,10 @@ run.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 run.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 run.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 run.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-run.o: ../core/rebus.h ../core/function.h ../core/compress.h
-run.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-run.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
+run.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+run.o: ../core/compress.h ../core/acceptencodingparser.h
+run.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+run.o: ../core/postmultiparser.h ../core/error.h
 thread.o: content.h ../core/item.h ../templates/templates.h
 thread.o: ../templates/patterncacher.h ../templates/misc.h
 thread.o: ../templates/localefilter.h ../core/locale.h
@@ -328,10 +346,11 @@ thread.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 thread.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 thread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-thread.o: ../core/rebus.h ../core/function.h ../core/compress.h
-thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-thread.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+thread.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+thread.o: ../core/compress.h ../core/acceptencodingparser.h
+thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+thread.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+thread.o: ../core/users.h ../core/groups.h ../core/functions.h
 thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 thread.o: ../core/loadavg.h ../core/mount.h
 ticket.o: content.h ../core/item.h ../templates/templates.h
@@ -343,10 +362,11 @@ ticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 ticket.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 ticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-ticket.o: ../core/rebus.h ../core/function.h ../core/compress.h
-ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-ticket.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+ticket.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+ticket.o: ../core/compress.h ../core/acceptencodingparser.h
+ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+ticket.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+ticket.o: ../core/users.h ../core/groups.h ../core/functions.h
 ticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 ticket.o: ../core/loadavg.h ../core/mount.h
 upload.o: content.h ../core/item.h ../templates/templates.h
@@ -358,10 +378,11 @@ upload.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 upload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-upload.o: ../core/rebus.h ../core/function.h ../core/compress.h
-upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
-upload.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+upload.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+upload.o: ../core/compress.h ../core/acceptencodingparser.h
+upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+upload.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h
+upload.o: ../core/users.h ../core/groups.h ../core/functions.h
 upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 upload.o: ../core/loadavg.h ../core/misc.h
 who.o: content.h ../core/item.h ../templates/templates.h
diff --git a/core/Makefile.dep b/core/Makefile.dep
index 0bf5314..fc11c9e 100755
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -6,8 +6,9 @@ config.o: config.h ../confparser/confparser.h log.h data.h dirs.h item.h
 config.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h
 config.o: functions.h function.h lastcontainer.h mounts.h mount.h error.h
 config.o: rebus.h loadavg.h plugin.h request.h requesttypes.h session.h
-config.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h
-config.o: htmlfilter.h postmultiparser.h ticket.h pluginmsg.h misc.h
+config.o: plugindata.h thread.h compress.h acceptencodingparser.h
+config.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h
+config.o: pluginmsg.h misc.h
 data.o: data.h dirs.h item.h dircontainer.h users.h user.h ugcontainer.h
 data.o: log.h groups.h group.h functions.h function.h lastcontainer.h
 data.o: mounts.h mount.h error.h rebus.h loadavg.h
@@ -19,15 +20,16 @@ dircontainer.o: dircontainer.h item.h log.h
 dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h
 dirs.o: thread.h ugcontainer.h ticket.h data.h users.h groups.h functions.h
 dirs.o: function.h lastcontainer.h mounts.h mount.h rebus.h loadavg.h
-dirs.o: request.h requesttypes.h session.h compress.h acceptencodingparser.h
-dirs.o: acceptbaseparser.h htmlfilter.h postmultiparser.h
+dirs.o: request.h requesttypes.h session.h plugindata.h compress.h
+dirs.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+dirs.o: postmultiparser.h
 function.o: function.h item.h
 functioncodeparser.o: functioncodeparser.h item.h function.h log.h
 functionparser.o: functionparser.h requesttypes.h log.h item.h error.h data.h
 functionparser.o: dirs.h dircontainer.h users.h user.h ugcontainer.h groups.h
 functionparser.o: group.h functions.h function.h lastcontainer.h mounts.h
 functionparser.o: mount.h rebus.h loadavg.h db.h thread.h ticket.h request.h
-functionparser.o: session.h compress.h acceptencodingparser.h
+functionparser.o: session.h plugindata.h compress.h acceptencodingparser.h
 functionparser.o: acceptbaseparser.h htmlfilter.h postmultiparser.h
 functions.o: functions.h function.h item.h
 groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h
@@ -49,35 +51,41 @@ mountparser.o: loadavg.h misc.h
 mounts.o: mounts.h mount.h error.h log.h data.h dirs.h item.h dircontainer.h
 mounts.o: users.h user.h ugcontainer.h groups.h group.h functions.h
 mounts.o: function.h lastcontainer.h rebus.h loadavg.h request.h
-mounts.o: requesttypes.h session.h thread.h compress.h acceptencodingparser.h
-mounts.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h
-mounts.o: mountparser.h db.h
+mounts.o: requesttypes.h session.h plugindata.h thread.h compress.h
+mounts.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+mounts.o: postmultiparser.h ticket.h mountparser.h db.h
 notify.o: log.h notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
 notify.o: ../core/locale.h ../confparser/confparser.h ../templates/misc.h
 notify.o: ../templates/localefilter.h data.h dirs.h item.h dircontainer.h
 notify.o: users.h user.h ugcontainer.h groups.h group.h functions.h
 notify.o: function.h lastcontainer.h mounts.h mount.h error.h rebus.h
-notify.o: loadavg.h misc.h request.h requesttypes.h session.h thread.h
-notify.o: compress.h acceptencodingparser.h acceptbaseparser.h htmlfilter.h
-notify.o: postmultiparser.h ticket.h
+notify.o: loadavg.h misc.h request.h requesttypes.h session.h plugindata.h
+notify.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h
+notify.o: htmlfilter.h postmultiparser.h ticket.h
 plugin.o: plugin.h request.h requesttypes.h session.h item.h error.h log.h
-plugin.o: user.h rebus.h function.h thread.h compress.h
+plugin.o: user.h rebus.h plugindata.h function.h thread.h compress.h
 plugin.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
 plugin.o: postmultiparser.h ticket.h data.h dirs.h dircontainer.h users.h
 plugin.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h mounts.h
 plugin.o: mount.h loadavg.h pluginmsg.h
+plugindata.o: plugindata.h plugin.h request.h requesttypes.h session.h item.h
+plugindata.o: error.h log.h user.h rebus.h function.h thread.h compress.h
+plugindata.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+plugindata.o: postmultiparser.h ticket.h data.h dirs.h dircontainer.h users.h
+plugindata.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h
+plugindata.o: mounts.h mount.h loadavg.h pluginmsg.h
 postmultiparser.o: postmultiparser.h error.h log.h requesttypes.h data.h
 postmultiparser.o: dirs.h item.h dircontainer.h users.h user.h ugcontainer.h
 postmultiparser.o: groups.h group.h functions.h function.h lastcontainer.h
 postmultiparser.o: mounts.h mount.h rebus.h loadavg.h
 rebus.o: log.h rebus.h misc.h item.h
 request.o: request.h requesttypes.h session.h item.h error.h log.h user.h
-request.o: rebus.h function.h thread.h compress.h acceptencodingparser.h
-request.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h
-request.o: getparser.h httpsimpleparser.h postparser.h cookieparser.h data.h
-request.o: dirs.h dircontainer.h users.h ugcontainer.h groups.h group.h
-request.o: functions.h lastcontainer.h mounts.h mount.h loadavg.h plugin.h
-request.o: pluginmsg.h misc.h db.h
+request.o: rebus.h plugindata.h function.h thread.h compress.h
+request.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+request.o: postmultiparser.h ticket.h getparser.h httpsimpleparser.h
+request.o: postparser.h cookieparser.h data.h dirs.h dircontainer.h users.h
+request.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h
+request.o: mounts.h mount.h loadavg.h plugin.h pluginmsg.h misc.h db.h
 requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h
 requestcontroller.o: ../templates/templates.h ../templates/patterncacher.h
 requestcontroller.o: misc.h item.h ../templates/ckeditorgetparser.h
@@ -86,29 +94,32 @@ requestcontroller.o: ../core/locale.h ../confparser/confparser.h
 requestcontroller.o: ../core/thread.h ../core/ticket.h ../core/db.h user.h
 requestcontroller.o: group.h thread.h error.h log.h dircontainer.h
 requestcontroller.o: ugcontainer.h ticket.h sessionmanager.h
-requestcontroller.o: sessioncontainer.h session.h rebus.h functionparser.h
-requestcontroller.o: requesttypes.h data.h dirs.h users.h groups.h
-requestcontroller.o: functions.h function.h lastcontainer.h mounts.h mount.h
-requestcontroller.o: loadavg.h request.h compress.h acceptencodingparser.h
-requestcontroller.o: acceptbaseparser.h htmlfilter.h postmultiparser.h
-requestcontroller.o: postparser.h httpsimpleparser.h cookieparser.h notify.h
+requestcontroller.o: sessioncontainer.h session.h rebus.h plugindata.h
+requestcontroller.o: functionparser.h requesttypes.h data.h dirs.h users.h
+requestcontroller.o: groups.h functions.h function.h lastcontainer.h mounts.h
+requestcontroller.o: mount.h loadavg.h request.h compress.h
+requestcontroller.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+requestcontroller.o: postmultiparser.h postparser.h httpsimpleparser.h
+requestcontroller.o: cookieparser.h notify.h
 requestcontroller.o: ../templatesnotify/templatesnotify.h ../core/mount.h
 requestcontroller.o: ../templates/misc.h ../templates/localefilter.h
-session.o: session.h item.h error.h log.h user.h rebus.h
+session.o: session.h item.h error.h log.h user.h rebus.h plugindata.h
 sessioncontainer.o: sessioncontainer.h session.h item.h error.h log.h user.h
-sessioncontainer.o: rebus.h data.h dirs.h dircontainer.h users.h
+sessioncontainer.o: rebus.h plugindata.h data.h dirs.h dircontainer.h users.h
 sessioncontainer.o: ugcontainer.h groups.h group.h functions.h function.h
 sessioncontainer.o: lastcontainer.h mounts.h mount.h loadavg.h
 sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
-sessionmanager.o: error.h log.h user.h rebus.h request.h requesttypes.h
-sessionmanager.o: function.h thread.h compress.h acceptencodingparser.h
-sessionmanager.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h
-sessionmanager.o: data.h dirs.h dircontainer.h users.h ugcontainer.h groups.h
-sessionmanager.o: group.h functions.h lastcontainer.h mounts.h mount.h
-sessionmanager.o: loadavg.h sessionparser.h
+sessionmanager.o: error.h log.h user.h rebus.h plugindata.h request.h
+sessionmanager.o: requesttypes.h function.h thread.h compress.h
+sessionmanager.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h
+sessionmanager.o: postmultiparser.h ticket.h data.h dirs.h dircontainer.h
+sessionmanager.o: users.h ugcontainer.h groups.h group.h functions.h
+sessionmanager.o: lastcontainer.h mounts.h mount.h loadavg.h sessionparser.h
+sessionmanager.o: plugin.h pluginmsg.h
 sessionparser.o: sessionparser.h session.h item.h error.h log.h user.h
-sessionparser.o: rebus.h sessioncontainer.h data.h dirs.h dircontainer.h
-sessionparser.o: users.h ugcontainer.h groups.h group.h functions.h
-sessionparser.o: function.h lastcontainer.h mounts.h mount.h loadavg.h
+sessionparser.o: rebus.h plugindata.h sessioncontainer.h data.h dirs.h
+sessionparser.o: dircontainer.h users.h ugcontainer.h groups.h group.h
+sessionparser.o: functions.h function.h lastcontainer.h mounts.h mount.h
+sessionparser.o: loadavg.h
 users.o: users.h user.h ugcontainer.h log.h db.h item.h group.h thread.h
 users.o: error.h dircontainer.h ticket.h
diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep
index a190e80..af48d6d 100755
--- a/core/Makefile.o.dep
+++ b/core/Makefile.o.dep
@@ -1 +1 @@
-o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o loadavg.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o 
+o = acceptbaseparser.o compress.o config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o function.o functioncodeparser.o functionparser.o functions.o groups.o htmlfilter.o httpsimpleparser.o lastcontainer.o loadavg.o locale.o log.o misc.o mount.o mountparser.o mounts.o notify.o plugin.o plugindata.o postmultiparser.o rebus.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o sessionparser.o users.o 
diff --git a/core/log.cpp b/core/log.cpp
index 15a4c57..311108a 100755
--- a/core/log.cpp
+++ b/core/log.cpp
@@ -88,6 +88,13 @@ Log & Log::operator<<(const std::string * s)
 }
 
 
+Log & Log::operator<<(const void * s)
+{
+    buffer << s;
+    
+    return *this;
+}
+
 
 Log & Log::operator<<(int s)
 {
diff --git a/core/log.h b/core/log.h
index bc786b2..75999f2 100755
--- a/core/log.h
+++ b/core/log.h
@@ -43,6 +43,7 @@ public:
 
 	void PutDate(Manipulators m);
 	Log & operator<<(const char * s);
+	Log & operator<<(const void * s);
 	Log & operator<<(const std::string * s);
 	Log & operator<<(const std::string & s);
 	Log & operator<<(int s);
diff --git a/core/plugin.cpp b/core/plugin.cpp
index 32dce63..2fd2f2f 100755
--- a/core/plugin.cpp
+++ b/core/plugin.cpp
@@ -29,6 +29,7 @@ size_t i;
 
 Plugin::Plugin()
 {
+	current_plugin = -1;
 }
 	
 
@@ -43,9 +44,7 @@ void Plugin::LoadPlugins(const std::vector<std::string> & plugins)
 size_t i;
 
 	for(i=0 ; i<plugins.size() ; ++i)
-	{
 		LoadPlugin(plugins[i]);
-	}
 }
 
 
@@ -82,10 +81,15 @@ void Plugin::LoadPlugin(const char * filename)
 	}
 	
 	arg.Clear();
-	
+
+	int old_current_plugin = current_plugin;
+
+	current_plugin = (int)plugins.size();
+	arg.plugin_id  = current_plugin;
+
 	if( fun(&arg) )
 	{
-		log << log1 << "Pl: plugin loaded: " << filename << logend;
+		log << log1 << "Pl: plugin loaded: " << filename << ", index: " << plugins.size() << logend;
 		plugins.push_back(p);
 	}
 	else
@@ -93,6 +97,8 @@ void Plugin::LoadPlugin(const char * filename)
 		log << log1 << "Pl: plugin Init() returned false (" << filename << ") " << logend;
 		dlclose(p);
 	}
+
+	current_plugin = old_current_plugin;
 }
 
 
@@ -102,26 +108,49 @@ Arg * Plugin::Call(int message, void * a, void * a2, void * a3)
 {
 	Slots::iterator i = slots.lower_bound(message);
 	arg.Clear();
-	arg.app  = a;
-	arg.app2 = a2;
-	arg.app3 = a3;
 	
+	int old_current_plugin = current_plugin;
+
 	for( ; i!=slots.end() && i->first==message ; ++i )
 	{
-		if( i->second(&arg) )
+		arg.app  = a;
+		arg.app2 = a2;
+		arg.app3 = a3;
+		current_plugin = i->second.index;
+		arg.plugin_id = current_plugin;
+
+		if( request.session && current_plugin != -1 )
+			arg.plugin_data_base = request.session->plugin_data.Get(current_plugin);
+		else
+			arg.plugin_data_base = 0;
+
+		if( i->second.fun(&arg) )
 			arg.ret_true++;
 		else
 			arg.ret_false++;
 	}
 	
+	current_plugin = old_current_plugin;
+
 return &arg;
 }
 
 
+size_t Plugin::Size()
+{
+	return plugins.size();
+}
 
 
 
 void Plugin::Assign(int message, Fun fun)
 {
-	slots.insert( std::make_pair(message, fun) );
+	Slot s;
+
+	s.fun   = fun;
+	s.index = current_plugin;
+
+	slots.insert( std::make_pair(message, s) );
+
+	log << log3 << "Plugin: added function for message: " << message << ", plugin index: " << s.index << logend;
 }
diff --git a/core/plugin.h b/core/plugin.h
index c5ec685..f9622b8 100755
--- a/core/plugin.h
+++ b/core/plugin.h
@@ -18,10 +18,7 @@
 #include "data.h"
 #include "pluginmsg.h"
 #include "log.h"
-
-
-
-class Plugin;
+#include "plugindata.h"
 
 
 // plugin arguments
@@ -31,6 +28,11 @@ struct Arg
 	void * app2;	// used for some purposes
 	void * app3;	// used for some purposes
 	
+	int plugin_id;  // unique plugin identifier
+
+
+	PluginDataBase * plugin_data_base; // pointer to the plugin session
+
 	int ret_true;	// how many plugins returned true
 	int ret_false;	// how many plugins returned false
 	
@@ -42,6 +44,7 @@ struct Arg
 		app3      = 0;
 		ret_true  = 0;
 		ret_false = 0;
+		plugin_data_base = 0;
 	}
 };
 
@@ -51,8 +54,23 @@ class Plugin
 {
 public:	
 
+	// index of a plugin which is called by Call() method
+	// normally: -1
+	int current_plugin;
+
+
+	// !! zmienic sygnature funkcji (niech nie zwraca zadnej wartosci, bo to tylko wkurwia)
+	// albo dodac jeszcze inna sygnature (niech nie pobiera zadnego argumentu)
 	typedef bool (*Fun)(Arg *);
 
+	//typedef void (*Fun2)();
+
+	struct Slot
+	{
+		Fun fun;
+		// Fun2 fun2; // dla drugiej sygnatury
+		int index; // plugin index
+	};
 
 
 	Plugin();
@@ -65,6 +83,7 @@ public:
 	
 	Arg * Call(int message, void * a=0, void * a2=0, void * a3=0);
 	
+	size_t Size();
 	
 	void Assign(int message, Fun);
 
@@ -74,10 +93,9 @@ private:
 	typedef std::vector<void*> Plugins;
 	Plugins plugins;
 	
-	typedef std::multimap<int, Fun> Slots;
+	typedef std::multimap<int, Slot> Slots;
 	Slots slots;
 	
-	
 	Arg arg;
 	
 };
diff --git a/core/plugindata.cpp b/core/plugindata.cpp
new file mode 100755
index 0000000..ef2c875
--- /dev/null
+++ b/core/plugindata.cpp
@@ -0,0 +1,125 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2008-2010, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#include "plugindata.h"
+#include "plugin.h"
+#include "log.h"
+
+
+
+
+
+void PluginData::Assign(size_t index, PluginDataBase * data)
+{
+	if( index >= table.size() )
+		Resize(index+1);
+
+	table[index] = data;
+}
+
+
+void PluginData::Assign(PluginDataBase * data)
+{
+	if( plugin.current_plugin == -1 )
+	{
+		log << log1 << "PD: Assign(PluginDataBase*) should be called only from plugins" << logend;
+		return;
+	}
+
+	Assign(plugin.current_plugin, data);
+}
+
+
+
+PluginDataBase * PluginData::Get(size_t index)
+{
+	if( index >= table.size() )
+		Resize(index+1);
+
+return table[index];
+}
+
+
+PluginDataBase * PluginData::Get()
+{
+	if( plugin.current_plugin == -1 )
+	{
+		log << log1 << "PD: Get() should be called only from plugins" << logend;
+		return 0;
+	}
+
+return Get(plugin.current_plugin);
+}
+
+
+
+
+void PluginData::DeleteAll()
+{
+	if( table.empty() )
+		return;
+
+	plugin.Call(WINIX_SESSION_REMOVE);
+
+	for(size_t i=0 ; i<table.size() ; ++i)
+		table[i] = 0;
+}
+
+
+
+PluginData::PluginData()
+{
+}
+
+
+
+PluginData::PluginData(const PluginData & p)
+{
+	operator=(p);
+}
+
+
+
+PluginData & PluginData::operator=(const PluginData & p)
+{
+	// we don't copy all pointers - only resize the table
+	// pointers will be set to zero
+	Resize(p.Size());
+
+return *this;
+}
+
+
+
+PluginData::~PluginData()
+{
+	DeleteAll();
+}
+
+
+
+size_t PluginData::Size() const
+{
+	return table.size();
+}
+
+
+
+void PluginData::Resize(size_t new_size)
+{
+size_t old_size = table.size();
+
+	if( old_size == new_size )
+		return;
+
+	table.resize(new_size);
+
+	for(size_t i = old_size ; i<new_size ; ++i)
+		table[i] = 0;
+}
diff --git a/core/plugindata.h b/core/plugindata.h
new file mode 100755
index 0000000..7b67bc5
--- /dev/null
+++ b/core/plugindata.h
@@ -0,0 +1,56 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2008-2010, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#ifndef headerfilecmslucoreplugindata
+#define headerfilecmslucoreplugindata
+
+#include <vector>
+
+
+
+
+
+struct PluginDataBase
+{
+	virtual ~PluginDataBase() {}
+};
+
+
+
+
+class PluginData
+{
+public:
+
+	void Assign(size_t index, PluginDataBase * data);
+	void Assign(PluginDataBase * data);
+
+	PluginDataBase * Get(size_t index);
+	PluginDataBase * Get();
+
+	void DeleteAll();
+
+	PluginData();
+	PluginData(const PluginData & p);
+	PluginData & operator=(const PluginData & p);
+	~PluginData();
+
+	size_t Size() const;
+	void Resize(size_t new_size);
+
+
+private:
+
+	std::vector<PluginDataBase*> table;
+};
+
+
+
+#endif
+
diff --git a/core/pluginmsg.h b/core/pluginmsg.h
index ace00a7..20a8062 100755
--- a/core/pluginmsg.h
+++ b/core/pluginmsg.h
@@ -18,6 +18,15 @@
 #define WINIX_CONTENT_MAKE					2000
 
 
+// here you can attach your own session data (based on PluginDataBase class)
+// call request.session->plugin_data.Assign(pointer)
+#define WINIX_SESSION_CREATED				3000
+
+// here you should remove your session data
+#define WINIX_SESSION_REMOVE				3001
+
+// when a session is changed (you can save a pointer to your data here)
+#define WINIX_SESSION_CHANGED				3002
 
 
 
diff --git a/core/requestcontroller.cpp b/core/requestcontroller.cpp
index b3d062c..79241e6 100755
--- a/core/requestcontroller.cpp
+++ b/core/requestcontroller.cpp
@@ -132,6 +132,12 @@ void RequestController::SaveSessions()
 }
 
 
+void RequestController::DeleteAllPluginsData()
+{
+	session_manager.DeleteAllPluginsData();
+}
+
+
 void RequestController::SaveSessionsIfNeeded()
 {
 	time_t t = time(0);
@@ -207,17 +213,21 @@ void RequestController::Loop()
 			request.SendAll();
 			notify.ItemChanged(request.notify_code);
 		}
+		catch(const std::logic_error & e)
+		{
+			log << log1 << "std logic exception: " << e.what() << logend;	
+		}
 		catch(const std::exception & e)
 		{
-			log << log1 << "uncaught std exception: " << e.what() << logend;	
+			log << log1 << "std exception: " << e.what() << logend;	
 		}
 		catch(const Error & e)
 		{
-			log << log1 << "uncaught exception: Error: " << e << logend;	
+			log << log1 << "exception: Error: " << e << logend;	
 		}
 		catch(...)
 		{
-			log << log1 << "uncaught exception" << logend;	
+			log << log1 << "uncaught unknown exception" << logend;	
 		}
 		
 		SaveSessionsIfNeeded();
diff --git a/core/requestcontroller.h b/core/requestcontroller.h
index ef18f43..a69694b 100755
--- a/core/requestcontroller.h
+++ b/core/requestcontroller.h
@@ -48,6 +48,7 @@ public:
 	void LoadSessions();
 	void SaveSessions();
 	void SaveSessionsIfNeeded(); // saving only once a day
+	void DeleteAllPluginsData();
 
 	SessionContainer::Iterator SessionBegin();
 	SessionContainer::Iterator SessionEnd();
diff --git a/core/session.cpp b/core/session.cpp
index 1d74aa5..87820c8 100755
--- a/core/session.cpp
+++ b/core/session.cpp
@@ -11,6 +11,8 @@
 
 
 
+
+
 Session::Session()
 {
 	Clear();
diff --git a/core/session.h b/core/session.h
index c6f2875..f71e6c1 100755
--- a/core/session.h
+++ b/core/session.h
@@ -15,6 +15,10 @@
 #include "error.h"
 #include "user.h"
 #include "rebus.h"
+#include "plugindata.h"
+
+
+
 
 
 struct Session
@@ -55,6 +59,9 @@ struct Session
 
 	int spam_score;
 
+
+	PluginData plugin_data;
+
 	// -------------------
 
 	Session();
@@ -67,10 +74,5 @@ struct Session
 
 
 
-
-
-
-
-
 #endif
 
diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp
index 8096bb7..11261fd 100755
--- a/core/sessioncontainer.cpp
+++ b/core/sessioncontainer.cpp
@@ -12,6 +12,8 @@
 #include "log.h"
 
 
+
+
 void SessionContainer::Clear()
 {
 	table.clear();
diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp
index 3800122..99d743d 100755
--- a/core/sessionmanager.cpp
+++ b/core/sessionmanager.cpp
@@ -14,6 +14,11 @@
 #include "data.h"
 #include "session.h"
 #include "sessionparser.h"
+#include "plugin.h"
+
+
+
+
 
 
 SessionManager::SessionManager()
@@ -22,6 +27,7 @@ SessionManager::SessionManager()
 }
 
 
+
 bool SessionManager::IsSession(long id)
 {
 	if( session_table.FindById(id) == session_table.End() )
@@ -31,6 +37,7 @@ return true;
 }
 
 
+
 long SessionManager::CreateSessionId()
 {
 long id;
@@ -61,6 +68,7 @@ return id;
 }
 
 
+
 void SessionManager::CreateTemporarySession()
 {
 	SessionContainer::Iterator i = session_table.FindById( 0 );
@@ -80,6 +88,7 @@ void SessionManager::CreateTemporarySession()
 }
 
 
+
 void SessionManager::CreateSession()
 {
 Session s;
@@ -97,7 +106,7 @@ int attempts = 100;
 			request.session->new_session = true;
 			
 			log << log2 << "SM: created a new session: " << request.session->id << logend;
-				
+
 		return;
 		}
 	}
@@ -138,6 +147,7 @@ return true;
 }
 
 
+
 void SessionManager::SetSession()
 {
 	CookieTable::iterator i = request.cookie_table.find(data.http_session_id_name);
@@ -160,6 +170,14 @@ void SessionManager::SetSession()
 	}
 	
 	// request.session is set now
+
+	if( request.session->new_session )
+	{
+		request.session->plugin_data.Resize(plugin.Size());
+		plugin.Call(WINIX_SESSION_CREATED);
+	}
+
+	plugin.Call(WINIX_SESSION_CHANGED);
 }
 
 
@@ -169,6 +187,8 @@ SessionContainer::Iterator SessionManager::SessionBegin()
 	return session_table.Begin();
 }
 
+
+
 SessionContainer::Iterator SessionManager::SessionEnd()
 {
 	return session_table.End();
@@ -192,15 +212,50 @@ void SessionManager::DeleteOldSessions()
 }
 
 
+
+void SessionManager::DeleteAllPluginsData()
+{
+	SessionContainer::Iterator i = session_table.Begin();
+
+	Session * old_session = request.session;
+
+	for( ; i!=session_table.End() ; ++i )
+	{
+		request.session = &(*i);
+		i->plugin_data.DeleteAll();
+	}
+
+	request.session = old_session;
+}
+
+
+
+
+
 void SessionManager::LoadSessions()
 {
 SessionParser sp;
+SessionContainer::Iterator i;
+
+	Session * old_session = request.session;
 
 	sp.Parse(data.session_file, session_table);
+	i = session_table.Begin();
 
+	for( ; i!=session_table.End() ; ++i )
+	{
+		i->plugin_data.Resize(plugin.Size());
+		request.session = &(*i);
+		plugin.Call(WINIX_SESSION_CREATED);
+	}
+
+	request.session = old_session;
 }
 
 
+
+
+
 void SessionManager::SaveSessions()
 {
 	if( data.session_file.empty() )
diff --git a/core/sessionmanager.h b/core/sessionmanager.h
index 7ee59b7..a4cd162 100755
--- a/core/sessionmanager.h
+++ b/core/sessionmanager.h
@@ -35,6 +35,7 @@ public:
 
 	SessionManager();
 	void SetSession();
+	void DeleteAllPluginsData();
 	void DeleteOldSessions();
 
 	void LoadSessions();
diff --git a/main/Makefile.dep b/main/Makefile.dep
index ccb5508..4d9f32d 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -9,13 +9,13 @@ main.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
 main.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
 main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 main.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/session.h
-main.o: ../core/rebus.h ../core/functionparser.h ../core/requesttypes.h
-main.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
-main.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
-main.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h ../core/request.h
-main.o: ../core/compress.h ../core/acceptencodingparser.h
-main.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-main.o: ../core/postmultiparser.h ../core/config.h ../core/notify.h
-main.o: ../templatesnotify/templatesnotify.h ../core/mount.h
+main.o: ../core/rebus.h ../core/plugindata.h ../core/functionparser.h
+main.o: ../core/requesttypes.h ../core/data.h ../core/dirs.h ../core/users.h
+main.o: ../core/groups.h ../core/functions.h ../core/function.h
+main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+main.o: ../core/loadavg.h ../core/request.h ../core/compress.h
+main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+main.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
+main.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
 main.o: ../templates/misc.h ../core/plugin.h ../core/request.h ../core/data.h
 main.o: ../core/pluginmsg.h
diff --git a/main/main.cpp b/main/main.cpp
index 60356ab..67a683a 100755
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -39,7 +39,8 @@ Plugin  plugin;
 void signal_term(int)
 {
 	req_controller.SaveSessions();
-	log << log1 << "cmslu stopped" << logend;
+	req_controller.DeleteAllPluginsData();
+	log << log1 << "cmslu stopped" << logend << logsave;
 
 	exit(0);
 }
@@ -50,7 +51,8 @@ void signal_hup(int)
 {
 	log << log1 << "SIGHUP received" << logend;
 	data.signal_hup = true;
-	config.ReadConfig(false); /* errors not to stdout */
+	//config.ReadConfig(false); /* errors not to stdout */
+	// plugins are not ready for reloading
 }
 
 
@@ -99,6 +101,7 @@ int main(int argv, char ** argc)
 	// it is done when the config is read
 	log << log3 << "base_server: " << data.base_server << logend;
 
+	// load plugins before loading sessions - req_controller.LoadSessions()
 	plugin.LoadPlugins(data.plugin_file);
 
 	request.Init();
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 9c12206..03aad2d 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -5,18 +5,20 @@ adduser.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
 adduser.o: ../core/requesttypes.h ../core/session.h ../core/item.h
 adduser.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
-adduser.o: ../core/function.h ../core/thread.h ../core/compress.h
-adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+adduser.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+adduser.o: ../core/compress.h ../core/acceptencodingparser.h
+adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+adduser.o: ../core/postmultiparser.h ../core/ticket.h
 dir.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 dir.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
 dir.o: ../core/requesttypes.h ../core/session.h ../core/item.h
 dir.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
-dir.o: ../core/function.h ../core/thread.h ../core/compress.h
-dir.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-dir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
-dir.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h
+dir.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+dir.o: ../core/compress.h ../core/acceptencodingparser.h
+dir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+dir.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
+dir.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
 dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
 dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
 dir.o: ../core/mount.h ../core/loadavg.h ../core/db.h ../core/misc.h
@@ -28,10 +30,10 @@ doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
 doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
 doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
 doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
-doc.o: ../core/session.h ../core/thread.h ../core/compress.h
-doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
-doc.o: ../core/misc.h
+doc.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+doc.o: ../core/compress.h ../core/acceptencodingparser.h
+doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
 item.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 item.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 item.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -40,8 +42,8 @@ item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
 item.o: ../core/group.h ../core/functions.h ../core/function.h
 item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 item.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
-item.o: ../core/requesttypes.h ../core/session.h ../core/thread.h
-item.o: ../core/compress.h ../core/acceptencodingparser.h
+item.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
 item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
 last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
@@ -53,19 +55,20 @@ last.o: ../core/groups.h ../core/group.h ../core/functions.h
 last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
 last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
 last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-last.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
-last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-last.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+last.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
+last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+last.o: ../core/misc.h
 localefilter.o: localefilter.h ../core/locale.h ../confparser/confparser.h
 localefilter.o: ../core/misc.h ../core/item.h
 ls.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 ls.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
 ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h
-ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/function.h
-ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
-ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-ls.o: ../core/postmultiparser.h ../core/ticket.h
+ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/plugindata.h
+ls.o: ../core/function.h ../core/thread.h ../core/compress.h
+ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+ls.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
 misc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
 misc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
 misc.o: ../core/groups.h ../core/group.h ../core/functions.h
@@ -96,14 +99,14 @@ priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
 priv.o: ../core/group.h ../core/functions.h ../core/function.h
 priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 priv.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
-priv.o: ../core/requesttypes.h ../core/session.h ../core/thread.h
-priv.o: ../core/compress.h ../core/acceptencodingparser.h
+priv.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
 priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
 rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
 rebus.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
-rebus.o: ../core/rebus.h ../core/function.h ../core/thread.h
-rebus.o: ../core/compress.h ../core/acceptencodingparser.h
+rebus.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+rebus.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
 rebus.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
 rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
@@ -121,10 +124,10 @@ sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
 sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
 sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
 sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
-sys.o: ../core/session.h ../core/thread.h ../core/compress.h
-sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
-sys.o: ../core/misc.h
+sys.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+sys.o: ../core/compress.h ../core/acceptencodingparser.h
+sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
 templates.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 templates.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 templates.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -134,10 +137,11 @@ templates.o: ../core/log.h ../core/groups.h ../core/group.h
 templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
 templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
 templates.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
-templates.o: ../core/session.h ../core/thread.h ../core/compress.h
-templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
-templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h
+templates.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+templates.o: ../core/compress.h ../core/acceptencodingparser.h
+templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+templates.o: ../core/plugin.h ../core/request.h ../core/data.h
 templates.o: ../core/pluginmsg.h
 thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
@@ -148,9 +152,10 @@ thread.o: ../core/groups.h ../core/group.h ../core/functions.h
 thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
 thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
 thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-thread.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
-thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+thread.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
+thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+thread.o: ../core/misc.h
 ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -160,17 +165,19 @@ ticket.o: ../core/groups.h ../core/group.h ../core/functions.h
 ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
 ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
 ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-ticket.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
-ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+ticket.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
+ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+ticket.o: ../core/misc.h
 upload.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 upload.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 upload.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
 upload.o: ../core/requesttypes.h ../core/session.h ../core/item.h
 upload.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
-upload.o: ../core/function.h ../core/thread.h ../core/compress.h
-upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+upload.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+upload.o: ../core/compress.h ../core/acceptencodingparser.h
+upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+upload.o: ../core/postmultiparser.h ../core/ticket.h
 uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 uptime.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -187,23 +194,24 @@ user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
 user.o: ../core/group.h ../core/functions.h ../core/function.h
 user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 user.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
-user.o: ../core/requesttypes.h ../core/session.h ../core/thread.h
-user.o: ../core/compress.h ../core/acceptencodingparser.h
+user.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
 user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
 who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
 who.o: ../core/httpsimpleparser.h ../core/log.h ../core/sessioncontainer.h
 who.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
-who.o: ../core/user.h ../core/rebus.h ../core/requestcontroller.h
-who.o: ../content/content.h ../templates/templates.h ../core/thread.h
-who.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/thread.h
-who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
-who.o: ../core/sessionmanager.h ../core/sessioncontainer.h
-who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h
-who.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
-who.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-who.o: ../core/mount.h ../core/loadavg.h ../core/request.h ../core/compress.h
+who.o: ../core/user.h ../core/rebus.h ../core/plugindata.h
+who.o: ../core/requestcontroller.h ../content/content.h
+who.o: ../templates/templates.h ../core/thread.h ../core/ticket.h
+who.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
+who.o: ../core/ugcontainer.h ../core/ticket.h ../core/sessionmanager.h
+who.o: ../core/sessioncontainer.h ../core/functionparser.h
+who.o: ../core/requesttypes.h ../core/data.h ../core/dirs.h ../core/users.h
+who.o: ../core/groups.h ../core/functions.h ../core/function.h
+who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+who.o: ../core/loadavg.h ../core/request.h ../core/compress.h
 who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
 who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/misc.h
 winix.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
@@ -214,7 +222,7 @@ winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
 winix.o: ../core/group.h ../core/functions.h ../core/function.h
 winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
 winix.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
-winix.o: ../core/requesttypes.h ../core/session.h ../core/thread.h
-winix.o: ../core/compress.h ../core/acceptencodingparser.h
+winix.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
 winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 winix.o: ../core/postmultiparser.h ../core/ticket.h