From 5266a7e4e5a73c08c7e5c40699a870bffbfbebc9 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sat, 18 Oct 2014 18:12:04 +0000 Subject: [PATCH] updated: to the new Ezc API git-svn-id: svn://ttmath.org/publicrep/winix/trunk@974 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile.dep | 2 +- core/Makefile.dep | 168 +++++---- functions/Makefile.dep | 710 ++++++++++++++++++----------------- main/Makefile.dep | 29 +- notify/Makefile.dep | 26 +- notify/notifythread.cpp | 9 +- plugins/export/Makefile.dep | 20 +- plugins/gallery/Makefile.dep | 16 +- plugins/group/Makefile.dep | 19 +- plugins/menu/Makefile.dep | 20 +- plugins/menu/templates.cpp | 12 +- plugins/stats/Makefile.dep | 10 +- plugins/thread/Makefile.dep | 34 +- plugins/thread/templates.cpp | 7 +- plugins/ticket/Makefile.dep | 41 +- templates/Makefile.dep | 315 +++++++++------- templates/insert.cpp | 8 +- templates/item.cpp | 16 +- templates/man.cpp | 4 +- templates/patterncacher.cpp | 14 +- templates/patterncacher.h | 3 + templates/patterns.cpp | 17 +- templates/patterns.h | 2 + templates/templates.cpp | 30 +- templates/templates.h | 1 - templates/winix.cpp | 7 +- 26 files changed, 864 insertions(+), 676 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 9dd1db9..fd716ae 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/item.cpp ../ezc/src/stringconv.h ../ezc/src/pattern.h ../ezc/src/item.h ../ezc/src/ezc.h ../ezc/src/funinfo.h ../ezc/src/generator.h ../ezc/src/stringconv.cpp ../ezc/src/functions.h ../ezc/src/pattern.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/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 6b5ebb4..1cd9b06 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -32,39 +32,40 @@ app.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h 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/pattern.h -app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -app.o: ../../ezc/src/stringconv.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: ../../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: ../../winix/templates/patterncacher.h app.o: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h app.o: ../../winix/templates/changepatterns.h @@ -111,9 +112,10 @@ config.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -config.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.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 @@ -202,12 +204,12 @@ dirs.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h 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/pattern.h -dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -dirs.o: ../../ezc/src/stringconv.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 +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 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 @@ -262,9 +264,10 @@ image.o: ../../winix/core/config.h system.h job.h dirs.h dircontainer.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -image.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.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 @@ -350,9 +353,10 @@ job.o: ../../winix/core/group.h ../../winix/core/dircontainer.h 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/pattern.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/stringconv.h ../../winix/notify/notifythread.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 job.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h groups.h @@ -447,10 +451,11 @@ misc.o: ../../winix/templates/htmltextstream.h ../../winix/core/textstream.h 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/pattern.h -misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -misc.o: ../../ezc/src/stringconv.h ../../winix/templates/patterncacher.h -misc.o: ../../winix/core/item.h ../../winix/templates/indexpatterns.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: ../../winix/templates/patterns.h ../../winix/templates/locale.h misc.o: ../../winix/templates/changepatterns.h misc.o: ../../winix/templates/htmltextstream.h @@ -494,9 +499,11 @@ mountparser.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -mountparser.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.h +mountparser.o: ../../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 mountparser.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h @@ -523,9 +530,10 @@ mounts.o: rebus.h ipban.h ../../winix/templates/locale.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -mounts.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.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 @@ -586,15 +594,15 @@ plugin.o: ../../winix/core/group.h ../../winix/core/dircontainer.h 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 -plugin.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.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: ../../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/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: ../../winix/functions/functions.h plugin.o: ../../winix/functions/functionbase.h ../../winix/core/request.h plugin.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -653,9 +661,10 @@ plugindata.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -plugindata.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.h +plugindata.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h plugindata.o: ../../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 @@ -748,9 +757,10 @@ request.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -request.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.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 @@ -857,9 +867,10 @@ sessionmanager.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -sessionmanager.o: ../../ezc/src/stringconv.h +sessionmanager.o: ../../ezc/src/patternparser.h sessionmanager.o: ../../winix/notify/notifythread.h sessionmanager.o: ../../winix/core/basethread.h sessionmanager.o: ../../winix/notify/templatesnotify.h @@ -961,9 +972,10 @@ system.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h 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/pattern.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/functions.h ../../ezc/src/funinfo.h -system.o: ../../ezc/src/stringconv.h ../../winix/notify/notifythread.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 @@ -1067,14 +1079,14 @@ users.o: ../../winix/core/ugcontainer.h log.h logmanipulators.h slog.h 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 -users.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -users.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.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: ../../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/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: ../../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/functions/Makefile.dep b/functions/Makefile.dep index f09eb44..483f963 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -33,14 +33,15 @@ account.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -84,14 +85,15 @@ adduser.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -144,23 +146,23 @@ cat.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -cat.o: functionparser.h ../../winix/core/cur.h account.h adduser.h chmod.h -cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -cat.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h -cat.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h -cat.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h -cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -cat.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -192,14 +194,15 @@ chmod.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -240,14 +243,15 @@ chown.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -290,14 +294,15 @@ ckeditor.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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: ../../winix/notify/templatesnotify.h ../../winix/core/users.h ckeditor.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h @@ -337,28 +342,28 @@ cp.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -cp.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -cp.o: chmod.h privchanger.h chown.h ckeditor.h default.h download.h emacs.h -cp.o: env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h mkdir.h -cp.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h -cp.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h -cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -cp.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h +cp.o: ../../ezc/src/pattern.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: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h cp.o: ../../winix/templates/changepatterns.h cp.o: ../../winix/templates/htmltextstream.h @@ -396,14 +401,15 @@ default.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -446,14 +452,15 @@ download.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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: ../../winix/notify/templatesnotify.h ../../winix/core/users.h download.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h @@ -494,14 +501,15 @@ emacs.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -548,23 +556,24 @@ env.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -env.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -env.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -env.o: emacs.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -env.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -env.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -env.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -env.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 functionbase.o: functionbase.h ../../winix/core/item.h functionbase.o: ../../pikotools/space/space.h functionbase.o: ../../pikotools/textstream/types.h @@ -601,7 +610,8 @@ functionbase.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.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: 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 @@ -609,7 +619,7 @@ 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/stringconv.h +functionbase.o: ../../winix/core/htmlfilter.h ../../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 @@ -659,15 +669,16 @@ functionparser.o: ../../winix/notify/notifypool.h 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/pattern.h -functionparser.o: functions.h account.h adduser.h cat.h chmod.h privchanger.h -functionparser.o: chown.h ckeditor.h cp.h default.h download.h emacs.h env.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: 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 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/stringconv.h +functionparser.o: ../../ezc/src/patternparser.h functionparser.o: ../../winix/notify/notifythread.h functionparser.o: ../../winix/core/basethread.h functionparser.o: ../../winix/notify/templatesnotify.h @@ -713,7 +724,8 @@ functions.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h 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/pattern.h ../../ezc/src/stringconv.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: ../../winix/notify/templatesnotify.h ../../winix/core/users.h functions.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h @@ -776,14 +788,15 @@ imgcrop.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -824,14 +837,15 @@ ipban.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.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: 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/stringconv.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 @@ -872,14 +886,15 @@ last.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -last.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -last.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -last.o: emacs.h env.h imgcrop.h login.h logout.h ln.h ls.h man.h meta.h -last.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -last.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -last.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -last.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../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 @@ -919,24 +934,24 @@ ln.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -ln.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -ln.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -ln.o: emacs.h env.h imgcrop.h last.h login.h logout.h ls.h man.h meta.h -ln.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -ln.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -ln.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -ln.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -970,14 +985,15 @@ locale.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1024,14 +1040,15 @@ login.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1074,14 +1091,15 @@ logout.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1121,23 +1139,23 @@ ls.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -ls.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -ls.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -ls.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h man.h meta.h -ls.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -ls.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -ls.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -ls.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -1169,23 +1187,23 @@ man.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -man.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -man.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -man.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h meta.h -man.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -man.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -man.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -man.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -1217,14 +1235,15 @@ meta.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -meta.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -meta.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -meta.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h -meta.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -meta.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -meta.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -meta.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../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 @@ -1265,14 +1284,15 @@ mkdir.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1324,14 +1344,15 @@ mount.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1371,27 +1392,28 @@ mv.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -mv.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -mv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -mv.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -mv.o: mkdir.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h -mv.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h -mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -mv.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h +mv.o: ../../ezc/src/pattern.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: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h mv.o: ../../winix/templates/changepatterns.h mv.o: ../../winix/templates/htmltextstream.h @@ -1429,14 +1451,15 @@ nicedit.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1477,14 +1500,15 @@ node.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -node.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -node.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -node.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h -node.o: meta.h mkdir.h mv.h nicedit.h passwd.h priv.h pw.h reload.h rm.h -node.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -node.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -node.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../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 @@ -1527,14 +1551,15 @@ passwd.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1576,14 +1601,15 @@ priv.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -priv.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -priv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -priv.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h -priv.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h pw.h reload.h rm.h -priv.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -priv.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -priv.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../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 @@ -1628,7 +1654,8 @@ privchanger.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h 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/pattern.h functions.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: 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 @@ -1636,7 +1663,7 @@ 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/stringconv.h +privchanger.o: ../../winix/core/htmlfilter.h ../../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 @@ -1677,24 +1704,24 @@ pw.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -pw.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -pw.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -pw.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -pw.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h rmuser.h -pw.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h -pw.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -pw.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -1728,14 +1755,15 @@ reload.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1781,27 +1809,28 @@ rm.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h functions.h -rm.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -rm.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -rm.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -rm.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rmuser.h -rm.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h -rm.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -rm.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: ../../ezc/src/generator.h ../../ezc/src/vars.h ../../ezc/src/blocks.h +rm.o: ../../ezc/src/pattern.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: ../../winix/templates/indexpatterns.h ../../winix/templates/patterns.h rm.o: ../../winix/templates/changepatterns.h rm.o: ../../winix/templates/htmltextstream.h @@ -1839,14 +1868,15 @@ rmuser.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -1899,23 +1929,23 @@ run.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -run.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -run.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -run.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -run.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -run.o: rmuser.h sort.h specialdefault.h stat.h subject.h template.h -run.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -run.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -1947,14 +1977,15 @@ sort.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -sort.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -sort.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -sort.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h -sort.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h -sort.o: rm.h rmuser.h run.h specialdefault.h stat.h subject.h template.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: ../../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/stringconv.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 @@ -2011,15 +2042,16 @@ specialdefault.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h 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/pattern.h -specialdefault.o: functions.h functionparser.h ../../winix/core/cur.h -specialdefault.o: account.h adduser.h cat.h chmod.h privchanger.h chown.h -specialdefault.o: ckeditor.h cp.h default.h download.h emacs.h env.h -specialdefault.o: imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -specialdefault.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h -specialdefault.o: rm.h rmuser.h run.h sort.h stat.h subject.h template.h -specialdefault.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h -specialdefault.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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: 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 +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/notify/notifythread.h specialdefault.o: ../../winix/core/basethread.h specialdefault.o: ../../winix/notify/templatesnotify.h @@ -2061,14 +2093,15 @@ stat.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -stat.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -stat.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -stat.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h -stat.o: meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h -stat.o: rm.h rmuser.h run.h sort.h specialdefault.h subject.h template.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: ../../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/stringconv.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 @@ -2111,14 +2144,15 @@ subject.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -2173,14 +2207,15 @@ template.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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: ../../winix/notify/templatesnotify.h ../../winix/core/users.h template.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h @@ -2223,14 +2258,15 @@ timezone.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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: ../../winix/notify/templatesnotify.h ../../winix/core/users.h timezone.o: ../../winix/core/ugcontainer.h ../../winix/core/lastcontainer.h @@ -2273,14 +2309,15 @@ tinymce.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -2321,14 +2358,15 @@ uname.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -2371,14 +2409,15 @@ upload.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -2432,14 +2471,15 @@ uptime.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.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: 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/stringconv.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 @@ -2480,23 +2520,23 @@ vim.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -vim.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -vim.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -vim.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -vim.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -vim.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -vim.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h -vim.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 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 @@ -2528,20 +2568,20 @@ who.o: ../../winix/core/synchro.h ../../winix/core/dirs.h 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/pattern.h functions.h -who.o: functionparser.h ../../winix/core/cur.h account.h adduser.h cat.h -who.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -who.o: emacs.h env.h imgcrop.h last.h login.h logout.h ln.h ls.h man.h meta.h -who.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h -who.o: rmuser.h run.h sort.h specialdefault.h stat.h subject.h template.h -who.o: timezone.h tinymce.h uname.h upload.h uptime.h vim.h -who.o: ../../winix/core/htmlfilter.h ../../ezc/src/stringconv.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 +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: ../../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 diff --git a/main/Makefile.dep b/main/Makefile.dep index dbf07e8..89162be 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -31,20 +31,21 @@ main.o: ../../winix/core/ugcontainer.h ../../winix/core/log.h 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/pattern.h -main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -main.o: ../../ezc/src/stringconv.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: ../../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: ../../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 eccab98..86261a5 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -10,10 +10,10 @@ notify.o: ../../pikotools/convert/inttostr.h notify.o: ../../pikotools/membuffer/membuffer.h notify.o: ../../pikotools/textstream/types.h ../../winix/templates/patterns.h notify.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h -notify.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -notify.o: ../../ezc/src/pattern.h ../../ezc/src/item.h -notify.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -notify.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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: ../../winix/core/textstream.h notifythread.h notify.o: ../../winix/core/basethread.h ../../winix/core/synchro.h @@ -91,9 +91,10 @@ notifypool.o: ../../pikotools/textstream/types.h notifythread.o: notifythread.h ../../winix/core/basethread.h notifythread.o: ../../winix/core/synchro.h templatesnotify.h notifythread.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -notifythread.o: ../../ezc/src/pattern.h ../../ezc/src/item.h -notifythread.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -notifythread.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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: ../../winix/templates/localefilter.h notifythread.o: ../../winix/templates/locale.h @@ -129,11 +130,12 @@ notifythread.o: ../../winix/core/dircontainer.h notifythread.o: ../../winix/core/ugcontainer.h notifythread.o: ../../winix/templates/patterns.h templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h -templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -templatesnotify.o: ../../pikotools/utf8/utf8.h ../../winix/core/textstream.h -templatesnotify.o: ../../winix/templates/misc.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: ../../winix/core/textstream.h ../../winix/templates/misc.h templatesnotify.o: ../../winix/templates/localefilter.h templatesnotify.o: ../../winix/templates/locale.h templatesnotify.o: ../../winix/templates/htmltextstream.h diff --git a/notify/notifythread.cpp b/notify/notifythread.cpp index 4c061de..65110e6 100755 --- a/notify/notifythread.cpp +++ b/notify/notifythread.cpp @@ -221,7 +221,14 @@ void NotifyThread::SendMail() generator.RecognizeSpecialChars(true); generator.TrimWhite(true); generator.SkipNewLine(true); - generator.Generate(notify_stream, *pat, TemplatesNotifyFunctions::ezc_functions); + /* + * !! IMPROVE ME + * add blocks and variables + * hmm may they are not needed here? + */ + generator.SetFunctions(TemplatesNotifyFunctions::ezc_functions); + generator.SetPattern(*pat); + generator.Generate(notify_stream); SendMail(TemplatesNotifyFunctions::notify_user_msg.email, notify_stream.Str()); } diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep index aae8eb9..171c68f 100755 --- a/plugins/export/Makefile.dep +++ b/plugins/export/Makefile.dep @@ -31,9 +31,10 @@ edb.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -edb.o: ../../../ezc/src/stringconv.h ../../../winix/notify/notifythread.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 @@ -79,9 +80,10 @@ exportinfo.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -exportinfo.o: ../../../ezc/src/stringconv.h +exportinfo.o: ../../../ezc/src/patternparser.h exportinfo.o: ../../../winix/notify/notifythread.h exportinfo.o: ../../../winix/core/basethread.h exportinfo.o: ../../../winix/notify/templatesnotify.h @@ -151,9 +153,10 @@ funexport.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -funexport.o: ../../../ezc/src/stringconv.h +funexport.o: ../../../ezc/src/patternparser.h funexport.o: ../../../winix/notify/notifythread.h funexport.o: ../../../winix/core/basethread.h funexport.o: ../../../winix/notify/templatesnotify.h @@ -203,9 +206,10 @@ init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index a64d91e..63eb93d 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -38,9 +38,11 @@ gallery.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -gallery.o: ../../../ezc/src/stringconv.h ../../../winix/notify/notifythread.h +gallery.o: ../../../ezc/src/patternparser.h +gallery.o: ../../../winix/notify/notifythread.h gallery.o: ../../../winix/core/basethread.h gallery.o: ../../../winix/notify/templatesnotify.h gallery.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h @@ -91,9 +93,10 @@ init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h @@ -180,9 +183,10 @@ templates.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/stringconv.h +templates.o: ../../../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 9a85d0f..1c890f3 100755 --- a/plugins/group/Makefile.dep +++ b/plugins/group/Makefile.dep @@ -37,9 +37,10 @@ groupinfo.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -groupinfo.o: ../../../ezc/src/stringconv.h +groupinfo.o: ../../../ezc/src/patternparser.h groupinfo.o: ../../../winix/notify/notifythread.h groupinfo.o: ../../../winix/core/basethread.h groupinfo.o: ../../../winix/notify/templatesnotify.h @@ -91,9 +92,10 @@ init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h @@ -139,10 +141,11 @@ init.o: ../../../winix/templates/changepatterns.h init.o: ../../../winix/templates/htmltextstream.h 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/pattern.h -templates.o: ../../../winix/core/item.h ../../../ezc/src/functions.h -templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h -templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/misc.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: ../../../winix/core/requesttypes.h templates.o: ../../../pikotools/textstream/textstream.h templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep index 4145f3a..f622ebd 100755 --- a/plugins/menu/Makefile.dep +++ b/plugins/menu/Makefile.dep @@ -32,9 +32,11 @@ cache.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h cache.o: ../../../winix/templates/patterns.h cache.o: ../../../winix/templates/locale.h cache.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h -cache.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h +cache.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h +cache.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h cache.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -cache.o: ../../../ezc/src/stringconv.h ../../../winix/notify/notifythread.h +cache.o: ../../../ezc/src/patternparser.h +cache.o: ../../../winix/notify/notifythread.h cache.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h cache.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h cache.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h @@ -74,9 +76,10 @@ init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h @@ -124,10 +127,11 @@ init.o: ../../../winix/templates/htmltextstream.h init.o: ../../../winix/core/sessionmanager.h cache.h init.o: ../../../winix/core/dirs.h templates.o: ../../../winix/templates/templates.h ../../../ezc/src/ezc.h -templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -templates.o: ../../../winix/core/item.h ../../../ezc/src/functions.h -templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h -templates.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/misc.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: ../../../winix/core/requesttypes.h templates.o: ../../../pikotools/textstream/textstream.h templates.o: ../../../pikotools/space/space.h diff --git a/plugins/menu/templates.cpp b/plugins/menu/templates.cpp index 2795963..461e5d3 100755 --- a/plugins/menu/templates.cpp +++ b/plugins/menu/templates.cpp @@ -214,7 +214,7 @@ void menu_dir_init(Info & i, long dir_id, int param, bool with_meta) skip_static_files(*citem); } - i.stack->fun_data = new StackItem(citem); + i.stack.fun_data = new StackItem(citem); } @@ -290,13 +290,13 @@ void menu_dir_init(Info & i) void menu_dir_tab(Info & i) { - if( !i.stack->fun_data ) + if( !i.stack.fun_data ) menu_dir_init(i); - if( i.stack->fun_data ) + if( i.stack.fun_data ) { - StackItem * sitem = reinterpret_cast(i.stack->fun_data); - i.res = (i.stack->iter < sitem->citem->menu_items.size()); + StackItem * sitem = reinterpret_cast(i.stack.fun_data); + i.res = (i.stack.iter < sitem->citem->menu_items.size()); } // @@ -311,7 +311,7 @@ void menu_dir_tab(Info & i) // [end] // if( i.is_for ) - stack = i.stack; + stack = &i.stack; } diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index e9eb268..9c3759a 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -38,9 +38,10 @@ init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h @@ -145,9 +146,10 @@ templates.o: ../../../winix/templates/locale.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/stringconv.h +templates.o: ../../../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 db97be7..e11c52c 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -44,8 +44,9 @@ createthread.o: ../../../winix/templates/patterns.h 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/stringconv.h +createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h createthread.o: ../../../winix/notify/notifythread.h createthread.o: ../../../winix/core/basethread.h createthread.o: ../../../winix/notify/templatesnotify.h @@ -144,9 +145,10 @@ funthread.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -funthread.o: ../../../ezc/src/stringconv.h +funthread.o: ../../../ezc/src/patternparser.h funthread.o: ../../../winix/notify/notifythread.h funthread.o: ../../../winix/core/basethread.h funthread.o: ../../../winix/notify/templatesnotify.h @@ -197,9 +199,10 @@ init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h @@ -289,9 +292,11 @@ reply.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -reply.o: ../../../ezc/src/stringconv.h ../../../winix/notify/notifythread.h +reply.o: ../../../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 reply.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h @@ -376,9 +381,10 @@ showthreads.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -showthreads.o: ../../../ezc/src/stringconv.h +showthreads.o: ../../../ezc/src/patternparser.h showthreads.o: ../../../winix/notify/notifythread.h showthreads.o: ../../../winix/core/basethread.h showthreads.o: ../../../winix/notify/templatesnotify.h @@ -434,9 +440,10 @@ templates.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -templates.o: ../../../ezc/src/stringconv.h +templates.o: ../../../ezc/src/patternparser.h templates.o: ../../../winix/notify/notifythread.h templates.o: ../../../winix/core/basethread.h templates.o: ../../../winix/notify/templatesnotify.h @@ -538,9 +545,10 @@ threadinfo.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -threadinfo.o: ../../../ezc/src/stringconv.h +threadinfo.o: ../../../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 f7c445f..ae7be2f 100755 --- a/plugins/thread/templates.cpp +++ b/plugins/thread/templates.cpp @@ -358,7 +358,12 @@ void thread_sort_tab_run(Info & i) 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); - ezc_generator.Generate(item_run_content, *p); + 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 97e20e9..f65b3a0 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -45,8 +45,9 @@ createticket.o: ../../../winix/templates/patterns.h 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/stringconv.h +createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h createticket.o: ../../../winix/notify/notifythread.h createticket.o: ../../../winix/core/basethread.h createticket.o: ../../../winix/notify/templatesnotify.h @@ -161,9 +162,10 @@ editticket.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -editticket.o: ../../../ezc/src/stringconv.h +editticket.o: ../../../ezc/src/patternparser.h editticket.o: ../../../winix/notify/notifythread.h editticket.o: ../../../winix/core/basethread.h editticket.o: ../../../winix/notify/templatesnotify.h @@ -267,9 +269,10 @@ funticket.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -funticket.o: ../../../ezc/src/stringconv.h +funticket.o: ../../../ezc/src/patternparser.h funticket.o: ../../../winix/notify/notifythread.h funticket.o: ../../../winix/core/basethread.h funticket.o: ../../../winix/notify/templatesnotify.h @@ -364,9 +367,10 @@ init.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h 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/pattern.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/stringconv.h ../../../winix/notify/notifythread.h +init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h init.o: ../../../winix/core/basethread.h init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/users.h init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/lastcontainer.h @@ -465,9 +469,10 @@ showtickets.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -showtickets.o: ../../../ezc/src/stringconv.h +showtickets.o: ../../../ezc/src/patternparser.h showtickets.o: ../../../winix/notify/notifythread.h showtickets.o: ../../../winix/core/basethread.h showtickets.o: ../../../winix/notify/templatesnotify.h @@ -537,13 +542,14 @@ showtickets.o: ../../../winix/core/sessionmanager.h tdb.o: tdb.h ticket.h ../../../winix/db/dbbase.h ../../../winix/core/error.h tdb.o: ../../../winix/core/log.h templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h -templates.o: ../../../ezc/src/pattern.h ../../../winix/core/item.h -templates.o: ../../../pikotools/space/space.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/functions.h -templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h -templates.o: ../../../pikotools/utf8/utf8.h ticketinfo.h ticket.h -templates.o: ../../../winix/core/item.h ../../../winix/core/system.h +templates.o: ../../../pikotools/date/date.h ../../../ezc/src/pattern.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: ../../../winix/functions/functions.h templates.o: ../../../winix/functions/functionbase.h ../../../winix/db/db.h templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h @@ -684,9 +690,10 @@ ticketinfo.o: ../../../winix/notify/notifypool.h 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/pattern.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/functions.h ../../../ezc/src/funinfo.h -ticketinfo.o: ../../../ezc/src/stringconv.h +ticketinfo.o: ../../../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 755d478..fc0a289 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -1,11 +1,12 @@ # DO NOT DELETE adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -adduser.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h adduser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h adduser.o: ../../pikotools/convert/convert.h @@ -60,16 +61,18 @@ changepatterns.o: ../../pikotools/convert/inttostr.h changepatterns.o: ../../pikotools/membuffer/membuffer.h changepatterns.o: ../../pikotools/textstream/types.h localefilter.h changepatterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -changepatterns.o: ../../ezc/src/pattern.h ../../ezc/src/item.h -changepatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h -changepatterns.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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 config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -config.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h config.o: ../../pikotools/convert/convert.h @@ -113,9 +116,10 @@ config.o: ../../winix/core/sessioncontainer.h config.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h config.o: ../../winix/core/htmlfilter.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -dir.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -dir.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -dir.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -182,9 +186,10 @@ dir.o: ../../winix/functions/uname.h ../../winix/functions/upload.h dir.o: ../../winix/functions/uptime.h ../../winix/functions/who.h dir.o: ../../winix/functions/vim.h miscspace.h doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -doc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -228,9 +233,10 @@ doc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h doc.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -env.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -env.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -297,11 +303,12 @@ env.o: ../../winix/functions/uname.h ../../winix/functions/upload.h env.o: ../../winix/functions/uptime.h ../../winix/functions/who.h env.o: ../../winix/functions/vim.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -filters.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h filters.o: ../../pikotools/space/space.h ../../pikotools/date/date.h filters.o: ../../pikotools/convert/convert.h @@ -356,15 +363,17 @@ htmltextstream.o: ../../pikotools/convert/convert.h htmltextstream.o: ../../pikotools/convert/inttostr.h htmltextstream.o: ../../pikotools/membuffer/membuffer.h htmltextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h -htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -htmltextstream.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -htmltextstream.o: ../../pikotools/utf8/utf8.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 indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h -indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -indexpatterns.o: ../../pikotools/utf8/utf8.h patterns.h locale.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/space/space.h indexpatterns.o: ../../pikotools/textstream/types.h @@ -379,11 +388,12 @@ indexpatterns.o: ../../winix/core/log.h ../../winix/core/textstream.h indexpatterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h 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/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h insert.o: ../../pikotools/space/space.h ../../pikotools/date/date.h insert.o: ../../pikotools/convert/convert.h @@ -428,9 +438,10 @@ insert.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h insert.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -ipban.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -ipban.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h @@ -500,9 +511,10 @@ ipban.o: ../../winix/functions/uname.h ../../winix/functions/upload.h ipban.o: ../../winix/functions/uptime.h ../../winix/functions/who.h ipban.o: ../../winix/functions/vim.h item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -item.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -item.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -547,9 +559,10 @@ item.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h item.o: ../../winix/core/misc.h ../../winix/core/winix_const.h item.o: ../../winix/core/bbcodeparser.h miscspace.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -last.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -last.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -604,8 +617,8 @@ locale.o: ../../winix/core/textstream.h ../../winix/core/logmanipulators.h locale.o: ../../winix/core/slog.h ../../winix/core/cur.h locale.o: ../../winix/templates/locale.h ../../winix/core/misc.h locale.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -locale.o: ../../winix/core/requesttypes.h ../../pikotools/utf8/utf8.h -locale.o: ../../winix/core/winix_const.h +locale.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h +locale.o: ../../winix/core/requesttypes.h ../../winix/core/winix_const.h localefilter.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h localefilter.o: ../../pikotools/space/space.h localefilter.o: ../../pikotools/textstream/types.h @@ -615,16 +628,18 @@ localefilter.o: ../../pikotools/convert/convert.h localefilter.o: ../../pikotools/convert/inttostr.h localefilter.o: ../../pikotools/membuffer/membuffer.h localefilter.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h -localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -localefilter.o: ../../pikotools/utf8/utf8.h ../core/misc.h +localefilter.o: ../../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: ../../winix/core/winix_const.h login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -login.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -login.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h @@ -692,9 +707,10 @@ login.o: ../../winix/functions/uname.h ../../winix/functions/upload.h login.o: ../../winix/functions/uptime.h ../../winix/functions/who.h login.o: ../../winix/functions/vim.h ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -ls.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -ls.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -ls.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -737,9 +753,10 @@ ls.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h ls.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -man.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -man.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -806,9 +823,10 @@ man.o: ../../winix/functions/uname.h ../../winix/functions/upload.h man.o: ../../winix/functions/uptime.h ../../winix/functions/who.h man.o: ../../winix/functions/vim.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -misc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -misc.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -852,10 +870,11 @@ misc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h misc.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h 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/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h -miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.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/space/space.h ../../pikotools/textstream/types.h miscspace.o: ../../pikotools/textstream/textstream.h miscspace.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -901,9 +920,10 @@ miscspace.o: ../../winix/core/sessioncontainer.h miscspace.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h miscspace.o: ../../winix/core/htmlfilter.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -mount.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -mount.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h @@ -949,12 +969,12 @@ mount.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h mount.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h mount.o: ../../winix/core/winix_const.h ../../winix/core/mounts.h passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h -passwd.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -passwd.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -passwd.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -passwd.o: ../../pikotools/utf8/utf8.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: ../../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: ../../pikotools/textstream/textstream.h passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h passwd.o: ../../pikotools/convert/convert.h @@ -1008,10 +1028,11 @@ patterncacher.o: ../../pikotools/convert/convert.h patterncacher.o: ../../pikotools/convert/inttostr.h patterncacher.o: ../../pikotools/membuffer/membuffer.h patterncacher.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h -patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -patterncacher.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -patterncacher.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -patterncacher.o: ../../pikotools/utf8/utf8.h htmltextstream.h +patterncacher.o: ../../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: ../../winix/core/logmanipulators.h ../../winix/core/slog.h @@ -1025,17 +1046,19 @@ patterns.o: ../../pikotools/convert/inttostr.h patterns.o: ../../pikotools/membuffer/membuffer.h patterns.o: ../../pikotools/textstream/types.h localefilter.h patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -patterns.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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 +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 priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -priv.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -priv.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -1103,12 +1126,12 @@ priv.o: ../../winix/functions/uname.h ../../winix/functions/upload.h priv.o: ../../winix/functions/uptime.h ../../winix/functions/who.h priv.o: ../../winix/functions/vim.h rebus.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h -rebus.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -rebus.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -rebus.o: ../../pikotools/utf8/utf8.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: ../../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: ../../pikotools/textstream/textstream.h rebus.o: ../../pikotools/space/space.h ../../pikotools/date/date.h rebus.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -1157,18 +1180,19 @@ slog.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h slog.o: ../../pikotools/convert/inttostr.h slog.o: ../../pikotools/membuffer/membuffer.h slog.o: ../../pikotools/textstream/types.h templates.h ../../ezc/src/ezc.h -slog.o: ../../ezc/src/generator.h ../../ezc/src/pattern.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 ../../ezc/src/stringconv.h -slog.o: ../../pikotools/utf8/utf8.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: ../../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: ../../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 @@ -1196,9 +1220,10 @@ slog.o: ../../winix/core/timezone.h ../../winix/core/sessionmanager.h slog.o: ../../winix/core/sessioncontainer.h ../../winix/core/ipbancontainer.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -stat.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -1242,9 +1267,10 @@ stat.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h stat.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -sys.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -sys.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -1312,11 +1338,12 @@ sys.o: ../../winix/functions/uname.h ../../winix/functions/upload.h sys.o: ../../winix/functions/uptime.h ../../winix/functions/who.h 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/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h template.o: ../../pikotools/space/space.h ../../pikotools/date/date.h template.o: ../../pikotools/convert/convert.h @@ -1362,10 +1389,11 @@ template.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h template.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h template.o: ../../winix/core/winix_const.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h misc.h -templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.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/space/space.h ../../pikotools/textstream/types.h templates.o: ../../pikotools/textstream/textstream.h templates.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -1448,17 +1476,18 @@ textextstream.o: ../../pikotools/convert/convert.h textextstream.o: ../../pikotools/convert/inttostr.h textextstream.o: ../../pikotools/membuffer/membuffer.h textextstream.o: ../../pikotools/textstream/types.h ../../ezc/src/ezc.h -textextstream.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -textextstream.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -textextstream.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -textextstream.o: ../../pikotools/utf8/utf8.h htmltextstream.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 upload.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h -upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -upload.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h -upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -upload.o: ../../pikotools/utf8/utf8.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: ../../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: ../../pikotools/textstream/textstream.h upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h upload.o: ../../pikotools/convert/convert.h @@ -1502,11 +1531,12 @@ upload.o: ../../winix/core/sessioncontainer.h upload.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h upload.o: ../../winix/core/htmlfilter.h uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -uptime.o: ../../ezc/src/pattern.h ../../ezc/src/item.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: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.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/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/textstream/textstream.h uptime.o: ../../pikotools/space/space.h ../../pikotools/date/date.h uptime.o: ../../pikotools/convert/convert.h @@ -1550,9 +1580,10 @@ uptime.o: ../../winix/core/sessioncontainer.h uptime.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h uptime.o: ../../winix/core/htmlfilter.h user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h -user.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -user.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -1596,9 +1627,10 @@ user.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h user.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -who.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -who.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h ../../pikotools/space/space.h @@ -1642,9 +1674,10 @@ who.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h who.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h 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/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h -winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -winix.o: ../../pikotools/utf8/utf8.h misc.h localefilter.h locale.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/textstream/textstream.h diff --git a/templates/insert.cpp b/templates/insert.cpp index 80dc125..d4d3985 100755 --- a/templates/insert.cpp +++ b/templates/insert.cpp @@ -77,7 +77,13 @@ void insert_page_run(Info & i) 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); - info.ezc_gen.Generate(info.run_content, *pat); + /* + * !! IMPROVE ME + * add blocks and variables + * hmm may they are not needed here? + */ + 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); insert_page_cur -= 1; diff --git a/templates/item.cpp b/templates/item.cpp index c3c0a2d..5f5b2ac 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -336,7 +336,13 @@ void item_run(Info & i) 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); - ezc_generator.Generate(item_run_content, *p); + /* + * !! IMPROVE ME + * add blocks and variables + * hmm may they are not needed here? + */ + ezc_generator.SetPattern(*p); + ezc_generator.Generate(item_run_content); item_print_content(i.out, item_run_content.Str(), cur->request->item.content_type); } @@ -733,7 +739,13 @@ void item_tab_run(Info & i) 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); - ezc_generator.Generate(item_run_content, *p); + /* + * !! IMPROVE ME + * add blocks and variables + * hmm may they are not needed here? + */ + 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); } else diff --git a/templates/man.cpp b/templates/man.cpp index 6d6f0b0..76a81dd 100755 --- a/templates/man.cpp +++ b/templates/man.cpp @@ -65,7 +65,7 @@ return winixfun_iter != functions->End(); void man_winixfun_tab(Info & i) { man_winixfun_tabcheck(); - winixstack = i.stack; + winixstack = &i.stack; if( i.iter == 0 ) winixfun_iter = functions->Begin(); @@ -113,7 +113,7 @@ return ezcfun_iter != ezc_functions.End(); void man_ezcfun_tab(Info & i) { man_ezcfun_tabcheck(); - ezcstack = i.stack; + ezcstack = &i.stack; if( i.iter == 0 ) ezcfun_iter = ezc_functions.Begin(); diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 8ca34a0..829209c 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -96,8 +96,18 @@ void PatternCacher::DeleteOldPatterns() void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) { - pattern.AllowInclude(false); - pattern.ParseString(item.content); + /* + * CHECK ME + * check the rest flags from pattern_parser + * if the default values are correct + * + * IMPROVE ME + * we can add blocks and variables + * + * add caching of blocks + */ + pattern_parser.AllowInclude(false); + pattern_parser.ParseString(item.content, pattern); if( ezc_fun ) pattern.CacheFunctions(*ezc_fun); diff --git a/templates/patterncacher.h b/templates/patterncacher.h index 943dabd..b924337 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -121,6 +121,9 @@ private: // can be null (not set directly) TemplatesFunctions::EzcFun * ezc_fun; + // parser for patterns + Ezc::PatternParser pattern_parser; + }; diff --git a/templates/patterns.cpp b/templates/patterns.cpp index 922615e..498a563 100755 --- a/templates/patterns.cpp +++ b/templates/patterns.cpp @@ -120,15 +120,26 @@ void Patterns::ReadPatterns(Template & templ) size_t len = locale->Size(); templ.patterns.resize(len); + /* + * CHECK ME + * make sure everything else is set correctly from pattern_parser + * (default values) + */ + pattern_parser.DeleteWhiteTextItems(del_white_items); + pattern_parser.Directory(templates_dir, templates_dir_def); + for(size_t i=0 ; iFilter(templ.patterns[i], *locale, i); } } diff --git a/templates/patterns.h b/templates/patterns.h index fd4077f..20de918 100755 --- a/templates/patterns.h +++ b/templates/patterns.h @@ -147,6 +147,8 @@ private: // non-const for default assignment operator to be created std::wstring empty_str; + Ezc::PatternParser pattern_parser; + void ReadPatterns(Template & templ); }; diff --git a/templates/templates.cpp b/templates/templates.cpp index db9a5e3..153236f 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -161,7 +161,14 @@ Ezc::Pattern * p = 0; 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); - content_gen.Generate(i.out, *p); + + /* + * !! IMPROVE ME + * add blocks and variables + */ + //content_gen.AddFunctions(); + content_gen.SetPattern(*p); + content_gen.Generate(i.out); } else { @@ -656,7 +663,6 @@ void Templates::CreateFunctions() ezc_functions.Insert("winix_subdomain_is_not_empty", winix_subdomain_is_not_empty); ezc_functions.Insert("winix_subdomain_is", winix_subdomain_is); ezc_functions.Insert("str", str); - ezc_functions.Insert("strnc", strnc); ezc_functions.Insert("winix_tz_tab", winix_tz_tab); ezc_functions.Insert("winix_tz_tab_id", winix_tz_tab_id); ezc_functions.Insert("winix_tz_tab_name", winix_tz_tab_name); @@ -972,7 +978,12 @@ using namespace TemplatesFunctions; generator.SkipNewLine(gen_skip_new_line); generator.RecognizeSpecialChars(gen_use_special_chars); generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - generator.Generate(cur->request->out_streams, *index); + generator.SetPattern(*index); + /* + * !! IMPROVE ME + * add blocks and variables + */ + generator.Generate(cur->request->out_streams); } else { @@ -989,12 +1000,14 @@ using namespace TemplatesFunctions; if( !empty_pars.empty() ) empty_pars.clear(); + Ezc::Stack s; + // !! FIX ME // at the moment stream 0 is used // here should be something other - Info info(cur->request->out_streams[0], empty_pars, empty_string, empty_stream); + Info info(cur->request->out_streams[0], empty_pars, empty_string, empty_stream, s); - info.iter = 0; + info.iter = s.iter; info.res = false; item_run(info); @@ -1009,7 +1022,12 @@ using namespace TemplatesFunctions; generator.SkipNewLine(gen_skip_new_line); generator.RecognizeSpecialChars(gen_use_special_chars); generator.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements); - generator.Generate(cur->request->out_streams, pattern); + generator.SetPattern(pattern); + /* + * !! IMPROVE ME + * add blocks and variables + */ + generator.Generate(cur->request->out_streams); } diff --git a/templates/templates.h b/templates/templates.h index 875a149..96b0efb 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -571,7 +571,6 @@ namespace TemplatesFunctions void winix_subdomain_is_not_empty(Info & i); void winix_subdomain_is(Info & i); void str(Info & i); - void strnc(Info & i); void winix_tz_tab(Info & i); void winix_tz_tab_id(Info & i); void winix_tz_tab_name(Info & i); diff --git a/templates/winix.cpp b/templates/winix.cpp index d0c211a..a4fcfe1 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -308,13 +308,8 @@ void str(Info & i) i.out << i.params[a]; } -void strnc(Info & i) -{ - for(size_t a=0 ; a