From fb18b2238e5cd0d0f7b4020740ef0037fa3a7712 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 19 Oct 2014 21:20:09 +0000 Subject: [PATCH] added: two options to the config: ezc_error_prefix (string) ezc_error_postfix (string) // prefix and postfix used when there is an error in Ezc patterns // default: // prefix: "" added: Ezc::Blocks to templates added: although patterns have pointers to functions and blocks cached the Ezc::Generator should use SetFunctions() and SetBlocks() method in order to correctly recognize variables (aliases) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@978 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile.dep | 2 +- core/Makefile.dep | 209 ++++---- core/config.cpp | 2 + core/config.h | 7 + functions/Makefile.dep | 995 ++++++++++++++++++----------------- main/Makefile.dep | 28 +- notify/Makefile.dep | 14 +- notify/notifythread.cpp | 20 +- notify/templatesnotify.cpp | 7 + plugins/export/Makefile.dep | 27 +- plugins/gallery/Makefile.dep | 14 +- plugins/group/Makefile.dep | 16 +- plugins/menu/Makefile.dep | 76 ++- plugins/stats/Makefile.dep | 10 +- plugins/thread/Makefile.dep | 31 +- plugins/thread/templates.cpp | 9 +- plugins/ticket/Makefile.dep | 35 +- templates/Makefile.dep | 283 +++++----- templates/insert.cpp | 11 +- templates/item.cpp | 20 +- templates/misc.cpp | 25 + templates/misc.h | 2 + templates/patterncacher.cpp | 50 +- templates/patterncacher.h | 20 +- templates/patterns.cpp | 53 +- templates/patterns.h | 39 +- templates/templates.cpp | 49 +- 27 files changed, 1105 insertions(+), 949 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index fd716ae..2d0652b 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1 +1 @@ -winix.src.files = ./main/main.cpp ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/synchro.cpp ./core/rebus.h ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/basethread.cpp ./core/item.h ./core/slog.h ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/threadmanager.cpp ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/app.h ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/winix_const.h ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ../ezc/src/funinfo.h ../ezc/src/patternparser.cpp ../ezc/src/generator.h ../ezc/src/functions.h ../ezc/src/pattern.cpp ../ezc/src/item.cpp ../ezc/src/patternparser.h ../ezc/src/pattern.h ../ezc/src/item.h ../ezc/src/ezc.h ../ezc/src/vars.cpp ../ezc/src/vars.h ../ezc/src/blocks.h ../ezc/src/blocks.cpp ../tito/src/crypto.cpp ../tito/src/misc.h ../tito/src/base64.cpp ../tito/src/crypto.h ../tito/src/aes.cpp ../tito/src/base64.h ../tito/src/misc.cpp ../tito/src/aes.h ../pikotools/mainparser/sample/sample.cpp ../pikotools/mainparser/mainparser.cpp ../pikotools/mainparser/mainparser.h ../pikotools/space/space.h ../pikotools/space/spaceparser.cpp ../pikotools/space/space.cpp ../pikotools/space/spaceparser.h ../pikotools/space/jsontospaceparser.cpp ../pikotools/space/spacetojson.cpp ../pikotools/space/jsontospaceparser.h ../pikotools/space/spacetojson.h ../pikotools/date/date.h ../pikotools/date/date.cpp ../pikotools/membuffer/membuffer.h ../pikotools/utf8/utf8.cpp ../pikotools/utf8/utf8.h ../pikotools/textstream/textstream.h ../pikotools/textstream/types.h ../pikotools/convert/convert.h ../pikotools/convert/inttostr.h \ No newline at end of file +winix.src.files = ./main/main.cpp ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/synchro.cpp ./core/rebus.h ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/basethread.cpp ./core/item.h ./core/slog.h ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/threadmanager.cpp ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/app.h ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/winix_const.h ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ../ezc/src/funinfo.h ../ezc/src/patternparser.cpp ../ezc/src/generator.h ../ezc/src/functions.h ../ezc/src/pattern.cpp ../ezc/src/item.cpp ../ezc/src/patternparser.h ../ezc/src/pattern.h ../ezc/src/item.h ../ezc/src/ezc.h ../ezc/src/vars.cpp ../ezc/src/cache.cpp ../ezc/src/cache.h ../ezc/src/vars.h ../ezc/src/blocks.h ../ezc/src/blocks.cpp ../tito/src/crypto.cpp ../tito/src/misc.h ../tito/src/base64.cpp ../tito/src/crypto.h ../tito/src/aes.cpp ../tito/src/base64.h ../tito/src/misc.cpp ../tito/src/aes.h ../pikotools/mainparser/sample/sample.cpp ../pikotools/mainparser/mainparser.cpp ../pikotools/mainparser/mainparser.h ../pikotools/space/space.h ../pikotools/space/spaceparser.cpp ../pikotools/space/space.cpp ../pikotools/space/spaceparser.h ../pikotools/space/jsontospaceparser.cpp ../pikotools/space/spacetojson.cpp ../pikotools/space/jsontospaceparser.h ../pikotools/space/spacetojson.h ../pikotools/date/date.h ../pikotools/date/date.cpp ../pikotools/membuffer/membuffer.h ../pikotools/utf8/utf8.cpp ../pikotools/utf8/utf8.h ../pikotools/textstream/textstream.h ../pikotools/textstream/types.h ../pikotools/convert/convert.h ../pikotools/convert/inttostr.h \ No newline at end of file diff --git a/core/Makefile.dep b/core/Makefile.dep index 1cd9b06..f2a067c 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -33,39 +33,39 @@ app.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h app.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h app.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h app.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -app.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -app.o: ../../ezc/src/funinfo.h ../../ezc/src/patternparser.h -app.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -app.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -app.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h -app.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h image.h -app.o: threadmanager.h timezones.h timezone.h sessionmanager.h -app.o: sessioncontainer.h ipbancontainer.h ../../winix/functions/functions.h -app.o: ../../winix/functions/functionbase.h ../../winix/core/request.h -app.o: ../../winix/core/system.h ../../winix/core/synchro.h -app.o: ../../winix/functions/functionparser.h ../../winix/core/cur.h -app.o: ../../winix/functions/account.h ../../winix/functions/adduser.h -app.o: ../../winix/functions/cat.h ../../winix/functions/chmod.h -app.o: ../../winix/functions/privchanger.h ../../winix/functions/chown.h -app.o: ../../winix/functions/ckeditor.h ../../winix/functions/cp.h -app.o: ../../winix/functions/default.h ../../winix/functions/download.h -app.o: ../../winix/functions/emacs.h ../../winix/functions/env.h -app.o: ../../winix/functions/imgcrop.h ../../winix/functions/last.h -app.o: ../../winix/functions/login.h ../../winix/functions/logout.h -app.o: ../../winix/functions/ln.h ../../winix/functions/ls.h -app.o: ../../winix/functions/man.h ../../winix/functions/meta.h -app.o: ../../winix/functions/mkdir.h ../../winix/functions/mv.h -app.o: ../../winix/functions/nicedit.h ../../winix/functions/node.h -app.o: ../../winix/functions/passwd.h ../../winix/functions/priv.h -app.o: ../../winix/functions/pw.h ../../winix/functions/reload.h -app.o: ../../winix/functions/rm.h ../../winix/functions/rmuser.h -app.o: ../../winix/functions/sort.h ../../winix/functions/specialdefault.h -app.o: ../../winix/functions/stat.h ../../winix/functions/subject.h -app.o: ../../winix/functions/template.h ../../winix/functions/tinymce.h -app.o: ../../winix/functions/uname.h ../../winix/functions/upload.h -app.o: ../../winix/functions/uptime.h ../../winix/functions/who.h -app.o: ../../winix/functions/vim.h ../../winix/core/htmlfilter.h -app.o: ../../winix/templates/templates.h +app.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +app.o: ../../ezc/src/funinfo.h ../../ezc/src/pattern.h +app.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +app.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +app.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +app.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h groups.h +app.o: group.h loadavg.h image.h threadmanager.h timezones.h timezone.h +app.o: sessionmanager.h sessioncontainer.h ipbancontainer.h +app.o: ../../winix/functions/functions.h ../../winix/functions/functionbase.h +app.o: ../../winix/core/request.h ../../winix/core/system.h +app.o: ../../winix/core/synchro.h ../../winix/functions/functionparser.h +app.o: ../../winix/core/cur.h ../../winix/functions/account.h +app.o: ../../winix/functions/adduser.h ../../winix/functions/cat.h +app.o: ../../winix/functions/chmod.h ../../winix/functions/privchanger.h +app.o: ../../winix/functions/chown.h ../../winix/functions/ckeditor.h +app.o: ../../winix/functions/cp.h ../../winix/functions/default.h +app.o: ../../winix/functions/download.h ../../winix/functions/emacs.h +app.o: ../../winix/functions/env.h ../../winix/functions/imgcrop.h +app.o: ../../winix/functions/last.h ../../winix/functions/login.h +app.o: ../../winix/functions/logout.h ../../winix/functions/ln.h +app.o: ../../winix/functions/ls.h ../../winix/functions/man.h +app.o: ../../winix/functions/meta.h ../../winix/functions/mkdir.h +app.o: ../../winix/functions/mv.h ../../winix/functions/nicedit.h +app.o: ../../winix/functions/node.h ../../winix/functions/passwd.h +app.o: ../../winix/functions/priv.h ../../winix/functions/pw.h +app.o: ../../winix/functions/reload.h ../../winix/functions/rm.h +app.o: ../../winix/functions/rmuser.h ../../winix/functions/sort.h +app.o: ../../winix/functions/specialdefault.h ../../winix/functions/stat.h +app.o: ../../winix/functions/subject.h ../../winix/functions/template.h +app.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h +app.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h +app.o: ../../winix/functions/who.h ../../winix/functions/vim.h +app.o: ../../winix/core/htmlfilter.h ../../winix/templates/templates.h app.o: ../../winix/templates/patterncacher.h app.o: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h app.o: ../../winix/templates/changepatterns.h @@ -113,14 +113,15 @@ config.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h config.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h config.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h config.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -config.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +config.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -config.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -config.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -config.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -config.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h -config.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h -config.o: timezone.h sessionmanager.h sessioncontainer.h ipbancontainer.h +config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +config.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +config.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +config.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h +config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +config.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h +config.o: sessioncontainer.h ipbancontainer.h config.o: ../../winix/functions/functions.h config.o: ../../winix/functions/functionbase.h ../../winix/core/request.h config.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -205,11 +206,12 @@ dirs.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h dirs.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h dirs.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h dirs.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/patternparser.h -dirs.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -dirs.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -dirs.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h +dirs.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/pattern.h +dirs.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +dirs.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +dirs.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +dirs.o: lastcontainer.h groups.o: groups.h group.h ugcontainer.h ../../winix/db/db.h groups.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h groups.o: ../../winix/db/dbtextstream.h ../../winix/core/textstream.h misc.h @@ -265,15 +267,15 @@ image.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h image.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h image.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h image.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -image.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +image.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h image.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -image.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -image.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -image.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h -image.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -image.o: threadmanager.h timezones.h timezone.h plugin.h pluginmsg.h -image.o: sessionmanager.h sessioncontainer.h ipbancontainer.h -image.o: ../../winix/functions/functions.h +image.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +image.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +image.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +image.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h +image.o: users.h groups.h group.h loadavg.h threadmanager.h timezones.h +image.o: timezone.h plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h +image.o: ipbancontainer.h ../../winix/functions/functions.h image.o: ../../winix/functions/functionbase.h ../../winix/core/request.h image.o: ../../winix/core/system.h ../../winix/core/synchro.h image.o: ../../winix/functions/functionparser.h ../../winix/core/cur.h @@ -354,8 +356,8 @@ job.o: ../../winix/core/ugcontainer.h ../../winix/notify/notify.h job.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h job.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h job.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/vars.h -job.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h -job.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +job.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h ../../ezc/src/functions.h +job.o: ../../ezc/src/funinfo.h ../../ezc/src/pattern.h job.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h job.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h job.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h @@ -452,10 +454,10 @@ misc.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h misc.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h misc.o: ../../winix/templates/templates.h ../../ezc/src/ezc.h misc.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -misc.o: ../../ezc/src/funinfo.h ../../ezc/src/patternparser.h -misc.o: ../../winix/templates/patterncacher.h ../../winix/core/item.h -misc.o: ../../winix/templates/indexpatterns.h +misc.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +misc.o: ../../ezc/src/funinfo.h ../../ezc/src/pattern.h +misc.o: ../../ezc/src/patternparser.h ../../winix/templates/patterncacher.h +misc.o: ../../winix/core/item.h ../../winix/templates/indexpatterns.h misc.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h misc.o: ../../winix/templates/changepatterns.h misc.o: ../../winix/templates/htmltextstream.h @@ -500,9 +502,9 @@ mountparser.o: ../../winix/templates/patterns.h mountparser.o: ../../winix/templates/locale.h mountparser.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mountparser.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -mountparser.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +mountparser.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -mountparser.o: ../../ezc/src/patternparser.h +mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h mountparser.o: ../../winix/notify/notifythread.h mountparser.o: ../../winix/core/basethread.h mountparser.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h @@ -531,15 +533,16 @@ mounts.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h mounts.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h mounts.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mounts.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -mounts.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +mounts.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -mounts.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -mounts.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -mounts.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -mounts.o: lastcontainer.h mountparser.h plugin.h pluginmsg.h system.h job.h -mounts.o: basethread.h synchro.h crypt.h run.h users.h groups.h group.h -mounts.o: loadavg.h image.h threadmanager.h timezones.h timezone.h -mounts.o: sessionmanager.h sessioncontainer.h ipbancontainer.h +mounts.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +mounts.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +mounts.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +mounts.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h +mounts.o: mountparser.h plugin.h pluginmsg.h system.h job.h basethread.h +mounts.o: synchro.h crypt.h run.h users.h groups.h group.h loadavg.h image.h +mounts.o: threadmanager.h timezones.h timezone.h sessionmanager.h +mounts.o: sessioncontainer.h ipbancontainer.h mounts.o: ../../winix/functions/functions.h mounts.o: ../../winix/functions/functionbase.h ../../winix/core/request.h mounts.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -595,14 +598,15 @@ plugin.o: ../../winix/core/ugcontainer.h ../../winix/notify/notify.h plugin.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h plugin.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h plugin.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/vars.h -plugin.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +plugin.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h plugin.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -plugin.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -plugin.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -plugin.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -plugin.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h -plugin.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h -plugin.o: timezone.h sessionmanager.h sessioncontainer.h ipbancontainer.h +plugin.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +plugin.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +plugin.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +plugin.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h +plugin.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +plugin.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h +plugin.o: sessioncontainer.h ipbancontainer.h plugin.o: ../../winix/functions/functions.h plugin.o: ../../winix/functions/functionbase.h ../../winix/core/request.h plugin.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -662,10 +666,10 @@ plugindata.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h plugindata.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h plugindata.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h plugindata.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -plugindata.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +plugindata.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -plugindata.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -plugindata.o: ../../winix/core/basethread.h +plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +plugindata.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h plugindata.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h plugindata.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h plugindata.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h @@ -758,14 +762,15 @@ request.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h request.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h request.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h request.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -request.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +request.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -request.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -request.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -request.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -request.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h -request.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h -request.o: timezone.h sessionmanager.h sessioncontainer.h ipbancontainer.h +request.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +request.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +request.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +request.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h +request.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +request.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h +request.o: sessioncontainer.h ipbancontainer.h request.o: ../../winix/functions/functions.h request.o: ../../winix/functions/functionbase.h ../../winix/core/request.h request.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -868,9 +873,9 @@ sessionmanager.o: ../../winix/templates/patterns.h sessionmanager.o: ../../winix/templates/locale.h sessionmanager.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h sessionmanager.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -sessionmanager.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +sessionmanager.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h sessionmanager.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -sessionmanager.o: ../../ezc/src/patternparser.h +sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h sessionmanager.o: ../../winix/notify/notifythread.h sessionmanager.o: ../../winix/core/basethread.h sessionmanager.o: ../../winix/notify/templatesnotify.h @@ -973,14 +978,15 @@ system.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h system.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h system.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h system.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -system.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +system.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -system.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -system.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -system.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -system.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h -system.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h -system.o: timezone.h ../../winix/templates/templates.h +system.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +system.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +system.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +system.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h +system.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +system.o: image.h threadmanager.h timezones.h timezone.h +system.o: ../../winix/templates/templates.h system.o: ../../winix/templates/patterncacher.h system.o: ../../winix/templates/indexpatterns.h system.o: ../../winix/templates/patterns.h @@ -1080,13 +1086,14 @@ users.o: ../../winix/templates/locale.h ../../winix/notify/notify.h users.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h users.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h users.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/vars.h -users.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h +users.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h users.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -users.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -users.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -users.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -users.o: mounts.h mountparser.h crypt.h run.h groups.h group.h loadavg.h -users.o: image.h threadmanager.h timezones.h timezone.h plugin.h pluginmsg.h +users.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +users.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +users.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h +users.o: ../../winix/core/users.h ugcontainer.h mounts.h mountparser.h +users.o: crypt.h run.h groups.h group.h loadavg.h image.h threadmanager.h +users.o: timezones.h timezone.h plugin.h pluginmsg.h users.o: ../../winix/functions/functions.h users.o: ../../winix/functions/functionbase.h ../../winix/core/request.h users.o: ../../winix/core/system.h ../../winix/core/synchro.h diff --git a/core/config.cpp b/core/config.cpp index a1fdc97..ecb7298 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -269,6 +269,8 @@ void Config::AssignValues(bool stdout_is_closed) ezc_max_elements = Size(L"ezc_max_elements", 50000); ezc_max_loop_elements = Size(L"ezc_max_loop_elements", 5000); ezc_out_streams_size = Size(L"ezc_out_streams_size", 16); + ezc_error_prefix = Text(L"ezc_error_prefix", L""); account_need_email_verification = Bool(L"account_need_email_verification", true); reset_password_code_expiration_time = Long(L"reset_password_code_expiration_time", 86400); diff --git a/core/config.h b/core/config.h index 7d1eda9..e24bf5a 100755 --- a/core/config.h +++ b/core/config.h @@ -552,6 +552,13 @@ public: // default: 16 (64 maximum) size_t ezc_out_streams_size; + // prefix and postfix used when there is an error in Ezc patterns + // default: + // prefix: "" + std::wstring ezc_error_prefix; + std::wstring ezc_error_postfix; + // when true then when a user want to create a new account // he has to provide his email and a message will be sent back to him // with a link to activate the account diff --git a/functions/Makefile.dep b/functions/Makefile.dep index 483f963..7d80b77 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -34,24 +34,25 @@ account.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h account.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h account.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h account.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -account.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +account.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h account.o: functionparser.h ../../winix/core/cur.h adduser.h cat.h chmod.h account.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h account.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h account.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h account.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h account.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -account.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -account.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -account.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -account.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -account.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -account.o: ../../winix/core/crypt.h ../../winix/core/users.h -account.o: ../../winix/core/groups.h ../../winix/core/group.h -account.o: ../../winix/core/loadavg.h ../../winix/core/image.h -account.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -account.o: ../../winix/core/synchro.h ../../winix/core/log.h -account.o: ../../winix/core/misc.h ../../winix/functions/functions.h +account.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +account.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +account.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +account.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +account.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +account.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +account.o: ../../winix/core/users.h ../../winix/core/groups.h +account.o: ../../winix/core/group.h ../../winix/core/loadavg.h +account.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +account.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +account.o: ../../winix/core/log.h ../../winix/core/misc.h +account.o: ../../winix/functions/functions.h adduser.o: adduser.h functionbase.h ../../winix/core/item.h adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h adduser.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -86,25 +87,26 @@ adduser.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h adduser.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h adduser.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h adduser.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -adduser.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +adduser.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h adduser.o: functionparser.h ../../winix/core/cur.h account.h cat.h chmod.h adduser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h adduser.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h adduser.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h adduser.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h adduser.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -adduser.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -adduser.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -adduser.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -adduser.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -adduser.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -adduser.o: ../../winix/core/crypt.h ../../winix/core/users.h -adduser.o: ../../winix/core/groups.h ../../winix/core/group.h -adduser.o: ../../winix/core/loadavg.h ../../winix/core/image.h -adduser.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -adduser.o: ../../winix/core/synchro.h ../../winix/core/slog.h -adduser.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h -adduser.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h +adduser.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +adduser.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +adduser.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +adduser.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +adduser.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +adduser.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +adduser.o: ../../winix/core/users.h ../../winix/core/groups.h +adduser.o: ../../winix/core/group.h ../../winix/core/loadavg.h +adduser.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +adduser.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +adduser.o: ../../winix/core/slog.h ../../winix/core/plugin.h +adduser.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h +adduser.o: ../../winix/core/sessionmanager.h adduser.o: ../../winix/core/sessioncontainer.h adduser.o: ../../winix/core/ipbancontainer.h adduser.o: ../../winix/functions/functions.h @@ -147,22 +149,23 @@ cat.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h cat.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h cat.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -cat.o: ../../ezc/src/pattern.h functions.h functionparser.h +cat.o: ../../ezc/src/cache.h functions.h functionparser.h cat.o: ../../winix/core/cur.h account.h adduser.h chmod.h privchanger.h cat.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h cat.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h cat.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h cat.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h cat.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -cat.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -cat.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -cat.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -cat.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -cat.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -cat.o: ../../winix/core/users.h ../../winix/core/groups.h -cat.o: ../../winix/core/group.h ../../winix/core/loadavg.h -cat.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -cat.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +cat.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +cat.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +cat.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +cat.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +cat.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +cat.o: ../../winix/core/crypt.h ../../winix/core/users.h +cat.o: ../../winix/core/groups.h ../../winix/core/group.h +cat.o: ../../winix/core/loadavg.h ../../winix/core/image.h +cat.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +cat.o: ../../winix/core/synchro.h chmod.o: chmod.h functionbase.h ../../winix/core/item.h chmod.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h chmod.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -195,23 +198,23 @@ chmod.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h chmod.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h chmod.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h chmod.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -chmod.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +chmod.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h chmod.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h chmod.o: chown.h privchanger.h ckeditor.h cp.h default.h download.h emacs.h chmod.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h chmod.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h chmod.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h chmod.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -chmod.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -chmod.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -chmod.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -chmod.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -chmod.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -chmod.o: ../../winix/core/crypt.h ../../winix/core/users.h -chmod.o: ../../winix/core/groups.h ../../winix/core/group.h -chmod.o: ../../winix/core/loadavg.h ../../winix/core/image.h -chmod.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -chmod.o: ../../winix/core/synchro.h +chmod.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +chmod.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +chmod.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +chmod.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +chmod.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +chmod.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +chmod.o: ../../winix/core/users.h ../../winix/core/groups.h +chmod.o: ../../winix/core/group.h ../../winix/core/loadavg.h +chmod.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +chmod.o: ../../winix/core/timezones.h ../../winix/core/synchro.h chown.o: chown.h functionbase.h ../../winix/core/item.h chown.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h chown.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -244,23 +247,23 @@ chown.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h chown.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h chown.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h chown.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -chown.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +chown.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h chown.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h chown.o: chmod.h privchanger.h ckeditor.h cp.h default.h download.h emacs.h chown.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h chown.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h chown.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h chown.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -chown.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -chown.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -chown.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -chown.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -chown.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -chown.o: ../../winix/core/crypt.h ../../winix/core/users.h -chown.o: ../../winix/core/groups.h ../../winix/core/group.h -chown.o: ../../winix/core/loadavg.h ../../winix/core/image.h -chown.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -chown.o: ../../winix/core/synchro.h +chown.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +chown.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +chown.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +chown.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +chown.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +chown.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +chown.o: ../../winix/core/users.h ../../winix/core/groups.h +chown.o: ../../winix/core/group.h ../../winix/core/loadavg.h +chown.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +chown.o: ../../winix/core/timezones.h ../../winix/core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../../winix/core/item.h ckeditor.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ckeditor.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -295,15 +298,16 @@ ckeditor.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h ckeditor.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h ckeditor.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -ckeditor.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +ckeditor.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h ckeditor.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h ckeditor.o: chmod.h privchanger.h chown.h cp.h default.h download.h emacs.h ckeditor.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h ckeditor.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h ckeditor.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h ckeditor.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -ckeditor.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -ckeditor.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +ckeditor.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +ckeditor.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +ckeditor.o: ../../winix/core/basethread.h ckeditor.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h ckeditor.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h ckeditor.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -343,27 +347,28 @@ cp.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h cp.o: ../../winix/templates/patterns.h locale.h cp.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h cp.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -cp.o: ../../ezc/src/pattern.h functions.h functionparser.h +cp.o: ../../ezc/src/cache.h functions.h functionparser.h cp.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h cp.o: chown.h ckeditor.h default.h download.h emacs.h env.h imgcrop.h last.h cp.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h cp.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h cp.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h cp.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -cp.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -cp.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -cp.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -cp.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -cp.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -cp.o: ../../winix/core/users.h ../../winix/core/groups.h -cp.o: ../../winix/core/group.h ../../winix/core/loadavg.h -cp.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -cp.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -cp.o: ../../winix/core/misc.h ../../winix/core/plugin.h -cp.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h -cp.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h -cp.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h -cp.o: ../../winix/templates/templates.h ../../winix/templates/patterncacher.h +cp.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +cp.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +cp.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +cp.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +cp.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +cp.o: ../../winix/core/crypt.h ../../winix/core/users.h +cp.o: ../../winix/core/groups.h ../../winix/core/group.h +cp.o: ../../winix/core/loadavg.h ../../winix/core/image.h +cp.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +cp.o: ../../winix/core/synchro.h ../../winix/core/misc.h +cp.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h +cp.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h +cp.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h +cp.o: ../../winix/functions/functions.h ../../winix/templates/templates.h +cp.o: ../../winix/templates/patterncacher.h cp.o: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h cp.o: ../../winix/templates/changepatterns.h cp.o: ../../winix/templates/htmltextstream.h @@ -402,23 +407,23 @@ default.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h default.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h default.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h default.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -default.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +default.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h default.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h default.o: chmod.h privchanger.h chown.h ckeditor.h cp.h download.h emacs.h default.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h default.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h default.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h default.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -default.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -default.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -default.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -default.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -default.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -default.o: ../../winix/core/crypt.h ../../winix/core/users.h -default.o: ../../winix/core/groups.h ../../winix/core/group.h -default.o: ../../winix/core/loadavg.h ../../winix/core/image.h -default.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -default.o: ../../winix/core/synchro.h +default.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +default.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +default.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +default.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +default.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +default.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +default.o: ../../winix/core/users.h ../../winix/core/groups.h +default.o: ../../winix/core/group.h ../../winix/core/loadavg.h +default.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +default.o: ../../winix/core/timezones.h ../../winix/core/synchro.h download.o: download.h functionbase.h ../../winix/core/item.h download.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h download.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -453,15 +458,16 @@ download.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h download.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h download.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h download.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -download.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +download.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h download.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h download.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h emacs.h download.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h download.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h download.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h download.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -download.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -download.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +download.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +download.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +download.o: ../../winix/core/basethread.h download.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h download.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h download.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -502,23 +508,24 @@ emacs.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h emacs.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h emacs.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h emacs.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -emacs.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +emacs.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h emacs.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h emacs.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h emacs.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h emacs.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h emacs.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -emacs.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -emacs.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -emacs.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -emacs.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -emacs.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -emacs.o: ../../winix/core/crypt.h ../../winix/core/users.h -emacs.o: ../../winix/core/groups.h ../../winix/core/group.h -emacs.o: ../../winix/core/loadavg.h ../../winix/core/image.h -emacs.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -emacs.o: ../../winix/core/synchro.h ../../winix/templates/templates.h +emacs.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +emacs.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +emacs.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +emacs.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +emacs.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +emacs.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +emacs.o: ../../winix/core/users.h ../../winix/core/groups.h +emacs.o: ../../winix/core/group.h ../../winix/core/loadavg.h +emacs.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +emacs.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +emacs.o: ../../winix/templates/templates.h emacs.o: ../../winix/templates/patterncacher.h emacs.o: ../../winix/templates/indexpatterns.h emacs.o: ../../winix/templates/patterns.h @@ -557,23 +564,23 @@ env.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h env.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h env.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h env.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -env.o: ../../ezc/src/pattern.h functions.h functionparser.h +env.o: ../../ezc/src/cache.h functions.h functionparser.h env.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h env.o: chown.h ckeditor.h cp.h default.h download.h emacs.h imgcrop.h last.h env.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h env.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h env.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h env.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -env.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -env.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -env.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -env.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -env.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -env.o: ../../winix/core/users.h ../../winix/core/groups.h -env.o: ../../winix/core/group.h ../../winix/core/loadavg.h -env.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -env.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -env.o: ../../winix/core/log.h +env.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +env.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +env.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +env.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +env.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +env.o: ../../winix/core/crypt.h ../../winix/core/users.h +env.o: ../../winix/core/groups.h ../../winix/core/group.h +env.o: ../../winix/core/loadavg.h ../../winix/core/image.h +env.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +env.o: ../../winix/core/synchro.h ../../winix/core/log.h functionbase.o: functionbase.h ../../winix/core/item.h functionbase.o: ../../pikotools/space/space.h functionbase.o: ../../pikotools/textstream/types.h @@ -611,7 +618,7 @@ functionbase.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h functionbase.o: ../../winix/templates/patterns.h locale.h functionbase.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h functionbase.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -functionbase.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +functionbase.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h functionbase.o: functionparser.h ../../winix/core/cur.h account.h adduser.h functionbase.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h functionbase.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h @@ -619,7 +626,8 @@ functionbase.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h functionbase.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h functionbase.o: specialdefault.h stat.h subject.h template.h timezone.h functionbase.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -functionbase.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h +functionbase.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +functionbase.o: ../../ezc/src/patternparser.h functionbase.o: ../../winix/notify/notifythread.h functionbase.o: ../../winix/core/basethread.h functionbase.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h @@ -670,7 +678,7 @@ functionparser.o: ../../winix/templates/locale.h functionparser.o: ../../winix/templates/patterns.h locale.h functionparser.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h functionparser.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -functionparser.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +functionparser.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h functionparser.o: account.h adduser.h cat.h chmod.h privchanger.h chown.h functionparser.o: ckeditor.h cp.h default.h download.h emacs.h env.h functionparser.o: imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h @@ -678,7 +686,7 @@ functionparser.o: mkdir.h mount.h mv.h nicedit.h node.h passwd.h priv.h pw.h functionparser.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h functionparser.o: subject.h template.h timezone.h tinymce.h uname.h upload.h functionparser.o: uptime.h who.h vim.h ../../winix/core/htmlfilter.h -functionparser.o: ../../ezc/src/patternparser.h +functionparser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h functionparser.o: ../../winix/notify/notifythread.h functionparser.o: ../../winix/core/basethread.h functionparser.o: ../../winix/notify/templatesnotify.h @@ -725,8 +733,9 @@ functions.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h functions.o: locale.h ../../winix/templates/localefilter.h functions.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h functions.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h -functions.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -functions.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +functions.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +functions.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +functions.o: ../../winix/core/basethread.h functions.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h functions.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h functions.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -789,23 +798,23 @@ imgcrop.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h imgcrop.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h imgcrop.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h imgcrop.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -imgcrop.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +imgcrop.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h imgcrop.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h imgcrop.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h imgcrop.o: emacs.h env.h last.h login.h logout.h ln.h ls.h man.h meta.h imgcrop.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h imgcrop.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h imgcrop.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -imgcrop.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -imgcrop.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -imgcrop.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -imgcrop.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -imgcrop.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -imgcrop.o: ../../winix/core/crypt.h ../../winix/core/users.h -imgcrop.o: ../../winix/core/groups.h ../../winix/core/group.h -imgcrop.o: ../../winix/core/loadavg.h ../../winix/core/image.h -imgcrop.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -imgcrop.o: ../../winix/core/synchro.h +imgcrop.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +imgcrop.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +imgcrop.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +imgcrop.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +imgcrop.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +imgcrop.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +imgcrop.o: ../../winix/core/users.h ../../winix/core/groups.h +imgcrop.o: ../../winix/core/group.h ../../winix/core/loadavg.h +imgcrop.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +imgcrop.o: ../../winix/core/timezones.h ../../winix/core/synchro.h ipban.o: ipban.h functionbase.h ../../winix/core/item.h ipban.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ipban.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -838,23 +847,24 @@ ipban.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h ipban.o: ../../winix/templates/patterns.h locale.h ipban.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ipban.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -ipban.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +ipban.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h ipban.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h ipban.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h ipban.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h ipban.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h ipban.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h ipban.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -ipban.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -ipban.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -ipban.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -ipban.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -ipban.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -ipban.o: ../../winix/core/crypt.h ../../winix/core/users.h -ipban.o: ../../winix/core/groups.h ../../winix/core/group.h -ipban.o: ../../winix/core/loadavg.h ../../winix/core/image.h -ipban.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -ipban.o: ../../winix/core/synchro.h ../../winix/core/sessionmanager.h +ipban.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +ipban.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +ipban.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +ipban.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +ipban.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +ipban.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +ipban.o: ../../winix/core/users.h ../../winix/core/groups.h +ipban.o: ../../winix/core/group.h ../../winix/core/loadavg.h +ipban.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +ipban.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +ipban.o: ../../winix/core/sessionmanager.h last.o: last.h functionbase.h ../../winix/core/item.h last.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h last.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -887,23 +897,23 @@ last.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h last.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h last.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h last.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -last.o: ../../ezc/src/pattern.h functions.h functionparser.h +last.o: ../../ezc/src/cache.h functions.h functionparser.h last.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h last.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h last.o: env.h imgcrop.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h last.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h last.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h last.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -last.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -last.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -last.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -last.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -last.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -last.o: ../../winix/core/crypt.h ../../winix/core/users.h -last.o: ../../winix/core/groups.h ../../winix/core/group.h -last.o: ../../winix/core/loadavg.h ../../winix/core/image.h -last.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -last.o: ../../winix/core/synchro.h +last.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +last.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +last.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +last.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +last.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +last.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +last.o: ../../winix/core/users.h ../../winix/core/groups.h +last.o: ../../winix/core/group.h ../../winix/core/loadavg.h +last.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +last.o: ../../winix/core/timezones.h ../../winix/core/synchro.h ln.o: ln.h functionbase.h ../../winix/core/item.h ln.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ln.o: ../../pikotools/date/date.h ../../winix/db/db.h ../../winix/db/dbbase.h @@ -935,23 +945,24 @@ ln.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h ln.o: ../../winix/templates/patterns.h locale.h ln.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ln.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -ln.o: ../../ezc/src/pattern.h functions.h functionparser.h +ln.o: ../../ezc/src/cache.h functions.h functionparser.h ln.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h ln.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h ln.o: last.h login.h logout.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h ln.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h ln.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h ln.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -ln.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -ln.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -ln.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -ln.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -ln.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -ln.o: ../../winix/core/users.h ../../winix/core/groups.h -ln.o: ../../winix/core/group.h ../../winix/core/loadavg.h -ln.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -ln.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -ln.o: ../../winix/core/misc.h ../../winix/functions/functions.h +ln.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +ln.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +ln.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +ln.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +ln.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +ln.o: ../../winix/core/crypt.h ../../winix/core/users.h +ln.o: ../../winix/core/groups.h ../../winix/core/group.h +ln.o: ../../winix/core/loadavg.h ../../winix/core/image.h +ln.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +ln.o: ../../winix/core/synchro.h ../../winix/core/misc.h +ln.o: ../../winix/functions/functions.h locale.o: locale.h functionbase.h ../../winix/core/item.h locale.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h locale.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -986,23 +997,24 @@ locale.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h locale.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h locale.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h locale.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -locale.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +locale.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h locale.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h locale.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h locale.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h locale.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h locale.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h locale.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -locale.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -locale.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -locale.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -locale.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -locale.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -locale.o: ../../winix/core/crypt.h ../../winix/core/users.h -locale.o: ../../winix/core/groups.h ../../winix/core/group.h -locale.o: ../../winix/core/loadavg.h ../../winix/core/image.h -locale.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -locale.o: ../../winix/core/synchro.h ../../winix/templates/templates.h +locale.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +locale.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +locale.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +locale.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +locale.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +locale.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +locale.o: ../../winix/core/users.h ../../winix/core/groups.h +locale.o: ../../winix/core/group.h ../../winix/core/loadavg.h +locale.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +locale.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +locale.o: ../../winix/templates/templates.h locale.o: ../../winix/templates/patterncacher.h locale.o: ../../winix/templates/indexpatterns.h locale.o: ../../winix/templates/patterns.h @@ -1041,23 +1053,23 @@ login.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h login.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h login.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h login.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -login.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +login.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h login.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h login.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h login.o: emacs.h env.h imgcrop.h last.h logout.h ln.h ls.h man.h meta.h login.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h login.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h login.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -login.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -login.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -login.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -login.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -login.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -login.o: ../../winix/core/crypt.h ../../winix/core/users.h -login.o: ../../winix/core/groups.h ../../winix/core/group.h -login.o: ../../winix/core/loadavg.h ../../winix/core/image.h -login.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -login.o: ../../winix/core/synchro.h +login.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +login.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +login.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +login.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +login.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +login.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +login.o: ../../winix/core/users.h ../../winix/core/groups.h +login.o: ../../winix/core/group.h ../../winix/core/loadavg.h +login.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +login.o: ../../winix/core/timezones.h ../../winix/core/synchro.h logout.o: logout.h functionbase.h ../../winix/core/item.h logout.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h logout.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1092,23 +1104,23 @@ logout.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h logout.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h logout.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h logout.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -logout.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +logout.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h logout.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h logout.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h logout.o: emacs.h env.h imgcrop.h last.h login.h ln.h ls.h man.h meta.h logout.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h logout.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h logout.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -logout.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -logout.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -logout.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -logout.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -logout.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -logout.o: ../../winix/core/crypt.h ../../winix/core/users.h -logout.o: ../../winix/core/groups.h ../../winix/core/group.h -logout.o: ../../winix/core/loadavg.h ../../winix/core/image.h -logout.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -logout.o: ../../winix/core/synchro.h +logout.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +logout.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +logout.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +logout.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +logout.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +logout.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +logout.o: ../../winix/core/users.h ../../winix/core/groups.h +logout.o: ../../winix/core/group.h ../../winix/core/loadavg.h +logout.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +logout.o: ../../winix/core/timezones.h ../../winix/core/synchro.h ls.o: ls.h functionbase.h ../../winix/core/item.h ls.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ls.o: ../../pikotools/date/date.h ../../winix/db/db.h ../../winix/db/dbbase.h @@ -1140,22 +1152,23 @@ ls.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h ls.o: ../../winix/templates/patterns.h locale.h ls.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ls.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -ls.o: ../../ezc/src/pattern.h functions.h functionparser.h +ls.o: ../../ezc/src/cache.h functions.h functionparser.h ls.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h ls.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h ls.o: last.h login.h logout.h ln.h man.h meta.h mkdir.h mv.h nicedit.h node.h ls.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h ls.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h ls.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -ls.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -ls.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -ls.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -ls.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -ls.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -ls.o: ../../winix/core/users.h ../../winix/core/groups.h -ls.o: ../../winix/core/group.h ../../winix/core/loadavg.h -ls.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -ls.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +ls.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +ls.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +ls.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +ls.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +ls.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +ls.o: ../../winix/core/crypt.h ../../winix/core/users.h +ls.o: ../../winix/core/groups.h ../../winix/core/group.h +ls.o: ../../winix/core/loadavg.h ../../winix/core/image.h +ls.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +ls.o: ../../winix/core/synchro.h man.o: man.h functionbase.h ../../winix/core/item.h man.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h man.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1188,22 +1201,23 @@ man.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h man.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h man.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h man.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -man.o: ../../ezc/src/pattern.h functions.h functionparser.h +man.o: ../../ezc/src/cache.h functions.h functionparser.h man.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h man.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h man.o: last.h login.h logout.h ln.h ls.h meta.h mkdir.h mv.h nicedit.h node.h man.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h man.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h man.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -man.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -man.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -man.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -man.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -man.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -man.o: ../../winix/core/users.h ../../winix/core/groups.h -man.o: ../../winix/core/group.h ../../winix/core/loadavg.h -man.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -man.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +man.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +man.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +man.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +man.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +man.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +man.o: ../../winix/core/crypt.h ../../winix/core/users.h +man.o: ../../winix/core/groups.h ../../winix/core/group.h +man.o: ../../winix/core/loadavg.h ../../winix/core/image.h +man.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +man.o: ../../winix/core/synchro.h meta.o: meta.h functionbase.h ../../winix/core/item.h meta.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h meta.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1236,23 +1250,24 @@ meta.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h meta.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h meta.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h meta.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -meta.o: ../../ezc/src/pattern.h functions.h functionparser.h +meta.o: ../../ezc/src/cache.h functions.h functionparser.h meta.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h meta.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h meta.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h mkdir.h mv.h meta.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h meta.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h meta.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -meta.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -meta.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -meta.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -meta.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -meta.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -meta.o: ../../winix/core/crypt.h ../../winix/core/users.h -meta.o: ../../winix/core/groups.h ../../winix/core/group.h -meta.o: ../../winix/core/loadavg.h ../../winix/core/image.h -meta.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -meta.o: ../../winix/core/synchro.h ../../winix/core/log.h +meta.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +meta.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +meta.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +meta.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +meta.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +meta.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +meta.o: ../../winix/core/users.h ../../winix/core/groups.h +meta.o: ../../winix/core/group.h ../../winix/core/loadavg.h +meta.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +meta.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +meta.o: ../../winix/core/log.h mkdir.o: mkdir.h functionbase.h ../../winix/core/item.h mkdir.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h mkdir.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1285,25 +1300,25 @@ mkdir.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h mkdir.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h mkdir.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mkdir.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -mkdir.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +mkdir.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h mkdir.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h mkdir.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h mkdir.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h mkdir.o: meta.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h mkdir.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h mkdir.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -mkdir.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -mkdir.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -mkdir.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -mkdir.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -mkdir.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -mkdir.o: ../../winix/core/crypt.h ../../winix/core/users.h -mkdir.o: ../../winix/core/groups.h ../../winix/core/group.h -mkdir.o: ../../winix/core/loadavg.h ../../winix/core/image.h -mkdir.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -mkdir.o: ../../winix/core/synchro.h ../../winix/core/plugin.h -mkdir.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h -mkdir.o: ../../winix/core/sessionmanager.h +mkdir.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +mkdir.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +mkdir.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +mkdir.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +mkdir.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +mkdir.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +mkdir.o: ../../winix/core/users.h ../../winix/core/groups.h +mkdir.o: ../../winix/core/group.h ../../winix/core/loadavg.h +mkdir.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +mkdir.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +mkdir.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h +mkdir.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h mkdir.o: ../../winix/core/sessioncontainer.h mkdir.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h mkdir.o: ../../winix/templates/templates.h @@ -1345,23 +1360,23 @@ mount.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h mount.o: ../../winix/templates/patterns.h locale.h mount.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mount.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -mount.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +mount.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h mount.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h mount.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h mount.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h mount.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h mount.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h mount.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -mount.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -mount.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -mount.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -mount.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -mount.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -mount.o: ../../winix/core/crypt.h ../../winix/core/users.h -mount.o: ../../winix/core/groups.h ../../winix/core/group.h -mount.o: ../../winix/core/loadavg.h ../../winix/core/image.h -mount.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -mount.o: ../../winix/core/synchro.h +mount.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +mount.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +mount.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +mount.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +mount.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +mount.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +mount.o: ../../winix/core/users.h ../../winix/core/groups.h +mount.o: ../../winix/core/group.h ../../winix/core/loadavg.h +mount.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +mount.o: ../../winix/core/timezones.h ../../winix/core/synchro.h mv.o: mv.h functionbase.h ../../winix/core/item.h mv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h mv.o: ../../pikotools/date/date.h ../../winix/db/db.h ../../winix/db/dbbase.h @@ -1393,27 +1408,27 @@ mv.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h mv.o: ../../winix/templates/patterns.h locale.h mv.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mv.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -mv.o: ../../ezc/src/pattern.h functions.h functionparser.h +mv.o: ../../ezc/src/cache.h functions.h functionparser.h mv.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h mv.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h mv.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h nicedit.h node.h mv.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h mv.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h mv.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -mv.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -mv.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -mv.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -mv.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -mv.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -mv.o: ../../winix/core/users.h ../../winix/core/groups.h -mv.o: ../../winix/core/group.h ../../winix/core/loadavg.h -mv.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -mv.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -mv.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h -mv.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h -mv.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h -mv.o: ../../winix/functions/functions.h ../../winix/templates/templates.h -mv.o: ../../winix/templates/patterncacher.h +mv.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +mv.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +mv.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +mv.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +mv.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +mv.o: ../../winix/core/crypt.h ../../winix/core/users.h +mv.o: ../../winix/core/groups.h ../../winix/core/group.h +mv.o: ../../winix/core/loadavg.h ../../winix/core/image.h +mv.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +mv.o: ../../winix/core/synchro.h ../../winix/core/plugin.h +mv.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h +mv.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h +mv.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h +mv.o: ../../winix/templates/templates.h ../../winix/templates/patterncacher.h mv.o: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h mv.o: ../../winix/templates/changepatterns.h mv.o: ../../winix/templates/htmltextstream.h @@ -1452,23 +1467,23 @@ nicedit.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h nicedit.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h nicedit.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h nicedit.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -nicedit.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +nicedit.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h nicedit.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h nicedit.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h nicedit.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h nicedit.o: meta.h mkdir.h mv.h node.h passwd.h priv.h pw.h reload.h rm.h nicedit.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h nicedit.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -nicedit.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -nicedit.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -nicedit.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -nicedit.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -nicedit.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -nicedit.o: ../../winix/core/crypt.h ../../winix/core/users.h -nicedit.o: ../../winix/core/groups.h ../../winix/core/group.h -nicedit.o: ../../winix/core/loadavg.h ../../winix/core/image.h -nicedit.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -nicedit.o: ../../winix/core/synchro.h +nicedit.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +nicedit.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +nicedit.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +nicedit.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +nicedit.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +nicedit.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +nicedit.o: ../../winix/core/users.h ../../winix/core/groups.h +nicedit.o: ../../winix/core/group.h ../../winix/core/loadavg.h +nicedit.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +nicedit.o: ../../winix/core/timezones.h ../../winix/core/synchro.h node.o: node.h functionbase.h ../../winix/core/item.h node.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h node.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1501,23 +1516,23 @@ node.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h node.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h node.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h node.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -node.o: ../../ezc/src/pattern.h functions.h functionparser.h +node.o: ../../ezc/src/cache.h functions.h functionparser.h node.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h node.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h node.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h node.o: mkdir.h mv.h nicedit.h passwd.h priv.h pw.h reload.h rm.h rmuser.h node.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h node.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -node.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -node.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -node.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -node.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -node.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -node.o: ../../winix/core/crypt.h ../../winix/core/users.h -node.o: ../../winix/core/groups.h ../../winix/core/group.h -node.o: ../../winix/core/loadavg.h ../../winix/core/image.h -node.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -node.o: ../../winix/core/synchro.h +node.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +node.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +node.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +node.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +node.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +node.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +node.o: ../../winix/core/users.h ../../winix/core/groups.h +node.o: ../../winix/core/group.h ../../winix/core/loadavg.h +node.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +node.o: ../../winix/core/timezones.h ../../winix/core/synchro.h passwd.o: passwd.h functionbase.h ../../winix/core/item.h passwd.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h passwd.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1552,24 +1567,24 @@ passwd.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h passwd.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h passwd.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h passwd.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -passwd.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +passwd.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h passwd.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h passwd.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h passwd.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h passwd.o: meta.h mkdir.h mv.h nicedit.h node.h priv.h pw.h reload.h rm.h passwd.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h passwd.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -passwd.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -passwd.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -passwd.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -passwd.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -passwd.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -passwd.o: ../../winix/core/crypt.h ../../winix/core/users.h -passwd.o: ../../winix/core/groups.h ../../winix/core/group.h -passwd.o: ../../winix/core/loadavg.h ../../winix/core/image.h -passwd.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -passwd.o: ../../winix/core/synchro.h ../../winix/core/slog.h -passwd.o: ../../winix/functions/functions.h +passwd.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +passwd.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +passwd.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +passwd.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +passwd.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +passwd.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +passwd.o: ../../winix/core/users.h ../../winix/core/groups.h +passwd.o: ../../winix/core/group.h ../../winix/core/loadavg.h +passwd.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +passwd.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +passwd.o: ../../winix/core/slog.h ../../winix/functions/functions.h priv.o: priv.h functionbase.h ../../winix/core/item.h priv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h priv.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1602,23 +1617,23 @@ priv.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h priv.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h priv.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h priv.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -priv.o: ../../ezc/src/pattern.h functions.h functionparser.h +priv.o: ../../ezc/src/cache.h functions.h functionparser.h priv.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h priv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h priv.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h priv.o: mkdir.h mv.h nicedit.h node.h passwd.h pw.h reload.h rm.h rmuser.h priv.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h priv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -priv.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -priv.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -priv.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -priv.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -priv.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -priv.o: ../../winix/core/crypt.h ../../winix/core/users.h -priv.o: ../../winix/core/groups.h ../../winix/core/group.h -priv.o: ../../winix/core/loadavg.h ../../winix/core/image.h -priv.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -priv.o: ../../winix/core/synchro.h +priv.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +priv.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +priv.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +priv.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +priv.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +priv.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +priv.o: ../../winix/core/users.h ../../winix/core/groups.h +priv.o: ../../winix/core/group.h ../../winix/core/loadavg.h +priv.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +priv.o: ../../winix/core/timezones.h ../../winix/core/synchro.h privchanger.o: privchanger.h ../../winix/core/request.h privchanger.o: ../../winix/core/system.h ../../winix/core/job.h privchanger.o: ../../winix/core/basethread.h ../../winix/core/synchro.h @@ -1655,7 +1670,7 @@ privchanger.o: ../../winix/templates/locale.h privchanger.o: ../../winix/templates/patterns.h locale.h privchanger.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h privchanger.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -privchanger.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +privchanger.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h privchanger.o: functionparser.h ../../winix/core/cur.h account.h adduser.h privchanger.o: cat.h chmod.h chown.h ckeditor.h cp.h default.h download.h privchanger.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h @@ -1663,7 +1678,8 @@ privchanger.o: man.h meta.h mkdir.h mount.h mv.h nicedit.h node.h passwd.h privchanger.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h privchanger.o: specialdefault.h stat.h subject.h template.h timezone.h privchanger.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -privchanger.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h +privchanger.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +privchanger.o: ../../ezc/src/patternparser.h privchanger.o: ../../winix/notify/notifythread.h privchanger.o: ../../winix/core/basethread.h privchanger.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h @@ -1705,23 +1721,24 @@ pw.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h pw.o: ../../winix/templates/patterns.h locale.h pw.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h pw.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -pw.o: ../../ezc/src/pattern.h functions.h functionparser.h +pw.o: ../../ezc/src/cache.h functions.h functionparser.h pw.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h pw.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h pw.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h pw.o: node.h passwd.h priv.h reload.h rm.h rmuser.h run.h sort.h pw.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h pw.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -pw.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -pw.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -pw.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -pw.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -pw.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -pw.o: ../../winix/core/users.h ../../winix/core/groups.h -pw.o: ../../winix/core/group.h ../../winix/core/loadavg.h -pw.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -pw.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -pw.o: ../../winix/core/log.h ../../winix/core/misc.h +pw.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +pw.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +pw.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +pw.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +pw.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +pw.o: ../../winix/core/crypt.h ../../winix/core/users.h +pw.o: ../../winix/core/groups.h ../../winix/core/group.h +pw.o: ../../winix/core/loadavg.h ../../winix/core/image.h +pw.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +pw.o: ../../winix/core/synchro.h ../../winix/core/log.h +pw.o: ../../winix/core/misc.h reload.o: reload.h functionbase.h ../../winix/core/item.h reload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h reload.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1756,23 +1773,24 @@ reload.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h reload.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h reload.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h reload.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -reload.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +reload.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h reload.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h reload.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h reload.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h reload.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h rm.h reload.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h reload.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -reload.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -reload.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -reload.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -reload.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -reload.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -reload.o: ../../winix/core/crypt.h ../../winix/core/users.h -reload.o: ../../winix/core/groups.h ../../winix/core/group.h -reload.o: ../../winix/core/loadavg.h ../../winix/core/image.h -reload.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -reload.o: ../../winix/core/synchro.h ../../winix/templates/templates.h +reload.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +reload.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +reload.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +reload.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +reload.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +reload.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +reload.o: ../../winix/core/users.h ../../winix/core/groups.h +reload.o: ../../winix/core/group.h ../../winix/core/loadavg.h +reload.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +reload.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +reload.o: ../../winix/templates/templates.h reload.o: ../../winix/templates/patterncacher.h reload.o: ../../winix/templates/indexpatterns.h reload.o: ../../winix/templates/patterns.h @@ -1810,27 +1828,27 @@ rm.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h rm.o: ../../winix/templates/patterns.h locale.h rm.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h rm.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -rm.o: ../../ezc/src/pattern.h functions.h functionparser.h +rm.o: ../../ezc/src/cache.h functions.h functionparser.h rm.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h rm.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h rm.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h rm.o: node.h passwd.h priv.h pw.h reload.h rmuser.h run.h sort.h rm.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h rm.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -rm.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -rm.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -rm.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -rm.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -rm.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -rm.o: ../../winix/core/users.h ../../winix/core/groups.h -rm.o: ../../winix/core/group.h ../../winix/core/loadavg.h -rm.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -rm.o: ../../winix/core/timezones.h ../../winix/core/synchro.h -rm.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h -rm.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h -rm.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h -rm.o: ../../winix/functions/functions.h ../../winix/templates/templates.h -rm.o: ../../winix/templates/patterncacher.h +rm.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +rm.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +rm.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +rm.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +rm.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +rm.o: ../../winix/core/crypt.h ../../winix/core/users.h +rm.o: ../../winix/core/groups.h ../../winix/core/group.h +rm.o: ../../winix/core/loadavg.h ../../winix/core/image.h +rm.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +rm.o: ../../winix/core/synchro.h ../../winix/core/plugin.h +rm.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h +rm.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h +rm.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h +rm.o: ../../winix/templates/templates.h ../../winix/templates/patterncacher.h rm.o: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h rm.o: ../../winix/templates/changepatterns.h rm.o: ../../winix/templates/htmltextstream.h @@ -1869,26 +1887,26 @@ rmuser.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h rmuser.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h rmuser.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h rmuser.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -rmuser.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +rmuser.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h rmuser.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h rmuser.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h rmuser.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h rmuser.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rmuser.o: rm.h run.h sort.h specialdefault.h stat.h subject.h template.h rmuser.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -rmuser.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -rmuser.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -rmuser.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -rmuser.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -rmuser.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -rmuser.o: ../../winix/core/crypt.h ../../winix/core/users.h -rmuser.o: ../../winix/core/groups.h ../../winix/core/group.h -rmuser.o: ../../winix/core/loadavg.h ../../winix/core/image.h -rmuser.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -rmuser.o: ../../winix/core/synchro.h ../../winix/core/log.h -rmuser.o: ../../winix/core/misc.h ../../winix/core/plugin.h -rmuser.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h -rmuser.o: ../../winix/core/sessionmanager.h +rmuser.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +rmuser.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +rmuser.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +rmuser.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +rmuser.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +rmuser.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +rmuser.o: ../../winix/core/users.h ../../winix/core/groups.h +rmuser.o: ../../winix/core/group.h ../../winix/core/loadavg.h +rmuser.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +rmuser.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +rmuser.o: ../../winix/core/log.h ../../winix/core/misc.h +rmuser.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h +rmuser.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h rmuser.o: ../../winix/core/sessioncontainer.h rmuser.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h rmuser.o: ../../winix/templates/templates.h @@ -1930,22 +1948,23 @@ run.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h run.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h run.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h run.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -run.o: ../../ezc/src/pattern.h functions.h functionparser.h +run.o: ../../ezc/src/cache.h functions.h functionparser.h run.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h run.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h run.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h run.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h run.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h run.o: uname.h upload.h uptime.h who.h vim.h ../../winix/core/htmlfilter.h -run.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -run.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -run.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -run.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -run.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -run.o: ../../winix/core/users.h ../../winix/core/groups.h -run.o: ../../winix/core/group.h ../../winix/core/loadavg.h -run.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -run.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +run.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +run.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +run.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +run.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +run.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +run.o: ../../winix/core/crypt.h ../../winix/core/users.h +run.o: ../../winix/core/groups.h ../../winix/core/group.h +run.o: ../../winix/core/loadavg.h ../../winix/core/image.h +run.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +run.o: ../../winix/core/synchro.h sort.o: sort.h functionbase.h ../../winix/core/item.h sort.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h sort.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -1978,27 +1997,27 @@ sort.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h sort.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h sort.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h sort.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -sort.o: ../../ezc/src/pattern.h functions.h functionparser.h +sort.o: ../../ezc/src/cache.h functions.h functionparser.h sort.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h sort.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h sort.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h sort.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h sort.o: rmuser.h run.h specialdefault.h stat.h subject.h template.h sort.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -sort.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -sort.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -sort.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -sort.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -sort.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -sort.o: ../../winix/core/crypt.h ../../winix/core/users.h -sort.o: ../../winix/core/groups.h ../../winix/core/group.h -sort.o: ../../winix/core/loadavg.h ../../winix/core/image.h -sort.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -sort.o: ../../winix/core/synchro.h ../../winix/core/plugin.h -sort.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h -sort.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h -sort.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h -sort.o: ../../winix/templates/templates.h +sort.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +sort.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +sort.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +sort.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +sort.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +sort.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +sort.o: ../../winix/core/users.h ../../winix/core/groups.h +sort.o: ../../winix/core/group.h ../../winix/core/loadavg.h +sort.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +sort.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +sort.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h +sort.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h +sort.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h +sort.o: ../../winix/functions/functions.h ../../winix/templates/templates.h sort.o: ../../winix/templates/patterncacher.h sort.o: ../../winix/templates/indexpatterns.h sort.o: ../../winix/templates/patterns.h @@ -2043,7 +2062,7 @@ specialdefault.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h specialdefault.o: ../../winix/templates/patterns.h locale.h specialdefault.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h specialdefault.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -specialdefault.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +specialdefault.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h specialdefault.o: functionparser.h ../../winix/core/cur.h account.h adduser.h specialdefault.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h specialdefault.o: default.h download.h emacs.h env.h imgcrop.h last.h login.h @@ -2051,7 +2070,8 @@ specialdefault.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h specialdefault.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h specialdefault.o: sort.h stat.h subject.h template.h timezone.h tinymce.h specialdefault.o: uname.h upload.h uptime.h who.h vim.h -specialdefault.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h +specialdefault.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +specialdefault.o: ../../ezc/src/patternparser.h specialdefault.o: ../../winix/notify/notifythread.h specialdefault.o: ../../winix/core/basethread.h specialdefault.o: ../../winix/notify/templatesnotify.h @@ -2094,23 +2114,23 @@ stat.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h stat.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h stat.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h stat.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -stat.o: ../../ezc/src/pattern.h functions.h functionparser.h +stat.o: ../../ezc/src/cache.h functions.h functionparser.h stat.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h stat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h stat.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h stat.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h stat.o: rmuser.h run.h sort.h specialdefault.h subject.h template.h stat.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -stat.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -stat.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -stat.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -stat.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -stat.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -stat.o: ../../winix/core/crypt.h ../../winix/core/users.h -stat.o: ../../winix/core/groups.h ../../winix/core/group.h -stat.o: ../../winix/core/loadavg.h ../../winix/core/image.h -stat.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -stat.o: ../../winix/core/synchro.h +stat.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +stat.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +stat.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +stat.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +stat.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +stat.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +stat.o: ../../winix/core/users.h ../../winix/core/groups.h +stat.o: ../../winix/core/group.h ../../winix/core/loadavg.h +stat.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +stat.o: ../../winix/core/timezones.h ../../winix/core/synchro.h subject.o: subject.h functionbase.h ../../winix/core/item.h subject.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h subject.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -2145,25 +2165,25 @@ subject.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h subject.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h subject.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h subject.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -subject.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +subject.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h subject.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h subject.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h subject.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h subject.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h subject.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h template.h subject.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -subject.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -subject.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -subject.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -subject.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -subject.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -subject.o: ../../winix/core/crypt.h ../../winix/core/users.h -subject.o: ../../winix/core/groups.h ../../winix/core/group.h -subject.o: ../../winix/core/loadavg.h ../../winix/core/image.h -subject.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -subject.o: ../../winix/core/synchro.h ../../winix/core/plugin.h -subject.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h -subject.o: ../../winix/core/sessionmanager.h +subject.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +subject.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +subject.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +subject.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +subject.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +subject.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +subject.o: ../../winix/core/users.h ../../winix/core/groups.h +subject.o: ../../winix/core/group.h ../../winix/core/loadavg.h +subject.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +subject.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +subject.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h +subject.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h subject.o: ../../winix/core/sessioncontainer.h subject.o: ../../winix/core/ipbancontainer.h subject.o: ../../winix/functions/functions.h @@ -2208,15 +2228,16 @@ template.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h template.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h template.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h template.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -template.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +template.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h template.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h template.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h template.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h ln.h template.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h template.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h template.o: subject.h timezone.h tinymce.h uname.h upload.h uptime.h who.h -template.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -template.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +template.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +template.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +template.o: ../../winix/core/basethread.h template.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h template.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h template.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -2259,15 +2280,16 @@ timezone.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h timezone.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h timezone.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h timezone.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -timezone.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +timezone.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h timezone.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h timezone.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h timezone.o: download.h emacs.h env.h imgcrop.h last.h login.h logout.h ln.h timezone.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h timezone.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h timezone.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -timezone.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -timezone.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +timezone.o: vim.h ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +timezone.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +timezone.o: ../../winix/core/basethread.h timezone.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h timezone.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h timezone.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -2310,23 +2332,23 @@ tinymce.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h tinymce.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h tinymce.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h tinymce.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -tinymce.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +tinymce.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h tinymce.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h tinymce.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h tinymce.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h tinymce.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h tinymce.o: template.h timezone.h uname.h upload.h uptime.h who.h vim.h -tinymce.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -tinymce.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -tinymce.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -tinymce.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -tinymce.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -tinymce.o: ../../winix/core/crypt.h ../../winix/core/users.h -tinymce.o: ../../winix/core/groups.h ../../winix/core/group.h -tinymce.o: ../../winix/core/loadavg.h ../../winix/core/image.h -tinymce.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -tinymce.o: ../../winix/core/synchro.h +tinymce.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +tinymce.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +tinymce.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +tinymce.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +tinymce.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +tinymce.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +tinymce.o: ../../winix/core/users.h ../../winix/core/groups.h +tinymce.o: ../../winix/core/group.h ../../winix/core/loadavg.h +tinymce.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +tinymce.o: ../../winix/core/timezones.h ../../winix/core/synchro.h uname.o: uname.h functionbase.h ../../winix/core/item.h uname.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h uname.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -2359,23 +2381,23 @@ uname.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h uname.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h uname.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h uname.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -uname.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +uname.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h uname.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h uname.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h uname.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h uname.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h uname.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h uname.o: template.h timezone.h tinymce.h upload.h uptime.h who.h vim.h -uname.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -uname.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -uname.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -uname.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -uname.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -uname.o: ../../winix/core/crypt.h ../../winix/core/users.h -uname.o: ../../winix/core/groups.h ../../winix/core/group.h -uname.o: ../../winix/core/loadavg.h ../../winix/core/image.h -uname.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -uname.o: ../../winix/core/synchro.h +uname.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +uname.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +uname.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +uname.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +uname.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +uname.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +uname.o: ../../winix/core/users.h ../../winix/core/groups.h +uname.o: ../../winix/core/group.h ../../winix/core/loadavg.h +uname.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +uname.o: ../../winix/core/timezones.h ../../winix/core/synchro.h upload.o: upload.h functionbase.h ../../winix/core/item.h upload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h upload.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -2410,25 +2432,26 @@ upload.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h upload.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h upload.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h upload.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -upload.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +upload.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h upload.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h upload.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h upload.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h upload.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h upload.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h upload.o: template.h timezone.h tinymce.h uname.h uptime.h who.h vim.h -upload.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -upload.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -upload.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -upload.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -upload.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -upload.o: ../../winix/core/crypt.h ../../winix/core/users.h -upload.o: ../../winix/core/groups.h ../../winix/core/group.h -upload.o: ../../winix/core/loadavg.h ../../winix/core/image.h -upload.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -upload.o: ../../winix/core/synchro.h ../../winix/core/misc.h -upload.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h -upload.o: ../../winix/core/system.h ../../winix/core/sessionmanager.h +upload.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +upload.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +upload.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +upload.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +upload.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +upload.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +upload.o: ../../winix/core/users.h ../../winix/core/groups.h +upload.o: ../../winix/core/group.h ../../winix/core/loadavg.h +upload.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +upload.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +upload.o: ../../winix/core/misc.h ../../winix/core/plugin.h +upload.o: ../../winix/core/pluginmsg.h ../../winix/core/system.h +upload.o: ../../winix/core/sessionmanager.h upload.o: ../../winix/core/sessioncontainer.h upload.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h upload.o: ../../winix/templates/templates.h @@ -2472,23 +2495,23 @@ uptime.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h uptime.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h uptime.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h uptime.o: ../../ezc/src/generator.h ../../ezc/src/vars.h -uptime.o: ../../ezc/src/blocks.h ../../ezc/src/pattern.h functions.h +uptime.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h functions.h uptime.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h uptime.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h uptime.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h uptime.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h uptime.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h uptime.o: template.h timezone.h tinymce.h uname.h upload.h who.h vim.h -uptime.o: ../../winix/core/htmlfilter.h ../../ezc/src/patternparser.h -uptime.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -uptime.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h -uptime.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h -uptime.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h -uptime.o: ../../winix/core/crypt.h ../../winix/core/users.h -uptime.o: ../../winix/core/groups.h ../../winix/core/group.h -uptime.o: ../../winix/core/loadavg.h ../../winix/core/image.h -uptime.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -uptime.o: ../../winix/core/synchro.h +uptime.o: ../../winix/core/htmlfilter.h ../../ezc/src/pattern.h +uptime.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +uptime.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +uptime.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h +uptime.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h +uptime.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h +uptime.o: ../../winix/core/users.h ../../winix/core/groups.h +uptime.o: ../../winix/core/group.h ../../winix/core/loadavg.h +uptime.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +uptime.o: ../../winix/core/timezones.h ../../winix/core/synchro.h vim.o: vim.h functionbase.h ../../winix/core/item.h vim.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h vim.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -2521,22 +2544,23 @@ vim.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h vim.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h vim.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -vim.o: ../../ezc/src/pattern.h functions.h functionparser.h +vim.o: ../../ezc/src/cache.h functions.h functionparser.h vim.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h vim.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h vim.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h vim.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h vim.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h vim.o: uname.h upload.h uptime.h who.h ../../winix/core/htmlfilter.h -vim.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -vim.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -vim.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -vim.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -vim.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -vim.o: ../../winix/core/users.h ../../winix/core/groups.h -vim.o: ../../winix/core/group.h ../../winix/core/loadavg.h -vim.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -vim.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +vim.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +vim.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +vim.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +vim.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +vim.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +vim.o: ../../winix/core/crypt.h ../../winix/core/users.h +vim.o: ../../winix/core/groups.h ../../winix/core/group.h +vim.o: ../../winix/core/loadavg.h ../../winix/core/image.h +vim.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +vim.o: ../../winix/core/synchro.h who.o: who.h functionbase.h ../../winix/core/item.h who.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h who.o: ../../pikotools/date/date.h ../../winix/db/db.h @@ -2569,19 +2593,20 @@ who.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h who.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h who.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h who.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -who.o: ../../ezc/src/pattern.h functions.h functionparser.h +who.o: ../../ezc/src/cache.h functions.h functionparser.h who.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h privchanger.h who.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.h imgcrop.h who.o: last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h who.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h who.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h who.o: uname.h upload.h uptime.h vim.h ../../winix/core/htmlfilter.h -who.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -who.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -who.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -who.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -who.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -who.o: ../../winix/core/users.h ../../winix/core/groups.h -who.o: ../../winix/core/group.h ../../winix/core/loadavg.h -who.o: ../../winix/core/image.h ../../winix/core/threadmanager.h -who.o: ../../winix/core/timezones.h ../../winix/core/synchro.h +who.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +who.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h +who.o: ../../winix/notify/templatesnotify.h ../../winix/core/users.h +who.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +who.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +who.o: ../../winix/core/crypt.h ../../winix/core/users.h +who.o: ../../winix/core/groups.h ../../winix/core/group.h +who.o: ../../winix/core/loadavg.h ../../winix/core/image.h +who.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h +who.o: ../../winix/core/synchro.h diff --git a/main/Makefile.dep b/main/Makefile.dep index 89162be..f320dc5 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -32,20 +32,20 @@ main.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h main.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h main.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h main.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h -main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -main.o: ../../ezc/src/funinfo.h ../../ezc/src/patternparser.h -main.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -main.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -main.o: ../../winix/core/users.h ../../winix/core/ugcontainer.h -main.o: ../../winix/core/lastcontainer.h ../../winix/core/mounts.h -main.o: ../../winix/core/mountparser.h ../../winix/core/crypt.h -main.o: ../../winix/core/run.h ../../winix/core/users.h -main.o: ../../winix/core/groups.h ../../winix/core/group.h -main.o: ../../winix/core/loadavg.h ../../winix/core/image.h -main.o: ../../winix/core/threadmanager.h ../../winix/core/timezones.h -main.o: ../../winix/core/timezone.h ../../winix/core/sessionmanager.h -main.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h -main.o: ../../winix/functions/functions.h +main.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +main.o: ../../ezc/src/funinfo.h ../../ezc/src/pattern.h +main.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +main.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +main.o: ../../winix/core/config.h ../../winix/core/users.h +main.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h +main.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h +main.o: ../../winix/core/crypt.h ../../winix/core/run.h +main.o: ../../winix/core/users.h ../../winix/core/groups.h +main.o: ../../winix/core/group.h ../../winix/core/loadavg.h +main.o: ../../winix/core/image.h ../../winix/core/threadmanager.h +main.o: ../../winix/core/timezones.h ../../winix/core/timezone.h +main.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h +main.o: ../../winix/core/ipbancontainer.h ../../winix/functions/functions.h main.o: ../../winix/functions/functionbase.h ../../winix/core/request.h main.o: ../../winix/core/system.h ../../winix/core/synchro.h main.o: ../../winix/functions/functionparser.h ../../winix/core/cur.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index 86261a5..c322678 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -13,8 +13,9 @@ notify.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h notify.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/vars.h notify.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h notify.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -notify.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -notify.o: ../../winix/templates/misc.h ../../winix/templates/htmltextstream.h +notify.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +notify.o: ../../ezc/src/patternparser.h ../../winix/templates/misc.h +notify.o: ../../winix/templates/htmltextstream.h notify.o: ../../winix/core/textstream.h notifythread.h notify.o: ../../winix/core/basethread.h ../../winix/core/synchro.h notify.o: templatesnotify.h ../../winix/core/config.h @@ -94,8 +95,9 @@ notifythread.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h notifythread.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h notifythread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h notifythread.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -notifythread.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -notifythread.o: ../../winix/core/textstream.h ../../winix/templates/misc.h +notifythread.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +notifythread.o: ../../ezc/src/patternparser.h ../../winix/core/textstream.h +notifythread.o: ../../winix/templates/misc.h notifythread.o: ../../winix/templates/localefilter.h notifythread.o: ../../winix/templates/locale.h notifythread.o: ../../winix/templates/htmltextstream.h @@ -133,8 +135,8 @@ templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/vars.h templatesnotify.o: ../../ezc/src/blocks.h ../../ezc/src/item.h templatesnotify.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -templatesnotify.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -templatesnotify.o: ../../ezc/src/patternparser.h +templatesnotify.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +templatesnotify.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h templatesnotify.o: ../../winix/core/textstream.h ../../winix/templates/misc.h templatesnotify.o: ../../winix/templates/localefilter.h templatesnotify.o: ../../winix/templates/locale.h diff --git a/notify/notifythread.cpp b/notify/notifythread.cpp index 65110e6..07b700c 100755 --- a/notify/notifythread.cpp +++ b/notify/notifythread.cpp @@ -207,6 +207,7 @@ void NotifyThread::SendMail() Lock(); // 'patterns' object can use logger or other stuff so we use Lock() before + Ezc::Pattern * pat = patterns.Get(template_index, lang_id); if( !pat ) @@ -221,13 +222,22 @@ void NotifyThread::SendMail() generator.RecognizeSpecialChars(true); generator.TrimWhite(true); generator.SkipNewLine(true); - /* - * !! IMPROVE ME - * add blocks and variables - * hmm may they are not needed here? - */ generator.SetFunctions(TemplatesNotifyFunctions::ezc_functions); generator.SetPattern(*pat); + + /* + * don't use cache + * 'pat' pattern is stored in 'patterns' object for all templates and by default + * all functions/blocks are cached, but we are in a second thread + * and cannot use such functions without locking + * + * IMPROVE ME + * blocks are parsed to the container from the main thread + * and we cannot just use it here (another thread) + * so may should we have our own 'patterns' object here? + * + */ + generator.CanUseCache(false); generator.Generate(notify_stream); SendMail(TemplatesNotifyFunctions::notify_user_msg.email, notify_stream.Str()); diff --git a/notify/templatesnotify.cpp b/notify/templatesnotify.cpp index b8784fb..5ea7a99 100755 --- a/notify/templatesnotify.cpp +++ b/notify/templatesnotify.cpp @@ -46,6 +46,7 @@ Ezc::Functions ezc_functions; + // you can use this pointer in template functions (will be always valid) NotifyUserMsg notify_user_msg; NotifyMsg notify_msg; @@ -120,6 +121,12 @@ void CreateFunctions() ezc_functions.Insert("fil_qencode", fil_qencode); + /* + * IMPROVE ME + * now we are able to read from a Space struct and these functions can be removed + * and we can use directly a Space struct + * (copy those functions here from normal templates) + */ ezc_functions.Insert("notify_add", notify_add); ezc_functions.Insert("notify_edit", notify_edit); ezc_functions.Insert("notify_delete", notify_delete); diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep index 171c68f..5de120b 100755 --- a/plugins/export/Makefile.dep +++ b/plugins/export/Makefile.dep @@ -32,13 +32,14 @@ edb.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h edb.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h edb.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h edb.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -edb.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +edb.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h edb.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -edb.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -edb.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -edb.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h -edb.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h -edb.o: ../../../winix/core/lastcontainer.h ../../../winix/core/log.h +edb.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +edb.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h +edb.o: ../../../winix/core/synchro.h ../../../winix/notify/templatesnotify.h +edb.o: ../../../winix/core/config.h ../../../winix/core/users.h +edb.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h +edb.o: ../../../winix/core/log.h exportinfo.o: ../../../winix/core/log.h exportinfo.h exportinfo.o: ../../../winix/core/system.h ../../../winix/core/job.h exportinfo.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h @@ -81,9 +82,9 @@ exportinfo.o: ../../../winix/templates/patterns.h exportinfo.o: ../../../winix/templates/locale.h exportinfo.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h exportinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -exportinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +exportinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h exportinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -exportinfo.o: ../../../ezc/src/patternparser.h +exportinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h exportinfo.o: ../../../winix/notify/notifythread.h exportinfo.o: ../../../winix/core/basethread.h exportinfo.o: ../../../winix/notify/templatesnotify.h @@ -154,9 +155,9 @@ funexport.o: ../../../winix/templates/patterns.h funexport.o: ../../../winix/templates/locale.h funexport.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h funexport.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -funexport.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +funexport.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h funexport.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -funexport.o: ../../../ezc/src/patternparser.h +funexport.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h funexport.o: ../../../winix/notify/notifythread.h funexport.o: ../../../winix/core/basethread.h funexport.o: ../../../winix/notify/templatesnotify.h @@ -207,10 +208,10 @@ init.o: ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h init.o: ../../../winix/core/lastcontainer.h ../../../winix/core/mounts.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index 63eb93d..8f2bd41 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -39,9 +39,9 @@ gallery.o: ../../../winix/templates/patterns.h gallery.o: ../../../winix/templates/locale.h gallery.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h gallery.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -gallery.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +gallery.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h gallery.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -gallery.o: ../../../ezc/src/patternparser.h +gallery.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h gallery.o: ../../../winix/notify/notifythread.h gallery.o: ../../../winix/core/basethread.h gallery.o: ../../../winix/notify/templatesnotify.h @@ -94,10 +94,10 @@ init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h init.o: ../../../winix/core/mounts.h ../../../winix/core/mountparser.h @@ -184,9 +184,9 @@ templates.o: ../../../winix/templates/patterns.h templates.o: ../../../winix/templates/locale.h templates.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/patternparser.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h templates.o: ../../../winix/notify/notifythread.h templates.o: ../../../winix/core/basethread.h templates.o: ../../../winix/notify/templatesnotify.h diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep index 1c890f3..943c638 100755 --- a/plugins/group/Makefile.dep +++ b/plugins/group/Makefile.dep @@ -38,9 +38,9 @@ groupinfo.o: ../../../winix/templates/patterns.h groupinfo.o: ../../../winix/templates/locale.h groupinfo.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h groupinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -groupinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +groupinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h groupinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -groupinfo.o: ../../../ezc/src/patternparser.h +groupinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h groupinfo.o: ../../../winix/notify/notifythread.h groupinfo.o: ../../../winix/core/basethread.h groupinfo.o: ../../../winix/notify/templatesnotify.h @@ -93,10 +93,10 @@ init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h init.o: ../../../winix/core/lastcontainer.h ../../../winix/core/mounts.h @@ -143,10 +143,10 @@ init.o: ../../../winix/core/sessionmanager.h groupinfo.h templates.o: ../../../winix/templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h templates.o: ../../../ezc/src/blocks.h ../../../winix/core/item.h -templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +templates.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h templates.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/patternparser.h ../../../winix/core/misc.h -templates.o: ../../../winix/core/requesttypes.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +templates.o: ../../../winix/core/misc.h ../../../winix/core/requesttypes.h templates.o: ../../../pikotools/textstream/textstream.h templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h templates.o: ../../../pikotools/convert/convert.h diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep index f622ebd..7a26f7b 100755 --- a/plugins/menu/Makefile.dep +++ b/plugins/menu/Makefile.dep @@ -77,10 +77,10 @@ init.o: ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h -init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/blocks.h cache.h ../../../winix/core/dirs.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h init.o: ../../../winix/core/lastcontainer.h ../../../winix/core/mounts.h @@ -124,39 +124,25 @@ init.o: ../../../winix/templates/indexpatterns.h init.o: ../../../winix/templates/patterns.h init.o: ../../../winix/templates/changepatterns.h init.o: ../../../winix/templates/htmltextstream.h -init.o: ../../../winix/core/sessionmanager.h cache.h -init.o: ../../../winix/core/dirs.h +init.o: ../../../winix/core/sessionmanager.h templates.o: ../../../winix/templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -templates.o: ../../../ezc/src/blocks.h ../../../winix/core/item.h -templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h -templates.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/patternparser.h ../../../winix/core/misc.h +templates.o: ../../../ezc/src/blocks.h ../../../winix/core/item.h cache.h +templates.o: ../../../winix/core/item.h ../../../pikotools/space/space.h +templates.o: ../../../pikotools/textstream/types.h +templates.o: ../../../pikotools/date/date.h ../../../winix/core/dirs.h +templates.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h +templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h +templates.o: ../../../winix/db/dbtextstream.h +templates.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h templates.o: ../../../winix/core/requesttypes.h templates.o: ../../../pikotools/textstream/textstream.h -templates.o: ../../../pikotools/space/space.h -templates.o: ../../../pikotools/textstream/types.h -templates.o: ../../../pikotools/date/date.h templates.o: ../../../pikotools/convert/convert.h templates.o: ../../../pikotools/convert/inttostr.h templates.o: ../../../pikotools/membuffer/membuffer.h templates.o: ../../../pikotools/textstream/types.h -templates.o: ../../../winix/core/winix_const.h -templates.o: ../../../winix/templates/patterncacher.h -templates.o: ../../../winix/core/item.h -templates.o: ../../../winix/templates/indexpatterns.h -templates.o: ../../../winix/templates/patterns.h -templates.o: ../../../winix/templates/locale.h -templates.o: ../../../winix/templates/changepatterns.h -templates.o: ../../../winix/templates/htmltextstream.h -templates.o: ../../../winix/templates/localefilter.h -templates.o: ../../../winix/core/config.h ../../../winix/core/cur.h -templates.o: ../../../winix/core/system.h -templates.o: ../../../winix/core/sessionmanager.h -templates.o: ../../../winix/core/htmlfilter.h ../../../winix/db/db.h -templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h -templates.o: ../../../winix/db/dbtextstream.h -templates.o: ../../../winix/core/textstream.h ../../../winix/core/error.h +templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h +templates.o: ../../../winix/core/error.h templates.o: ../../../pikotools/space/spaceparser.h templates.o: ../../../pikotools/space/space.h ../../../winix/db/dbitemquery.h templates.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h @@ -172,19 +158,30 @@ templates.o: ../../../pikotools/space/spacetojson.h templates.o: ../../../winix/core/session.h ../../../winix/core/user.h templates.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h templates.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -templates.o: ../../../winix/templates/locale.h ../../../winix/core/plugin.h -templates.o: ../../../winix/core/pluginmsg.h ../../../winix/core/system.h -templates.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -templates.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -templates.o: ../../../winix/core/dircontainer.h -templates.o: ../../../winix/notify/notify.h +templates.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h templates.o: ../../../winix/notify/notifypool.h templates.o: ../../../winix/templates/patterns.h +templates.o: ../../../winix/templates/locale.h +templates.o: ../../../winix/templates/localefilter.h templates.o: ../../../winix/notify/notifythread.h -templates.o: ../../../winix/core/basethread.h +templates.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h templates.o: ../../../winix/notify/templatesnotify.h -templates.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h -templates.o: ../../../winix/core/lastcontainer.h ../../../winix/core/mounts.h +templates.o: ../../../winix/core/config.h ../../../winix/core/users.h +templates.o: ../../../winix/core/ugcontainer.h +templates.o: ../../../winix/core/lastcontainer.h ../../../ezc/src/pattern.h +templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +templates.o: ../../../ezc/src/patternparser.h +templates.o: ../../../winix/templates/patterncacher.h +templates.o: ../../../winix/templates/indexpatterns.h +templates.o: ../../../winix/templates/patterns.h +templates.o: ../../../winix/templates/changepatterns.h +templates.o: ../../../winix/templates/htmltextstream.h +templates.o: ../../../winix/core/cur.h ../../../winix/core/system.h +templates.o: ../../../winix/core/sessionmanager.h +templates.o: ../../../winix/core/htmlfilter.h ../../../winix/core/plugin.h +templates.o: ../../../winix/core/pluginmsg.h ../../../winix/core/system.h +templates.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +templates.o: ../../../winix/core/dirs.h ../../../winix/core/mounts.h templates.o: ../../../winix/core/mountparser.h ../../../winix/core/crypt.h templates.o: ../../../winix/core/run.h ../../../winix/core/users.h templates.o: ../../../winix/core/groups.h ../../../winix/core/group.h @@ -228,6 +225,5 @@ templates.o: ../../../winix/functions/uname.h templates.o: ../../../winix/functions/upload.h templates.o: ../../../winix/functions/uptime.h ../../../winix/functions/who.h templates.o: ../../../winix/functions/vim.h ../../../winix/core/log.h -templates.o: ../../../winix/core/misc.h cache.h ../../../winix/core/dirs.h -templates.o: ../../../winix/templates/miscspace.h +templates.o: ../../../winix/core/misc.h ../../../winix/templates/miscspace.h templates.o: ../../../winix/templates/templates.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 9c3759a..30357b3 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -39,10 +39,10 @@ init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h init.o: ../../../winix/core/mounts.h ../../../winix/core/mountparser.h @@ -147,9 +147,9 @@ templates.o: ../../../winix/templates/patterns.h templates.o: ../../../winix/templates/locale.h templates.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/patternparser.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h templates.o: ../../../winix/notify/notifythread.h templates.o: ../../../winix/core/basethread.h templates.o: ../../../winix/notify/templatesnotify.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index e11c52c..dcf113f 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -45,8 +45,9 @@ createthread.o: ../../../winix/templates/locale.h createthread.o: ../../../winix/templates/localefilter.h createthread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h createthread.o: ../../../ezc/src/vars.h ../../../ezc/src/blocks.h -createthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h -createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h +createthread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/pattern.h +createthread.o: ../../../ezc/src/patternparser.h createthread.o: ../../../winix/notify/notifythread.h createthread.o: ../../../winix/core/basethread.h createthread.o: ../../../winix/notify/templatesnotify.h @@ -146,9 +147,9 @@ funthread.o: ../../../winix/templates/patterns.h funthread.o: ../../../winix/templates/locale.h funthread.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h funthread.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -funthread.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +funthread.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h funthread.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -funthread.o: ../../../ezc/src/patternparser.h +funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h funthread.o: ../../../winix/notify/notifythread.h funthread.o: ../../../winix/core/basethread.h funthread.o: ../../../winix/notify/templatesnotify.h @@ -200,10 +201,10 @@ init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h init.o: ../../../winix/core/mounts.h ../../../winix/core/mountparser.h @@ -293,9 +294,9 @@ reply.o: ../../../winix/templates/patterns.h reply.o: ../../../winix/templates/locale.h reply.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h reply.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -reply.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +reply.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -reply.o: ../../../ezc/src/patternparser.h +reply.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h reply.o: ../../../winix/notify/notifythread.h reply.o: ../../../winix/core/basethread.h reply.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h @@ -382,9 +383,9 @@ showthreads.o: ../../../winix/templates/patterns.h showthreads.o: ../../../winix/templates/locale.h showthreads.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h showthreads.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -showthreads.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +showthreads.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h showthreads.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -showthreads.o: ../../../ezc/src/patternparser.h +showthreads.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h showthreads.o: ../../../winix/notify/notifythread.h showthreads.o: ../../../winix/core/basethread.h showthreads.o: ../../../winix/notify/templatesnotify.h @@ -441,9 +442,9 @@ templates.o: ../../../winix/templates/patterns.h templates.o: ../../../winix/templates/locale.h templates.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/patternparser.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h templates.o: ../../../winix/notify/notifythread.h templates.o: ../../../winix/core/basethread.h templates.o: ../../../winix/notify/templatesnotify.h @@ -546,9 +547,9 @@ threadinfo.o: ../../../winix/templates/patterns.h threadinfo.o: ../../../winix/templates/locale.h threadinfo.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h threadinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -threadinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +threadinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h threadinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -threadinfo.o: ../../../ezc/src/patternparser.h +threadinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h threadinfo.o: ../../../winix/notify/notifythread.h threadinfo.o: ../../../winix/core/basethread.h threadinfo.o: ../../../winix/notify/templatesnotify.h diff --git a/plugins/thread/templates.cpp b/plugins/thread/templates.cpp index ae7be2f..4580de0 100755 --- a/plugins/thread/templates.cpp +++ b/plugins/thread/templates.cpp @@ -354,15 +354,8 @@ void thread_sort_tab_run(Info & i) Ezc::Pattern * p = pattern_cacher.GetPattern(*thread_info.item_sort_tab[item_sort_index]); item_run_content.Clear(); - ezc_generator.TrimWhite(gen_trim_white); - ezc_generator.SkipNewLine(gen_skip_new_line); - ezc_generator.RecognizeSpecialChars(gen_use_special_chars); - ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); + InitGenerator(ezc_generator); ezc_generator.SetPattern(*p); - /* - * IMPROVE ME - * set variables and blocks (functions are cached) - */ ezc_generator.Generate(item_run_content); item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->content_type); diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index f65b3a0..100ab35 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -46,8 +46,9 @@ createticket.o: ../../../winix/templates/locale.h createticket.o: ../../../winix/templates/localefilter.h createticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h createticket.o: ../../../ezc/src/vars.h ../../../ezc/src/blocks.h -createticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h -createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h +createticket.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h +createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/pattern.h +createticket.o: ../../../ezc/src/patternparser.h createticket.o: ../../../winix/notify/notifythread.h createticket.o: ../../../winix/core/basethread.h createticket.o: ../../../winix/notify/templatesnotify.h @@ -163,9 +164,9 @@ editticket.o: ../../../winix/templates/patterns.h editticket.o: ../../../winix/templates/locale.h editticket.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h editticket.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -editticket.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +editticket.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -editticket.o: ../../../ezc/src/patternparser.h +editticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h editticket.o: ../../../winix/notify/notifythread.h editticket.o: ../../../winix/core/basethread.h editticket.o: ../../../winix/notify/templatesnotify.h @@ -270,9 +271,9 @@ funticket.o: ../../../winix/templates/patterns.h funticket.o: ../../../winix/templates/locale.h funticket.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h funticket.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -funticket.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +funticket.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -funticket.o: ../../../ezc/src/patternparser.h +funticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h funticket.o: ../../../winix/notify/notifythread.h funticket.o: ../../../winix/core/basethread.h funticket.o: ../../../winix/notify/templatesnotify.h @@ -368,10 +369,10 @@ init.o: ../../../winix/notify/notifypool.h init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -init.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h -init.o: ../../../winix/core/basethread.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h init.o: ../../../winix/functions/functionparser.h ../../../winix/core/cur.h @@ -470,9 +471,9 @@ showtickets.o: ../../../winix/templates/patterns.h showtickets.o: ../../../winix/templates/locale.h showtickets.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h showtickets.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -showtickets.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +showtickets.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h showtickets.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -showtickets.o: ../../../ezc/src/patternparser.h +showtickets.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h showtickets.o: ../../../winix/notify/notifythread.h showtickets.o: ../../../winix/core/basethread.h showtickets.o: ../../../winix/notify/templatesnotify.h @@ -545,11 +546,11 @@ templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/vars.h ../../../ezc/src/blocks.h templates.o: ../../../winix/core/item.h ../../../pikotools/space/space.h templates.o: ../../../pikotools/textstream/types.h -templates.o: ../../../pikotools/date/date.h ../../../ezc/src/pattern.h +templates.o: ../../../pikotools/date/date.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h -templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h -templates.o: ticketinfo.h ticket.h ../../../winix/core/item.h -templates.o: ../../../winix/core/system.h +templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/pattern.h +templates.o: ../../../ezc/src/patternparser.h ticketinfo.h ticket.h +templates.o: ../../../winix/core/item.h ../../../winix/core/system.h templates.o: ../../../winix/functions/functions.h templates.o: ../../../winix/functions/functionbase.h ../../../winix/db/db.h templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h @@ -691,9 +692,9 @@ ticketinfo.o: ../../../winix/templates/patterns.h ticketinfo.o: ../../../winix/templates/locale.h ticketinfo.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h ticketinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h -ticketinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h +ticketinfo.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h ticketinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -ticketinfo.o: ../../../ezc/src/patternparser.h +ticketinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h ticketinfo.o: ../../../winix/notify/notifythread.h ticketinfo.o: ../../../winix/core/basethread.h ticketinfo.o: ../../../winix/notify/templatesnotify.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index fc0a289..0764d82 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -3,10 +3,10 @@ adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h adduser.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -adduser.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -adduser.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -adduser.o: ../../pikotools/textstream/types.h +adduser.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +adduser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h adduser.o: ../../pikotools/textstream/textstream.h adduser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h adduser.o: ../../pikotools/convert/convert.h @@ -64,15 +64,16 @@ changepatterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h changepatterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h changepatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h changepatterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -changepatterns.o: misc.h htmltextstream.h ../../winix/core/textstream.h +changepatterns.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +changepatterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h +changepatterns.o: ../../winix/core/textstream.h config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h config.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h config.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -config.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -config.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -config.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -config.o: ../../pikotools/textstream/types.h +config.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +config.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h config.o: ../../pikotools/textstream/textstream.h config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h config.o: ../../pikotools/convert/convert.h @@ -118,10 +119,10 @@ config.o: ../../winix/core/htmlfilter.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h dir.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -dir.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -dir.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -dir.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -dir.o: ../../pikotools/textstream/types.h +dir.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +dir.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +dir.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +dir.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h dir.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h dir.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h dir.o: ../../pikotools/convert/inttostr.h @@ -188,10 +189,10 @@ dir.o: ../../winix/functions/vim.h miscspace.h doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h doc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -doc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -doc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -doc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -doc.o: ../../pikotools/textstream/types.h +doc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +doc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +doc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +doc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h doc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h doc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h doc.o: ../../pikotools/convert/inttostr.h @@ -235,10 +236,10 @@ doc.o: ../../winix/core/misc.h ../../winix/core/winix_const.h env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h env.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h env.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -env.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -env.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -env.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -env.o: ../../pikotools/textstream/types.h +env.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +env.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +env.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +env.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h env.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h env.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h env.o: ../../pikotools/convert/inttostr.h @@ -305,10 +306,10 @@ env.o: ../../winix/functions/vim.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h filters.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -filters.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -filters.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -filters.o: ../../pikotools/textstream/types.h +filters.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +filters.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +filters.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h filters.o: ../../pikotools/textstream/textstream.h filters.o: ../../pikotools/space/space.h ../../pikotools/date/date.h filters.o: ../../pikotools/convert/convert.h @@ -366,15 +367,15 @@ htmltextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h htmltextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -htmltextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -htmltextstream.o: ../../ezc/src/patternparser.h +htmltextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/vars.h indexpatterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h indexpatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -indexpatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -indexpatterns.o: ../../ezc/src/patternparser.h patterns.h locale.h -indexpatterns.o: ../../pikotools/space/spaceparser.h +indexpatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +indexpatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +indexpatterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h indexpatterns.o: ../../pikotools/space/space.h indexpatterns.o: ../../pikotools/textstream/types.h indexpatterns.o: ../../pikotools/textstream/textstream.h @@ -390,10 +391,10 @@ indexpatterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h insert.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h insert.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -insert.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -insert.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -insert.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -insert.o: ../../pikotools/textstream/types.h +insert.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +insert.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +insert.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +insert.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h insert.o: ../../pikotools/textstream/textstream.h insert.o: ../../pikotools/space/space.h ../../pikotools/date/date.h insert.o: ../../pikotools/convert/convert.h @@ -440,10 +441,10 @@ insert.o: ../../winix/core/misc.h ../../winix/core/winix_const.h ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h ipban.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h ipban.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -ipban.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -ipban.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -ipban.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -ipban.o: ../../pikotools/textstream/types.h +ipban.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +ipban.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +ipban.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +ipban.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ipban.o: ../../pikotools/textstream/textstream.h ipban.o: ../../pikotools/space/space.h ../../pikotools/date/date.h ipban.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -513,10 +514,10 @@ ipban.o: ../../winix/functions/vim.h item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h item.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h item.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -item.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -item.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -item.o: ../../pikotools/textstream/types.h +item.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +item.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +item.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +item.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h item.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h item.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h item.o: ../../pikotools/convert/inttostr.h @@ -561,10 +562,10 @@ item.o: ../../winix/core/bbcodeparser.h miscspace.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h last.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h last.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -last.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -last.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -last.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -last.o: ../../pikotools/textstream/types.h +last.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +last.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +last.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +last.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h last.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h last.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h last.o: ../../pikotools/convert/inttostr.h @@ -631,17 +632,17 @@ localefilter.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h localefilter.o: ../../ezc/src/generator.h ../../ezc/src/vars.h localefilter.o: ../../ezc/src/blocks.h ../../ezc/src/item.h localefilter.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -localefilter.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -localefilter.o: ../../ezc/src/patternparser.h ../core/misc.h -localefilter.o: ../../winix/core/requesttypes.h +localefilter.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +localefilter.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +localefilter.o: ../core/misc.h ../../winix/core/requesttypes.h localefilter.o: ../../winix/core/winix_const.h login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h login.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h login.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -login.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -login.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -login.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -login.o: ../../pikotools/textstream/types.h +login.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +login.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +login.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +login.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h login.o: ../../pikotools/textstream/textstream.h login.o: ../../pikotools/space/space.h ../../pikotools/date/date.h login.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -709,10 +710,10 @@ login.o: ../../winix/functions/vim.h ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h ls.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -ls.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -ls.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -ls.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -ls.o: ../../pikotools/textstream/types.h +ls.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +ls.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +ls.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +ls.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ls.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h ls.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h ls.o: ../../pikotools/convert/inttostr.h @@ -755,10 +756,10 @@ ls.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h man.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h man.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -man.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -man.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -man.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -man.o: ../../pikotools/textstream/types.h +man.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +man.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +man.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +man.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h man.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h man.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h man.o: ../../pikotools/convert/inttostr.h @@ -825,10 +826,10 @@ man.o: ../../winix/functions/vim.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h misc.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h misc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -misc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -misc.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -misc.o: ../../pikotools/textstream/types.h +misc.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +misc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +misc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +misc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h misc.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h misc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h misc.o: ../../pikotools/convert/inttostr.h @@ -872,9 +873,9 @@ misc.o: ../../winix/core/winix_const.h ../../winix/core/request.h miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h miscspace.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -miscspace.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -miscspace.o: ../../pikotools/space/spaceparser.h +miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h miscspace.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h miscspace.o: ../../pikotools/textstream/textstream.h miscspace.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -922,10 +923,10 @@ miscspace.o: ../../winix/core/htmlfilter.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h mount.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h mount.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -mount.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -mount.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -mount.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -mount.o: ../../pikotools/textstream/types.h +mount.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +mount.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +mount.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +mount.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h mount.o: ../../pikotools/textstream/textstream.h mount.o: ../../pikotools/space/space.h ../../pikotools/date/date.h mount.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -972,9 +973,10 @@ passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h passwd.o: ../../ezc/src/generator.h ../../ezc/src/vars.h passwd.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h passwd.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -passwd.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -passwd.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -passwd.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +passwd.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +passwd.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +passwd.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +passwd.o: ../../pikotools/textstream/types.h passwd.o: ../../pikotools/textstream/textstream.h passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h passwd.o: ../../pikotools/convert/convert.h @@ -1031,10 +1033,10 @@ patterncacher.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/vars.h patterncacher.o: ../../ezc/src/blocks.h ../../ezc/src/item.h patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -patterncacher.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -patterncacher.o: ../../ezc/src/patternparser.h htmltextstream.h -patterncacher.o: ../../winix/core/textstream.h ../../winix/core/log.h -patterncacher.o: ../../winix/core/textstream.h +patterncacher.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +patterncacher.o: htmltextstream.h ../../winix/core/textstream.h +patterncacher.o: ../../winix/core/log.h ../../winix/core/textstream.h patterncacher.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h patterncacher.o: ../../winix/core/cur.h ../../winix/templates/locale.h patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h @@ -1048,19 +1050,19 @@ patterns.o: ../../pikotools/textstream/types.h localefilter.h patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h patterns.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -patterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h -patterns.o: ../../winix/core/textstream.h ../../winix/core/log.h -patterns.o: ../../winix/core/textstream.h ../../winix/core/logmanipulators.h -patterns.o: ../../winix/core/slog.h ../../winix/core/cur.h -patterns.o: ../../winix/templates/locale.h +patterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +patterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +patterns.o: htmltextstream.h ../../winix/core/textstream.h +patterns.o: ../../winix/core/log.h ../../winix/core/textstream.h +patterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h +patterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h priv.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h priv.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -priv.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -priv.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -priv.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -priv.o: ../../pikotools/textstream/types.h +priv.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +priv.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +priv.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +priv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h priv.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h priv.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h priv.o: ../../pikotools/convert/inttostr.h @@ -1129,9 +1131,10 @@ rebus.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h rebus.o: ../../ezc/src/generator.h ../../ezc/src/vars.h rebus.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h rebus.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -rebus.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -rebus.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -rebus.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +rebus.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +rebus.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +rebus.o: ../../pikotools/textstream/types.h rebus.o: ../../pikotools/textstream/textstream.h rebus.o: ../../pikotools/space/space.h ../../pikotools/date/date.h rebus.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -1183,16 +1186,16 @@ slog.o: ../../pikotools/textstream/types.h templates.h ../../ezc/src/ezc.h slog.o: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h slog.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -slog.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -slog.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -slog.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h -slog.o: htmltextstream.h ../../winix/core/textstream.h patterncacher.h -slog.o: ../../winix/core/item.h indexpatterns.h patterns.h changepatterns.h -slog.o: ../../winix/core/config.h ../../winix/core/htmlfilter.h -slog.o: ../../winix/core/cur.h ../../winix/core/request.h -slog.o: ../../winix/core/requesttypes.h ../../winix/core/error.h -slog.o: ../../winix/core/config.h ../../winix/core/textstream.h -slog.o: ../../winix/templates/htmltextstream.h +slog.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +slog.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +slog.o: ../../pikotools/textstream/types.h htmltextstream.h +slog.o: ../../winix/core/textstream.h patterncacher.h ../../winix/core/item.h +slog.o: indexpatterns.h patterns.h changepatterns.h ../../winix/core/config.h +slog.o: ../../winix/core/htmlfilter.h ../../winix/core/cur.h +slog.o: ../../winix/core/request.h ../../winix/core/requesttypes.h +slog.o: ../../winix/core/error.h ../../winix/core/config.h +slog.o: ../../winix/core/textstream.h ../../winix/templates/htmltextstream.h slog.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h slog.o: ../../winix/core/user.h ../../winix/core/plugindata.h slog.o: ../../winix/core/rebus.h ../../winix/core/ipban.h @@ -1222,10 +1225,10 @@ slog.o: ../../winix/core/system.h ../../winix/core/htmlfilter.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h stat.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h stat.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -stat.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -stat.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -stat.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -stat.o: ../../pikotools/textstream/types.h +stat.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +stat.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +stat.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +stat.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h stat.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h stat.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h stat.o: ../../pikotools/convert/inttostr.h @@ -1269,10 +1272,10 @@ stat.o: ../../winix/core/misc.h ../../winix/core/winix_const.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h sys.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -sys.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -sys.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -sys.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -sys.o: ../../pikotools/textstream/types.h +sys.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +sys.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +sys.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +sys.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h sys.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h sys.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h sys.o: ../../pikotools/convert/inttostr.h @@ -1340,10 +1343,10 @@ sys.o: ../../winix/functions/vim.h ../../winix/templates/templates.h template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h template.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h template.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -template.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -template.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -template.o: ../../pikotools/textstream/types.h +template.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +template.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +template.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h template.o: ../../pikotools/textstream/textstream.h template.o: ../../pikotools/space/space.h ../../pikotools/date/date.h template.o: ../../pikotools/convert/convert.h @@ -1391,9 +1394,9 @@ template.o: ../../winix/core/winix_const.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h templates.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -templates.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -templates.o: ../../pikotools/space/spaceparser.h +templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +templates.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h templates.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h templates.o: ../../pikotools/textstream/textstream.h templates.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -1479,15 +1482,17 @@ textextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h textextstream.o: ../../ezc/src/generator.h ../../ezc/src/vars.h textextstream.o: ../../ezc/src/blocks.h ../../ezc/src/item.h textextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -textextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -textextstream.o: ../../ezc/src/patternparser.h htmltextstream.h +textextstream.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +textextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +textextstream.o: htmltextstream.h upload.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h upload.o: ../../ezc/src/generator.h ../../ezc/src/vars.h upload.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/funinfo.h upload.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h -upload.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -upload.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -upload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +upload.o: ../../ezc/src/cache.h ../../ezc/src/pattern.h +upload.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +upload.o: ../../pikotools/textstream/types.h upload.o: ../../pikotools/textstream/textstream.h upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h upload.o: ../../pikotools/convert/convert.h @@ -1533,10 +1538,10 @@ upload.o: ../../winix/core/htmlfilter.h uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h uptime.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -uptime.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -uptime.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -uptime.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -uptime.o: ../../pikotools/textstream/types.h +uptime.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +uptime.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +uptime.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +uptime.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h uptime.o: ../../pikotools/textstream/textstream.h uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h uptime.o: ../../pikotools/convert/convert.h @@ -1582,10 +1587,10 @@ uptime.o: ../../winix/core/htmlfilter.h user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h user.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h user.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -user.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -user.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -user.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -user.o: ../../pikotools/textstream/types.h +user.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +user.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +user.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +user.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h user.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h user.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h user.o: ../../pikotools/convert/inttostr.h @@ -1629,10 +1634,10 @@ user.o: ../../winix/core/misc.h ../../winix/core/winix_const.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h who.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -who.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -who.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -who.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -who.o: ../../pikotools/textstream/types.h +who.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +who.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +who.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +who.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h who.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h who.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h who.o: ../../pikotools/convert/inttostr.h @@ -1676,10 +1681,10 @@ who.o: ../../winix/core/misc.h ../../winix/core/winix_const.h winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h winix.o: ../../ezc/src/vars.h ../../ezc/src/blocks.h ../../ezc/src/item.h winix.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -winix.o: ../../pikotools/utf8/utf8.h ../../ezc/src/pattern.h -winix.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -winix.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -winix.o: ../../pikotools/textstream/types.h +winix.o: ../../pikotools/utf8/utf8.h ../../ezc/src/cache.h +winix.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h +winix.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +winix.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h winix.o: ../../pikotools/textstream/textstream.h winix.o: ../../pikotools/space/space.h ../../pikotools/date/date.h winix.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h diff --git a/templates/insert.cpp b/templates/insert.cpp index d4d3985..f29543f 100755 --- a/templates/insert.cpp +++ b/templates/insert.cpp @@ -73,15 +73,8 @@ void insert_page_run(Info & i) insert_page_cur += 1; info.run_content.Clear(); - info.ezc_gen.TrimWhite(gen_trim_white); - info.ezc_gen.SkipNewLine(gen_skip_new_line); - info.ezc_gen.RecognizeSpecialChars(gen_use_special_chars); - info.ezc_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - /* - * !! IMPROVE ME - * add blocks and variables - * hmm may they are not needed here? - */ + + InitGenerator(info.ezc_gen); info.ezc_gen.SetPattern(*pat); info.ezc_gen.Generate(info.run_content); item_print_content(i.out, info.run_content.Str(), info.item.content_type); diff --git a/templates/item.cpp b/templates/item.cpp index 5f5b2ac..cb21427 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -332,15 +332,7 @@ void item_run(Info & i) Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item); item_run_content.Clear(); - ezc_generator.TrimWhite(gen_trim_white); - ezc_generator.SkipNewLine(gen_skip_new_line); - ezc_generator.RecognizeSpecialChars(gen_use_special_chars); - ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - /* - * !! IMPROVE ME - * add blocks and variables - * hmm may they are not needed here? - */ + InitGenerator(ezc_generator); ezc_generator.SetPattern(*p); ezc_generator.Generate(item_run_content); @@ -735,15 +727,7 @@ void item_tab_run(Info & i) { Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item_tab[item_index]); item_run_content.Clear(); - ezc_generator.TrimWhite(gen_trim_white); - ezc_generator.SkipNewLine(gen_skip_new_line); - ezc_generator.RecognizeSpecialChars(gen_use_special_chars); - ezc_generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - /* - * !! IMPROVE ME - * add blocks and variables - * hmm may they are not needed here? - */ + InitGenerator(ezc_generator); ezc_generator.SetPattern(*p); ezc_generator.Generate(item_run_content); item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].content_type); diff --git a/templates/misc.cpp b/templates/misc.cpp index 4da3d7c..ba99d8a 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -45,6 +45,9 @@ namespace Winix namespace TemplatesFunctions { +extern EzcFun ezc_functions; +extern Ezc::Blocks ezc_blocks; + void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in) @@ -88,6 +91,28 @@ int was_enter = 0; // how many enteres there were before + +void InitGenerator(EzcGen & gen) +{ + gen.TrimWhite(gen_trim_white); + gen.SkipNewLine(gen_skip_new_line); + gen.RecognizeSpecialChars(gen_use_special_chars); + gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); + gen.SetCommentary(config->ezc_error_prefix, config->ezc_error_postfix); + + /* + * although we have addresses to blocks and functions cached in patters + * we have to provide it here because they will be used for variables + * if a variable is an alias e.g. [def variable function] + */ + gen.SetBlocks(ezc_blocks); + gen.SetFunctions(ezc_functions); +} + + + + + void print_hour_min(Info & i, time_t time) { char buffer[100]; diff --git a/templates/misc.h b/templates/misc.h index b8d6402..7f20712 100755 --- a/templates/misc.h +++ b/templates/misc.h @@ -63,6 +63,8 @@ HtmlTextStream::RawText R(const RawType & par) } +void InitGenerator(EzcGen & gen); + void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in); void print_hour_min(Info & i, time_t time); diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 829209c..903d0d6 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -42,7 +42,8 @@ PatternCacher::PatternCacher() { when_delete_patterns = 13; how_many_delete = 3; - ezc_fun = 0; + ezc_fun = 0; + ezc_blocks = 0; } @@ -52,6 +53,16 @@ void PatternCacher::SetEzcFunctions(TemplatesFunctions::EzcFun * fun) } +void PatternCacher::SetEzcBlocks(Ezc::Blocks * blocks) +{ + ezc_blocks = blocks; +} + +void PatternCacher::SetEzcCommentary(const std::wstring & start, const std::wstring & end) +{ + pattern_parser.SetCommentary(start, end); +} + void PatternCacher::SetWhenDelete(size_t when_delete, size_t how_many_del) { when_delete_patterns = when_delete; @@ -97,30 +108,30 @@ void PatternCacher::DeleteOldPatterns() void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) { /* - * CHECK ME - * check the rest flags from pattern_parser - * if the default values are correct + * we do not set pattern_parser.SetBlocks() + * blocks cannot be created in patterns generated from virtual FS + * but we can call other blocks (from normal templates) * - * IMPROVE ME - * we can add blocks and variables - * - * add caching of blocks + * pattern_parser.SetCommentary() is set beforehand */ pattern_parser.AllowInclude(false); + pattern_parser.DeleteWhiteTextItems(false); pattern_parser.ParseString(item.content, pattern); - if( ezc_fun ) - pattern.CacheFunctions(*ezc_fun); + RebuildCache(pattern); + } + Ezc::Pattern * PatternCacher::AddPattern(const Item & item) { // don't call DeleteOldPatterns() here // because you can delete a pattern which is in use - // (think about ezc functions: item run, insert_page etc) + // ezc functions such as: item_run, insert_page etc + // are using GetPattern() method which can call this method PatternUsed pu; @@ -196,6 +207,23 @@ size_t PatternCacher::Size() } +void PatternCacher::RebuildCache(Ezc::Pattern & pattern) +{ + pattern.ClearCache(); + + if( ezc_fun ) + pattern.CacheFunctions(*ezc_fun); + + if( ezc_blocks ) + pattern.CacheBlocks(*ezc_blocks); +} + + +void PatternCacher::RebuildCache() +{ + for(size_t i=0 ; iFilter(templ.patterns[i], *locale, i); } } +// caching should be done after all patterns are read +// because patterns can define blocks +void Patterns::RebuildCache() +{ + for(size_t a = 0 ; a < pat_tab.size() ; ++a) + { + for(size_t b = 0 ; b < pat_tab[a].patterns.size() ; ++b) + { + Ezc::Pattern & pat = pat_tab[a].patterns[b]; + + pat.ClearCache(); + + if( ezc_fun ) + pat.CacheFunctions(*ezc_fun); + + if( ezc_blocks ) + pat.CacheBlocks(*ezc_blocks); + } + } +} + + Ezc::Pattern * Patterns::Get(size_t index, size_t lang_id) { @@ -174,6 +201,8 @@ void Patterns::Reload() for(size_t i=0 ; i 0 ) ReadPatterns(pat_tab[i]); + + RebuildCache(); } diff --git a/templates/patterns.h b/templates/patterns.h index 20de918..6516370 100755 --- a/templates/patterns.h +++ b/templates/patterns.h @@ -61,12 +61,29 @@ public: void SetLocaleFilter(LocaleFilter * plocale_filter); /* - setting ezc functions - you don't have to call this method - (in such a case functions will be search with O(log) by the Generator) + remembering a pointer to ezc functions + this functions (pointers to them) will be cached in patterns + + this caching will be done when a pattern is read from the hard drive + so you have to call this method before */ void SetEzcFunctions(TemplatesFunctions::EzcFun * fun); + /* + remembering a pointer to ezc blocks + this blocks (pointers to them) will be cached in patterns + + this caching will be done when a pattern is read from the hard drive + so you have to call this method before + */ + void SetEzcBlocks(Ezc::Blocks * blocks); + + + /* + commentary prefix/postfix used in pattern_parser + (when there is an error) + */ + void SetEzcCommentary(const std::wstring & start, const std::wstring & end); /* adding a new pattern and returning its index @@ -75,8 +92,10 @@ public: if read_pattern is false then the pattern is not read, it will be read when you call Reload() method + + after adding some new patterns you have to call RebuildCache() method */ - size_t Add(const wchar_t * file_name, bool read_pattern = true); + size_t Add(const wchar_t * file_name, bool read_pattern = true); size_t Add(const std::wstring & file_name, bool read_pattern = true); @@ -107,7 +126,7 @@ public: /* - reloading all patterns + reloading all patterns and rebuilding cache */ void Reload(); @@ -120,6 +139,13 @@ public: size_t Size(); + /* + * rebuilding the cache for functions and blocks + * you should call this method when you Add() new patterns + */ + void RebuildCache(); + + private: bool del_white_items; @@ -130,6 +156,9 @@ private: // can be null (not set directly) TemplatesFunctions::EzcFun * ezc_fun; + // can be null + Ezc::Blocks * ezc_blocks; + struct Template { bool to_delete; diff --git a/templates/templates.cpp b/templates/templates.cpp index 153236f..9840e0f 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -58,6 +58,7 @@ PatternCacher pattern_cacher; // patterns for user items (files with an exec Locale locale; EzcFun ezc_functions; +Ezc::Blocks ezc_blocks; LocaleFilter locale_filter; HTMLFilter html_filter; @@ -157,16 +158,7 @@ Ezc::Pattern * p = 0; if( p ) { - content_gen.TrimWhite(gen_trim_white); - content_gen.SkipNewLine(gen_skip_new_line); - content_gen.RecognizeSpecialChars(gen_use_special_chars); - content_gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - - /* - * !! IMPROVE ME - * add blocks and variables - */ - //content_gen.AddFunctions(); + InitGenerator(content_gen); content_gen.SetPattern(*p); content_gen.Generate(i.out); } @@ -852,11 +844,15 @@ using namespace TemplatesFunctions; patterns.Clear(); index_patterns.Clear(); change_patterns.Clear(); + ezc_blocks.Clear(); + //a pattern cacher chyba tez powinien byc wyczyszczony (tylko tam jest jakies zabezpieczenie) + //bo moze miec skeszowane bloki.... + pat_index = patterns.Add(config->templates_index); - pat_index_fullscreen = patterns.Add(L"index_fullscreen.html"); - pat_err_404 = patterns.Add(L"err_404.html"); - pat_err_per_denied = patterns.Add(L"err_per_denied.html"); + pat_index_fullscreen = patterns.Add(L"index_fullscreen.html"); // !! IMPROVE ME name to the config + pat_err_404 = patterns.Add(L"err_404.html"); // !! IMPROVE ME name to the config + pat_err_per_denied = patterns.Add(L"err_per_denied.html"); // !! IMPROVE ME name to the config ReadTemplatesForFunctions(); ReadIndexTemplates(); @@ -864,6 +860,11 @@ using namespace TemplatesFunctions; plugin.Call((Session*)0, WINIX_ADD_TEMPLATE); + patterns.RebuildCache(); + ezc_blocks.CacheBlocks(ezc_blocks); + ezc_blocks.CacheFunctions(ezc_functions); + pattern_cacher.RebuildCache(); + SetHtmlFilter(); log << log3 << "Templates: there are " << patterns.Size() << " patterns" @@ -881,8 +882,10 @@ void Templates::Init() using namespace TemplatesFunctions; patterns.SetDirectories(config->templates_dir, config->templates_dir_default); + patterns.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix); pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete); + pattern_cacher.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix); CreateFunctions(); // create functions first (functions will be cached by patterns) ReadTemplates(); } @@ -974,15 +977,8 @@ using namespace TemplatesFunctions; if( index ) { - generator.TrimWhite(gen_trim_white); - generator.SkipNewLine(gen_skip_new_line); - generator.RecognizeSpecialChars(gen_use_special_chars); - generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); + InitGenerator(generator); generator.SetPattern(*index); - /* - * !! IMPROVE ME - * add blocks and variables - */ generator.Generate(cur->request->out_streams); } else @@ -1018,15 +1014,8 @@ void Templates::Generate(Ezc::Pattern & pattern) { using namespace TemplatesFunctions; - generator.TrimWhite(gen_trim_white); - generator.SkipNewLine(gen_skip_new_line); - generator.RecognizeSpecialChars(gen_use_special_chars); - generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); + InitGenerator(generator); generator.SetPattern(pattern); - /* - * !! IMPROVE ME - * add blocks and variables - */ generator.Generate(cur->request->out_streams); } @@ -1074,11 +1063,13 @@ Templates::Templates() using namespace TemplatesFunctions; patterns.SetEzcFunctions(&ezc_functions); + patterns.SetEzcBlocks(&ezc_blocks); patterns.SetLocale(&locale); patterns.SetLocaleFilter(&locale_filter); index_patterns.SetPatterns(&patterns); change_patterns.SetPatterns(&patterns); pattern_cacher.SetEzcFunctions(&ezc_functions); + pattern_cacher.SetEzcBlocks(&ezc_blocks); }