added: mount option: html_template(file.html)

files: indexpatterns.h indexpatterns.cpp
removed: templates/index_root.html
        its content was moved to index.html


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@611 e52654a7-88a9-db11-a3e9-0013d4bc506e

content/Makefile.dep

@@ -4,9 +4,10 @@ adduser.o: content.h ../core/item.h ../templates/templates.h
 adduser.o: ../templates/patterncacher.h ../templates/misc.h
 adduser.o: ../templates/localefilter.h ../core/locale.h
 adduser.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+adduser.o: ../core/httpsimpleparser.h ../core/log.h
-adduser.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+adduser.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-adduser.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+adduser.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+adduser.o: ../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/plugindata.h ../core/function.h
@@ -20,13 +21,13 @@ 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
 cat.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-cat.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+cat.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-cat.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+cat.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-cat.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+cat.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-cat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+cat.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
-cat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
+cat.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-cat.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+cat.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
-cat.o: ../core/compress.h ../core/acceptencodingparser.h
+cat.o: ../core/function.h ../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
@@ -36,9 +37,10 @@ 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
 content.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-content.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+content.o: ../core/httpsimpleparser.h ../core/log.h
-content.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+content.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-content.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+content.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+content.o: ../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/plugindata.h ../core/function.h
@@ -53,22 +55,23 @@ cp.o: content.h ../core/item.h ../templates/templates.h
 cp.o: ../templates/patterncacher.h ../templates/misc.h
 cp.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h
 cp.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-cp.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/db.h
+cp.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h
-cp.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
+cp.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
-cp.o: ../core/error.h ../core/log.h ../core/dircontainer.h
+cp.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
-cp.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
+cp.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
-cp.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
+cp.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-cp.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+cp.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-cp.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+cp.o: ../core/compress.h ../core/acceptencodingparser.h
-cp.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
+cp.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-cp.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+cp.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h ../core/users.h
-cp.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+cp.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-cp.o: ../core/loadavg.h ../core/misc.h
+cp.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h ../core/misc.h
 createthread.o: content.h ../core/item.h ../templates/templates.h
 createthread.o: ../templates/patterncacher.h ../templates/misc.h
 createthread.o: ../templates/localefilter.h ../core/locale.h
 createthread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-createthread.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+createthread.o: ../core/httpsimpleparser.h ../core/log.h
+createthread.o: ../templates/indexpatterns.h ../core/thread.h
 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
@@ -85,7 +88,8 @@ 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
 createticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-createticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+createticket.o: ../core/httpsimpleparser.h ../core/log.h
+createticket.o: ../templates/indexpatterns.h ../core/thread.h
 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
@@ -102,9 +106,10 @@ 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
 default.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-default.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+default.o: ../core/httpsimpleparser.h ../core/log.h
-default.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+default.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-default.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+default.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+default.o: ../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/plugindata.h ../core/function.h
@@ -118,9 +123,10 @@ download.o: content.h ../core/item.h ../templates/templates.h
 download.o: ../templates/patterncacher.h ../templates/misc.h
 download.o: ../templates/localefilter.h ../core/locale.h
 download.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-download.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+download.o: ../core/httpsimpleparser.h ../core/log.h
-download.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+download.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-download.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+download.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+download.o: ../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/plugindata.h ../core/function.h
@@ -134,9 +140,10 @@ 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
 editticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-editticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+editticket.o: ../core/httpsimpleparser.h ../core/log.h
-editticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+editticket.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-editticket.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+editticket.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+editticket.o: ../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/plugindata.h ../core/function.h
@@ -150,9 +157,10 @@ 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
 emacs.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-emacs.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+emacs.o: ../core/httpsimpleparser.h ../core/log.h
-emacs.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+emacs.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-emacs.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+emacs.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+emacs.o: ../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/plugindata.h ../core/function.h
@@ -168,17 +176,19 @@ last.o: content.h ../core/item.h ../templates/templates.h
 last.o: ../templates/patterncacher.h ../templates/misc.h
 last.o: ../templates/localefilter.h ../core/locale.h
 last.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-last.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+last.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-last.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+last.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-last.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+last.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+last.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
+last.o: ../core/ticket.h
 login.o: content.h ../core/item.h ../templates/templates.h
 login.o: ../templates/patterncacher.h ../templates/misc.h
 login.o: ../templates/localefilter.h ../core/locale.h
 login.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-login.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+login.o: ../core/httpsimpleparser.h ../core/log.h
-login.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+login.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-login.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+login.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+login.o: ../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/plugindata.h ../core/function.h
@@ -192,9 +202,10 @@ 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
 logout.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-logout.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+logout.o: ../core/httpsimpleparser.h ../core/log.h
-logout.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+logout.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-logout.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+logout.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+logout.o: ../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/plugindata.h ../core/function.h
@@ -208,21 +219,23 @@ ls.o: content.h ../core/item.h ../templates/templates.h
 ls.o: ../templates/patterncacher.h ../templates/misc.h
 ls.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h
 ls.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-ls.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/db.h
+ls.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h
-ls.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
+ls.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
-ls.o: ../core/error.h ../core/log.h ../core/dircontainer.h
+ls.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
-ls.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
+ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
-ls.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
+ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-ls.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+ls.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+ls.o: ../core/compress.h ../core/acceptencodingparser.h
-ls.o: ../core/htmlfilter.h ../core/postmultiparser.h
+ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+ls.o: ../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
 misc_item.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-misc_item.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+misc_item.o: ../core/httpsimpleparser.h ../core/log.h
-misc_item.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+misc_item.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-misc_item.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+misc_item.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+misc_item.o: ../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/plugindata.h ../core/function.h
@@ -234,7 +247,8 @@ misc_specialfile.o: ../templates/patterncacher.h ../templates/misc.h
 misc_specialfile.o: ../templates/localefilter.h ../core/locale.h
 misc_specialfile.o: ../confparser/confparser.h
 misc_specialfile.o: ../templates/ckeditorgetparser.h
-misc_specialfile.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+misc_specialfile.o: ../core/httpsimpleparser.h ../core/log.h
+misc_specialfile.o: ../templates/indexpatterns.h ../core/thread.h
 misc_specialfile.o: ../core/ticket.h ../core/db.h ../core/item.h
 misc_specialfile.o: ../core/user.h ../core/group.h ../core/thread.h
 misc_specialfile.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -251,9 +265,10 @@ mkdir.o: content.h ../core/item.h ../templates/templates.h
 mkdir.o: ../templates/patterncacher.h ../templates/misc.h
 mkdir.o: ../templates/localefilter.h ../core/locale.h
 mkdir.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-mkdir.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+mkdir.o: ../core/httpsimpleparser.h ../core/log.h
-mkdir.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+mkdir.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-mkdir.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+mkdir.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+mkdir.o: ../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/plugindata.h ../core/function.h
@@ -269,41 +284,41 @@ mv.o: content.h ../core/item.h ../templates/templates.h
 mv.o: ../templates/patterncacher.h ../templates/misc.h
 mv.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h
 mv.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-mv.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/db.h
+mv.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h
-mv.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
+mv.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
-mv.o: ../core/error.h ../core/log.h ../core/dircontainer.h
+mv.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
-mv.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
+mv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
-mv.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
+mv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-mv.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+mv.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-mv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+mv.o: ../core/compress.h ../core/acceptencodingparser.h
-mv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/data.h
+mv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-mv.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
+mv.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h ../core/users.h
-mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+mv.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h
-mv.o: ../core/loadavg.h
+mv.o: ../core/mounts.h ../core/mount.h ../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
 node.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-node.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+node.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-node.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+node.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-node.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+node.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-node.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+node.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
-node.o: ../core/request.h ../core/requesttypes.h ../core/session.h
+node.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-node.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+node.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
-node.o: ../core/compress.h ../core/acceptencodingparser.h
+node.o: ../core/function.h ../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
 priv.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+priv.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-priv.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+priv.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-priv.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+priv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+priv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
-priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
+priv.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-priv.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+priv.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
-priv.o: ../core/compress.h ../core/acceptencodingparser.h
+priv.o: ../core/function.h ../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
@@ -313,9 +328,10 @@ 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
 reload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-reload.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+reload.o: ../core/httpsimpleparser.h ../core/log.h
-reload.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+reload.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-reload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+reload.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+reload.o: ../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/plugindata.h ../core/function.h
@@ -328,37 +344,39 @@ 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
 rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-rm.o: ../core/log.h ../core/thread.h ../core/ticket.h ../core/db.h
+rm.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h
-rm.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
+rm.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
-rm.o: ../core/error.h ../core/log.h ../core/dircontainer.h
+rm.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
-rm.o: ../core/ugcontainer.h ../core/ticket.h ../core/request.h
+rm.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
-rm.o: ../core/requesttypes.h ../core/session.h ../core/rebus.h
+rm.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-rm.o: ../core/plugindata.h ../core/function.h ../core/compress.h
+rm.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-rm.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+rm.o: ../core/compress.h ../core/acceptencodingparser.h
-rm.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/error.h
+rm.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-rm.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h
+rm.o: ../core/postmultiparser.h ../core/error.h ../core/data.h ../core/dirs.h
-rm.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
+rm.o: ../core/users.h ../core/groups.h ../core/functions.h
-rm.o: ../core/mount.h ../core/loadavg.h
+rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+rm.o: ../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
 run.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-run.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+run.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-run.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+run.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-run.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+run.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-run.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+run.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
-run.o: ../core/request.h ../core/requesttypes.h ../core/session.h
+run.o: ../core/ticket.h ../core/request.h ../core/requesttypes.h
-run.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
+run.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
-run.o: ../core/compress.h ../core/acceptencodingparser.h
+run.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h
 run.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
 run.o: ../core/postmultiparser.h ../core/error.h
 subject.o: content.h ../core/item.h ../templates/templates.h
 subject.o: ../templates/patterncacher.h ../templates/misc.h
 subject.o: ../templates/localefilter.h ../core/locale.h
 subject.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-subject.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+subject.o: ../core/httpsimpleparser.h ../core/log.h
-subject.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+subject.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-subject.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+subject.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+subject.o: ../core/thread.h ../core/error.h ../core/log.h
 subject.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 subject.o: ../core/request.h ../core/requesttypes.h ../core/session.h
 subject.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
@@ -369,9 +387,10 @@ 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
 thread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-thread.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+thread.o: ../core/httpsimpleparser.h ../core/log.h
-thread.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+thread.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-thread.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+thread.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+thread.o: ../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/plugindata.h ../core/function.h
@@ -385,9 +404,10 @@ ticket.o: content.h ../core/item.h ../templates/templates.h
 ticket.o: ../templates/patterncacher.h ../templates/misc.h
 ticket.o: ../templates/localefilter.h ../core/locale.h
 ticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+ticket.o: ../core/httpsimpleparser.h ../core/log.h
-ticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+ticket.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-ticket.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+ticket.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+ticket.o: ../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/plugindata.h ../core/function.h
@@ -401,17 +421,19 @@ uname.o: content.h ../core/item.h ../templates/templates.h
 uname.o: ../templates/patterncacher.h ../templates/misc.h
 uname.o: ../templates/localefilter.h ../core/locale.h
 uname.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-uname.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+uname.o: ../core/httpsimpleparser.h ../core/log.h
-uname.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+uname.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-uname.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+uname.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+uname.o: ../core/thread.h ../core/error.h ../core/log.h
 uname.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
 upload.o: content.h ../core/item.h ../templates/templates.h
 upload.o: ../templates/patterncacher.h ../templates/misc.h
 upload.o: ../templates/localefilter.h ../core/locale.h
 upload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-upload.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+upload.o: ../core/httpsimpleparser.h ../core/log.h
-upload.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+upload.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h
-upload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+upload.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h
+upload.o: ../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/plugindata.h ../core/function.h
@@ -425,7 +447,8 @@ who.o: content.h ../core/item.h ../templates/templates.h
 who.o: ../templates/patterncacher.h ../templates/misc.h
 who.o: ../templates/localefilter.h ../core/locale.h
 who.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-who.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+who.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-who.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+who.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-who.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+who.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+who.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
+who.o: ../core/ticket.h

content/content.cpp

@@ -19,6 +19,7 @@
 
 bool Content::Init()
 {
+	templates.ReadIndexFileNames();
 	templates.ReadTemplates();
 	templates.CreateFunctions();
 

content/misc_specialfile.cpp

@@ -30,6 +30,7 @@ void Content::CheckSpecialFile()
 		log << log3 << "Content: reloading mount points" << logend;
 
 		request.status = data.mounts.ReadMounts(request.item.content);
+		templates.ReadNewIndexTemplates();
 	}
 }
 

core/Makefile.dep

@@ -91,6 +91,7 @@ requestcontroller.o: ../templates/templates.h ../templates/patterncacher.h
 requestcontroller.o: misc.h item.h ../templates/ckeditorgetparser.h
 requestcontroller.o: ../core/httpsimpleparser.h ../core/log.h
 requestcontroller.o: ../core/locale.h ../confparser/confparser.h
+requestcontroller.o: ../templates/indexpatterns.h ../templates/localefilter.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
@@ -102,7 +103,7 @@ 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
+requestcontroller.o: ../templates/misc.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 plugindata.h data.h dirs.h dircontainer.h users.h

core/mount.cpp

@@ -101,7 +101,8 @@ Mount::ParamCode Mount::ParseParam(const char * param_name)
 		{ par_only_root_remove,			"only_root_remove" },
 		{ par_emacs_on,					"emacs_on" },
 		{ par_mkdir_on,					"mkdir_on" },
-		{ par_app,						"app" }
+		{ par_app,						"app" },
+		{ par_html_template,			"html_template" },
 	};
 
 	size_t i, len = sizeof(par_name_tab) / sizeof(ParName);
@@ -176,3 +177,15 @@ return false;
 }
 
 
+
+const std::string * Mount::HtmlTemplate() const
+{
+	if( !param[par_html_template].defined )
+		return 0;
+
+	if( param[par_html_template].arg.size() != 1 )
+		return 0;
+
+return & param[par_html_template].arg[0];
+}
+

core/mount.h

@@ -60,6 +60,7 @@ public:
 		par_emacs_on,
 		par_mkdir_on,
 		par_app,
+		par_html_template,
 		
 		par_none
 	};
@@ -99,6 +100,9 @@ public:
 	bool IsArg(Mount::ParamCode code, const std::string & arg);
 	bool IsArg(Mount::ParamCode code, int arg);
 
+	// returning a name to html template (can be null if not defined)
+	const std::string * HtmlTemplate() const;
+
 };
 
 

core/mounts.cpp

@@ -16,6 +16,7 @@
 
 
 
+
 Mounts::Mounts()
 {
 	pmount = 0;
@@ -23,6 +24,7 @@ Mounts::Mounts()
 
 
 
+
 // reading from 'mounts'
 Error Mounts::ReadMounts(const std::string & mounts)
 {
@@ -146,3 +148,11 @@ Mount * Mounts::CalcMount(long dir_id)
 		dir_id = pdir->parent_id;
 	}
 }
+
+
+const Mounts::MountTab * Mounts::GetMountTab()
+{
+	return &mount_tab;
+}
+
+

core/mounts.h

@@ -22,6 +22,9 @@ class Mounts
 {
 public:
 
+	// dir_id, mount_point
+	typedef std::map<long, Mount> MountTab;
+
 	Mounts();
 	Error ReadMounts(const std::string & mounts);
 	Error ReadMounts();
@@ -33,13 +36,13 @@ public:
 	// will not be null after calling CalcCurMount() or ReadMounts([...])
 	Mount * pmount;
 
+
+	const MountTab * GetMountTab();
+
 private:
 
-	// dir_id, mount_point
-	typedef std::map<long, Mount> MountTab;
 	MountTab mount_tab;
 
-
 	void MountCmsForRoot();
 };
 

core/version.h

@@ -13,7 +13,7 @@
 
 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		3
-#define WINIX_VER_REVISION	1
+#define WINIX_VER_REVISION	2
 
 
 #endif

html/index.html

@@ -1,4 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="{language}">
+
+[include "index_head.html"]
 
 
+[is-no winix_function_param_is "fullscreen"]
 
-[include "index_root.html"]
+	<body>
+	<div id="winix_container">
+	
+		[include "index_header.html"]	
+		
+		
+		[if-no winix_show_content_in_full_window]
+			<div id="winix_middle">
+			[include "index_contentmenu.html"]
+			
+			<div id="winix_contentright">
+			[content]
+			</div> <!-- winix_contentright -->
+			</div> <!-- winix_middle -->
+		[else]
+			<div id="winix_contentfull">
+			[content]
+			</div> <!-- winix_contentfull -->
+		[end] [# is-no winix_function_is "ckeditor"]
+		
+		
+		[include "index_footer.html"]
+	
+	</div> <!-- winix_container -->
+	</body>
+
+[else]
+	
+	<body>
+	<div id="winix_containerfull">
+	[content]
+	</div> <!-- winix_containerfull -->
+</body>
+
+[end] [# is-no winix_function_param_is "fullscreen"]
+
+</html>

html/index_root.html

@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="{language}">
-
-[include "index_head.html"]
-
-
-[is-no winix_function_param_is "fullscreen"]
-
-	<body>
-	<div id="winix_container">
-	
-		[include "index_header.html"]	
-		
-		
-		[if-no winix_content_full]
-			<div id="winix_middle">
-			[include "index_contentmenu.html"]
-			
-			<div id="winix_contentright">
-			[content]
-			</div> <!-- winix_contentright -->
-			</div> <!-- winix_middle -->
-		[else]
-			<div id="winix_contentfull">
-			[content]
-			</div> <!-- winix_contentfull -->
-		[end] [# is-no winix_function_is "ckeditor"]
-		
-		
-		[include "index_footer.html"]
-	
-	</div> <!-- winix_container -->
-	</body>
-
-[else]
-	
-	<body>
-	<div id="winix_containerfull">
-	[content]
-	</div> <!-- winix_containerfull -->
-</body>
-
-[end] [# is-no winix_function_param_is "fullscreen"]
-
-</html>

main/Makefile.dep

@@ -4,18 +4,19 @@ main.o: ../core/requestcontroller.h ../content/content.h ../core/item.h
 main.o: ../templates/templates.h ../templates/patterncacher.h
 main.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
 main.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h
-main.o: ../core/httpsimpleparser.h ../core/log.h ../core/thread.h
+main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
-main.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h
+main.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h
-main.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
+main.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
-main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
+main.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
-main.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/session.h
+main.o: ../core/ticket.h ../core/sessionmanager.h ../core/sessioncontainer.h
-main.o: ../core/rebus.h ../core/plugindata.h ../core/functionparser.h
+main.o: ../core/session.h ../core/rebus.h ../core/plugindata.h
-main.o: ../core/requesttypes.h ../core/data.h ../core/dirs.h ../core/users.h
+main.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h
-main.o: ../core/groups.h ../core/functions.h ../core/function.h
+main.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
-main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+main.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-main.o: ../core/loadavg.h ../core/request.h ../core/compress.h
+main.o: ../core/mount.h ../core/loadavg.h ../core/request.h
-main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+main.o: ../core/compress.h ../core/acceptencodingparser.h
-main.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
+main.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-main.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
+main.o: ../core/postmultiparser.h ../core/config.h ../core/notify.h
+main.o: ../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

templates/Makefile.dep

@@ -2,20 +2,20 @@
 
 adduser.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 adduser.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
+adduser.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-adduser.o: ../core/requesttypes.h ../core/session.h ../core/item.h
+adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-adduser.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
+adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
-adduser.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+adduser.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-adduser.o: ../core/compress.h ../core/acceptencodingparser.h
+adduser.o: ../core/thread.h ../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/httpsimpleparser.h ../core/log.h indexpatterns.h
-dir.o: ../core/requesttypes.h ../core/session.h ../core/item.h
+dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-dir.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
+dir.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
-dir.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+dir.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-dir.o: ../core/compress.h ../core/acceptencodingparser.h
+dir.o: ../core/thread.h ../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
@@ -24,51 +24,62 @@ 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
 doc.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 doc.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
+doc.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-doc.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
+doc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
+doc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
+doc.o: ../core/groups.h ../core/group.h ../core/functions.h
-doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
+doc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
+doc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-doc.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-doc.o: ../core/compress.h ../core/acceptencodingparser.h
+doc.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+doc.o: ../core/misc.h
+indexpatterns.o: indexpatterns.h ../core/locale.h ../confparser/confparser.h
+indexpatterns.o: localefilter.h ../core/log.h ../core/data.h ../core/dirs.h
+indexpatterns.o: ../core/item.h ../core/dircontainer.h ../core/users.h
+indexpatterns.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
+indexpatterns.o: ../core/groups.h ../core/group.h ../core/functions.h
+indexpatterns.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
+indexpatterns.o: ../core/mount.h ../core/error.h ../core/rebus.h
+indexpatterns.o: ../core/loadavg.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
+item.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-item.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
+item.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
+item.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-item.o: ../core/group.h ../core/functions.h ../core/function.h
+item.o: ../core/groups.h ../core/group.h ../core/functions.h
-item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+item.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-item.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
+item.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-item.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
+item.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+item.o: ../core/misc.h
 last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 last.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-last.o: ../core/httpsimpleparser.h ../core/log.h ../core/lastcontainer.h
+last.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-last.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
+last.o: ../core/lastcontainer.h ../core/data.h ../core/dirs.h ../core/item.h
-last.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
+last.o: ../core/dircontainer.h ../core/users.h ../core/user.h
-last.o: ../core/groups.h ../core/group.h ../core/functions.h
+last.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
-last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
+last.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
-last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
+last.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
-last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
+last.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
-last.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
+last.o: ../core/session.h ../core/plugindata.h ../core/thread.h
-last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+last.o: ../core/compress.h ../core/acceptencodingparser.h
-last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
-last.o: ../core/misc.h
+last.o: ../core/postmultiparser.h ../core/ticket.h ../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/httpsimpleparser.h ../core/log.h indexpatterns.h
-ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h
+ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/plugindata.h
+ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
-ls.o: ../core/function.h ../core/thread.h ../core/compress.h
+ls.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
+ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
-ls.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+ls.o: ../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
@@ -78,12 +89,12 @@ misc.o: ../core/misc.h misc.h localefilter.h ../core/locale.h
 misc.o: ../confparser/confparser.h
 mount.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 mount.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-mount.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
+mount.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-mount.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
+mount.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-mount.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
+mount.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-mount.o: ../core/group.h ../core/functions.h ../core/function.h
+mount.o: ../core/groups.h ../core/group.h ../core/functions.h
-mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+mount.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-mount.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
+mount.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
 patterncacher.o: patterncacher.h ../core/item.h ../core/data.h ../core/dirs.h
 patterncacher.o: ../core/item.h ../core/dircontainer.h ../core/users.h
 patterncacher.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
@@ -93,16 +104,17 @@ patterncacher.o: ../core/mount.h ../core/error.h ../core/rebus.h
 patterncacher.o: ../core/loadavg.h ../core/log.h
 priv.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 priv.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
+priv.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-priv.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
+priv.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
+priv.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-priv.o: ../core/group.h ../core/functions.h ../core/function.h
+priv.o: ../core/groups.h ../core/group.h ../core/functions.h
-priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+priv.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-priv.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
+priv.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-priv.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
+priv.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+priv.o: ../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/plugindata.h ../core/function.h
@@ -115,38 +127,39 @@ rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
 rebus.o: ../core/mount.h ../core/loadavg.h templates.h patterncacher.h
 rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
 rebus.o: ../confparser/confparser.h ckeditorgetparser.h
-rebus.o: ../core/httpsimpleparser.h ../core/log.h
+rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
 sys.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 sys.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
+sys.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-sys.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
+sys.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
+sys.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
+sys.o: ../core/groups.h ../core/group.h ../core/functions.h
-sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
+sys.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
+sys.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-sys.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-sys.o: ../core/compress.h ../core/acceptencodingparser.h
+sys.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/version.h
+sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+sys.o: ../core/version.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
+templates.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-templates.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
+templates.o: ../core/data.h ../core/dirs.h ../core/item.h
-templates.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
+templates.o: ../core/dircontainer.h ../core/users.h ../core/user.h
-templates.o: ../core/log.h ../core/groups.h ../core/group.h
+templates.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
-templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
+templates.o: ../core/group.h ../core/functions.h ../core/function.h
-templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
+templates.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
-templates.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
+templates.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
-templates.o: ../core/session.h ../core/plugindata.h ../core/thread.h
+templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-templates.o: ../core/compress.h ../core/acceptencodingparser.h
+templates.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
-templates.o: ../core/plugin.h ../core/request.h ../core/data.h
+templates.o: ../core/misc.h ../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
-thread.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
+thread.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-thread.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
+thread.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
 thread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
 thread.o: ../core/groups.h ../core/group.h ../core/functions.h
 thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
@@ -158,8 +171,8 @@ 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
+ticket.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-ticket.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
+ticket.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
 ticket.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
 ticket.o: ../core/groups.h ../core/group.h ../core/functions.h
 ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
@@ -171,39 +184,40 @@ 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/httpsimpleparser.h ../core/log.h indexpatterns.h
-upload.o: ../core/requesttypes.h ../core/session.h ../core/item.h
+upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-upload.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
+upload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
-upload.o: ../core/plugindata.h ../core/function.h ../core/thread.h
+upload.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
-upload.o: ../core/compress.h ../core/acceptencodingparser.h
+upload.o: ../core/thread.h ../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
+uptime.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-uptime.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
+uptime.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
 uptime.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
 uptime.o: ../core/groups.h ../core/group.h ../core/functions.h
 uptime.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
 uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
 user.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
 user.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-user.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
+user.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-user.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
+user.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
+user.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-user.o: ../core/group.h ../core/functions.h ../core/function.h
+user.o: ../core/groups.h ../core/group.h ../core/functions.h
-user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+user.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-user.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
+user.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-user.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
+user.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
+user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
+user.o: ../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/httpsimpleparser.h ../core/log.h indexpatterns.h
-who.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
+who.o: ../core/sessioncontainer.h ../core/session.h ../core/item.h
-who.o: ../core/user.h ../core/rebus.h ../core/plugindata.h
+who.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
-who.o: ../core/requestcontroller.h ../content/content.h
+who.o: ../core/plugindata.h ../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
@@ -216,13 +230,13 @@ 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
 winix.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
-winix.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
+winix.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
-winix.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
+winix.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
-winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
+winix.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
-winix.o: ../core/group.h ../core/functions.h ../core/function.h
+winix.o: ../core/groups.h ../core/group.h ../core/functions.h
-winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
+winix.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
-winix.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
+winix.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
-winix.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
+winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
+winix.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
-winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
+winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
-winix.o: ../core/postmultiparser.h ../core/ticket.h
+winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h

templates/Makefile.o.dep

@@ -1 +1 @@
-o = adduser.o dir.o doc.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o 
+o = adduser.o dir.o doc.o indexpatterns.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o 

templates/indexpatterns.cpp

@@ -0,0 +1,117 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2010, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#include "indexpatterns.h"
+#include "../core/log.h"
+#include "../core/data.h"
+
+
+
+
+Ezc::Pattern * IndexPatterns::GetPattern(const std::string & file, Locale::Lang lang)
+{
+Tab::iterator i = tab.find(file);
+
+	if( i == tab.end() )
+		return 0;
+
+	size_t index = static_cast<size_t>(lang);
+
+	if( index >= i->second.patterns.size() )
+	{
+		log << log1 << "IndexPatterns: there is no a pattern: " << file << ", for lang: " << index << logend;
+		return 0;
+	}
+
+return &i->second.patterns[index];
+}
+
+
+
+void IndexPatterns::AddPattern(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
+{
+	std::pair<Tab::iterator, bool> ins = tab.insert( std::make_pair(file, Template()) );
+	Tab::iterator i = ins.first;
+
+	i->second.to_delete = false;
+	ReadPattern(i, locale, locale_filter, delete_white);
+}
+
+
+void IndexPatterns::AddPatternIfNotExists(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
+{
+	Tab::iterator i = tab.find(file);
+
+	if( i != tab.end() )
+		return;
+
+	AddPattern(file, locale, locale_filter, delete_white);
+}
+
+
+void IndexPatterns::AddFileName(const std::string & file)
+{
+	tab.insert( std::make_pair(file, Template()) );
+}
+
+
+void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
+{
+	size_t i;
+	size_t len = Locale::lang_unknown;
+	Template & templ = iter->second;
+
+	templ.patterns.resize(len);
+
+	for(i=0 ; i<len ; ++i)
+	{
+		templ.patterns[i].delete_all_white = delete_white;
+		templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
+		templ.patterns[i].ParseFile(iter->first);
+
+		locale_filter.Filter(templ.patterns[i], locale, static_cast<Locale::Lang>(i));
+	}
+}
+
+
+void IndexPatterns::ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white)
+{
+Tab::iterator i;
+
+	for(i=tab.begin() ; i!=tab.end() ; ++i)
+		ReadPattern(i, locale, locale_filter, delete_white);
+}
+
+
+
+void IndexPatterns::MarkAllToDelete()
+{
+Tab::iterator i;
+
+	for(i=tab.begin() ; i!=tab.end() ; ++i)
+		i->second.to_delete = true;
+}
+
+
+void IndexPatterns::DeleteMarked()
+{
+Tab::iterator i = tab.begin();
+Tab::iterator next;
+
+	while( i != tab.end() )
+	{
+		next = i;
+		++next;
+
+		if( i->second.to_delete )
+			tab.erase(i);
+
+		i = next;
+	}
+}

templates/indexpatterns.h

@@ -0,0 +1,58 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2010, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#ifndef headerfilecmslutemplatesindexpatterns
+#define headerfilecmslutemplatesindexpatterns
+
+#include <string>
+#include <vector>
+#include <map>
+#include "ezc.h"
+#include "../core/locale.h"
+#include "localefilter.h"
+
+
+
+class IndexPatterns
+{
+public:
+
+	// can return null pointer if there is not such a pattern
+	Ezc::Pattern * GetPattern(const std::string & file, Locale::Lang lang);
+	void AddPattern(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
+	void AddPatternIfNotExists(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
+
+	// adding a file name without reading the pattern
+	// the pattern will be read during ReloadPatterns()
+	void AddFileName(const std::string & file);
+
+	void ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white);
+	void MarkAllToDelete();
+	void DeleteMarked();
+
+private:
+
+
+	struct Template
+	{
+		bool to_delete;
+
+		// table[lang]
+		std::vector<Ezc::Pattern> patterns;
+	};
+
+	typedef std::map<std::string, Template> Tab;
+	Tab tab;
+
+	void ReadPattern(Tab::iterator & i, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
+
+};
+
+
+#endif

templates/localefilter.cpp

@@ -76,7 +76,7 @@ void LocaleFilter::Parse(std::string & str)
 		{
 			++pchar;
 			ReadKey();
-			res += FilterValue(plocale->Get(key));
+			res += FilterValue(plocale->Get(key, lang));
 		}
 		else
 		if( *pchar == '\\' && (*(pchar+1) == open_mark || *(pchar+1) == closing_mark || *(pchar+1) == '\\') )
@@ -110,8 +110,10 @@ void LocaleFilter::FilterText(Ezc::Pattern::Item & item)
 
 
 
-void LocaleFilter::Filter(Ezc::Pattern & pattern, const Locale & locale)
+void LocaleFilter::Filter(Ezc::Pattern & pattern, const Locale & locale, Locale::Lang lang_)
 {
 	plocale = &locale;
+	lang    = lang_;
+
 	FilterText( pattern.item_root );
 }

templates/localefilter.h

@@ -21,7 +21,7 @@ class LocaleFilter
 public:
 	
 	LocaleFilter();
-	void Filter(Ezc::Pattern & pattern, const Locale & locale);
+	void Filter(Ezc::Pattern & pattern, const Locale & locale, Locale::Lang lang_);
 
 private:
 	void ReadKey();
@@ -33,6 +33,7 @@ private:
 	char closing_mark;	// default '}'
 
 	const Locale * plocale;
+	Locale::Lang lang;
 	std::string res;
 	std::string key;
 	std::string value;

templates/misc.cpp

@@ -33,7 +33,6 @@ void print_date_nice(Ezc::Info & i, tm * ptm)
 
 
 
-
 // those functions from here are used in the second thread too
 
 
@@ -43,8 +42,6 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
 {
 	size_t i;
 	size_t len = patterns.size();
-	Locale::Lang old_lang = locale.GetLang();
-	
 
 	for(i=0 ; i<len ; ++i)
 	{
@@ -54,24 +51,9 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
 			patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
 			patterns[i][pat].ParseFile(file);
 
-			Locale::Lang new_lang = static_cast<Locale::Lang>(i);
+			locale_filter.Filter(patterns[i][pat], locale, static_cast<Locale::Lang>(i));
-			locale.SetLang(new_lang);
-
-			locale_filter.Filter(patterns[i][pat], locale);
 		}
 	}
-
-	locale.SetLang(old_lang);
-
-
-
-
-
-
-
-
-
-
 }
 
 

templates/templates.cpp

@@ -8,16 +8,19 @@
  */
  
 #include "templates.h"
-#include "localefilter.h"
 #include "../core/data.h"
 #include "../core/request.h"
 #include "../core/misc.h"
 #include "../core/plugin.h"
+#include "localefilter.h"
+
+
 
 
 namespace TemplatesFunctions
 {
 
+IndexPatterns           index_patterns;
 TemplatesMisc::Patterns patterns;
 Ezc::Functions          functions;
 PatternCacher           pattern_cacher;
@@ -464,7 +467,7 @@ void Templates::CreateFunctions()
 	functions.Insert("winix_err_code",            winix_err_code);
 	functions.Insert("winix_is_err_in_locales",   winix_is_err_in_locales);
 	functions.Insert("winix_err_msg_from_locales",winix_err_msg_from_locales);
-	functions.Insert("winix_content_full",        winix_content_full);
+	functions.Insert("winix_show_content_in_full_window",        winix_show_content_in_full_window);
 
 	plugin.Call(WINIX_TEMPLATES_CREATEFUNCTIONS, &functions);
 }
@@ -526,10 +529,54 @@ using namespace TemplatesFunctions;
 	ReadFile(pat_fun_subject,		"fun_subject.html");
 	ReadFile(pat_fun_cp,			"fun_cp.html");
 	ReadFile(pat_fun_tinymce,		"fun_tinymce.html");
+
+	index_patterns.ReloadPatterns(locale, locale_filter, false);
 }
 
 
 
+// reading only new index templates (with parsing)
+// those which are exists are not touched
+// the rest are deleted
+void Templates::ReadNewIndexTemplates()
+{
+Mounts::MountTab::const_iterator i;
+
+	using namespace TemplatesFunctions;
+
+	index_patterns.MarkAllToDelete();
+	const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
+
+	for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
+	{
+		const std::string * file = i->second.HtmlTemplate();
+
+		if( file )
+			index_patterns.AddPatternIfNotExists(*file, locale, locale_filter, false); // file pattern will be unmarked
+	}
+
+	index_patterns.DeleteMarked();
+}
+
+
+// reading only index file names (without parsing the files)
+void Templates::ReadIndexFileNames()
+{
+using namespace TemplatesFunctions;
+
+	Mounts::MountTab::const_iterator i;
+	const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
+
+	for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
+	{
+		const std::string * file = i->second.HtmlTemplate();
+
+		if( file )
+			index_patterns.AddFileName(*file);
+	}
+}
+
+
 
 void Templates::ClearPatterns()
 {
@@ -547,7 +594,16 @@ using namespace TemplatesFunctions;
 	if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
 		return;
 
-	Ezc::Generator generator(request.page, patterns[locale.GetLang()][pat_index], functions);
+	Ezc::Pattern * index = 0;
+	const std::string * index_file_local = data.mounts.pmount->HtmlTemplate();
+
+	if( index_file_local )
+		index = index_patterns.GetPattern(*index_file_local, locale.GetLang());
+
+	if( !index )
+		index = &patterns[locale.GetLang()][pat_index];
+
+	Ezc::Generator generator(request.page, *index, functions);
 	generator.Generate();
 }
 

templates/templates.h

@@ -17,6 +17,8 @@
 #include "misc.h"
 #include "ckeditorgetparser.h"
 #include "../core/locale.h"
+#include "indexpatterns.h"
+
 
 
 namespace TemplatesFunctions
@@ -66,7 +68,7 @@ namespace TemplatesFunctions
 	};
 
 
-
+	extern IndexPatterns index_patterns;
 	extern TemplatesMisc::Patterns patterns;
 	extern PatternCacher pattern_cacher;
 	extern Locale locale;
@@ -369,7 +371,7 @@ namespace TemplatesFunctions
 	void winix_err_code(Info & i);
 	void winix_is_err_in_locales(Info & i);
 	void winix_err_msg_from_locales(Info & i);
-	void winix_content_full(Info & i);
+	void winix_show_content_in_full_window(Info & i);
 
 } // namespace TemplatesFunctions
 
@@ -384,6 +386,8 @@ public:
 
 	void ClearPatterns();
 	void ReadTemplates();
+	void ReadNewIndexTemplates();
+	void ReadIndexFileNames();
 	void CreateFunctions();
 	void Generate();
 	void GenerateRunRaw();

templates/winix.cpp

@@ -170,7 +170,7 @@ char buff[40];
 }
 
 
-void winix_content_full(Info & i)
+void winix_show_content_in_full_window(Info & i)
 {
 	if( request.pfunction )
 		i.res = (request.pfunction->code == FUN_CKEDITOR || request.pfunction->code == FUN_TINYMCE);